From d0f83141fbaa5bb61a43bf803fa5a432eb2e7098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:38:01 +0200
Subject: [PATCH 001/345] FIX: Bad variable usage

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

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index c42a8d7079b..340cb3e18d5 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -65,8 +65,7 @@ if ($action == 'delete') {
 $accounting = new AccountingAccount($db);
 
 if ($action == 'disable') {
-	$accounting = $accounting->fetch($id);
-	if (! empty($accounting->id)) {
+	if ($accounting->fetch($id)) {
 		$result = $accounting->account_desactivate($id);
 	}
 	
@@ -75,10 +74,7 @@ if ($action == 'disable') {
 		setEventMessage($accounting->error, 'errors');
 	}
 } else if ($action == 'enable') {
-	
-	$accounting = $accounting->fetch($id);
-	
-	if (! empty($accounting->id)) {
+	if ($accounting->fetch($id)) {
 		$result = $accounting->account_activate($id);
 	}
 	$action = 'update';
@@ -206,4 +202,4 @@ if ($result) {
 }
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();

From bab1dd13e248a08bd01cd9336a7291f2bcfce7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:42:07 +0200
Subject: [PATCH 002/345] FIX: missing extends

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

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 82c3ec3ca10..f91f21343f8 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -26,7 +26,7 @@
 /**
  * Classe permettant la gestion des comptes generaux de compta
  */
-class AccountingAccount
+class AccountingAccount extends CommonObject
 {
 	var $db;
 	var $id;
@@ -426,4 +426,4 @@ class AccountingAccount
 			return - 1;
 		}
 	}
-}
\ No newline at end of file
+}

From 7b300b0a9dfdc2d9c852febb6e2c0fb02bd20e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:42:21 +0200
Subject: [PATCH 003/345] FIX: Missing variable declaration

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

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index f91f21343f8..4ecd0b3c8e1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -107,6 +107,7 @@ class AccountingAccount extends CommonObject
 	{
 		global $conf, $langs;
 		$error = 0;
+		$now = dol_now();
 
 		// Clean parameters
 		if (isset($this->fk_pcg_version))

From b1ad7af527f039c0c4888408c7ae9034f4cbe26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:42:33 +0200
Subject: [PATCH 004/345] FIX: Missing extends

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 2788526de05..e9bbc7d5958 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -27,7 +27,7 @@
 /**
  *	Class to manage accountancy book keeping
  */
-class BookKeeping
+class BookKeeping extends CommonObject
 {
 	var $db;
 	var $id;
@@ -709,4 +709,4 @@ class BookKeepingLine
 	var $fk_user_author;
 	var $code_journal;
 	var $piece_num;
-}
\ No newline at end of file
+}

From 64da1b1dc03326dfcc9785314948a36bd3bc1daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:43:49 +0200
Subject: [PATCH 005/345] FIX: Removed HTML file preventing PHP service

---
 htdocs/accountancy/customer/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 htdocs/accountancy/customer/index.html

diff --git a/htdocs/accountancy/customer/index.html b/htdocs/accountancy/customer/index.html
deleted file mode 100644
index e69de29bb2d..00000000000

From 9a141215bb279e46b7c2fda8c30e13cd489156d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:46:53 +0200
Subject: [PATCH 006/345] FIX: Moved code to where the variable is defined

---
 htdocs/accountancy/journal/bankjournal.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 82c3a09e20a..ef39e5668a0 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -137,17 +137,18 @@ if ($result) {
 	$tabpay = array ();
 	$tabbq = array ();
 	$tabtp = array ();
-	$tabcompany[$obj->rowid] = array (
-			'id' => $obj->socid,
-			'name' => $obj->name,
-			'code_client' => $obj->code_compta
-	);
 	$tabtype = array ();
 
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 
+		$tabcompany[$obj->rowid] = array (
+			'id' => $obj->socid,
+			'name' => $obj->name,
+			'code_client' => $obj->code_compta
+		);
+
 		// Controls
 		$compta_bank = $obj->account_number;
 		if ($obj->label == '(SupplierInvoicePayment)')
@@ -580,4 +581,4 @@ if ($action == 'export_csv') {
 	// End of page
 	llxFooter();
 }
-$db->close();
\ No newline at end of file
+$db->close();

From cc68966d7282f17176ce9baf52d188a2d69d72dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:49:07 +0200
Subject: [PATCH 007/345] FIX: Missing declaration

---
 htdocs/accountancy/journal/purchasesjournal.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e0c2ceb8e36..09d93d5cd50 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -246,7 +246,9 @@ if ($action == 'export_csv') {
 	
 	header('Content-Type: text/csv');
 	header('Content-Disposition: attachment;filename=journal_achats.csv');
-	
+
+	$companystatic = new Fournisseur($db);
+
 	if ($conf->global->ACCOUNTING_MODELCSV == 1) 	// Modèle Export Cegid Expert
 	{
 		foreach ( $tabfac as $key => $val ) {
@@ -468,4 +470,4 @@ if ($action == 'export_csv') {
 	// End of page
 	llxFooter();
 }
-$db->close();
\ No newline at end of file
+$db->close();

From 332caa2b7124ca6e314d5b119d2ee8676c903504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:51:21 +0200
Subject: [PATCH 008/345] FIX: missing global declaration

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1059d1af07d..50b9a35f4fe 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2768,7 +2768,7 @@ abstract class CommonObject
 	 */
 	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
 	{
-		global $conf,$langs,$user,$object,$hookmanager;
+		global $conf, $hookmanager, $inputalsopricewithtax, $langs, $user;
 
 		print '<tr class="liste_titre nodrag nodrop">';
 

From 852758c81c0bba13e3769804695206884e91e8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:52:22 +0200
Subject: [PATCH 009/345] FIX: Removed concatenation on undeclared variable

---
 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 5cf872eb3d8..937f904c512 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1297,7 +1297,7 @@ class Form
 
         // Method with no ajax
         //$out.='<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		$out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
+		$out=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
 		$out.='<input type="submit" class="button" name="addassignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 		$assignedtouser=array();
 		if (!empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);

From 4c7ae3d14b66e836b13b2fd6d11d56bb924127eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:54:04 +0200
Subject: [PATCH 010/345] FIX: Missing parameter declaration

---
 htdocs/core/lib/accounting.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index e7313c73aee..7b18de022f6 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -25,10 +25,11 @@
 
 /**
  *	Prepare array with list of admin tabs
+ *	@param	Object	$object		Accounting account
  *
  *	@return	array				Array of tabs to show
  */
-function admin_accounting_prepare_head()
+function admin_accounting_prepare_head($object)
 {
 	global $langs, $conf;
 	
@@ -189,4 +190,4 @@ function length_exportsage($txt, $len, $end)
 		}
 	}
 	return $res;
-}
\ No newline at end of file
+}

From 7c7276b5aaaf3c3dc515f4299e6e2e4b8ee8e892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 11:57:15 +0200
Subject: [PATCH 011/345] FIX: Removed undeclared variable

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

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0aa9f0e5979..10d0f69dd8e 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -67,7 +67,7 @@ if (GETPOST("button_removefilter"))
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element')?GETPOST('type_element'):$type_element;
+$type_element = GETPOST('type_element')?GETPOST('type_element'):'';
 
 
 $langs->load("companies");

From c7c809a6095ceae7697bfe9b24f6bb7a7fb5fd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 12:02:17 +0200
Subject: [PATCH 012/345] FIX: Wrong type hinting

---
 .../class/fournisseur.commande.class.php      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4e8c3a650b0..07964e69d58 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1062,25 +1062,25 @@ class CommandeFournisseur extends CommonOrder
      *	Add order line
      *
      *	@param      string	$desc            		Description
-     *	@param      double	$pu_ht              	Unit price
-     *	@param      double	$qty             		Quantity
-     *	@param      double	$txtva           		Taux tva
-     *	@param      double	$txlocaltax1        	Localtax1 tax
-     *  @param      double	$txlocaltax2        	Localtax2 tax
+     *	@param      float	$pu_ht              	Unit price
+     *	@param      float	$qty             		Quantity
+     *	@param      float	$txtva           		Taux tva
+     *	@param      float	$txlocaltax1        	Localtax1 tax
+     *  @param      float	$txlocaltax2        	Localtax2 tax
      *	@param      int		$fk_product      		Id produit
      *  @param      int		$fk_prod_fourn_price	Id supplier price
      *  @param      string	$fourn_ref				Supplier reference
-     *	@param      double	$remise_percent  		Remise
+     *	@param      float	$remise_percent  		Remise
      *	@param      string	$price_base_type		HT or TTC
-     *	@param		double	$pu_ttc					Unit price TTC
+     *	@param		float	$pu_ttc					Unit price TTC
      *	@param		int		$type					Type of line (0=product, 1=service)
      *	@param		int		$info_bits				More information
-     *  @param		int		$notrigger				Disable triggers
-     *  @param		timestamp	$date_start			Date start of service
-     *  @param		timestamp	$date_end			Date end of service
+     *  @param		bool	$notrigger				Disable triggers
+     *  @param		int		$date_start				Date start of service
+     *  @param		int		$date_end				Date end of service
      *	@return     int             				<=0 if KO, >0 if OK
      */
-    function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $type=0, $info_bits=0, $notrigger=false, $date_start='', $date_end='')
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null)
     {
         global $langs,$mysoc;
 

From 3a0d4cd47f139e57d8a9c81db00d4c6ab8b27c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 14:22:22 +0200
Subject: [PATCH 013/345] =?UTF-8?q?FIX:=C2=A0Missing=20visibility=20of=20s?=
 =?UTF-8?q?tatic=20property?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 d5d16efc2e9..c4bb2afcd44 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -54,7 +54,7 @@ class ExtraFields
 	var $error;
 	var $errno;
 
-	static $type2label=array(
+	public static $type2label=array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
 	'int'=>'Int',

From 37c0b9606b7c7db25fb714b3ae3b37ae9bb8b573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 14:32:50 +0200
Subject: [PATCH 014/345] FIX: Removed unused variable

---
 scripts/accountancy/export-thirdpartyaccount.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 2556457f38e..f1ff769059c 100644
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -164,7 +164,6 @@ if ($resql) {
 		header('Content-Disposition: attachment;filename=export_csv.csv');
 
 		$obj = $db->fetch_object($resql);
-		$var = ! $var;
 
 		print '"' . $obj->compta . '",';
 		print '"' . $obj->address . '",';
@@ -237,4 +236,4 @@ if ($resql) {
 }
 
 llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();

From 131997eeb8684df3c6012a134ef6cabe064011a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 14:39:17 +0200
Subject: [PATCH 015/345] FIX: Removed undeclared variables

---
 htdocs/core/modules/action/rapport.pdf.php           | 2 +-
 htdocs/core/modules/cheque/pdf/pdf_blochet.class.php | 2 +-
 htdocs/core/modules/rapport/pdf_paiement.class.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 1f03ea19d62..3bf7eddecce 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -127,7 +127,7 @@ class CommActionRapport
 				$hookmanager=new HookManager($this->db);
 			}
 			$hookmanager->initHooks(array('pdfgeneration'));
-			$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+			$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
 			global $action;
 			$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index 1112150a0e9..c2ac3aaa628 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -120,7 +120,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$hookmanager=new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		$parameters=array('outputlangs'=>$outputlangs);
 		global $action;
 		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 683034156da..a4b73f22e90 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -126,7 +126,7 @@ class pdf_paiement
 			$hookmanager=new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		$parameters=array('file'=>$file,'outputlangs'=>$outputlangs);
 		global $action;
 		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 

From afcebea440e2752945f67b95a43fa9d6a47ec90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 14:40:43 +0200
Subject: [PATCH 016/345] FIX: Missing global declaration

---
 htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php | 2 +-
 htdocs/core/modules/project/pdf/pdf_baleine.modules.php  | 2 +-
 htdocs/core/modules/rapport/pdf_paiement.class.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index fa2e3c85c06..80cf628838d 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -106,7 +106,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $conf, $hookmanager, $langs, $user;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
index 58dd367757e..0165a01a9bc 100644
--- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
@@ -92,7 +92,7 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	function write_file($object,$outputlangs)
 	{
-		global $user,$langs,$conf;
+		global $conf, $hookmanager, $langs, $user;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index a4b73f22e90..6f48cc1baca 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -91,7 +91,7 @@ class pdf_paiement
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-		global $user,$langs,$conf;
+		global $conf, $hookmanager, $langs, $user;
 
 		$socid=0;
 		if ($user->societe_id) $socid=$user->societe_id;

From f68cb3bfcbbf9e659066e53d532bd27ab345256b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 14:52:59 +0200
Subject: [PATCH 017/345] FIX: Variable declared boolean

---
 htdocs/core/modules/modSyslog.class.php | 2 +-
 htdocs/core/modules/modUser.class.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 563b2e31fa0..f2b5f80ff32 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -50,7 +50,7 @@ class modSyslog extends DolibarrModules
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Activate debug logs (syslog)";
 		// Can be enabled / disabled only in the main company
-		$this->core_enabled = 1;
+		$this->core_enabled = true;
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';    // 'experimental' or 'dolibarr' or version
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index a59031b4a44..55e96f02262 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -49,7 +49,7 @@ class modUser 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));
 		$this->description = "Gestion des utilisateurs (requis)";
-		$this->always_enabled = 1;	// Can't be disabled
+		$this->always_enabled = true;	// Can't be disabled
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';

From eea9a76589c6138dea1e06c8774d7c6a1522cfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:09:03 +0200
Subject: [PATCH 018/345] FIX: Variable might not be traversable

---
 htdocs/accountancy/journal/bankjournal.php | 144 +++++++++++----------
 htdocs/accountancy/journal/cashjournal.php | 107 +++++++--------
 htdocs/comm/action/peruser.php             |  77 ++++++-----
 htdocs/compta/bank/class/account.class.php |   8 +-
 htdocs/core/class/html.form.class.php      |  19 +--
 htdocs/core/lib/json.lib.php               |   2 +-
 htdocs/user/class/usergroup.class.php      |   2 +-
 7 files changed, 192 insertions(+), 167 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ef39e5668a0..ca862098bd3 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -170,83 +170,87 @@ if ($result) {
 		}
 		$links = $object->get_url($obj->rowid);
 
-		foreach ( $links as $key => $val ) {
+		// get_url may return -1 which is not traversable
+		if (is_array($links)) {
 
-			$tabtype[$obj->rowid] = $links[$key]['type'];
+			foreach ( $links as $key => $val ) {
 
-			if ($links[$key]['type'] == 'payment')
-			{
-				$paymentstatic->id = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-			} 
-			else if ($links[$key]['type'] == 'payment_supplier')
-			{
-				$paymentsupplierstatic->id = $links[$key]['url_id'];
-				$paymentsupplierstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
-			}
-			else if ($links[$key]['type'] == 'company')
-			{
-				$societestatic->id = $links[$key]['url_id'];
-				$societestatic->nom = $links[$key]['label'];
-				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-			}
-			else if ($links[$key]['type'] == 'sc')
-			{
-				$chargestatic->id = $links[$key]['url_id'];
-				$chargestatic->ref = $links[$key]['url_id'];
+				$tabtype[$obj->rowid] = $links[$key]['type'];
 
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-					if ($reg[1] == 'socialcontribution')
-						$reg[1] = 'SocialContribution';
-					$chargestatic->lib = $langs->trans($reg[1]);
-				}
-				else
+				if ($links[$key]['type'] == 'payment')
 				{
-					$chargestatic->lib = $links[$key]['label'];
-				}
-				$chargestatic->ref = $chargestatic->lib;
-				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
-				$sqlmid = 'SELECT cchgsoc.accountancy_code';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
-				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-
-				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid)
+					$paymentstatic->id = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+				} 
+				else if ($links[$key]['type'] == 'payment_supplier')
 				{
-					$objmid = $db->fetch_object($resultmid);
-					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+					$paymentsupplierstatic->id = $links[$key]['url_id'];
+					$paymentsupplierstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
 				}
+				else if ($links[$key]['type'] == 'company')
+				{
+					$societestatic->id = $links[$key]['url_id'];
+					$societestatic->nom = $links[$key]['label'];
+					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+				}
+				else if ($links[$key]['type'] == 'sc')
+				{
+					$chargestatic->id = $links[$key]['url_id'];
+					$chargestatic->ref = $links[$key]['url_id'];
+
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+						if ($reg[1] == 'socialcontribution')
+							$reg[1] = 'SocialContribution';
+						$chargestatic->lib = $langs->trans($reg[1]);
+					}
+					else
+					{
+						$chargestatic->lib = $links[$key]['label'];
+					}
+					$chargestatic->ref = $chargestatic->lib;
+					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+
+					$sqlmid = 'SELECT cchgsoc.accountancy_code';
+					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+
+					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+					$resultmid = $db->query($sqlmid);
+					if ($resultmid)
+					{
+						$objmid = $db->fetch_object($resultmid);
+						$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+					}
+				}
+				else if ($links[$key]['type'] == 'payment_vat')
+				{
+					$paymentvatstatic->id = $links[$key]['url_id'];
+					$paymentvatstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+				}
+				else if ($links[$key]['type'] == 'payment_salary')
+				{	
+					$paymentsalstatic->id = $links[$key]['url_id'];
+					$paymentsalstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
+					$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
+				}
+				else if ($links[$key]['type'] == 'banktransfert')
+				{
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+				}
+				/*else {
+					$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
+				}*/
 			}
-			else if ($links[$key]['type'] == 'payment_vat')
-			{
-				$paymentvatstatic->id = $links[$key]['url_id'];
-				$paymentvatstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-			}
-			else if ($links[$key]['type'] == 'payment_salary')
-			{	
-				$paymentsalstatic->id = $links[$key]['url_id'];
-				$paymentsalstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
-			}
-			else if ($links[$key]['type'] == 'banktransfert')
-			{
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-			}
-			/*else {
-				$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
-			}*/
 		}
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php
index 33b1e4359c1..e2994ce57e6 100644
--- a/htdocs/accountancy/journal/cashjournal.php
+++ b/htdocs/accountancy/journal/cashjournal.php
@@ -157,64 +157,67 @@ if ($result) {
 		}
 		$links = $object->get_url($obj->rowid);
 
-		foreach ( $links as $key => $val ) {
+		// get_url may return -1 which is not traversable
+		if (is_array($links)) {
+			foreach ($links as $key => $val) {
 
-			$tabtype[$obj->rowid] = $links[$key]['type'];
+				$tabtype[$obj->rowid] = $links[$key]['type'];
 
-			if ($links[$key]['type'] == 'payment') {
-				$paymentstatic->id = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-			} else if ($links[$key]['type'] == 'payment_supplier') {
-				$paymentsupplierstatic->id = $links[$key]['url_id'];
-				$paymentsupplierstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
-			} else if ($links[$key]['type'] == 'company') {
+				if ($links[$key]['type'] == 'payment') {
+					$paymentstatic->id = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+				} else if ($links[$key]['type'] == 'payment_supplier') {
+					$paymentsupplierstatic->id = $links[$key]['url_id'];
+					$paymentsupplierstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
+				} else if ($links[$key]['type'] == 'company') {
 
-				$societestatic->id = $links[$key]['url_id'];
-				$societestatic->nom = $links[$key]['label'];
-				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-			} else if ($links[$key]['type'] == 'sc') {
+					$societestatic->id = $links[$key]['url_id'];
+					$societestatic->nom = $links[$key]['label'];
+					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+				} else if ($links[$key]['type'] == 'sc') {
 
-				$chargestatic->id = $links[$key]['url_id'];
-				$chargestatic->ref = $links[$key]['url_id'];
+					$chargestatic->id = $links[$key]['url_id'];
+					$chargestatic->ref = $links[$key]['url_id'];
 
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-					if ($reg[1] == 'socialcontribution')
-						$reg[1] = 'SocialContribution';
-					$chargestatic->lib = $langs->trans($reg[1]);
-				} else {
-					$chargestatic->lib = $links[$key]['label'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+						if ($reg[1] == 'socialcontribution')
+							$reg[1] = 'SocialContribution';
+						$chargestatic->lib = $langs->trans($reg[1]);
+					} else {
+						$chargestatic->lib = $links[$key]['label'];
+					}
+					$chargestatic->ref = $chargestatic->lib;
+					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+
+					$sqlmid = 'SELECT cchgsoc.accountancy_code';
+					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+					dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+					$resultmid = $db->query($sqlmid);
+					if ($resultmid) {
+						$objmid = $db->fetch_object($resultmid);
+						$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+					}
+				} else if ($links[$key]['type'] == 'payment_vat') {
+
+					$paymentvatstatic->id = $links[$key]['url_id'];
+					$paymentvatstatic->ref = $links[$key]['url_id'];
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+				} else if ($links[$key]['type'] == 'banktransfert') {
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
 				}
-				$chargestatic->ref = $chargestatic->lib;
-				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
-				$sqlmid = 'SELECT cchgsoc.accountancy_code';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
-				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
-				}
-			} else if ($links[$key]['type'] == 'payment_vat') {
-
-				$paymentvatstatic->id = $links[$key]['url_id'];
-				$paymentvatstatic->ref = $links[$key]['url_id'];
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-			} else if ($links[$key]['type'] == 'banktransfert') {
-				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+				/*else {
+					$tabtp [$obj->rowid] [$cptsociale] += $obj->amount;
+				}*/
 			}
-			/*else {
-				$tabtp [$obj->rowid] [$cptsociale] += $obj->amount;
-			}*/
 		}
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
@@ -530,4 +533,4 @@ if ($action == 'export_csv') {
 	// End of page
 	llxFooter();
 }
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 8bcd1c7289b..ccb544ac4bb 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -600,41 +600,56 @@ else
 // Loop on each user to show calendar
 $sav = $tmpday;
 $showheader = true;
-foreach ($usernames as $username)
-{
-	echo "<tr>";
-	echo '<td class="cal_current_month">' . $username->getNomUrl(1). '</td>';
-	$tmpday = $sav;
 
-	$i = 0;
-	for ($iter_day = 0; $iter_day < 7; $iter_day++)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
+// listUsersForGroup may return -1 which is not traversable
+if (is_array($usernames)) {
+	foreach ($usernames as $username) {
+		echo "<tr>";
+		echo '<td class="cal_current_month">' . $username->getNomUrl(1) . '</td>';
+		$tmpday = $sav;
+
+		$i = 0;
+		for ($iter_day = 0; $iter_day < 7; $iter_day++) {
+			if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
+				$i++;
+				continue;
+			}
+
+			// Show days of the current week
+			$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
+			$tmparray = dol_getdate($curtime, 'fast');
+			$tmpday = $tmparray['mday'];
+			$tmpmonth = $tmparray['mon'];
+			$tmpyear = $tmparray['year'];
+
+			$style = 'cal_current_month';
+			if ($iter_day == 6) $style .= ' cal_other_month';
+			$today = 0;
+			$todayarray = dol_getdate($now, 'fast');
+			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
+			if ($today) $style = 'cal_today_peruser';
+
+			show_day_events2(
+				$username,
+				$tmpday,
+				$month,
+				$year,
+				$monthshown,
+				$style,
+				$eventarray,
+				0,
+				$maxnbofchar,
+				$newparam,
+				1,
+				300,
+				$showheader
+			);
+
 			$i++;
-			continue;
 		}
-
-        // Show days of the current week
-		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime,'fast');
-		$tmpday = $tmparray['mday'];
-		$tmpmonth = $tmparray['mon'];
-		$tmpyear = $tmparray['year'];
-
-		$style='cal_current_month';
-		if ($iter_day == 6) $style.=' cal_other_month';
-		$today=0;
-		$todayarray=dol_getdate($now,'fast');
-		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
-		if ($today) $style='cal_today_peruser';
-
-		show_day_events2($username, $tmpday, $month, $year, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader);
-
-		$i++;
+		echo "</tr>\n";
+		$showheader = false;
 	}
-	echo "</tr>\n";
-	$showheader = false;
 }
 
 echo "</table>\n";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4ca6175d785..cd428f927b2 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -164,10 +164,10 @@ class Account extends CommonObject
      * 		TODO Move this into AccountLine
      *      Return array with links from llx_bank_url
      *
-     *      @param	int		$fk_bank        To search using bank transaction id
-     *      @param	int		$url_id         To search using link to
-     *      @param  string	$type           To search using type
-     *      @return array           		Array of links
+     *      @param  int         $fk_bank    To search using bank transaction id
+     *      @param  int         $url_id     To search using link to
+     *      @param  string      $type       To search using type
+     *      @return array|-1                Array of links or -1 on error
      */
     function get_url($fk_bank='', $url_id='', $type='')
     {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 937f904c512..6b0e9b4d895 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1302,14 +1302,17 @@ class Form
 		$assignedtouser=array();
 		if (!empty($_SESSION['assignedtouser'])) $assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);
 		if (count($assignedtouser)) $out.='<br>';
-		foreach($assignedtouser as $key => $value)
-		{
-			$userstatic->fetch($key);
-			$out.=$userstatic->getNomUrl(1);
-			//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
-			//$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));
-			$out.='<br>';
-		}
+		// dol_json_decode may return false on error which is not traversable
+		if (is_array($assignedtouser)) {
+			foreach($assignedtouser as $key => $value)
+			{
+				$userstatic->fetch($key);
+				$out.=$userstatic->getNomUrl(1);
+				//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
+				//$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));
+				$out.='<br>';
+			}
+	    }
 
 		//$out.='</form>';
         return $out;
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 69dbb4eba1a..00d5970d77e 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -218,7 +218,7 @@ if (! function_exists('json_decode'))
  *
  * @param	string	$json		Json encoded to PHP Object or Array
  * @param	bool	$assoc		False return an object, true return an array. Try to always use it with true !
- * @return 	mixed				Object or Array
+ * @return 	mixed				Object or Array or false on error
  */
 function dol_json_decode($json, $assoc=false)
 {
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index b801c2660aa..9bd0d64fe4c 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -178,7 +178,7 @@ class UserGroup extends CommonObject
 	 *
 	 * 	@param	string	$excludefilter		Filter to exclude
 	 *  @param	int		$mode				0=Return array of user instance, 1=Return array of users id only
-	 * 	@return	array 						Array of users
+	 * 	@return	array|-1					Array of users or -1 on error
 	 */
 	function listUsersForGroup($excludefilter='', $mode=0)
 	{

From a7964c4a9ad4af94b6796b727b304e3ebb9f43c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:20:48 +0200
Subject: [PATCH 019/345] FIX: Replaced deprecated call

---
 htdocs/accountancy/customer/list.php | 4 ++--
 htdocs/accountancy/supplier/list.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 02602262e2c..03e31d44a96 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -63,7 +63,7 @@ if ($action == 'ventil') {
 		$cpt = 0;
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
 			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
-			$maLigneCourante = split("_", $maLigneCochee);
+			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
 			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
@@ -234,4 +234,4 @@ if ($result) {
 }
 
 $db->close();
-llxFooter();
\ No newline at end of file
+llxFooter();
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 84f548344b8..817b07c178e 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -65,7 +65,7 @@ if ($action == 'ventil') {
 		
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
 			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
-			$maLigneCourante = split("_", $maLigneCochee);
+			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
 			$monCompte = $mesCodesVentilChoisis[$monNumLigne];

From e87b1d68b6fce80fd66e255c6a654b5981232d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:22:05 +0200
Subject: [PATCH 020/345] FIX: Replaced deprecated property

---
 htdocs/accountancy/journal/bankjournal.php | 2 +-
 htdocs/accountancy/journal/cashjournal.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ca862098bd3..218c4dd46df 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -191,7 +191,7 @@ if ($result) {
 				else if ($links[$key]['type'] == 'company')
 				{
 					$societestatic->id = $links[$key]['url_id'];
-					$societestatic->nom = $links[$key]['label'];
+					$societestatic->name = $links[$key]['label'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 				}
diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php
index e2994ce57e6..ac7cbeb2f77 100644
--- a/htdocs/accountancy/journal/cashjournal.php
+++ b/htdocs/accountancy/journal/cashjournal.php
@@ -173,7 +173,7 @@ if ($result) {
 				} else if ($links[$key]['type'] == 'company') {
 
 					$societestatic->id = $links[$key]['url_id'];
-					$societestatic->nom = $links[$key]['label'];
+					$societestatic->name = $links[$key]['label'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 				} else if ($links[$key]['type'] == 'sc') {

From c20f5b186e6e8997feb7fb0f989c69afdbec2612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:25:18 +0200
Subject: [PATCH 021/345] Qual: Updated code documentation

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

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index e4d1f834b4a..69dabf04219 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -192,10 +192,10 @@ abstract class DolibarrModules
 	 * Enables a module.
 	 * Inserts all informations into database
 	 *
-	 * @param   string[]    $array_sql  SQL requests to be executed when enabling module
-	 * @param   string      $options    String with options when disabling module ('newboxdefonly|noboxes')
+	 * @param   string[]|array  $array_sql  SQL requests to be executed when enabling module
+	 * @param   string          $options    String with options when disabling module ('newboxdefonly|noboxes')
 	 *
-	 * @return  int                     1 if OK, 0 if KO
+	 * @return  int                         1 if OK, 0 if KO
 	 */
     function _init($array_sql, $options='')
     {

From e9175d5d663430c9b4e21988e4d87b3b9cff52b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:26:42 +0200
Subject: [PATCH 022/345] Qual: date type doesn't exist

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

diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 9c701441765..d41594c3193 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -31,7 +31,7 @@
 *    @param 	string	$period         Period of report
 *    @param 	string	$periodlink     Link to switch period
 *    @param 	string	$description    Description
-*    @param 	date	$builddate      Date generation
+*    @param 	int		$builddate      Date generation
 *    @param 	string	$exportlink     Link for export or ''
 *    @param		array	$moreparam		Array with list of params to add into form
 *    @param		string	$calcmode		Calculation mode

From b21d85a1da139aafe593ba4300b3d58d3f3b102b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:28:56 +0200
Subject: [PATCH 023/345] FIX: Function was expecting a boolean not a string

---
 htdocs/comm/action/index.php   | 2 +-
 htdocs/comm/action/peruser.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 2318c45f132..7cec34cb6db 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -986,7 +986,7 @@ elseif ($action == 'show_week') // View by week
     {
         // Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-		$tmparray = dol_getdate($curtime,'fast');
+		$tmparray = dol_getdate($curtime, true);
 		$tmpday = $tmparray['mday'];
 		$tmpmonth = $tmparray['mon'];
 		$tmpyear = $tmparray['year'];
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ccb544ac4bb..ec6243c7ae7 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -617,7 +617,7 @@ if (is_array($usernames)) {
 
 			// Show days of the current week
 			$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
-			$tmparray = dol_getdate($curtime, 'fast');
+			$tmparray = dol_getdate($curtime, true);
 			$tmpday = $tmparray['mday'];
 			$tmpmonth = $tmparray['mon'];
 			$tmpyear = $tmparray['year'];
@@ -625,7 +625,7 @@ if (is_array($usernames)) {
 			$style = 'cal_current_month';
 			if ($iter_day == 6) $style .= ' cal_other_month';
 			$today = 0;
-			$todayarray = dol_getdate($now, 'fast');
+			$todayarray = dol_getdate($now, true);
 			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
 			if ($today) $style = 'cal_today_peruser';
 

From bd03cb439d91954e18274024a7ec29dc3fa61811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:36:37 +0200
Subject: [PATCH 024/345] FIX: Function expects an int, not a boolean

---
 htdocs/comm/action/peruser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ec6243c7ae7..5afda948a77 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -800,9 +800,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					$color = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,false);
-						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,false);
-						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,false);
+						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,0);
+						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,0);
+						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,0);
 
 						$dateendtouse=$event->date_end_in_calendar;
 						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;

From 0f71b7e0b0f5f5f4628355028dd33eeedee87175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 18 Sep 2014 15:38:07 +0200
Subject: [PATCH 025/345] FIX: Typo

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 20b030a9226..2acf4071052 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -822,7 +822,7 @@ function dol_strftime($fmt, $ts=false, $is_gmt=false)
  * 	@param	string		$tzoutput		true or 'gmt' => string is for Greenwich location
  * 										false or 'tzserver' => output string is for local PHP server TZ usage
  * 										'tzuser' => output string is for local browser TZ usage
- *	@param	Tranlsate	$outputlangs	Object lang that contains language for text translation.
+ *	@param	Translate	$outputlangs	Object lang that contains language for text translation.
  *  @param  boolean		$encodetooutput false=no convert into output pagecode
  * 	@return string      				Formated date or '' if time is null
  *

From 4296766ea96dfbb13de71d282ca1bcc9bd86476b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@free.fr>
Date: Fri, 19 Sep 2014 03:03:24 +0200
Subject: [PATCH 026/345] Qual: Coding style

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

diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 7b18de022f6..69e47569b07 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -25,6 +25,7 @@
 
 /**
  *	Prepare array with list of admin tabs
+ *
  *	@param	Object	$object		Accounting account
  *
  *	@return	array				Array of tabs to show

From e9f754395d280e614bd8f59f9a16e9055124c137 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 10 Nov 2014 13:09:58 +0100
Subject: [PATCH 027/345] Start bank extrafields

---
 htdocs/compta/bank/class/account.class.php    | 61 ++++++++++++++++++-
 htdocs/core/lib/bank.lib.php                  | 33 ++++++++++
 .../llx_bank_account_extrafields.key.sql      | 20 ++++++
 .../tables/llx_bank_account_extrafields.sql   | 26 ++++++++
 4 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_bank_account_extrafields.sql

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e2a039cf2d8..a50a7f448a9 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -343,7 +343,7 @@ class Account extends CommonObject
      */
     function create($user='')
     {
-        global $langs,$conf;
+        global $langs,$conf, $hookmanager;
 
         // Clean parameters
         if (! $this->min_allowed) $this->min_allowed=0;
@@ -441,6 +441,23 @@ class Account extends CommonObject
                     $this->error=$this->db->lasterror();
                     return -3;
                 }
+                
+                // Actions on extra fields (by external module or standard code)
+                $hookmanager->initHooks(array('bankdao'));
+                $parameters=array('id'=>$this->id);
+                $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                if (empty($reshook))
+                {
+                	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+                	{
+                		$result=$this->insertExtraFields();
+                		if ($result < 0)
+                		{
+                			return -4;
+                		}
+                	}
+                }
+                else if ($reshook < 0) return -5;
             }
             return $this->id;
         }
@@ -466,7 +483,7 @@ class Account extends CommonObject
      */
     function update($user='')
     {
-        global $langs,$conf;
+        global $langs,$conf, $hookmanager;
 
         // Clean parameters
         if (! $this->min_allowed) $this->min_allowed=0;
@@ -517,6 +534,25 @@ class Account extends CommonObject
         $result = $this->db->query($sql);
         if ($result)
         {
+        	
+        	// Actions on extra fields (by external module or standard code)
+        	$hookmanager->initHooks(array('bankdao'));
+        	$parameters=array('id'=>$this->id);
+        	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        	if (empty($reshook))
+        	{
+        		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+        		{
+        			$result=$this->insertExtraFields();
+        			if ($result < 0)
+        			{
+        				return -1;
+        			}
+        		}
+        	}
+        	else if ($reshook < 0) return -1;
+        	
+        	
             return 1;
         }
         else
@@ -663,6 +699,15 @@ class Account extends CommonObject
                 $this->min_allowed    = $obj->min_allowed;
                 $this->min_desired    = $obj->min_desired;
                 $this->comment        = $obj->comment;
+                
+                // Retreive all extrafield for thirdparty
+                // fetch optionals attributes and labels
+                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+                $extrafields=new ExtraFields($this->db);
+                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+                $this->fetch_optionals($this->id,$extralabels);
+                
+                
                 return 1;
             }
             else
@@ -694,6 +739,18 @@ class Account extends CommonObject
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
+        	
+        	// Remove extrafields
+        	if ((empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        	{
+        		$result=$this->deleteExtraFields();
+        		if ($result < 0)
+        		{
+        			return -1;
+        			dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+        		}
+        	}
+        	
             return 1;
         }
         else {
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 488a4c3a530..e3fb787657b 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -89,6 +89,39 @@ function bank_prepare_head($object)
 
     return $head;
 }
+/**
+ * Prepare array with list of tabs
+ * 
+ * @param   Object	$object		Object related to tabs
+ * @return  array				Array of tabs to shoc
+ */
+function bank_admin_prepare_head($object)
+{
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'general';
+	$h++;
+
+	
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin');
+	
+	$head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
+
+	return $head;
+		}
 
 /**
  * 		Check account number informations for a bank account
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
new file mode 100644
index 00000000000..0f6e8052115
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2014 Florian Henry	<florian.henry@open-concept.pro>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- 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_bank_account_extrafields ADD INDEX idx_bank_account_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
new file mode 100644
index 00000000000..97b1508237c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2014 Florian Henry	<florian.henry@open-concept.pro>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- 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_bank_account_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+

From 9c795d2c4b5f95bdd8f647e8ba7aa9b30fd106e3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 10 Nov 2014 13:18:27 +0100
Subject: [PATCH 028/345] Finnish bank extrafeilds

---
 htdocs/admin/bank.php             |   4 +
 htdocs/admin/bank_extrafields.php | 154 ++++++++++++++++++++++++++++++
 htdocs/compta/bank/card.php       |  37 +++++++
 3 files changed, 195 insertions(+)
 create mode 100644 htdocs/admin/bank_extrafields.php

diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index de1f7662373..9b5cb77e072 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -26,6 +26,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->load("admin");
@@ -89,6 +90,9 @@ print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
 print '<br>';
 
 
+$head = bank_admin_prepare_head(null);
+dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), 0, 'account');
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>';
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
new file mode 100644
index 00000000000..b28c8b417c3
--- /dev/null
+++ b/htdocs/admin/bank_extrafields.php
@@ -0,0 +1,154 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/bank_extrafields.php
+ *		\ingroup    bank
+ *		\brief      Page to setup extra fields of bank
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("banks");
+$langs->load("admin");
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='bank_account';  //Must be the $element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("BankSetupModule"),$help_url);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
+
+
+$head = bank_admin_prepare_head(null);
+
+dol_fiche_head($head, 'attributes', $langs->trans("Bank"), 0, 'account');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td align="center">'.$langs->trans("Position").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+    $var=!$var;
+    print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+    print "<td>".$key."</td>\n";
+    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+    print "</tr>";
+    //      $i++;
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel
+ /*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+    print "<br>";
+    print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 81596540489..9b4efe79eb1 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -48,6 +49,10 @@ $fieldid = isset($_GET["ref"])?'ref':'rowid';
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fieldid);
 
+$account = new Account($db);
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($account->table_element);
 
 /*
  * Actions
@@ -100,6 +105,9 @@ if ($_POST["action"] == 'add')
     	$error++;
     }
 
+    // Fill array 'array_options' with data from add form
+    $ret = $extrafields->setOptionalsFromPost($extralabels,$account);
+
     if (! $error)
     {
         $id = $account->create($user);
@@ -172,6 +180,9 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
     	$error++;
     }
 
+    // Fill array 'array_options' with data from add form
+    $ret = $extrafields->setOptionalsFromPost($extralabels,$account);
+
     if (! $error)
     {
         $result = $account->update($user);
@@ -306,6 +317,15 @@ if ($action == 'create')
 	$doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
 	$doleditor->Create();
 	print '</td></tr>';
+    
+ 	// Other attributes
+	$parameters=array('colspan' => 3);
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$account,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $account->showOptionals($extrafields,'edit',$parameters);
+	}
+
 
 	print '</table>';
 
@@ -461,6 +481,14 @@ else
 		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
 		print '<td colspan="3">'.$account->comment.'</td></tr>';
 
+		// Other attributes
+		$parameters=array('colspan' => 3);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$account,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $account->showOptionals($extrafields);
+		}
+
 		print '</table>';
 
 		print '<br>';
@@ -615,6 +643,15 @@ else
 		$doleditor->Create();
 		print '</td></tr>';
 
+		// Other attributes
+		$parameters=array('colspan' => 3);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$account,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $account->showOptionals($extrafields,'edit');
+		}
+
+
 		print '</table>';
 
 		print '<br>';

From 7c617b3515261a95c80f43855de2e8a91abaa561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 11 Nov 2014 11:21:31 +0100
Subject: [PATCH 029/345] Update card.php

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8984e4c5424..1b1dbedfe59 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -664,7 +664,8 @@ if ($action == 'create')
             print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
             print '<td colspan="3">';
             //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
-            print $form->select_date($object->date_livraison?$object->date_livraison:-1,'date_delivery',1,1);
+            $date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
+            print $form->select_date($date_delivery?$date_delivery:-1,'date_delivery',1,1);
             print "</td>\n";
             print '</tr>';
 

From 917423dc0c76e557fac2fcca0c1114ced4cea52b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 26 Nov 2014 14:16:59 +0100
Subject: [PATCH 030/345] add default payment mode select

---
 htdocs/comm/card.php  | 4 ++++
 htdocs/fourn/card.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d0dd842cd7c..7c47c25409d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -347,6 +347,10 @@ if ($id > 0)
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
 	{
+		if (empty($object->mode_reglement_id))
+		{
+			$object->mode_reglement_id=$conf->global->MAIN_PAYMENT_MODE_DEFAULT;
+		}
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
 	}
 	else
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 3e234af68cd..30c55c7b130 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -232,6 +232,10 @@ if ($object->fetch($id))
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
 	{
+		if (empty($object->mode_reglement_supplier_id))
+		{
+			$object->mode_reglement_supplier_id=$conf->global->MAIN_PAYMENT_MODE_DEFAULT;
+		}
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'mode_reglement_supplier_id');
 	}
 	else

From 21f14320cf08f487d8f4b98b83c2e3ad05e2da62 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 27 Nov 2014 05:07:04 +0100
Subject: [PATCH 031/345] Untranslatable token in datepicker

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

diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 7e0333bc5aa..67af3c7e083 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -39,6 +39,7 @@ require_once '../main.inc.php';
 
 if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));	// If language was forced on URL by the main.inc.php
 $langs->load("main");
+$langs->load("agenda");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
 
@@ -57,7 +58,7 @@ if (GETPOST('mode') && GETPOST('mode') == 'test')
 }
 else
 {
-	print '<title>Calendar</title>';
+	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
 // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)

From ea70159a7e72cf5057bc5dc95f5ffb50662f6cab Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 27 Nov 2014 05:07:39 +0100
Subject: [PATCH 032/345] Activate the HTML5 Doctype

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c8553f29291..9250384880b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -959,11 +959,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
     if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
 
-    print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+    //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-    //print '<!DOCTYPE HTML>';
+    print '<!DOCTYPE html>';
     print "\n";
     if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
     else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";

From 92c093055ca148d1253ab2f596e00367b915c1b7 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 27 Nov 2014 05:41:57 +0100
Subject: [PATCH 033/345] Add meta balise for viewport & scale

---
 htdocs/main.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9250384880b..f9ff80dd366 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -975,6 +975,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         // Displays meta
         print '<meta name="robots" content="noindex,nofollow">'."\n";      // Evite indexation par robots
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
+		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";	// Needed for Responsive Web Design
         $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";

From 217cacbc295a16daafb33e48494fa6f1531fac0e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 27 Nov 2014 17:26:06 +0100
Subject: [PATCH 034/345] To avoid over wrighting lines

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 3223412dc5f..bc0a9e71f38 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -897,7 +897,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
 
 			if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
 			{
-				$posy+=3;
+				$posy+=7;
 				$pdf->SetXY($posx,$posy);
 				$pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
 			}

From b98c0a3208098512a0b9645b578c0a83bfaff2ba Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 27 Nov 2014 20:32:29 +0100
Subject: [PATCH 035/345] Login - Better presentation with RWD

---
 htdocs/core/tpl/login.tpl.php   | 9 +++------
 htdocs/theme/eldy/style.css.php | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 23d8dd4f326..844f874a711 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -67,6 +67,8 @@ $(document).ready(function () {
 <input type="hidden" name="dol_no_mouse_hover" id="dol_no_mouse_hover" value="<?php echo $dol_no_mouse_hover; ?>" />
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
+<div class="center"><img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" /></div>
+
 <table class="login_table_title center" summary="<?php echo dol_escape_htmltag($title); ?>">
 <tr class="vmenu"><td align="center"><?php echo dol_escape_htmltag($title); ?></td></tr>
 </table>
@@ -76,7 +78,7 @@ $(document).ready(function () {
 
 <div id="login_line1">
 
-<div id="login_left">
+<div>
 
 <table class="left" summary="Login pass">
 <!-- Login -->
@@ -130,11 +132,6 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div> <!-- end div left -->
 
-<div id="login_right">
-
-<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
-
-</div>
 </div>
 
 <div id="login_line2" style="clear: both">
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5ac8a76fb53..08c5fbcf2ff 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -849,7 +849,7 @@ form#login {
 	vertical-align: middle;
 }
 .login_table_title {
-	max-width: 540px;
+	max-width: 320px;
 	color: #888888;
 	text-shadow: 1px 1px 1px #FFF;
 }
@@ -863,7 +863,7 @@ form#login {
 	padding-right:6px;
 	padding-top:12px;
 	padding-bottom:12px;
-	max-width: 540px;
+	max-width: 320px;
 
 	background-color: #FFFFFF;
 

From c3d66b037dc0cc13e078b7357d1f095413091ff9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 28 Nov 2014 10:35:02 +0100
Subject: [PATCH 036/345] Revert "add default payment mode select"

This reverts commit 917423dc0c76e557fac2fcca0c1114ced4cea52b.
---
 htdocs/comm/card.php  | 4 ----
 htdocs/fourn/card.php | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 7c47c25409d..d0dd842cd7c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -347,10 +347,6 @@ if ($id > 0)
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
 	{
-		if (empty($object->mode_reglement_id))
-		{
-			$object->mode_reglement_id=$conf->global->MAIN_PAYMENT_MODE_DEFAULT;
-		}
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
 	}
 	else
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 30c55c7b130..3e234af68cd 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -232,10 +232,6 @@ if ($object->fetch($id))
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
 	{
-		if (empty($object->mode_reglement_supplier_id))
-		{
-			$object->mode_reglement_supplier_id=$conf->global->MAIN_PAYMENT_MODE_DEFAULT;
-		}
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'mode_reglement_supplier_id');
 	}
 	else

From 15311fb643fc0d44524ab420abc5809d56b83eb8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 28 Nov 2014 12:41:53 +0100
Subject: [PATCH 037/345] form should not be inside table

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

diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 9e5c59f4555..6358bf353f3 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -120,6 +120,9 @@ if ($result) {
 	$i = 0;
 	print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 	
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+	print '<input type="hidden" name="action" value="import">';
+	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>' . $langs->trans("accountingaccount") . '</td>';
 	print '<td>' . $langs->trans("label") . '</td>';
@@ -132,9 +135,6 @@ if ($result) {
 	$form = new Form($db);
 	$htmlacc = new FormVentilation($db);
 	
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-	print '<input type="hidden" name="action" value="import">';
-	
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);

From d156e1ba82217abba188ac2b645243a76a804773 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 28 Nov 2014 12:51:08 +0100
Subject: [PATCH 038/345] form should be outside table

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

diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index f7507cda234..84c8042027a 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -112,8 +112,8 @@ foreach ( $list as $key ) {
 	print '</td></tr>';
 }
 
-print '</form>';
 print "</table>\n";
+print '</form>';
 
 print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
 

From 64260cde726df9979899922b5c04598d77296beb Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 29 Nov 2014 07:07:27 +0100
Subject: [PATCH 039/345] Add button in admin->GUISetup to activate Html5

---
 htdocs/admin/ihm.php          | 61 +++++++++++++++++++++++------------
 htdocs/langs/en_US/admin.lang |  3 +-
 htdocs/main.inc.php           |  4 +--
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 23e7cc96363..f2312ee042f 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -53,29 +53,30 @@ $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name
 
 if ($action == 'update')
 {
-	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",       $_POST["main_lang_default"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MULTILANGS",         $_POST["main_multilangs"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",   $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_START_WEEK",         $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS",  $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SHOW_LOGO",          $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION",          $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["main_lang_default"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MULTILANGS",					$_POST["main_multilangs"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED",	$_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_START_WEEK",					$_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS",		$_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS",		$_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SHOW_LOGO",					$_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_ACTIVATE_HTML5",				$_POST["MAIN_ACTIVATE_HTML5"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION",		$_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_THEME",              $_POST["main_theme"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",			$_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE",			$_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",	$_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER",$_POST["MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT",			$_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
-	dolibarr_set_const($db, "MAIN_MOTD",                   dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_HOME",                   dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_HELP_DISABLELINK",       $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0);	    // Param for all entities
+	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
+	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HOME",						dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HELP_DISABLELINK",			$_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0);	    // Param for all entities
 
 	// This one is not always defined
 	if (isset($_POST["MAIN_USE_PREVIEW_TABS"])) dolibarr_set_const($db, "MAIN_USE_PREVIEW_TABS", $_POST["MAIN_USE_PREVIEW_TABS"],'chaine',0,'',$conf->entity);
@@ -119,7 +120,7 @@ if ($action == 'edit')	// Edit
 
     print_fiche_titre($langs->trans("Language"),'','').'<br>';
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -172,6 +173,17 @@ if ($action == 'edit')	// Edit
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
+	
+	// Activate Html5 - Developement - Only available on Eldy template
+	if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5))
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableHtml5").'</td><td>';
+		print $form->selectyesno('MAIN_ACTIVATE_HTML5',$conf->global->MAIN_ACTIVATE_HTML5,1);
+		print '</td>';
+		print '<td width="20">&nbsp;</td>';
+		print '</tr>';
+	}
 
 	// Max size of lists
     $var=!$var;
@@ -351,6 +363,15 @@ else	// Show
     print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
+	
+	// Activate Html5 - Developement - Only available on Eldy template
+	if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5))
+    {
+		$var=!$var;
+		print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableHtml5").'</td><td>' . yn($conf->global->MAIN_ACTIVATE_HTML5) . '</td>';
+		print '<td width="20">&nbsp;</td>';
+		print "</tr>";
+	}
 
 	$var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a524ff8a5fe..4aee36d73ab 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -887,7 +887,8 @@ MessageLogin=Login page message
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu 
+EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 87b69b56443..199436eae65 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -959,11 +959,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
     if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
 
-    //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+    if (empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-    print '<!DOCTYPE html>';
+    if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<!DOCTYPE html>'; // Html5 - Developement - Only available on Eldy template
     print "\n";
     if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
     else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";

From c27e2676e3b79db13af1b0f411afc6d14f2ad75c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 29 Nov 2014 07:08:35 +0100
Subject: [PATCH 040/345] Modify presentation of login page

---
 htdocs/core/tpl/login.tpl.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index c34894e49c3..a12a960aaec 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -67,6 +67,11 @@ $(document).ready(function () {
 <input type="hidden" name="dol_no_mouse_hover" id="dol_no_mouse_hover" value="<?php echo $dol_no_mouse_hover; ?>" />
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
+<div class="login_table">
+
+<div id="login_line1">
+
+<!-- Logo -->
 <div class="center"><img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" /></div>
 
 <table align="center" class="login_table_title" summary="<?php echo dol_escape_htmltag($title); ?>">
@@ -74,12 +79,6 @@ $(document).ready(function () {
 </table>
 <br>
 
-<div class="login_table">
-
-<div id="login_line1">
-
-<div>
-
 <table class="left" summary="Login pass">
 <!-- Login -->
 <tr>
@@ -132,8 +131,6 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div> <!-- end div left -->
 
-</div>
-
 <div id="login_line2" style="clear: both">
 
 <!-- Button Connection -->

From 30bff7ef28d9c2f6bf0eb5e3e95f64a504247d51 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 29 Nov 2014 07:12:12 +0100
Subject: [PATCH 041/345] Need to enable MAIN_ACTIVATE_HTML5 to insert meta
 balise viewport

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 199436eae65..54b0a68db19 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011-2014 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2008      Matteli
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@altairis.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
@@ -975,7 +975,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         // Displays meta
         print '<meta name="robots" content="noindex,nofollow">'."\n";      // Evite indexation par robots
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";	// Needed for Responsive Web Design
+		if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";	// Needed for Responsive Web Design
         $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";

From 3db2e46fc66a005a188dba68c6aba900a85b363b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 29 Nov 2014 07:41:51 +0100
Subject: [PATCH 042/345] Typo

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

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f2312ee042f..6ebf107ffbe 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -162,7 +162,7 @@ if ($action == 'edit')	// Edit
 
     // Other
     print '<table summary="edit" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
@@ -313,7 +313,7 @@ else	// Show
     // Language
     print_fiche_titre($langs->trans("Language"),'','').'<br>';
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td><td>&nbsp;</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultLanguage").'</td><td>';
@@ -357,7 +357,7 @@ else	// Show
     // Other
     $var=true;
     print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
+    print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';

From ca3f4a09f42ab208ddda2569dc183f7c21c9de94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 30 Nov 2014 13:07:13 +0100
Subject: [PATCH 043/345] Update main.inc.php

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 54b0a68db19..b7d57719220 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -959,12 +959,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
     if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
 
-    if (empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-    //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">';
-    //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-    //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-    if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<!DOCTYPE html>'; // Html5 - Developement - Only available on Eldy template
-    print "\n";
+    if (empty($conf->global->MAIN_ACTIVATE_HTML5)) {
+        $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+    }else {
+        $doctype = '<!doctype html>'; // Html5 - Developement - Only available on Eldy template
+    }
+    print $doctype."\n";
     if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
     else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";

From 9118ef7c8f3ac99b72f4b03fe7b34f9c69e85af0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 1 Dec 2014 12:03:23 +0100
Subject: [PATCH 044/345] form should be outside table and close form was twice

---
 htdocs/accountancy/admin/export.php | 2 +-
 htdocs/accountancy/admin/index.php  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index d0eef1dc2f4..a5f54d5c431 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -155,8 +155,8 @@ foreach ( $list as $key ) {
 	print '</td></tr>';
 }
 
-print '</form>';
 print "</table>\n";
+print '</form>';
 
 print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index e72df6a0431..85e49028298 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -181,7 +181,6 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 print "</td></tr>\n";
 print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
-print '</form>';
 
 print "</table>\n";
 
@@ -285,10 +284,10 @@ if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
 }
 print '</tr>';
 
-print '</form>';
+
 print "</table>\n";
 
 print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
-
+print '</form>';
 llxFooter();
 $db->close();
\ No newline at end of file

From b33612d2311ebbc3242a39319188908479096229 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 1 Dec 2014 12:09:05 +0100
Subject: [PATCH 045/345] close form should be outside button

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

diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index 84c8042027a..d97af918f90 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -113,9 +113,9 @@ foreach ( $list as $key ) {
 }
 
 print "</table>\n";
-print '</form>';
 
 print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+print '</form>';
 
 print '<br />';
 

From d7dcd153f0d519a0e0d4c998b7810d2cde785246 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 1 Dec 2014 12:21:54 +0100
Subject: [PATCH 046/345] missing close form

---
 htdocs/accountancy/bookkeeping/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 608c62cf1d0..a24ed34e052 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -358,7 +358,8 @@ else
 					print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
 					print '</tr>';
 				}
-				print "</table>";
+				print '</table>';
+				print '</form>';
 			}
 		}
 	}

From e18196eac6052d1f67ffa4c2892f35572988533c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 1 Dec 2014 16:50:27 +0100
Subject: [PATCH 047/345] to avoid undefined method

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 6291790d008..9d0de035223 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -27,7 +27,7 @@
 /**
  *	Class to manage accountancy book keeping
  */
-class BookKeeping
+class BookKeeping extends CommonObject
 {
 	var $db;
 	var $error;

From 477aeecdac467663a3fbe42aaa5cdf27130b17e5 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 2 Dec 2014 22:30:40 +0100
Subject: [PATCH 048/345] #1725 Missing table cells in services list header

---
 htdocs/product/liste.php | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index cab06a7f387..44a6a69da2e 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -324,12 +324,16 @@ else
     		print '<td class="liste_titre" align="left">';
     		print '<input class="flat" type="text" name="snom" size="12" value="'.$snom.'">';
     		print '</td>';
+			
+			// Barcode
     		if (! empty($conf->barcode->enabled))
     		{
     			print '<td class="liste_titre">';
     			print '<input class="flat" type="text" name="sbarcode" size="6" value="'.$sbarcode.'">';
     			print '</td>';
     		}
+			
+			// Date modification
     		print '<td class="liste_titre">';
     		print '&nbsp;';
     		print '</td>';
@@ -363,16 +367,7 @@ else
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
-    			//desiredstock
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    		}
-    		else
-    		{
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
+    			// Desired stock
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
@@ -501,15 +496,6 @@ else
         				print $product_static->stock_reel;
     					print '</td>';
     				}
-    				else
-    				{
-		    			print '<td>';
-		    			print '&nbsp;';
-		    			print '</td>';
-		    			print '<td>';
-		    			print '&nbsp;';
-		    			print '</td>';
-    				}
     			}
 
     			// Status (to buy)

From ceba894d5748271162e7474b1184a2c6ea8edd97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 5 Dec 2014 13:26:47 +0100
Subject: [PATCH 049/345] Start to work on new generation combo box.

---
 htdocs/comm/propal.php                        |  14 +-
 htdocs/core/class/conf.class.php              |   3 +
 htdocs/core/class/html.form.class.php         |  38 +++-
 htdocs/core/class/html.formcompany.class.php  | 192 ++++++++----------
 htdocs/core/lib/ajax.lib.php                  |  31 +--
 htdocs/core/tpl/contacts.tpl.php              |  14 +-
 .../jquery/plugins/select2/select2.js         |   4 +-
 htdocs/langs/en_US/admin.lang                 |   2 +
 htdocs/projet/tasks/contact.php               |   5 +-
 htdocs/public/test/test_forms.php             |   9 +-
 htdocs/societe/admin/societe.php              |   8 +-
 11 files changed, 161 insertions(+), 159 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index aa75945f0ea..5feb7769a43 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1151,6 +1151,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->
 	}
 }
 
+
 /*
  * View
  */
@@ -1236,12 +1237,13 @@ if ($action == 'create')
 	print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
-
 	if ($origin != 'project' && $originid) {
 		print '<input type="hidden" name="origin" value="' . $origin . '">';
 		print '<input type="hidden" name="originid" value="' . $originid . '">';
 	}
 
+	dol_fiche_head();
+	
 	print '<table class="border" width="100%">';
 
 	// Reference
@@ -1435,16 +1437,13 @@ if ($action == 'create')
 	print "</table>\n";
 
 
-	print '<br>';
-
-
 	/*
 	 * Combobox pour la fonction de copie
  	 */
 
 	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
 
-	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<table>';
+	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<br><table>';
 	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
 	{
 		// For backward compatibility
@@ -1514,9 +1513,10 @@ if ($action == 'create')
 		}
 		print '</td></tr>';
 	}
-	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table><br>';
-
+	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table>';
 
+	dol_fiche_end();
+	
 	$langs->load("bills");
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="' . $langs->trans("CreateDraft") . '">';
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e079efb8ecc..ece24bfee34 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -432,6 +432,9 @@ class Conf
 		// Define list of limited modules
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.
 
+		// Enable select2
+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)) $conf->global->MAIN_USE_JQUERY_MULTISELECT='select2';
+		
 		// Timeouts
         if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10;
         if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT=30;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 14b7c78cc7d..08bc3b4c85e 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -825,9 +825,22 @@ class Form
 	            }
 	            else
 				{
+					if (! $forcecombo)
+					{
+						$out.='
+						<script type="text/javascript">
+	        				$(document).ready(function () {
+	        					$(\'#'.$htmlname.'\').select2({
+	        						width: \'resolve\',
+	        						minimumInputLength: 0,
+	        				});
+	        			});
+	        		    </script>';
+					}
+										
 					if (count($events))		// Add management of event
 					{
-						print '<script type="text/javascript">
+						$out.='<script type="text/javascript">
 								$(document).ready(function() {
 									jQuery("#'.$htmlname.'").change(function () {
 										var obj = '.json_encode($events).';
@@ -1077,7 +1090,7 @@ class Form
         {
             $num=$this->db->num_rows($resql);
 
-            if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo && ! $options_only)
+            if ($conf->use_javascript_ajax && ! $forcecombo && ! $options_only)
             {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
             	$out.= ajax_combobox($htmlname, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
@@ -1338,10 +1351,20 @@ class Form
             }
             else
             {
-                $out.= '<select class="flat" name="'.$htmlname.'" disabled="disabled">';
+                $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled="disabled">';
                 $out.= '<option value="">'.$langs->trans("None").'</option>';
             }
             $out.= '</select>';
+            
+           	$out.= '<script type="text/javascript">
+						$(document).ready(function() {
+
+						$(\'#'.$htmlname.'\').select2({
+							width: \'resolve\',
+							minimumInputLength: 0
+						});
+           			})
+           		   </script>';
         }
         else
         {
@@ -4119,10 +4142,11 @@ class Form
      * 	@param	int		$disabled		Html select box is disabled
      *  @param	int		$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' = Do not sort
      *  @param	string	$morecss		Add more class to css styles
+     *  @param	int		$addjscombo		Add js combo
      * 	@return	string					HTML select string.
      *  @see multiselectarray
      */
-    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='')
+    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0)
     {
         global $conf, $langs;
 
@@ -4131,13 +4155,15 @@ class Form
         $out='';
 
         // Add code for jquery to use multiselect
-        if (empty($conf->dol_use_jmobile) && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))
+        if ($addjscombo && empty($conf->dol_use_jmobile) && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))
         {
         	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-        	$out='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+        	$out.='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
         			<script type="text/javascript">
         				$(document).ready(function () {
         					$(\'#'.$htmlname.'\').'.$tmpplugin.'({
+        					width: \'off\',
+        					minimumInputLength: 0
         				});
         			});
         		   </script>';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index e45fffff759..413dc3d1544 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -520,118 +520,105 @@ class FormCompany
 	 *  @param  string		$htmlname       Name of HTML form
 	 * 	@param	array		$limitto		Disable answers that are not id in this array list
 	 *  @param	int			$forceid		This is to force another object id than object->id
-     *  @param	array		$events			More js events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
 	 * 	@return int 						The selected third party ID
 	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $events=array(), $moreparam='')
+	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='')
 	{
 		global $conf, $langs;
 
-		// On recherche les societes
-		$sql = "SELECT s.rowid, s.nom as name FROM";
-		$sql.= " ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
-		if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND s.rowid = ".$selected;
+		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+		{
+			// Use Ajax search
+			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+
+			$socid=0; $name='';
+			if ($selected > 0)
+			{
+				$tmpthirdparty=new Societe($this->db);
+				$result = $tmpthirdparty->fetch($selected);
+				if ($result > 0)
+				{
+					$socid = $selected;
+					$name = $tmpthirdparty->name;
+				}
+			}
+
+			// Refresh contacts list on thirdparty list change
+			$htmloption='';
+
+			$events=array();
+			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
+			{
+				print '<script type="text/javascript">
+				jQuery(document).ready(function() {
+					$("#search_'.$htmlname.'").change(function() {
+						var obj = '.json_encode($events).';
+						$.each(obj, function(key,values) {
+							if (values.method.length) {
+								runJsCodeForEvent'.$htmlname.'(values);
+							}
+						});
+						/* Clean contact */
+						$("div#s2id_contactid>a>span").html(\'\');
+					});
+
+					// Function used to execute events when search_htmlname change
+					function runJsCodeForEvent'.$htmlname.'(obj) {
+						var id = $("#'.$htmlname.'").val();
+						var method = obj.method;
+						var url = obj.url;
+						var htmlname = obj.htmlname;
+						$.getJSON(url,
+							{
+								action: method,
+								id: id,
+								htmlname: htmlname
+							},
+							function(response) {
+								if (response != null)
+								{
+									$.each(obj.params, function(key,action) {
+										if (key.length) {
+											var num = response.num;
+											if (num > 0) {
+												$("#" + key).removeAttr(action);
+											} else {
+												$("#" + key).attr(action, action);
+											}
+										}
+									});
+									$("select#" + htmlname).html(response.value);
+								}
+							}
+						);
+					};
+				});
+				</script>';
+			}
+
+			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
+			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" '.$htmloption.' />';
+			print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength);
+			return $socid;
+		}
 		else
 		{
+			// Search to list thirdparties
+			$sql = "SELECT s.rowid, s.nom as name FROM";
+			$sql.= " ".MAIN_DB_PREFIX."societe as s";
+			$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
 			// For ajax search we limit here. For combo list, we limit later
-			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT
-			&& is_array($limitto) && count($limitto))
+			if (is_array($limitto) && count($limitto))
 			{
 				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
 			}
-		}
-		$sql.= " ORDER BY s.nom ASC";
+			$sql.= " ORDER BY s.nom ASC";
 
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+			$resql = $this->db->query($sql);
+			if ($resql)
 			{
-				// Use Ajax search
-				$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
-
-				$socid=0;
-				if ($selected)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$socid = $obj->rowid?$obj->rowid:'';
-				}
-
-				// We recall a page after a small delay when a new input has been selected
-				$htmloption='';
-				//$javaScript = "window.location=\'".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id)."&amp;".$htmlname."=\' + document.getElementById(\'".$htmlname."\').value;";
-                //$htmloption.= 'onChange="ac_delay(\''.$javaScript.'\',\'500\');"';								// When we select with mouse
-                //$htmloption.= 'onKeyUp="if (event.keyCode== 13) { ac_delay(\''.$javaScript.'\',\'500\'); }"';	// When we select with keyboard
-
-                if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
-                {
-	                print '<script type="text/javascript">
-						jQuery(document).ready(function() {
-	                   		$("#search_'.$htmlname.'").change(function() {
-								var obj = '.json_encode($events).';
-				    			$.each(obj, function(key,values) {
-				    				if (values.method.length) {
-				    					runJsCodeForEvent'.$htmlname.'(values);
-				    				}
-								});
-                			});
-
-							// Function used to execute events when search_htmlname change
-							function runJsCodeForEvent'.$htmlname.'(obj) {
-								var id = $("#'.$htmlname.'").val();
-								var method = obj.method;
-								var url = obj.url;
-								var htmlname = obj.htmlname;
-					    		$.getJSON(url,
-									{
-										action: method,
-										id: id,
-										htmlname: htmlname
-									},
-									function(response) {
-										if (response != null)
-										{
-											$.each(obj.params, function(key,action) {
-												if (key.length) {
-													var num = response.num;
-													if (num > 0) {
-														$("#" + key).removeAttr(action);
-													} else {
-														$("#" + key).attr(action, action);
-													}
-												}
-											});
-											$("select#" + htmlname).html(response.value);
-										}
-									});
-							};
-						});
-					</script>';
-                }
-
-				print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
-				//print '<table class="nobordernopadding"><tr class="nobordernopadding">';
-				//print '<td class="nobordernopadding">';
-				if ($obj->rowid == 0)
-				{
-					print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="" '.$htmloption.' />';
-				}
-				else
-				{
-					print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$obj->name.'" '.$htmloption.' />';
-				}
-				print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength);
-				//print '</td>';
-				//print '</tr>';
-				//print '</table>';
-				//print "\n";
-				return $socid;
-			}
-			else
-			{
-				// No Ajax search
 				print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax)
 				{
@@ -668,10 +655,11 @@ class FormCompany
 				print "</select>\n";
 				return $firstCompany;
 			}
-		}
-		else
-		{
-			dol_print_error($this->db);
+			else
+			{
+				dol_print_error($this->db);
+				print 'Error sql';
+			}
 		}
 	}
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 3966b29f874..df7c09d9274 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -323,34 +323,23 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
 	if (! empty($conf->browser->phone)) return '';	// combobox disabled for smartphones (does not works)
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
 
-	/* Some properties for combobox:
-	minLengthToAutocomplete: 2,
-	comboboxContainerClass: "comboboxContainer",
-	comboboxValueContainerClass: "comboboxValueContainer",
-	comboboxValueContentClass: "comboboxValueContent",
-	comboboxDropDownClass: "comboboxDropDownContainer",
-	comboboxDropDownButtonClass: "comboboxDropDownButton",
-	comboboxDropDownItemClass: "comboboxItem",
-	comboboxDropDownItemHoverClass: "comboboxItemHover",
-	comboboxDropDownGroupItemHeaderClass: "comboboxGroupItemHeader",
-	comboboxDropDownGroupItemContainerClass: "comboboxGroupItemContainer",
-	animationType: "slide",
-	width: "500px" */
-
 	$msg = '<script type="text/javascript">
 	$(document).ready(function() {
-    	$("#'.$htmlname.'").combobox({
-    		minLengthToAutocomplete : '.$minLengthToAutocomplete.',
-    		selected : function(event,ui) {
-    			var obj = '.json_encode($events).';
-    			$.each(obj, function(key,values) {
+
+		$(\'#'.$htmlname.'\').select2({
+					width: \'resolve\',
+					minimumInputLength: '.$minLengthToAutocomplete.',
+		});
+		jQuery("#'.$htmlname.'").change(function () {
+				var obj = '.json_encode($events).';
+	   			$.each(obj, function(key,values) {
     				if (values.method.length) {
     					runJsCodeForEvent'.$htmlname.'(values);
     				}
 				});
-			}
 		});
-
+		
+		
 		function runJsCodeForEvent'.$htmlname.'(obj) {
 			var id = $("#'.$htmlname.'").val();
 			var method = obj.method;
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index acc0cd6b502..6aaf0f5f28d 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -20,12 +20,8 @@
  * $withproject (if we are on task contact)
  */
 
-if (! class_exists('Contact')) {
-	require DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-}
-if (! class_exists('FormCompany')) {
-	require DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $module = $object->element;
 
@@ -96,13 +92,9 @@ $userstatic=new User($db);
 	<input type="hidden" name="source" value="external" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
 		<div class="tagtd nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
-		<?php
-		$events=array();
-		$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-		?>
 		<div class="tagtd nowrap maxwidthonsmartphone">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
-			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, $events); ?>
+			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone">
 			<?php $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); ?>
diff --git a/htdocs/includes/jquery/plugins/select2/select2.js b/htdocs/includes/jquery/plugins/select2/select2.js
index 7590b822953..a7a7c044497 100644
--- a/htdocs/includes/jquery/plugins/select2/select2.js
+++ b/htdocs/includes/jquery/plugins/select2/select2.js
@@ -1912,7 +1912,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 if (this.opts.width === "off") {
                     return null;
                 } else if (this.opts.width === "element"){
-                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
+                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : 20+this.opts.element.outerWidth(false) + 'px';
                 } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
                     // check if there is inline style on the element that contains width
                     style = this.opts.element.attr('style');
@@ -1933,7 +1933,7 @@ the specific language governing permissions and limitations under the Apache Lic
                         if (style.indexOf("%") > 0) return style;
 
                         // finally, fallback on the calculated width of the element
-                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
+                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : 20+this.opts.element.outerWidth(false) + 'px');
                     }
 
                     return null;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2febc9288c3..ea739563127 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index efec0f68223..fa3116c895a 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -348,12 +348,9 @@ if ($id > 0 || ! empty($ref))
 				print '</td>';
 
 				print '<td colspan="1">';
-				$events=array();
-				$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-
 				$thirdpartyofproject=$projectstatic->getListContactId('thirdparty');
 				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
-				$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, $events, '&withproject='.$withproject);
+				$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', $thirdpartyofproject, 0, '&withproject='.$withproject);
 				print '</td>';
 
 				print '<td colspan="1">';
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index c600e9b0acd..71f9024c17f 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -58,10 +58,15 @@ print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0,
 print '<br><br>'."\n";
 
 // Test5: a select
-print "Test 5: a select<br>\n";
+print "Test 5a: a select<br>\n";
+$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
+$selected=3;
+print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
+print '<br>';
+print "Test 5b: a select<br>\n";
 $array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
 $selected=3;
-print $form->selectarray('testselect', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"');
+print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
 
 
 llxFooter();
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index f17a9d9f298..84a593d759a 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -711,7 +711,7 @@ print '<td width="80">&nbsp;</td></tr>'."\n";
 // Utilisation formulaire Ajax sur choix societe
 $var=!$var;
 print "<tr ".$bc[$var].">";
-print '<td width="80%">'.$form->textwithpicto($langs->trans("UseSearchToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
+print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
 if (! $conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
@@ -726,7 +726,7 @@ else
     '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
     '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
 	);
-	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT",$arrval,$conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
@@ -735,7 +735,7 @@ print '</tr>';
 
 $var=!$var;
 print "<tr ".$bc[$var].">";
-print '<td width="80%">'.$form->textwithpicto($langs->trans("UseSearchToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
+print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
 if (! $conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
@@ -750,7 +750,7 @@ else
 	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
 	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
 	);
-	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT",$arrval,$conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
 	print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";

From aaf2cca45f3488a81ffd713e148ea9c3572efaf8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 27 Oct 2014 19:31:42 +0100
Subject: [PATCH 050/345] Fix bug n sellist extrafield filtered

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 451598a5830..228fef11d10 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -727,11 +727,11 @@ class ExtraFields
 					if (strpos($InfoFieldList[4], 'extra')!==false)
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' AND extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' AND '.$InfoFieldList[4];
+						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				if (in_array($InfoFieldList[0],array('tablewithentity'))) $sqlwhere.= ' AND entity = '.$conf->entity;	// Some tables may have field, some other not. For the moment we disable it.

From bd8b393d8a8e383e6345488be2836e61d7e1004c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 5 Dec 2014 21:24:16 +0100
Subject: [PATCH 051/345] Fix [ bug #1740 ] Clone project make task date crazy

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 4f883e1b743..68b6c867442 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1007,7 +1007,8 @@ class Task extends CommonObject
 
 		$error=0;
 
-		$now=dol_now();
+		//Use 00:00 of today if time is use on task.
+		$now=dol_mktime(0,0,0,dol_print_date(dol_now(),'%m'),dol_print_date(dol_now(),'%d'),dol_print_date(dol_now(),'%Y'));
 
 		$datec = $now;
 

From dc2bd10cec7580240fcf0aa08f285b84e7aaeb32 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 01:25:52 +0100
Subject: [PATCH 052/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/accountancy.lang   | 26 +++++-----
 htdocs/langs/es_ES/admin.lang         | 68 ++++++++++++++-------------
 htdocs/langs/es_ES/agenda.lang        |  2 +-
 htdocs/langs/es_ES/bills.lang         |  2 +-
 htdocs/langs/es_ES/categories.lang    |  2 +-
 htdocs/langs/es_ES/compta.lang        |  2 +-
 htdocs/langs/es_ES/contracts.lang     |  4 +-
 htdocs/langs/es_ES/cron.lang          |  2 +-
 htdocs/langs/es_ES/donations.lang     | 10 ++--
 htdocs/langs/es_ES/errors.lang        | 18 +++++++
 htdocs/langs/es_ES/externalsite.lang  |  2 +-
 htdocs/langs/es_ES/interventions.lang | 16 +++----
 htdocs/langs/es_ES/mails.lang         |  8 ++--
 htdocs/langs/es_ES/main.lang          |  2 +-
 htdocs/langs/es_ES/margins.lang       |  2 +-
 htdocs/langs/es_ES/members.lang       |  1 +
 htdocs/langs/es_ES/orders.lang        |  2 +-
 htdocs/langs/es_ES/other.lang         | 40 ++++++++--------
 htdocs/langs/es_ES/paybox.lang        |  6 +--
 htdocs/langs/es_ES/printipp.lang      | 10 ++--
 htdocs/langs/es_ES/products.lang      |  5 ++
 htdocs/langs/es_ES/resource.lang      | 56 +++++++++++-----------
 htdocs/langs/es_ES/sendings.lang      |  4 +-
 htdocs/langs/es_ES/stocks.lang        |  2 +-
 htdocs/langs/es_ES/users.lang         |  2 +-
 htdocs/langs/es_ES/withdrawals.lang   |  6 +--
 26 files changed, 164 insertions(+), 136 deletions(-)

diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 2c5560d1d24..d26e84d7a36 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Seleccione un plan contable
 Validate=Validar
 Addanaccount=Añadir una cuenta contable
 AccountAccounting=Cuenta contable
-Ventilation=Breakdown
+Ventilation=Contabilizar
 ToDispatch=A realizar
 Dispatched=Realizadas
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Contabilizar clientes
+SuppliersVentilation=Contabilizar proveedores
 TradeMargin=Margen de beneficio
 Reports=Informes
 ByCustomerInvoice=Por facturas a clientes
@@ -45,9 +45,9 @@ WriteBookKeeping=Registrar los asientos en el libro mayor
 Bookkeeping=Libro Mayor
 AccountBalanceByMonth=Saldo mensual
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Descuadre contabilidad
+AccountingVentilationSupplier=Contablilización compras
+AccountingVentilationCustomer=Contabilización ventas
 Line=Línea
 
 CAHTF=Total (base imponible) compras a proveedor
@@ -56,7 +56,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
 IntoAccount=En la cuenta
 
 Ventilate=Contabilizar
-VentilationAuto=Automatic breakdown
+VentilationAuto=Contabilización automática
 
 Processing=Tratamiento
 EndProcessing=Final del tratamiento
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 
 ACCOUNTING_SEPARATORCSV=Separador CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
 
 AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
 AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
@@ -140,14 +140,14 @@ Active=Estado
 
 NewFiscalYear=Nuevo año fiscal
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
 TotalVente=Total ventas (base imponible)
 TotalMarge=Total margen ventas
 DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
 DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
 ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
 DescVentilTodoSupplier=Contabilize sus líneas de facturas de proveedores
 DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
 
@@ -155,4 +155,4 @@ ValidateHistory=Validar automáticamente
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 
-FicheVentilation=Breakdown card
+FicheVentilation=Ficha contable
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 8637f7088db..2deac3d4278 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productos
 Module52Desc=Gestión de stocks de productos
 Module53Name=Servicios
 Module53Desc=Gestión de servicios
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contratos/Suscripciones
+Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestión de los códigos de barras
 Module56Name=Telefonía
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Proyectos/Oportunidades
+Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -495,6 +495,8 @@ Module1780Name=Categorías
 Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado
+Module2200Name=Precios dinámicos
+Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
 Module2300Desc=Tareas programadas
 Module2400Name=Agenda
@@ -503,6 +505,8 @@ Module2500Name=Gestión Electrónica de Documentos
 Module2500Desc=Permite administrar una base de documentos
 Module2600Name=WebServices
 Module2600Desc=Activa los servicios de servidor web services de Dolibarr
+Module2650Name=WebServices (cliente)
+Module2650Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
 Module2700Name=Gravatar
 Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet
 Module2800Desc=Cliente FTP
@@ -517,7 +521,7 @@ Module6000Desc=Gestión del flujo de trabajo
 Module20000Name=Gestión de días libres retribuidos
 Module20000Desc=Gestión de los días libres retribuidos de los empleados
 Module39000Name=Lotes de productos
-Module39000Desc=Gestión de lotes y fechas de caducidad y venta de los productos
+Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos
 Module50000Name=PayBox
 Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox
 Module50100Name=TPV
@@ -606,11 +610,11 @@ Permission151=Consultar domiciliaciones
 Permission152=Crear/modificar domiciliaciones
 Permission153=Enviar domiciliaciones
 Permission154=Abonar/devolver domiciliaciones
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Consultar contratos/suscripciones
+Permission162=Crear/modificar contratos/suscripciones
+Permission163=Activar un servicio/suscripción de un contrato
+Permission164=Desactivar un servicio/suscripcion de un contrato
+Permission165=Eliminar contratos/suscripciones
 Permission171=Leer honorarios (propios y de sus subordinados)
 Permission172=Crear/modificar honorarios
 Permission173=Eliminar honorarios
@@ -672,7 +676,7 @@ Permission300=Consultar códigos de barras
 Permission301=Crear/modificar códigos de barras
 Permission302=Eliminar código de barras
 Permission311=Consultar servicios
-Permission312=Assign service/subscription to contract
+Permission312=Asignar servicios/suscripciones a un contrato
 Permission331=Consultar marcadores
 Permission332=Crear/modificar marcadores
 Permission333=Eliminar marcadores
@@ -702,8 +706,8 @@ Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
 Permission1001=Consultar stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Crear/modificar almacenes
+Permission1003=Eliminar almacenes
 Permission1004=Consultar movimientos de stock
 Permission1005=Crear/modificar movimientos de stock
 Permission1101=Consultar ordenes de envío
@@ -1138,7 +1142,7 @@ AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
 UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad nula se considera como una opción
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1160,7 +1164,7 @@ FicheinterNumberingModules=Módulos de numeración de las fichas de intervenció
 TemplatePDFInterventions=Modelo de documentos de las fichas de intervención
 WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configuración del módulo Contratos/suscripciones
 ContractsNumberingModules=Módulos de numeración de los contratos
 TemplatePDFContracts=Modelos de documento de contratos
 FreeLegalTextOnContracts=Texto libre en contratos
@@ -1324,7 +1328,7 @@ FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor
 CacheByServer=Caché mediante el servidor
 CacheByClient=Caché mediante el navegador
 CompressionOfResources=Compresión de las respuestas HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
 ##### Products #####
 ProductSetup=Configuración del módulo Productos
 ServiceSetup=Configuración del módulo Servicios
@@ -1415,9 +1419,9 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario
 OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
 OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configuración del módulo Almacenes
+UserWarehouse=Utilizar almacenes personales de usuarios
+IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
 TreeMenu=Estructura de los menús
@@ -1482,14 +1486,14 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
 ##### Point Of Sales (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
 CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
 CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
 CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV
+CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
+StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
+CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
 BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda.
@@ -1543,13 +1547,13 @@ ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 Opened=Abierto
 Closed=Cerrado
 AlwaysEditable=Puede editarse siempre
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
+NbMajMin=Número mínimo de caracteres en mayúsculas
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiales
+NbIteConsecutive=Número máximo de repeticiones de los mismos caracteres
+NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O") para la generación automática
+SalariesSetup=Configuración del módulo salarios
+SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index c1085fe2b4c..feb1581d674 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -44,7 +44,7 @@ AgendaExtSitesDesc=Esta página le permite configurar calendarios externos para
 ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma automática
 PropalValidatedInDolibarr=Presupuesto %s validado
 InvoiceValidatedInDolibarr=Factura %s validada
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
 InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
 OrderValidatedInDolibarr= Pedido %s validado
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 2f90ce489e7..7e4a1e1376d 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Ninguna factura
 ClassifyBill=Clasificar la factura
 SupplierBillsToPay=Facturas de proveedores a pagar
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Las facturas escritas a través de procedimientos mecanograficos son dispensadas por la orden en letras
 NonPercuRecuperable=No percibido recuperable
 SetConditions=Definir condiciones de pago
 SetMode=Definir modo de pago
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 51c6e4e094b..e4d86be11bd 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Configuración de categorías
 CategorieRecursiv=Enlazar con la categoría padre automáticamente
 CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-ShowCategory=Show category
+ShowCategory=Mostrar categoría
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index a8172d5d5b8..ded2c3c764e 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contable incorrecto para %s
 SuppliersProductsSellSalesTurnover=Volumen de ventas generado por la venta de los productos de los proveedores
 CheckReceipt=Lista de remesas
 CheckReceiptShort=Remesas
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=%s Últimas remesas
 NewCheckReceipt=Nueva remesa
 NewCheckDeposit=Nuevo ingreso
 NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index af08e1c1aaf..6e8cc61b5c4 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Área contratos
 ListOfContracts=Listado de contratos
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=%s Últimos contratos modificados
 AllContracts=Todos los contratos
 ContractCard=Ficha contrato
 ContractStatus=Estado del contrato
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listado de líneas de contratos en servicio
 ListOfRunningServices=Listado de servicios activos
 NotActivatedServices=Servicios no activados (con los contratos validados)
 BoardNotActivatedServices=Servicios a activar con los contratos validados
-LastContracts=Last % contracts
+LastContracts=%s Últimos contratos
 LastActivatedServices=Los %s últimos servicios activados
 LastModifiedServices=Los %s últimos servicios modificados
 EditServiceLine=Edición línea del servicio
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 75a14a528b7..883b32aefa9 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el coma
 CronExplainHowToRunWin=En un entorno de Microsoft(tm) Windows puedes usar el programador de tareas para ejecutar el comando cada varios minutos
 # Menu
 CronJobs=Tareas programadas
-CronListActive=List of active/scheduled jobs
+CronListActive=Listado de tareas activas/programadas
 CronListInactive=Tareas Inactivas
 # Page list
 CronDateLastRun=Últ. ejec.
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index 27cb070685b..dda4508af8a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Beneficiario
 ThankYou=Muchas gracias
 IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad
 MinimumAmount=El importe mínimo es %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Texto libre a mostrar a pié de página
+FrenchOptions=Opciones para Francia
+DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado
+DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado
+DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 7ac24f97c46..71715c703db 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no es
 ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar.
 ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que ha generado una transacción bancaria que se encuentra conciliada
 ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago de varias factura con alguna factura con estado Pagada
+ErrorPriceExpression1=No se puede asignar a la constante '%s'
+ErrorPriceExpression2=No se puede redefinir la función incorporada '%s'
+ErrorPriceExpression3=Variable '%s' no definida en la definición de la función
+ErrorPriceExpression4=Carácter '%s' ilegal
+ErrorPriceExpression5=No se esperaba '%s'
+ErrorPriceExpression6=Número de argumentos inadecuados (%s dados, %s esperados) 
+ErrorPriceExpression8=Operador '%s' no esperado
+ErrorPriceExpression9=Ha ocurrido un error no esperado
+ErrorPriceExpression10=Operador '%s' carece de operando
+ErrorPriceExpression11=Se esperaba '%s'
+ErrorPriceExpression14=División por cero
+ErrorPriceExpression17=Variable '%s' indefinida
+ErrorPriceExpression19=Expresión no encontrada
+ErrorPriceExpression20=Expresión vacía
+ErrorPriceExpression21=Resultado '%s' vacío
+ErrorPriceExpression22=Resultado '%s' negativo
+ErrorPriceExpressionInternal=Error interno '%s'
+ErrorPriceExpressionUnknown=Error desconocido '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
index d67d5d8125e..973ff6db361 100644
--- a/htdocs/langs/es_ES/externalsite.lang
+++ b/htdocs/langs/es_ES/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Configuración del enlace al sitio web externo
 ExternalSiteURL=URL del sitio externo
 ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Mi entrada de menú
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index 2db13d0c487..d674f45fc5d 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -31,14 +31,14 @@ RelatedInterventions=Intervenciones adjuntas
 ShowIntervention=Mostrar intervención
 SendInterventionRef=Envío de la intervención %s
 SendInterventionByMail=Enviar intervención por e-mail
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+InterventionCreatedInDolibarr=Intervención %s creada
+InterventionValidatedInDolibarr=Intervención %s validada
+InterventionModifiedInDolibarr=Intervención %s modificada
+InterventionClassifiedBilledInDolibarr=Intervención %s clasificada como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención %s clasificada como no facturada
+InterventionSentByEMail=Intervención %s enviada por E-Mail
+InterventionDeletedInDolibarr=Intervención %s eliminada
+SearchAnIntervention=Buscar una intervención
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguimiento de la intervención
 TypeContact_fichinter_internal_INTERVENING=Interventor
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 65885aaa6d0..6c154537764 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviado por
 MailingNeedCommand=Por razones de seguridad, el envío de un E-Mailing en masa debe realizarse en línea de comandos. Pida a su administrador que lance el comando siguiente para para enviar la correspondencia a a todos los destinatarios:
 MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
 ConfirmSendingEmailing=¿Confirma el envío del e-mailing?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza en tandas por razones de seguridad y timeouts, se enviarán a <b>%s</b> destinatarios por tanda.
 TargetsReset=Vaciar lista
 ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón
 ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
 AddNewNotification=Activar un nuevo destinatario de notificaciones
 ListOfActiveNotifications=Listado de todos los destinatarios de notificaciones
 ListOfNotificationsDone=Listado de notificaciones enviadas
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
+MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
+MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 209c6be9ef7..0f13a2540a2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -367,7 +367,7 @@ ActionsOnCompany=Eventos respecto a este tercero
 ActionsOnMember=Eventos respecto a este miembro
 NActions=%s eventos
 NActionsLate=%s en retraso
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Solicitud ya registrada
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos generados
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index f16c868e593..2094ff8761a 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,4 +41,4 @@ AgentContactType=Tipo de contacto comisionado
 AgentContactTypeDetails=Indique qué tipo de contacto (enlazado a las facturas) será el utilizado para el informe de márgenes de agentes comerciales
 rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
-ShowMarginInfos=Show margin infos
+ShowMarginInfos=Mostrar info de márgenes
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index dd1989dbb48..afff6708e0d 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Miembros por naturaleza
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
 NoVatOnSubscription=Sin IVA para en las afiliaciones
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail para advertir en caso de recepción de confirmación de un pago validado de una afiliación
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 474753385db..67002f7d105 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Existe una expedición
 DraftOrWaitingApproved=Borrador o aprobado aún no controlado
 DraftOrWaitingShipped=Borrador o validado aún no expedido
 MenuOrdersToBill=Pedidos a facturar
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Pedidos facturables
 SearchOrder=Buscar un pedido
 SearchACustomerOrder=Buscar un pedido de cliente
 ShipProduct=Enviar producto
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 1b2319ae9a1..fe430c2878c 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -203,26 +203,26 @@ ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este e
 
 ##### Calendar common #####
 AddCalendarEntry=Añadir entrada en el calendario
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Empresa %s añadida
+ContractValidatedInDolibarr=Contrato %s validado
+ContractCanceledInDolibarr=Contrato %s cancelado
+ContractClosedInDolibarr=Contrato %s cerrado
+PropalClosedSignedInDolibarr=Presupuesto %s firmado
+PropalClosedRefusedInDolibarr=Presupuesto %s rechazado
+PropalValidatedInDolibarr=Presupuesto %s validado
+PropalClassifiedBilledInDolibarr=Presupuesto %s clasificado facturado
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoicePaidInDolibarr=Factura %s pasada a pagada
+InvoiceCanceledInDolibarr=Factura %s cancelada
+PaymentDoneInDolibarr=Pago %s realizado
+CustomerPaymentDoneInDolibarr=Pago de cliente %s realizado
+SupplierPaymentDoneInDolibarr=Pago a proveedor %s realizado
+MemberValidatedInDolibarr=Miembro %s validado
+MemberResiliatedInDolibarr=Miembro %s dado de baja
+MemberDeletedInDolibarr=Miembro %s eliminado
+MemberSubscriptionAddedInDolibarr=Subscripción del miembro %s añadida
+ShipmentValidatedInDolibarr=Expedición %s validada
+ShipmentDeletedInDolibarr=Expedición %s eliminada
 ##### Export #####
 Export=Exportación
 ExportsArea=Área de exportaciones
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index 91846ce244e..0ebdba0ae8b 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Mensaje en la página de retorno de pago cancelado
 NewPayboxPaymentReceived=Nuevo pago Paybox recibido
 NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito
 PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Valor para PBX SITE
+PAYBOX_PBX_RANG=valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index 241272d262e..b1831a86789 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuración del módulo Impresión directa IPP
-PrintIPPDesc=Este módulo permite añadir un botón de impresión directa de sus documentos hacia su impresora. Se requiere un sistema Linux equipado con Cups.
-PRINTIPP_ENABLED=Muestra el logo "Impresión directa" en los listados de documentos
+PrintIPPSetup=Configuración del módulo Impresión Directa
+PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado.
+PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos
 PRINTIPP_HOST=Servidor de impresión
 PRINTIPP_PORT=Puerto
-PRINTIPP_USER=Login
+PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
-NoPrinterFound=No se ha encontrado ninguna impresora (compruebe su configuración Cups)
\ No newline at end of file
+NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 1a4726afcc2..693cdfdd193 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clien
 PriceByCustomerLog=Log de precios por clientes
 MinimumPriceLimit=El precio mínimo no puede ser menor de %s
 MinimumRecommendedPrice=El precio mínimo recomendado es: %s
+PriceExpressionEditor=Editor de expresión de precios
+PriceExpressionSelected=Expresión de precios seleccionada
+PriceExpressionEditorHelp="price = 2 + 2" o "2 + 2" para indicar el precio<br>ExtraFields son variables como "#options_myextrafieldkey# * 2"<br>Existen variables especiales como #quantity# y #tva_tx#<br>Use ; para separar expresiones
+PriceMode=Modo precio
+PriceNumeric=Número
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index d64075dfbf5..5bc252fbce3 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -1,36 +1,36 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Recursos
+MenuResourceAdd=Nuevo recurso
+MenuResourcePlanning=Planificación de recursos
+DeleteResource=Eliminar recurso
+ConfirmDeleteResourceElement=¿Está seguro de querer eliminar el recurso de este elemento?
+NoResourceInDatabase=Sin recursos en la base de datos.
+NoResourceLinked=Sin recursos enlazados
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Listado de recursos
+ResourceSingular=Recurso
+ResourceCard=Ficha recurso
+AddResource=Crear un recurso
+ResourceFormLabel_ref=Nombre recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descripción recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos enlazados a elemento
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Ver planificación de recursos
+GotoDate=Ir a fecha
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Elementos de recursos
+ResourceCreatedWithSuccess=Recurso creado correctamente
+RessourceLineSuccessfullyDeleted=Línea de recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea de recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso enlazado correctamente
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Ficha recurso
+ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
+RessourceSuccessfullyDeleted=Recurso eliminado correctamente
+DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modèles d'Emails
+DictionaryEMailTemplates=Modelo de E-Mails
 
-SelectResource=Select resource
+SelectResource=Seleccionar recurso
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 9f6f20a1eb9..4335c234d11 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedició
 RelatedShippings=Expedición(es) asociada(s)
 ShipmentLine=Línea de expedición
 CarrierList=Listado de transportistas
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Ya ha sido enviado el producto del pedido de cliente
+SuppliersReceiptRunning=Ya ha sido recibido el producto del pedido a proveedor
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 3a98d9a9add..04f2c864f9d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=La etiqueta del almacén es obligatoria
 CorrectStock=Corregir stock
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
-StocksArea=Warehouses area
+StocksArea=Área almacenes
 Location=Lugar
 LocationSummary=Nombre corto del lugar
 NumberOfDifferentProducts=Número de productos diferentes
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index b00190c30b3..0440f777da0 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Usuario %s deshailitado
 UserEnabled=Usuario %s activado
 UserDeleted=Usuario %s eliminado
 NewGroupCreated=Grupo %s creado
-GroupModified=Group %s modified
+GroupModified=Grupo %s modificado
 GroupDeleted=Grupo %s eliminado
 ConfirmCreateContact=¿Está seguro de querer crear una cuenta Dolibarr para este contacto?
 ConfirmCreateLogin=¿Está seguro de que desea crear una cuenta Dolibarr para este miembro?
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index ab7be0799b4..1762411d3c8 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -16,7 +16,7 @@ WithdrawedBills=Facturas domiciliadas
 WithdrawalsLines=Lineas de domiciliación
 RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar
 RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas
 CustomersStandingOrders=Domiciliaciones de clientes
 CustomerStandingOrder=Domiciliación cliente
 NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
@@ -47,7 +47,7 @@ RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación de la devolución
 NoInvoiceRefused=No facturar la devolución
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 Status=Estado
 StatusUnknown=Desconocido
 StatusWaiting=En espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
 BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones
 CreditDate=Abonada el
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
 DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.

From 6720d3d7065af1bfac578daa5a0298c3d43ec359 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 01:27:11 +0100
Subject: [PATCH 053/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/accountancy.lang   | 26 +++++-----
 htdocs/langs/es_ES/admin.lang         | 68 ++++++++++++++-------------
 htdocs/langs/es_ES/agenda.lang        |  2 +-
 htdocs/langs/es_ES/bills.lang         |  2 +-
 htdocs/langs/es_ES/categories.lang    |  2 +-
 htdocs/langs/es_ES/compta.lang        |  2 +-
 htdocs/langs/es_ES/contracts.lang     |  4 +-
 htdocs/langs/es_ES/cron.lang          |  2 +-
 htdocs/langs/es_ES/donations.lang     | 10 ++--
 htdocs/langs/es_ES/errors.lang        | 18 +++++++
 htdocs/langs/es_ES/externalsite.lang  |  2 +-
 htdocs/langs/es_ES/interventions.lang | 16 +++----
 htdocs/langs/es_ES/mails.lang         |  8 ++--
 htdocs/langs/es_ES/main.lang          |  2 +-
 htdocs/langs/es_ES/margins.lang       |  2 +-
 htdocs/langs/es_ES/members.lang       |  1 +
 htdocs/langs/es_ES/orders.lang        |  2 +-
 htdocs/langs/es_ES/other.lang         | 40 ++++++++--------
 htdocs/langs/es_ES/paybox.lang        |  6 +--
 htdocs/langs/es_ES/printipp.lang      | 10 ++--
 htdocs/langs/es_ES/products.lang      |  5 ++
 htdocs/langs/es_ES/resource.lang      | 56 +++++++++++-----------
 htdocs/langs/es_ES/sendings.lang      |  4 +-
 htdocs/langs/es_ES/stocks.lang        |  2 +-
 htdocs/langs/es_ES/users.lang         |  2 +-
 htdocs/langs/es_ES/withdrawals.lang   |  6 +--
 26 files changed, 164 insertions(+), 136 deletions(-)

diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 2c5560d1d24..d26e84d7a36 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Seleccione un plan contable
 Validate=Validar
 Addanaccount=Añadir una cuenta contable
 AccountAccounting=Cuenta contable
-Ventilation=Breakdown
+Ventilation=Contabilizar
 ToDispatch=A realizar
 Dispatched=Realizadas
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Contabilizar clientes
+SuppliersVentilation=Contabilizar proveedores
 TradeMargin=Margen de beneficio
 Reports=Informes
 ByCustomerInvoice=Por facturas a clientes
@@ -45,9 +45,9 @@ WriteBookKeeping=Registrar los asientos en el libro mayor
 Bookkeeping=Libro Mayor
 AccountBalanceByMonth=Saldo mensual
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Descuadre contabilidad
+AccountingVentilationSupplier=Contablilización compras
+AccountingVentilationCustomer=Contabilización ventas
 Line=Línea
 
 CAHTF=Total (base imponible) compras a proveedor
@@ -56,7 +56,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
 IntoAccount=En la cuenta
 
 Ventilate=Contabilizar
-VentilationAuto=Automatic breakdown
+VentilationAuto=Contabilización automática
 
 Processing=Tratamiento
 EndProcessing=Final del tratamiento
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 
 ACCOUNTING_SEPARATORCSV=Separador CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
 
 AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
 AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
@@ -140,14 +140,14 @@ Active=Estado
 
 NewFiscalYear=Nuevo año fiscal
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
 TotalVente=Total ventas (base imponible)
 TotalMarge=Total margen ventas
 DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
 DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
 ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
 DescVentilTodoSupplier=Contabilize sus líneas de facturas de proveedores
 DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
 
@@ -155,4 +155,4 @@ ValidateHistory=Validar automáticamente
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 
-FicheVentilation=Breakdown card
+FicheVentilation=Ficha contable
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 8637f7088db..2deac3d4278 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productos
 Module52Desc=Gestión de stocks de productos
 Module53Name=Servicios
 Module53Desc=Gestión de servicios
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contratos/Suscripciones
+Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestión de los códigos de barras
 Module56Name=Telefonía
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Proyectos/Oportunidades
+Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -495,6 +495,8 @@ Module1780Name=Categorías
 Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado
+Module2200Name=Precios dinámicos
+Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
 Module2300Desc=Tareas programadas
 Module2400Name=Agenda
@@ -503,6 +505,8 @@ Module2500Name=Gestión Electrónica de Documentos
 Module2500Desc=Permite administrar una base de documentos
 Module2600Name=WebServices
 Module2600Desc=Activa los servicios de servidor web services de Dolibarr
+Module2650Name=WebServices (cliente)
+Module2650Desc=Habilitar los servicios web cliente de Dolibarr (puede ser utilizado para grabar datos/solicitudes de servidores externos. De momento solo se soporta pedidos a proveedor)
 Module2700Name=Gravatar
 Module2700Desc=Utiliza el servicio en línea de Gravatar (www.gravatar.com) para mostrar fotos de los usuarios/miembros (que se encuentran en sus mensajes de correo electrónico). Necesita un acceso a Internet
 Module2800Desc=Cliente FTP
@@ -517,7 +521,7 @@ Module6000Desc=Gestión del flujo de trabajo
 Module20000Name=Gestión de días libres retribuidos
 Module20000Desc=Gestión de los días libres retribuidos de los empleados
 Module39000Name=Lotes de productos
-Module39000Desc=Gestión de lotes y fechas de caducidad y venta de los productos
+Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos
 Module50000Name=PayBox
 Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox
 Module50100Name=TPV
@@ -606,11 +610,11 @@ Permission151=Consultar domiciliaciones
 Permission152=Crear/modificar domiciliaciones
 Permission153=Enviar domiciliaciones
 Permission154=Abonar/devolver domiciliaciones
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Consultar contratos/suscripciones
+Permission162=Crear/modificar contratos/suscripciones
+Permission163=Activar un servicio/suscripción de un contrato
+Permission164=Desactivar un servicio/suscripcion de un contrato
+Permission165=Eliminar contratos/suscripciones
 Permission171=Leer honorarios (propios y de sus subordinados)
 Permission172=Crear/modificar honorarios
 Permission173=Eliminar honorarios
@@ -672,7 +676,7 @@ Permission300=Consultar códigos de barras
 Permission301=Crear/modificar códigos de barras
 Permission302=Eliminar código de barras
 Permission311=Consultar servicios
-Permission312=Assign service/subscription to contract
+Permission312=Asignar servicios/suscripciones a un contrato
 Permission331=Consultar marcadores
 Permission332=Crear/modificar marcadores
 Permission333=Eliminar marcadores
@@ -702,8 +706,8 @@ Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
 Permission1001=Consultar stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Crear/modificar almacenes
+Permission1003=Eliminar almacenes
 Permission1004=Consultar movimientos de stock
 Permission1005=Crear/modificar movimientos de stock
 Permission1101=Consultar ordenes de envío
@@ -1138,7 +1142,7 @@ AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
 UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad nula se considera como una opción
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1160,7 +1164,7 @@ FicheinterNumberingModules=Módulos de numeración de las fichas de intervenció
 TemplatePDFInterventions=Modelo de documentos de las fichas de intervención
 WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configuración del módulo Contratos/suscripciones
 ContractsNumberingModules=Módulos de numeración de los contratos
 TemplatePDFContracts=Modelos de documento de contratos
 FreeLegalTextOnContracts=Texto libre en contratos
@@ -1324,7 +1328,7 @@ FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor
 CacheByServer=Caché mediante el servidor
 CacheByClient=Caché mediante el navegador
 CompressionOfResources=Compresión de las respuestas HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
 ##### Products #####
 ProductSetup=Configuración del módulo Productos
 ServiceSetup=Configuración del módulo Servicios
@@ -1415,9 +1419,9 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario
 OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
 OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configuración del módulo Almacenes
+UserWarehouse=Utilizar almacenes personales de usuarios
+IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
 TreeMenu=Estructura de los menús
@@ -1482,14 +1486,14 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
 ##### Point Of Sales (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Configuración del módulo Terminal Punto de Venta
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
 CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
 CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
 CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV
+CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
+StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
+CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
 BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda.
@@ -1543,13 +1547,13 @@ ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 Opened=Abierto
 Closed=Cerrado
 AlwaysEditable=Puede editarse siempre
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
+NbMajMin=Número mínimo de caracteres en mayúsculas
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiales
+NbIteConsecutive=Número máximo de repeticiones de los mismos caracteres
+NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O") para la generación automática
+SalariesSetup=Configuración del módulo salarios
+SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index c1085fe2b4c..feb1581d674 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -44,7 +44,7 @@ AgendaExtSitesDesc=Esta página le permite configurar calendarios externos para
 ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma automática
 PropalValidatedInDolibarr=Presupuesto %s validado
 InvoiceValidatedInDolibarr=Factura %s validada
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
 InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
 OrderValidatedInDolibarr= Pedido %s validado
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 2f90ce489e7..7e4a1e1376d 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Ninguna factura
 ClassifyBill=Clasificar la factura
 SupplierBillsToPay=Facturas de proveedores a pagar
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Las facturas escritas a través de procedimientos mecanograficos son dispensadas por la orden en letras
 NonPercuRecuperable=No percibido recuperable
 SetConditions=Definir condiciones de pago
 SetMode=Definir modo de pago
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 51c6e4e094b..e4d86be11bd 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Configuración de categorías
 CategorieRecursiv=Enlazar con la categoría padre automáticamente
 CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-ShowCategory=Show category
+ShowCategory=Mostrar categoría
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index a8172d5d5b8..ded2c3c764e 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contable incorrecto para %s
 SuppliersProductsSellSalesTurnover=Volumen de ventas generado por la venta de los productos de los proveedores
 CheckReceipt=Lista de remesas
 CheckReceiptShort=Remesas
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=%s Últimas remesas
 NewCheckReceipt=Nueva remesa
 NewCheckDeposit=Nuevo ingreso
 NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index af08e1c1aaf..6e8cc61b5c4 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Área contratos
 ListOfContracts=Listado de contratos
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=%s Últimos contratos modificados
 AllContracts=Todos los contratos
 ContractCard=Ficha contrato
 ContractStatus=Estado del contrato
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listado de líneas de contratos en servicio
 ListOfRunningServices=Listado de servicios activos
 NotActivatedServices=Servicios no activados (con los contratos validados)
 BoardNotActivatedServices=Servicios a activar con los contratos validados
-LastContracts=Last % contracts
+LastContracts=%s Últimos contratos
 LastActivatedServices=Los %s últimos servicios activados
 LastModifiedServices=Los %s últimos servicios modificados
 EditServiceLine=Edición línea del servicio
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 75a14a528b7..883b32aefa9 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el coma
 CronExplainHowToRunWin=En un entorno de Microsoft(tm) Windows puedes usar el programador de tareas para ejecutar el comando cada varios minutos
 # Menu
 CronJobs=Tareas programadas
-CronListActive=List of active/scheduled jobs
+CronListActive=Listado de tareas activas/programadas
 CronListInactive=Tareas Inactivas
 # Page list
 CronDateLastRun=Últ. ejec.
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index 27cb070685b..dda4508af8a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Beneficiario
 ThankYou=Muchas gracias
 IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad
 MinimumAmount=El importe mínimo es %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Texto libre a mostrar a pié de página
+FrenchOptions=Opciones para Francia
+DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado
+DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado
+DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 7ac24f97c46..71715c703db 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no es
 ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar.
 ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que ha generado una transacción bancaria que se encuentra conciliada
 ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago de varias factura con alguna factura con estado Pagada
+ErrorPriceExpression1=No se puede asignar a la constante '%s'
+ErrorPriceExpression2=No se puede redefinir la función incorporada '%s'
+ErrorPriceExpression3=Variable '%s' no definida en la definición de la función
+ErrorPriceExpression4=Carácter '%s' ilegal
+ErrorPriceExpression5=No se esperaba '%s'
+ErrorPriceExpression6=Número de argumentos inadecuados (%s dados, %s esperados) 
+ErrorPriceExpression8=Operador '%s' no esperado
+ErrorPriceExpression9=Ha ocurrido un error no esperado
+ErrorPriceExpression10=Operador '%s' carece de operando
+ErrorPriceExpression11=Se esperaba '%s'
+ErrorPriceExpression14=División por cero
+ErrorPriceExpression17=Variable '%s' indefinida
+ErrorPriceExpression19=Expresión no encontrada
+ErrorPriceExpression20=Expresión vacía
+ErrorPriceExpression21=Resultado '%s' vacío
+ErrorPriceExpression22=Resultado '%s' negativo
+ErrorPriceExpressionInternal=Error interno '%s'
+ErrorPriceExpressionUnknown=Error desconocido '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
index d67d5d8125e..973ff6db361 100644
--- a/htdocs/langs/es_ES/externalsite.lang
+++ b/htdocs/langs/es_ES/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Configuración del enlace al sitio web externo
 ExternalSiteURL=URL del sitio externo
 ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Mi entrada de menú
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index 2db13d0c487..d674f45fc5d 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -31,14 +31,14 @@ RelatedInterventions=Intervenciones adjuntas
 ShowIntervention=Mostrar intervención
 SendInterventionRef=Envío de la intervención %s
 SendInterventionByMail=Enviar intervención por e-mail
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+InterventionCreatedInDolibarr=Intervención %s creada
+InterventionValidatedInDolibarr=Intervención %s validada
+InterventionModifiedInDolibarr=Intervención %s modificada
+InterventionClassifiedBilledInDolibarr=Intervención %s clasificada como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención %s clasificada como no facturada
+InterventionSentByEMail=Intervención %s enviada por E-Mail
+InterventionDeletedInDolibarr=Intervención %s eliminada
+SearchAnIntervention=Buscar una intervención
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguimiento de la intervención
 TypeContact_fichinter_internal_INTERVENING=Interventor
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 65885aaa6d0..6c154537764 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviado por
 MailingNeedCommand=Por razones de seguridad, el envío de un E-Mailing en masa debe realizarse en línea de comandos. Pida a su administrador que lance el comando siguiente para para enviar la correspondencia a a todos los destinatarios:
 MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
 ConfirmSendingEmailing=¿Confirma el envío del e-mailing?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza en tandas por razones de seguridad y timeouts, se enviarán a <b>%s</b> destinatarios por tanda.
 TargetsReset=Vaciar lista
 ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón
 ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
 AddNewNotification=Activar un nuevo destinatario de notificaciones
 ListOfActiveNotifications=Listado de todos los destinatarios de notificaciones
 ListOfNotificationsDone=Listado de notificaciones enviadas
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
+MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
+MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 209c6be9ef7..0f13a2540a2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -367,7 +367,7 @@ ActionsOnCompany=Eventos respecto a este tercero
 ActionsOnMember=Eventos respecto a este miembro
 NActions=%s eventos
 NActionsLate=%s en retraso
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Solicitud ya registrada
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos generados
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index f16c868e593..2094ff8761a 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,4 +41,4 @@ AgentContactType=Tipo de contacto comisionado
 AgentContactTypeDetails=Indique qué tipo de contacto (enlazado a las facturas) será el utilizado para el informe de márgenes de agentes comerciales
 rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
-ShowMarginInfos=Show margin infos
+ShowMarginInfos=Mostrar info de márgenes
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index dd1989dbb48..afff6708e0d 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Miembros por naturaleza
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
 NoVatOnSubscription=Sin IVA para en las afiliaciones
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail para advertir en caso de recepción de confirmación de un pago validado de una afiliación
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 474753385db..67002f7d105 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Existe una expedición
 DraftOrWaitingApproved=Borrador o aprobado aún no controlado
 DraftOrWaitingShipped=Borrador o validado aún no expedido
 MenuOrdersToBill=Pedidos a facturar
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Pedidos facturables
 SearchOrder=Buscar un pedido
 SearchACustomerOrder=Buscar un pedido de cliente
 ShipProduct=Enviar producto
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 1b2319ae9a1..fe430c2878c 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -203,26 +203,26 @@ ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este e
 
 ##### Calendar common #####
 AddCalendarEntry=Añadir entrada en el calendario
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Empresa %s añadida
+ContractValidatedInDolibarr=Contrato %s validado
+ContractCanceledInDolibarr=Contrato %s cancelado
+ContractClosedInDolibarr=Contrato %s cerrado
+PropalClosedSignedInDolibarr=Presupuesto %s firmado
+PropalClosedRefusedInDolibarr=Presupuesto %s rechazado
+PropalValidatedInDolibarr=Presupuesto %s validado
+PropalClassifiedBilledInDolibarr=Presupuesto %s clasificado facturado
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoicePaidInDolibarr=Factura %s pasada a pagada
+InvoiceCanceledInDolibarr=Factura %s cancelada
+PaymentDoneInDolibarr=Pago %s realizado
+CustomerPaymentDoneInDolibarr=Pago de cliente %s realizado
+SupplierPaymentDoneInDolibarr=Pago a proveedor %s realizado
+MemberValidatedInDolibarr=Miembro %s validado
+MemberResiliatedInDolibarr=Miembro %s dado de baja
+MemberDeletedInDolibarr=Miembro %s eliminado
+MemberSubscriptionAddedInDolibarr=Subscripción del miembro %s añadida
+ShipmentValidatedInDolibarr=Expedición %s validada
+ShipmentDeletedInDolibarr=Expedición %s eliminada
 ##### Export #####
 Export=Exportación
 ExportsArea=Área de exportaciones
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index 91846ce244e..0ebdba0ae8b 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Mensaje en la página de retorno de pago cancelado
 NewPayboxPaymentReceived=Nuevo pago Paybox recibido
 NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito
 PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Valor para PBX SITE
+PAYBOX_PBX_RANG=valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index 241272d262e..b1831a86789 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuración del módulo Impresión directa IPP
-PrintIPPDesc=Este módulo permite añadir un botón de impresión directa de sus documentos hacia su impresora. Se requiere un sistema Linux equipado con Cups.
-PRINTIPP_ENABLED=Muestra el logo "Impresión directa" en los listados de documentos
+PrintIPPSetup=Configuración del módulo Impresión Directa
+PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado.
+PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos
 PRINTIPP_HOST=Servidor de impresión
 PRINTIPP_PORT=Puerto
-PRINTIPP_USER=Login
+PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
-NoPrinterFound=No se ha encontrado ninguna impresora (compruebe su configuración Cups)
\ No newline at end of file
+NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 1a4726afcc2..693cdfdd193 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clien
 PriceByCustomerLog=Log de precios por clientes
 MinimumPriceLimit=El precio mínimo no puede ser menor de %s
 MinimumRecommendedPrice=El precio mínimo recomendado es: %s
+PriceExpressionEditor=Editor de expresión de precios
+PriceExpressionSelected=Expresión de precios seleccionada
+PriceExpressionEditorHelp="price = 2 + 2" o "2 + 2" para indicar el precio<br>ExtraFields son variables como "#options_myextrafieldkey# * 2"<br>Existen variables especiales como #quantity# y #tva_tx#<br>Use ; para separar expresiones
+PriceMode=Modo precio
+PriceNumeric=Número
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index d64075dfbf5..5bc252fbce3 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -1,36 +1,36 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Recursos
+MenuResourceAdd=Nuevo recurso
+MenuResourcePlanning=Planificación de recursos
+DeleteResource=Eliminar recurso
+ConfirmDeleteResourceElement=¿Está seguro de querer eliminar el recurso de este elemento?
+NoResourceInDatabase=Sin recursos en la base de datos.
+NoResourceLinked=Sin recursos enlazados
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Listado de recursos
+ResourceSingular=Recurso
+ResourceCard=Ficha recurso
+AddResource=Crear un recurso
+ResourceFormLabel_ref=Nombre recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descripción recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos enlazados a elemento
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Ver planificación de recursos
+GotoDate=Ir a fecha
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Elementos de recursos
+ResourceCreatedWithSuccess=Recurso creado correctamente
+RessourceLineSuccessfullyDeleted=Línea de recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea de recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso enlazado correctamente
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Ficha recurso
+ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
+RessourceSuccessfullyDeleted=Recurso eliminado correctamente
+DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modèles d'Emails
+DictionaryEMailTemplates=Modelo de E-Mails
 
-SelectResource=Select resource
+SelectResource=Seleccionar recurso
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 9f6f20a1eb9..4335c234d11 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedició
 RelatedShippings=Expedición(es) asociada(s)
 ShipmentLine=Línea de expedición
 CarrierList=Listado de transportistas
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Ya ha sido enviado el producto del pedido de cliente
+SuppliersReceiptRunning=Ya ha sido recibido el producto del pedido a proveedor
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 3a98d9a9add..04f2c864f9d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=La etiqueta del almacén es obligatoria
 CorrectStock=Corregir stock
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
-StocksArea=Warehouses area
+StocksArea=Área almacenes
 Location=Lugar
 LocationSummary=Nombre corto del lugar
 NumberOfDifferentProducts=Número de productos diferentes
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index b00190c30b3..0440f777da0 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Usuario %s deshailitado
 UserEnabled=Usuario %s activado
 UserDeleted=Usuario %s eliminado
 NewGroupCreated=Grupo %s creado
-GroupModified=Group %s modified
+GroupModified=Grupo %s modificado
 GroupDeleted=Grupo %s eliminado
 ConfirmCreateContact=¿Está seguro de querer crear una cuenta Dolibarr para este contacto?
 ConfirmCreateLogin=¿Está seguro de que desea crear una cuenta Dolibarr para este miembro?
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index ab7be0799b4..1762411d3c8 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -16,7 +16,7 @@ WithdrawedBills=Facturas domiciliadas
 WithdrawalsLines=Lineas de domiciliación
 RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar
 RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas
 CustomersStandingOrders=Domiciliaciones de clientes
 CustomerStandingOrder=Domiciliación cliente
 NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
@@ -47,7 +47,7 @@ RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación de la devolución
 NoInvoiceRefused=No facturar la devolución
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 Status=Estado
 StatusUnknown=Desconocido
 StatusWaiting=En espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
 BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones
 CreditDate=Abonada el
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
 DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.

From 430b2ff8dbc7cf3971ec772bc8afe303d3182899 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 11:00:49 +0100
Subject: [PATCH 054/345] Fix: datepicker first day of week can be monday by
 setting into display setup

---
 ChangeLog                         |  1 +
 htdocs/core/datepicker.php        | 16 ++++++++++++++++
 htdocs/core/lib/functions.lib.php | 15 +++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a5d67d88d7f..09061bda629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@ For users:
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
+- Fix: datepicker first day of week can be monday by setting into display setup
 
 For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 67af3c7e083..7c5c4898fce 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -2,6 +2,7 @@
 /* Copyright (C) phpBSM
  * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -184,6 +185,19 @@ function displayBox($selectedDate,$month,$year)
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
 	<tr class="dpDayNames">
+	<?php
+	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+	if($startday==1)
+	{?>
+		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>     
+	<?php
+	}else {?>	
 		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
 		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
@@ -191,6 +205,8 @@ function displayBox($selectedDate,$month,$year)
 		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<?php
+	}?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ad081b1158..a7cb3bbee73 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1028,6 +1028,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
  */
 function dol_getdate($timestamp,$fast=false)
 {
+	global $conf;
+	
 	$usealternatemethod=false;
 	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
 	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
@@ -1039,6 +1041,19 @@ function dol_getdate($timestamp,$fast=false)
 	else
 	{
 		$arrayinfo=getdate($timestamp);
+		
+		$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+		if($startday==1)
+		{
+			if ($arrayinfo["wday"]==0)
+			{
+				$arrayinfo["wday"]=6;
+			}
+			else
+			{
+				$arrayinfo["wday"]=$arrayinfo["wday"]-1;
+			}
+		}
 	}
 
 	return $arrayinfo;

From 0d9aa452b8a457431698ec2b1a3ff73e98943b90 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 11:01:15 +0100
Subject: [PATCH 055/345] Trad: Create es_ES productbatch from transifex

---
 htdocs/langs/es_ES/productbatch.lang | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 htdocs/langs/es_ES/productbatch.lang

diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
new file mode 100644
index 00000000000..dd61a420dbc
--- /dev/null
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -0,0 +1,19 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestionar lotes/series
+ProductStatusOnBatch=Gestionado
+ProductStatusNotOnBatch=No gestionado
+ProductStatusOnBatchShort=Gestionado
+ProductStatusNotOnBatchShort=No gestionado
+Batch=Lote/Serie
+atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote
+batch_number=Número Lote/Serie
+l_eatby=Fecha de caducidad
+l_sellby=Fecha límite de venta
+DetailBatchNumber=Detalles del lote/serie
+DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+printBatch=Lote: %s
+printEatby=Caducidad: %s
+printSellby=Límite venta: %s
+printQty=Cant.: %d
+AddDispatchBatchLine=Añada una línea para despacho por caducidad
+BatchDefaultNumber=Indefinido

From fe23a851e7fdde76c4b20b0fbfae8c205fe86450 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 11:00:49 +0100
Subject: [PATCH 056/345] Fix: datepicker first day of week can be monday by
 setting into display setup

---
 ChangeLog                         |  1 +
 htdocs/core/datepicker.php        | 16 ++++++++++++++++
 htdocs/core/lib/functions.lib.php | 15 +++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a5d67d88d7f..09061bda629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@ For users:
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
+- Fix: datepicker first day of week can be monday by setting into display setup
 
 For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 67af3c7e083..7c5c4898fce 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -2,6 +2,7 @@
 /* Copyright (C) phpBSM
  * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -184,6 +185,19 @@ function displayBox($selectedDate,$month,$year)
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
 	<tr class="dpDayNames">
+	<?php
+	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+	if($startday==1)
+	{?>
+		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>     
+	<?php
+	}else {?>	
 		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
 		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
@@ -191,6 +205,8 @@ function displayBox($selectedDate,$month,$year)
 		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<?php
+	}?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ad081b1158..a7cb3bbee73 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1028,6 +1028,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
  */
 function dol_getdate($timestamp,$fast=false)
 {
+	global $conf;
+	
 	$usealternatemethod=false;
 	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
 	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
@@ -1039,6 +1041,19 @@ function dol_getdate($timestamp,$fast=false)
 	else
 	{
 		$arrayinfo=getdate($timestamp);
+		
+		$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+		if($startday==1)
+		{
+			if ($arrayinfo["wday"]==0)
+			{
+				$arrayinfo["wday"]=6;
+			}
+			else
+			{
+				$arrayinfo["wday"]=$arrayinfo["wday"]-1;
+			}
+		}
 	}
 
 	return $arrayinfo;

From c655af6135a574100b7b48ac1ef75f4f6a454461 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 6 Dec 2014 11:06:34 +0100
Subject: [PATCH 057/345] Trad: Create es_ES productbatch from transifex

---
 htdocs/langs/es_ES/productbatch.lang | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 htdocs/langs/es_ES/productbatch.lang

diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
new file mode 100644
index 00000000000..dd61a420dbc
--- /dev/null
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -0,0 +1,19 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestionar lotes/series
+ProductStatusOnBatch=Gestionado
+ProductStatusNotOnBatch=No gestionado
+ProductStatusOnBatchShort=Gestionado
+ProductStatusNotOnBatchShort=No gestionado
+Batch=Lote/Serie
+atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote
+batch_number=Número Lote/Serie
+l_eatby=Fecha de caducidad
+l_sellby=Fecha límite de venta
+DetailBatchNumber=Detalles del lote/serie
+DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+printBatch=Lote: %s
+printEatby=Caducidad: %s
+printSellby=Límite venta: %s
+printQty=Cant.: %d
+AddDispatchBatchLine=Añada una línea para despacho por caducidad
+BatchDefaultNumber=Indefinido

From 71683d20cfa3d04f0fbae246f6d5823eade219c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Dec 2014 14:05:51 +0100
Subject: [PATCH 058/345] Update doc

---
 build/obs/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/obs/README b/build/obs/README
index fefe6dbd91d..cf312fc0e68 100644
--- a/build/obs/README
+++ b/build/obs/README
@@ -14,7 +14,7 @@ https://build.opensuse.org
 Packaging rules: http://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot
+OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 

From 04594770971cf5b7cb4b78a40b6edd0b48ac5128 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 6 Dec 2014 14:41:56 +0100
Subject: [PATCH 059/345] Fix: Miscellaneous fixes for multicompany

---
 htdocs/comm/action/listactions.php             |  2 +-
 htdocs/comm/action/peruser.php                 |  2 +-
 htdocs/comm/action/rapport/index.php           |  5 +++--
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql |  2 ++
 htdocs/install/mysql/tables/llx_resource.sql   |  2 +-
 htdocs/opensurvey/list.php                     |  2 +-
 htdocs/projet/class/project.class.php          |  4 ++--
 htdocs/resource/class/resource.class.php       | 14 ++++++++------
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 245902013a1..7fa67695860 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -180,7 +180,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid";
 if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
 $sql.= " WHERE c.id = a.fk_action";
 $sql.= ' AND a.fk_user_author = u.rowid';
-$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';    // To limit to entity
+$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 if ($actioncode) $sql.=" AND c.code='".$db->escape($actioncode)."'";
 if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index dcebefbcbb7..22cf8841c02 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -610,7 +610,7 @@ else
 	$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 	$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
-	$sql.= " WHERE u.entity IN (".getEntity('user').")";
+	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 	if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
 	if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3);
 	//print $sql;
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index a9a19f57a9e..24eb117684f 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,6 +55,7 @@ $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
 /*
  * Actions
  */
+
 if ($action == 'builddoc')
 {
 	$cat = new CommActionRapport($db, $month, $year);
@@ -79,7 +80,7 @@ $sql.= " date_format(a.datep, '%Y') as year";
 $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a,";
 $sql.= " ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE a.fk_user_author = u.rowid";
-$sql.= " AND a.entity = ".$conf->entity;
+$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 //$sql.= " AND percent = 100";
 $sql.= " GROUP BY year, month, df";
 $sql.= " ORDER BY year DESC, month DESC, df DESC";
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 40a7f7b86c6..e2c586de47f 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1140,6 +1140,8 @@ ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
 ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
 ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;
 
+ALTER TABLE llx_resource MODIFY COLUMN entity integer DEFAULT 1 NOT NULL;
+
 -- This request make mysql drop (mysql bug, so we add it at end):
 --ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
 
diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql
index 91ebbe8b75d..0d67075f1ea 100755
--- a/htdocs/install/mysql/tables/llx_resource.sql
+++ b/htdocs/install/mysql/tables/llx_resource.sql
@@ -17,7 +17,7 @@
 CREATE TABLE llx_resource
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  entity          		integer,
+  entity          		integer DEFAULT 1 NOT NULL,
   ref             		varchar(255),
   description     		text,
   fk_code_type_resource varchar(32),
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 83482bbe04f..d21a08007a4 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -123,7 +123,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 }
-$sql.= " WHERE p.entity = ".getEntity('survey');
+$sql.= " WHERE p.entity = ".getEntity('survey',1);
 if ($status == 'expired') $sql.=" AND date_fin < '".$db->idate($now)."'";
 if ($status == 'opened') $sql.=" AND date_fin >= '".$db->idate($now)."'";
 if ($surveytitle) $sql.=" AND titre LIKE '%".$db->escape($surveytitle)."%'";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 738eec46ec0..ec449f009c7 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -298,7 +298,7 @@ class Project extends CommonObject
         else if (! empty($ref))
         {
         	$sql.= " WHERE ref='".$this->db->escape($ref)."'";
-        	$sql.= " AND entity IN (".getEntity('project').")";
+        	$sql.= " AND entity IN (".getEntity('project',1).")";
         }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -910,7 +910,7 @@ class Project extends CommonObject
             $sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
             $sql.= ", " . MAIN_DB_PREFIX . "c_type_contact as ctc";
         }
-        $sql.= " WHERE p.entity IN (".getEntity('project').")";
+        $sql.= " WHERE p.entity IN (".getEntity('project',1).")";
         // Internal users must see project he is contact to even if project linked to a third party he can't see.
         //if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
         if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index a7be5d0d25a..c75f37b00c2 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -388,7 +388,7 @@ class Resource extends CommonObject
     	$sql.= " ty.label as type_label";
     	$sql.= " FROM ".MAIN_DB_PREFIX."resource as t";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
-    	//$sql.= " WHERE t.entity IN (".getEntity('resource').")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
 
     	//Manage filter
     	if (!empty($filter)){
@@ -402,7 +402,7 @@ class Resource extends CommonObject
     		}
     	}
     	$sql.= " GROUP BY t.rowid";
-    	$sql.= " ORDER BY $sortfield $sortorder ";
+    	$sql.= $this->db->order($sortfield,$sortorder);
     	if ($limit) $sql.= $this->db->plimit($limit+1,$offset);
     	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
@@ -462,7 +462,7 @@ class Resource extends CommonObject
 		$sql.= " t.fk_user_create,";
 		$sql.= " t.tms";
    		$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-   		//$sql.= " WHERE t.entity IN (".getEntity('resource').")";
+   		$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
 
    		//Manage filter
    		if (!empty($filter)){
@@ -476,7 +476,8 @@ class Resource extends CommonObject
    			}
    		}
    		$sql.= " GROUP BY t.rowid";
-   		$sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit($limit+1,$offset);
+    	$sql.= $this->db->order($sortfield,$sortorder);
+   		if ($limit) $sql.= $this->db->plimit($limit+1,$offset);
    		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
    		$resql=$this->db->query($sql);
@@ -547,7 +548,7 @@ class Resource extends CommonObject
     	$sql.= " t.fk_user_create,";
     	$sql.= " t.tms";
     	$sql.= ' FROM '.MAIN_DB_PREFIX .'element_resources as t ';
-    	//$sql.= " WHERE t.entity IN (".getEntity('resource').")";
+    	$sql.= " WHERE t.entity IN (".getEntity('resource',1).")";
 
     	//Manage filter
     	if (!empty($filter)){
@@ -561,7 +562,8 @@ class Resource extends CommonObject
     		}
     	}
     	$sql.= " GROUP BY t.resource_id";
-    	$sql.= " ORDER BY " . $sortfield . "  " . $sortorder . " " . $this->db->plimit($limit+1,$offset);
+    	$sql.= $this->db->order($sortfield,$sortorder);
+    	if ($limit) $sql.= $this->db->plimit($limit+1,$offset);
     	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
     	$resql=$this->db->query($sql);

From c7313210244ce259d0a632c07db8aa2beac135d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 01:57:23 +0100
Subject: [PATCH 060/345] New: Function yn can show a visual checkbox

---
 ChangeLog                         | 12 ++++++++++++
 htdocs/comm/action/card.php       |  2 +-
 htdocs/core/lib/functions.lib.php | 22 +++++++++++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09061bda629..75c284c0283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,18 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 3.8 compared to 3.7.* *****
+For users:
+- New:
+
+For translators:
+- Update language files.
+- New: When a translation is not available we always jump to en_US and only en_US.
+
+For developers:
+- New: Function yn can show a visual checkbox
+
+
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
 - New: Match other auth system: Login can be done entering login or user 
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 9d98823289c..5ad26b0fa38 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1045,7 +1045,7 @@ if ($id > 0)
 		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
         // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
+        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
 
 		$rowspan=4;
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a7cb3bbee73..5c0040a74b9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1029,7 +1029,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 function dol_getdate($timestamp,$fast=false)
 {
 	global $conf;
-	
+
 	$usealternatemethod=false;
 	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
 	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
@@ -1041,7 +1041,7 @@ function dol_getdate($timestamp,$fast=false)
 	else
 	{
 		$arrayinfo=getdate($timestamp);
-		
+
 		$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
 		if($startday==1)
 		{
@@ -1116,11 +1116,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
-		
+
 		if (empty($localtz)) {
 			$localtz = new DateTimeZone('UTC');
 		}
-		
+
 		$dt = new DateTime(null,$localtz);
 		$dt->setDate($year,$month,$day);
 		$dt->setTime((int) $hour, (int) $minute, (int) $second);
@@ -3595,7 +3595,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
  *	Return yes or no in current language
  *
  *	@param	string	$yesno			Value to test (1, 'yes', 'true' or 0, 'no', 'false')
- *	@param	string	$case			1=Yes/No, 0=yes/no
+ *	@param	string	$case			1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Yes/No
  *	@param	int		$color			0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
  *	@return	string					HTML string
  */
@@ -3605,12 +3605,20 @@ function yn($yesno, $case=1, $color=0)
 	$result='unknown';
 	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
 	{
-		$result=($case?$langs->trans("Yes"):$langs->trans("yes"));
+		$result=$langs->trans('yes');
+		if ($case == 1 || $case == 3) $result=$langs->trans("Yes");
+		if ($case == 2) $result='<input type="checkbox" value="1" checked="checked" disabled="disabled">';
+		if ($case == 3) $result='<input type="checkbox" value="1" checked="checked" disabled="disabled"> '.$result;
+
 		$classname='ok';
 	}
 	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
-		$result=($case?$langs->trans("No"):$langs->trans("no"));
+		$result=$langs->trans("no");
+		if ($case == 1 || $case == 3) $result=$langs->trans("No");
+		if ($case == 2) $result='<input type="checkbox" value="0" disabled="disabled">';
+		if ($case == 3) $result='<input type="checkbox" value="0" disabled="disabled"> '.$result;
+
 		if ($color == 2) $classname='ok';
 		else $classname='error';
 	}

From a59ac280bc5585c40d7318e84565fb5ec0a15958 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 02:19:57 +0100
Subject: [PATCH 061/345] Doxygen

---
 htdocs/comm/action/class/actioncomm.class.php  | 2 +-
 htdocs/install/mysql/tables/llx_actioncomm.sql | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 34e88dd893e..56fb713ae0c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -57,7 +57,7 @@ class ActionComm extends CommonObject
     var $datef;			// Date action end (datep2)
     var $durationp = -1;      // -1=Unkown duration			// deprecated
     var $fulldayevent = 0;    // 1=Event on full day
-    var $punctual = 1;        // Milestone					// TODO Not sure we need this. Milestone is already event with end date = start date
+    var $punctual = 1;        // Milestone					// deprecated. Milestone is already event with end date = start date
     var $percentage;    // Percentage
     var $location;      // Location
 
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index c42cf377b85..f68d99f6a72 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -51,10 +51,10 @@ create table llx_actioncomm
   
   priority			smallint,
   fulldayevent		smallint NOT NULL default 0,
-  punctual			smallint NOT NULL default 1,
+  punctual			smallint NOT NULL default 1, -- deprecated. milestone is event with date start = date end
   percent			smallint NOT NULL default 0,
   location			varchar(128),
-  durationp			real,							-- duree planifiee
+  durationp			real,							-- planed duration
   durationa			real,							-- deprecated
   note				text,
   

From ff23b0c0a65f27c234c14021ab6801b41007b185 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 12:10:50 +0100
Subject: [PATCH 062/345] Fix: No print

---
 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 b70820463b0..272798a6f65 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -827,7 +827,7 @@ class Form
 				{
 					if (count($events))		// Add management of event
 					{
-						print '<script type="text/javascript">
+						$out.='<script type="text/javascript">
 								$(document).ready(function() {
 									jQuery("#'.$htmlname.'").change(function () {
 										var obj = '.json_encode($events).';

From a4a7489a541aea8c04f9f9854b3189ac124569dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 15:12:32 +0100
Subject: [PATCH 063/345] Fix: Missing the hook init

---
 htdocs/societe/consumption.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d5ef1af6dbb..f8b5829b03e 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -76,11 +76,18 @@ $langs->load("orders");
 $langs->load("suppliers");
 $langs->load("propal");
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('consumptionthirdparty'));
+
 
 /*
  * Actions
  */
 
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 
 
 /*

From 455a2fe07a354bbddf8e3f6c085d998288a94381 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 15:14:24 +0100
Subject: [PATCH 064/345] Fixed: Missing hook init Fixed: Translation at wrong
 place

---
 htdocs/langs/en_US/admin.lang    | 1 +
 htdocs/langs/en_US/resource.lang | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 27dabba3d88..29664483d18 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -781,6 +781,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource

From c35018be5f1ca6ca9a597f425fd8e722fefce4c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 18:24:45 +0100
Subject: [PATCH 065/345] Fixed: Translations

---
 .../contact/canvas/default/tpl/contactcard_create.tpl.php | 2 +-
 .../contact/canvas/default/tpl/contactcard_edit.tpl.php   | 2 +-
 .../contact/canvas/default/tpl/contactcard_view.tpl.php   | 2 +-
 htdocs/contact/card.php                                   | 8 ++++----
 htdocs/contact/exportimport.php                           | 4 ++--
 htdocs/contact/ldap.php                                   | 4 ++--
 htdocs/contact/list.php                                   | 2 +-
 htdocs/contact/note.php                                   | 4 ++--
 htdocs/contact/perso.php                                  | 8 ++++----
 htdocs/core/class/html.formfile.class.php                 | 8 +++++---
 htdocs/societe/document.php                               | 2 +-
 11 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index a0605d3656e..70d6b41bf35 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -50,7 +50,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index a445444e42c..3be1d16bc8d 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -59,7 +59,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index 623fad27e77..0b4b8a07fcb 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -44,7 +44,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index db83554c7ae..af07cbb9a62 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -456,7 +456,7 @@ else
             {
                 if ($socid > 0)
                 {
-                    print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td>';
+                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
                     print '<td colspan="3" class="maxwidthonsmartphone">';
                     print $objsoc->getNomUrl(1);
                     print '</td>';
@@ -464,7 +464,7 @@ else
                     print '</td></tr>';
                 }
                 else {
-                    print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                     print $form->select_company($socid,'socid','',1);
                     print '</td></tr>';
                 }
@@ -690,7 +690,7 @@ else
             // Company
             if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
             {
-                print '<tr><td><label for="socid">'.$langs->trans("Company").'</label></td>';
+                print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
                 print '<td colspan="3" class="maxwidthonsmartphone">';
                 print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):($object->socid?$object->socid:-1),'socid','',1);
                 print '</td>';
@@ -924,7 +924,7 @@ else
         // Company
         if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
         {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             if ($object->socid > 0)
             {
                 $objsoc->fetch($object->socid);
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index bcb3b9c2be0..e9e9c70966c 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -77,11 +77,11 @@ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     	$objsoc = new Societe($db);
     	$objsoc->fetch($contact->socid);
 
-    	print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
     }
     else
     {
-    	print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">';
+    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
     	print $langs->trans("ContactNotLinkedToCompany");
     	print '</td></tr>';
     }
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index fe3098eaa9a..170ed039904 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -105,11 +105,11 @@ if ($contact->socid > 0)
 	$objsoc = new Societe($db);
 	$objsoc->fetch($contact->socid);
 
-	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
 }
 else
 {
-	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">';
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
 }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index eab4369ac21..4413b721fc9 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -300,7 +300,7 @@ if ($result)
     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("Company"),$_SERVER["PHP_SELF"],"s.nom", $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);
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 73b0f513db9..ab8101dd739 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -98,12 +98,12 @@ if ($id > 0)
     		$objsoc = new Societe($db);
     		$objsoc->fetch($object->socid);
 
-    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
     	}
 
     	else
     	{
-    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
     		print $langs->trans("ContactNotLinkedToCompany");
     		print '</td></tr>';
     	}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 92ba03e9861..6ec43320e54 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -111,11 +111,11 @@ if ($action == 'edit')
             $objsoc = new Societe($db);
             $objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
         }
         else
         {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
@@ -179,12 +179,12 @@ else
             $objsoc = new Societe($db);
             $objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
         }
 
         else
         {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2bcfd36bdde..cf06894dde5 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -271,13 +271,13 @@ class FormFile
         if (! empty($iconPDF)) {
         	return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
         }
-        
+
         $printer=0;
         if (in_array($modulepart,array('facture','propal','proposal','order','commande')))	// This feature is implemented only for such elements
         {
         	$printer = (!empty($user->rights->printipp->read) && !empty($conf->printipp->enabled))?true:false;
         }
-        
+
         $hookmanager->initHooks(array('formfile'));
         $forname='builddoc';
         $out='';
@@ -1100,6 +1100,8 @@ class FormFile
         global $bc;
         global $sortfield, $sortorder;
 
+        $langs->load("link");
+
         require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
         $link = new Link($this->db);
         $links = array();
@@ -1161,7 +1163,7 @@ class FormFile
         $nboflinks = count($links);
         if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-        $var = false;
+        $var = true;
         foreach ($links as $link)
         {
             $var =! $var;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 2fde1ef5dcf..c2ad751f196 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -147,7 +147,7 @@ if ($object->id)
 
 	print '</table>';
 
-	print '</div>';
+	dol_fiche_end();
 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;

From 1db6d86c78002f6eb8ce7ff0ade5637b0c5ac60a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 19:10:24 +0100
Subject: [PATCH 066/345] Fix: versions

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

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index d815d67dd59..1f233e9f551 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -71,12 +71,12 @@ if (! empty($useragent))
 
 
 // Check PHP version
-if (versioncompare(versionphparray(),array(4,3,10)) < 0)        // Minimum to use (error if lower)
+if (versioncompare(versionphparray(),array(5,2,3)) < 0)        // Minimum to use (error if lower)
 {
-	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow",'4.3.10');
+	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow",'5.2.3');
 	$checksok=0;	// 0=error, 1=warning
 }
-else if (versioncompare(versionphparray(),array(5,3,0)) < 0)    // Minimum supported (error if lower)
+else if (versioncompare(versionphparray(),array(5,3,0)) < 0)    // Minimum supported (warning if lower)
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow",'5.3.0');
     $checksok=0;	// 0=error, 1=warning

From 1e8e7474d8e27c75cb2988f95227a6da3d78029b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 21:22:43 +0100
Subject: [PATCH 067/345] Fixed: specimen init did not include new vars of 3.7

---
 htdocs/comm/action/class/actioncomm.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 56fb713ae0c..15394c81a3a 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1142,7 +1142,7 @@ class ActionComm extends CommonObject
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user,$langs,$conf,$user;
 
         $now=dol_now();
 
@@ -1166,6 +1166,9 @@ class ActionComm extends CommonObject
         $this->transparency=1;	// 1 means opaque
         $this->priority=1;
         $this->note = 'Note';
+
+        $this->userownerid=$user->id;
+        $this->userassigned[$user->id]=array('id'=>$user->id, 'transparency'=> 1);
     }
 
 }

From ec0c7476fbf355fc20ae1675a2a94b17e280a7fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Dec 2014 23:51:36 +0100
Subject: [PATCH 068/345] Work on select2 prototype.

---
 htdocs/main.inc.php               |  1 +
 htdocs/public/test/test_forms.php | 28 ++++++++++++++++++++-------
 htdocs/theme/eldy/style.css.php   | 32 ++++++++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2920dc2e436..9c682f42eb0 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -992,6 +992,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 
         $ext='';
         if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
+        if (GETPOST('version')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
 
         if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
         {
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 71f9024c17f..55b8296e43a 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -21,8 +21,8 @@ llxHeader();
 This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with<br>
 - css (edit page to change to test another css)<br>
 - jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)<br>
-<br>
 </h1>
+<br>
 
 <!--  Output to test html.form.class.php -->
 <?php
@@ -49,21 +49,35 @@ $form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
 
 print '<br><br>'."\n";
 
-// Test4: a multiselect
-print "Test 4: a multiselect<br>\n";
+// Test4a: form->select_product
+print "Test 4: Select product - ";
+$form->select_produits(0,'producttest');
+
+print '<br><br>'."\n";
+
+// Test4b: form->selectarray
+print "Test 4: Select array - ";
+$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
+$arrayselected=array(1,3);
+print $form->selectarray('selectarray',$array);
+
+print '<br><br>'."\n";
+
+// Test5: a multiselect
+print "Test 5: a multiselect<br>\n";
 $array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
 $arrayselected=array(1,3);
 print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
 
 print '<br><br>'."\n";
 
-// Test5: a select
-print "Test 5a: a select<br>\n";
+// Test6: a select
+print "Test 6a: a select<br>\n";
 $array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
 $selected=3;
 print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
-print '<br>';
-print "Test 5b: a select<br>\n";
+print '<br><br>';
+print "Test 6b: a select<br>\n";
 $array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
 $selected=3;
 print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c4d933d4940..8a11a65241e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -107,7 +107,7 @@ $colorbacklinepair2='255,255,255';    // line pair
 $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
 $colorbackbody='#f9f9f9';
 $colortext='40,40,40';
-$fontsize='12';
+$fontsize='13';
 $fontsizesmaller='11';
 
 // Eldy colors
@@ -263,7 +263,7 @@ input, textarea, select {
 	border-top:solid 1px rgba(0,0,0,.3);
 	border-bottom:solid 1px rgba(0,0,0,.2);
 	/* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
-	padding:2px;
+	padding:4px;
 	margin-left:1px;
 	margin-bottom:1px;
 	margin-top:1px;
@@ -2454,6 +2454,7 @@ li.cal_event       { border: none; list-style-type: none; }
 	       cursor:pointer;
 	     }
 
+
 /* ============================================================================== */
 /*  jQuery - jeditable                                                            */
 /* ============================================================================== */
@@ -2642,7 +2643,7 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 {
     line-height: 1em !important;
 }
-.ui-autocomplete-input { margin: 0; padding: 2px; }
+.ui-autocomplete-input { margin: 0; padding: 4px; }
 
 
 /* ============================================================================== */
@@ -2910,6 +2911,31 @@ div.dolEventError h1, div.dolEventError h2 {
 	background-image: none;
 }
 
+/* ============================================================================== */
+/*  Select2                                                                       */
+/* ============================================================================== */
+
+.select2-choice, 
+.select2-drop.select2-drop-above.select2-drop-active, 
+.select2-container-active .select2-choice, 
+.select2-container-active .select2-choices,
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+	border: 1px solid #aaa;
+}
+
+.select2-drop-active
+{
+	border: 1px solid #aaa;
+	border-top: none;
+}
+a span.select2-chosen
+{
+	font-weight: normal !important;
+}
+
 
 /* ============================================================================== */
 /*  JMobile                                                                       */

From d9e5a597e43029e43de751e6c2108da0a8b3395e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 00:29:33 +0100
Subject: [PATCH 069/345] Fixed: Avoid wrapping of help text

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3a3bba15653..1a936db37fb 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -789,10 +789,11 @@ else
 	        print '</label>';
             print ' &nbsp; &nbsp; ';
 	        print '<label for="radioprivate">';
-            print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
-	        print '&nbsp;';
-            print $langs->trans("Individual");
-            print '<div class="hideonsmartphone">('.$langs->trans("ToCreateContactWithSameName").')</div>';
+            $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
+	        $text.='&nbsp;';
+	        $text.= $langs->trans("Individual");
+	        $htmltext=$langs->trans("ToCreateContactWithSameName");
+	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
             print '</label>';
             print '</div>';
             print "<br>\n";

From 4d7f3cb741d0c6480736115212c31e3f9aaf3a3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 02:41:21 +0100
Subject: [PATCH 070/345] Fixed: Pb of wrapping login page New: Use placeholder

---
 htdocs/core/tpl/login.tpl.php             | 76 +++++++++++++++--------
 htdocs/core/tpl/passwordforgotten.tpl.php | 33 ++++++----
 htdocs/theme/eldy/style.css.php           | 17 ++++-
 3 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 898b5f4cb57..8ce6e631a4a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -46,9 +46,10 @@ $(document).ready(function () {
 </script>
 <?php } ?>
 
-<div align="center">
+<center>
 <div class="login_vertical_align">
 
+
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 <input type="hidden" name="loginfunction" value="loginfunction" />
@@ -66,33 +67,39 @@ $(document).ready(function () {
 <input type="hidden" name="dol_no_mouse_hover" id="dol_no_mouse_hover" value="<?php echo $dol_no_mouse_hover; ?>" />
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
-<div class="login_table">
-
-<div id="login_line1">
-
-<!-- Logo -->
-<div class="center"><img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" /></div>
-
-<table align="center" class="login_table_title" summary="<?php echo dol_escape_htmltag($title); ?>">
+<table class="login_table_title center" summary="<?php echo dol_escape_htmltag($title); ?>">
 <tr class="vmenu"><td align="center"><?php echo dol_escape_htmltag($title); ?></td></tr>
 </table>
 <br>
 
-<table class="left" summary="Login pass">
+<div class="login_table">
+
+<div id="login_line1">
+
+<div id="login_left">
+
+<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
+
+</div>
+
+
+
+<div id="login_right">
+
+<table class="left centpercent" summary="Login pass">
 <!-- Login -->
 <tr>
-<td valign="middle" class="loginfield"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="middle" class="nowrap">
 <span class="span-icon-user">
-<input type="text" id="username" name="username" class="flat input-icon-user" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="15" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </span>
 </td>
 </tr>
 <!-- Password -->
-<tr><td valign="middle" class="loginfield nowrap"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong></td>
+<tr>
 <td valign="middle" class="nowrap">
 <span class="span-icon-password">
-<input id="password" name="password" class="flat input-icon-password" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
+<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="15" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
 </span>
 </td></tr>
 <?php
@@ -110,18 +117,18 @@ if (! empty($hookmanager->resArray['options'])) {
 	if ($captcha) {
 		// TODO: provide accessible captha variants
 ?>
-<!-- Captcha -->
-	<tr><td valign="middle" class="loginfield nowrap"><label for="securitycode"><b><?php echo $langs->trans('SecurityCode'); ?></b></label></td>
+	<!-- Captcha -->
+	<tr>
 	<td valign="top" class="nowrap none" align="left">
 
 	<table class="login_table_securitycode" style="width: 100px;"><tr>
 	<td>
 	<span class="span-icon-security">
-	<input id="securitycode" class="flat input-icon-security" type="text" size="6" maxlength="5" name="code" tabindex="4" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
+	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
 	</td></tr>
@@ -130,6 +137,12 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div> <!-- end div left -->
 
+
+
+
+
+</div>
+
 <div id="login_line2" style="clear: both">
 
 <!-- Button Connection -->
@@ -145,7 +158,7 @@ if ($forgetpasslink || $helpcenterlink)
 	if ($dol_use_jmobile)    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile;
 
 	echo '<br>';
-	echo '<div class="center" style="margin-top: 4px;">';
+	echo '<div align="center" style="margin-top: 4px;">';
 	if ($forgetpasslink) {
 		echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">(';
 		echo $langs->trans('PasswordForgotten');
@@ -172,7 +185,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 
 	//if (! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $url=
 	echo '<br>';
-	echo '<div class="center" style="margin-top: 4px;">';
+	echo '<div align="center" style="margin-top: 4px;">';
 
 	$url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 	if (! empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
@@ -185,14 +198,18 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 	echo '</div>';
 }
 
+
 ?>
 
 </div>
-</div>
+
 </div>
 
 </form>
 
+
+
+
 <?php if (! empty($_SESSION['dol_loginmesg']))
 {
 ?>
@@ -206,17 +223,21 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 <?php if ($main_home)
 {
 ?>
-<!-- main_home message -->
-<div class="login_main_home center" style="max-width: 80%"><?php echo $main_home; ?></div>
-<br>
+	<div class="center" class="login_main_home" style="max-width: 80%">
+	<?php echo $main_home; ?>
+	</div><br>
 <?php
 }
 ?>
+
 <!-- authentication mode = <?php echo $main_authentication ?> -->
 <!-- cookie name used for this session = <?php echo $session_name ?> -->
 <!-- urlfrom in this session = <?php echo isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:''; ?> -->
+
 <!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
+
 <?php if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?>
+
 <?php
 // Google Analytics (need Google module)
 if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
@@ -246,7 +267,7 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
 	if (empty($conf->dol_use_jmobile))
 	{
 ?>
-	<div class="center"><br>
+	<div align="center"><br>
 		<script type="text/javascript"><!--
 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
@@ -262,8 +283,11 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
 	}
 }
 ?>
+
+
 </div>
-</div>
+</center>	<!-- end of center -->
+
 
 </body>
 </html>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 9a740c0960e..f75804ea524 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -44,7 +44,8 @@ $(document).ready(function () {
 <?php } ?>
 
 
-<div align="center" class="login_vertical_align">
+<center>
+<div class="login_vertical_align">
 
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
@@ -52,7 +53,7 @@ $(document).ready(function () {
 <input type="hidden" name="action" value="buildnewpassword">
 
 <table class="login_table_title center" summary="<?php echo dol_escape_htmltag($title); ?>">
-<tr class="vmenu"><td class="center"><?php echo $title; ?></td></tr>
+<tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
 </table>
 <br>
 
@@ -60,16 +61,23 @@ $(document).ready(function () {
 
 <div id="login_line1">
 
+
 <div id="login_left">
 
+<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
+
+</div>
+
+
+<div id="login_right">
+
 <table class="left" summary="Login pass">
 
 <!-- Login -->
 <tr>
-<td valign="bottom" class="loginfield nowrap"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="bottom" class="nowrap">
 <span class="span-icon-user">
-<input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="15" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
 </span>
 </td>
 </tr>
@@ -88,17 +96,17 @@ if (! empty($hookmanager->resArray['options'])) {
 
 <?php if ($captcha) { ?>
 	<!-- Captcha -->
-	<tr><td valign="middle" class="loginfield nowrap"><strong><label for="securitycode"><?php echo $langs->trans('SecurityCode'); ?></label></strong></td>
+	<tr>
 	<td valign="top" class="nowrap none" align="left">
 
 	<table class="login_table_securitycode" style="width: 100px;"><tr>
 	<td>
 	<span class="span-icon-security">
-	<input id="securitycode" class="flat input-icon-security" type="text" size="6" maxlength="5" name="code" tabindex="4" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
+	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
 	</td></tr>
@@ -108,11 +116,9 @@ if (! empty($hookmanager->resArray['options'])) {
 
 </div> <!-- end div left -->
 
-<div id="login_right">
 
-<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
 
-</div>
+
 </div>
 
 <div id="login_line2" style="clear: both">
@@ -121,7 +127,7 @@ if (! empty($hookmanager->resArray['options'])) {
 <br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
 
 <br>
-<div class="center" style="margin-top: 4px;">
+<div align="center" style="margin-top: 4px;">
 	<?php
 	$moreparam='';
 	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
@@ -146,7 +152,7 @@ if (! empty($hookmanager->resArray['options'])) {
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
 	</font>
 <?php }else{ ?>
-	<div class="warning center">
+	<div class="warning" align="center">
 	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
 	</div>
 <?php } ?>
@@ -163,8 +169,9 @@ if (! empty($hookmanager->resArray['options'])) {
 
 
 </div>
+</center>	<!-- end of center -->
 
 
 </body>
 </html>
-<!-- END PHP TEMPLATE -->
\ No newline at end of file
+<!-- END PHP TEMPLATE -->
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b6c5b1a047b..9d29707e1bf 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -849,7 +849,7 @@ form#login {
 	vertical-align: middle;
 }
 .login_table_title {
-	max-width: 320px;
+	max-width: 560px;
 	color: #888888;
 	text-shadow: 1px 1px 1px #FFF;
 }
@@ -863,7 +863,7 @@ form#login {
 	padding-right:6px;
 	padding-top:12px;
 	padding-bottom:12px;
-	max-width: 320px;
+	max-width: 560px;
 
 	background-color: #FFFFFF;
 
@@ -891,6 +891,8 @@ div#login_left, div#login_right {
 	display: inline-block;
 	min-width: 245px;
 	padding-top: 10px;
+	padding-left: 16px;
+	padding-right: 16px;
 	text-align: center;
 	vertical-align: middle;
 }
@@ -964,6 +966,17 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 
+.span-icon-user {
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px;
+}
+.span-icon-password {
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+	background-repeat: no-repeat;
+}
+.span-icon-user input, .span-icon-password input {
+	margin-right: 30px;
+	width: 98%;
+}
 
 /* ============================================================================== */
 /* Menu gauche                                                                    */

From 1616f05068b1ed4618759baaf4b0cabd693740da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 02:51:26 +0100
Subject: [PATCH 071/345] Fixed: missing css

---
 htdocs/support/default.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index 14454a19245..ea62df52ef0 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -148,3 +148,11 @@ background: #DDDFDD;
 
 table { font-size: 12px; }
 table.login {  border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; }
+
+.inline-block
+{
+	display:inline-block;
+	vertical-align: top;
+	margin: 12px;
+	min-width: 400px;
+}

From bd91603cd86dfef94a2927bbaafccef3115aade4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 17:28:26 +0100
Subject: [PATCH 072/345] Fixed: form outside table

---
 htdocs/user/agenda_extsites.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 1993f12bd5c..47a1f160b5a 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -122,6 +122,10 @@ $arrayofcss=array();
 
 llxHeader('',$langs->trans("UserSetup"),'','',0,0,$arrayofjs,$arrayofcss);
 
+
+print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="id" value="'.$id.'">';
+
 $head=user_prepare_head($fuser);
 
 dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
@@ -129,9 +133,6 @@ dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
 print $langs->trans("AgendaExtSitesDesc")."<br>\n";
 print "<br>\n";
 
-print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="id" value="'.$id.'">';
-
 $selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
@@ -172,15 +173,15 @@ while ($i <= $MAXAGENDA)
 }
 
 print '</table>';
-print '<br>';
 
-print '<center>';
+dol_fiche_end();
+
+print '<div align="center">';
 print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">";
-print "</center>";
+print "</div>";
 
 print "</form>\n";
 
-dol_fiche_end();
 
 llxFooter();
 

From 0ea7d51b227c2ef32b25378e4355e1a4479c9b16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 19:05:22 +0100
Subject: [PATCH 073/345] Fixed: Several fix in color management (function at
 wrong place, mark param that are deprecated, convertion of value to get
 correct format in all situation)

---
 htdocs/adherents/stats/geo.php             |  3 +-
 htdocs/core/class/html.formother.class.php |  8 ++---
 htdocs/core/lib/functions.lib.php          | 13 --------
 htdocs/core/lib/functions2.lib.php         | 39 ++++++++++++++++++++++
 htdocs/theme/eldy/style.css.php            | 15 +++++----
 5 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 736f6ef0140..938e3e172b2 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -23,6 +23,7 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
@@ -69,7 +70,7 @@ dol_mkdir($dir);
 
 if ($mode)
 {
-    // Define sql	
+    // Define sql
     if ($mode == 'memberbycountry')
     {
         $label=$langs->trans("Country");
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1ed76cddd9b..c7f953dbbfc 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -560,13 +560,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@return	void
      * 		@deprecated
      */
-    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
+    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
     {
     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
     }
@@ -576,13 +576,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@param	string		$morecss		Add css style into input field
      * 		@return	void
      */
-    function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
         global $langs,$conf;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5c0040a74b9..fb587487aae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4843,19 +4843,6 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 }
 
 
-/**
- *	Convert an array with RGB value into hex RGB value
- *
- *  @param	array	$arraycolor			Array
- *  @param	string	$colorifnotfound	Color code to return if entry not defined
- *  @return	string						RGB hex value (without # before). For example: FF00FF
- */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
-{
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
-}
-
 /**
  * Set focus onto field with selector
  *
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4702fe69e99..246af863d12 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1836,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) {
 	}
 	return 0;
 }
+
+
+/**
+ *	Convert an array with RGB value into hex RGB value
+ *
+ *  @param	array	$arraycolor			Array
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorStringToArray
+ */
+function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+{
+	if (! is_array($arraycolor)) return $colorifnotfound;
+	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+}
+
+
+/**
+ *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255)
+ *
+ *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorArrayToHex
+ */
+function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+{
+	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	if (! $tmp)
+	{
+		$tmp=explode(',',$stringcolor);
+		if (count($tmp) < 3) return $colorifnotfound;
+		return $tmp;
+	}
+	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+}
+
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7eed00b74f6..dc159a87607 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -38,6 +38,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
 if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
@@ -107,7 +108,7 @@ $colorbacklinepair2='255,255,255';    // line pair
 $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
 $colorbackbody='#f9f9f9';
 $colortext='40,40,40';
-$fontsize='13';
+$fontsize='12';
 $fontsizesmaller='11';
 
 // Eldy colors
@@ -131,12 +132,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='50,50,130';
-	/*if ($dol_use_jmobile)
-	{
-    	$conf->global->THEME_ELDY_BACKTABCARD1='245,245,245';    // topmenu
-		$conf->global->THEME_ELDY_BACKTABCARD2='245,245,245';
-		$conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245';
-	}*/
+    $conf->global->THEME_ELDY_FONT_SIZE1='12';
+    $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
@@ -167,6 +164,10 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
 	$colorbacklinepairhover='';
 }
 
+// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
+$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');

From a8052d8ea48f1ad9622c82e95b39b4f01ee9bd10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 19:05:22 +0100
Subject: [PATCH 074/345] Fixed: Several fix in color management (function at
 wrong place, mark param that are deprecated, convertion of value to get
 correct format in all situation)

---
 htdocs/adherents/stats/geo.php             |  3 +-
 htdocs/core/class/html.formother.class.php |  8 ++---
 htdocs/core/lib/functions.lib.php          | 13 --------
 htdocs/core/lib/functions2.lib.php         | 39 ++++++++++++++++++++++
 htdocs/theme/eldy/style.css.php            | 13 ++++----
 5 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 736f6ef0140..938e3e172b2 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -23,6 +23,7 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $graphwidth=DolGraph::getDefaultGraphSizeForStats('width',700);
@@ -69,7 +70,7 @@ dol_mkdir($dir);
 
 if ($mode)
 {
-    // Define sql	
+    // Define sql
     if ($mode == 'memberbycountry')
     {
         $label=$langs->trans("Country");
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1ed76cddd9b..c7f953dbbfc 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -560,13 +560,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@return	void
      * 		@deprecated
      */
-    function select_color($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='')
+    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
     {
     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
     }
@@ -576,13 +576,13 @@ class FormOther
      *
      *		@param	string		$set_color		Pre-selected color
      *		@param	string		$prefix			Name of HTML field
-     *		@param	string		$form_name		Name of form
+     *		@param	string		$form_name		Deprecated. Not used.
      * 		@param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
      * 		@param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
      * 		@param	string		$morecss		Add css style into input field
      * 		@return	void
      */
-    function selectColor($set_color='', $prefix='f_color', $form_name='objForm', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
         global $langs,$conf;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a7cb3bbee73..a48b7e3caff 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4835,19 +4835,6 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 }
 
 
-/**
- *	Convert an array with RGB value into hex RGB value
- *
- *  @param	array	$arraycolor			Array
- *  @param	string	$colorifnotfound	Color code to return if entry not defined
- *  @return	string						RGB hex value (without # before). For example: FF00FF
- */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
-{
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
-}
-
 /**
  * Set focus onto field with selector
  *
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4702fe69e99..246af863d12 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1836,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) {
 	}
 	return 0;
 }
+
+
+/**
+ *	Convert an array with RGB value into hex RGB value
+ *
+ *  @param	array	$arraycolor			Array
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorStringToArray
+ */
+function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+{
+	if (! is_array($arraycolor)) return $colorifnotfound;
+	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+}
+
+
+/**
+ *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255)
+ *
+ *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorArrayToHex
+ */
+function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+{
+	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	if (! $tmp)
+	{
+		$tmp=explode(',',$stringcolor);
+		if (count($tmp) < 3) return $colorifnotfound;
+		return $tmp;
+	}
+	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+}
+
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c4d933d4940..99d5495ef58 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -38,6 +38,7 @@ if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 session_cache_limiter(FALSE);
 
 require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
 if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
@@ -131,12 +132,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='50,50,130';
-	/*if ($dol_use_jmobile)
-	{
-    	$conf->global->THEME_ELDY_BACKTABCARD1='245,245,245';    // topmenu
-		$conf->global->THEME_ELDY_BACKTABCARD2='245,245,245';
-		$conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245';
-	}*/
+    $conf->global->THEME_ELDY_FONT_SIZE1='12';
+    $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
@@ -167,6 +164,10 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
 	$colorbacklinepairhover='';
 }
 
+// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
+$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');

From 5f8919c857b16df0aec7505e2d89652cc25fca70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 8 Dec 2014 23:59:33 +0100
Subject: [PATCH 075/345] Update translation

---
 htdocs/comm/action/card.php    | 4 ++--
 htdocs/langs/en_US/agenda.lang | 1 +
 htdocs/langs/fr_FR/agenda.lang | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 60fb20206b7..8a2c602a3f0 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -902,7 +902,7 @@ if ($id > 0)
 	    }
 
 		// Assigned to
-		print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
@@ -1072,7 +1072,7 @@ if ($id > 0)
     	}
 
 		// Assigned to
-    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		$listofuserid=array();
 		if (empty($donotclearsession))
 		{
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 5781d5e3ac0..1cc01ec2e7b 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index be2e6083aa6..a4e5e7e0a03 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Événements affectés à
 ActionsDoneBy=Événements réalisés par
 ActionsForUser=Evénements de l'utilisateur
 ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe
+ActionAssignedTo=Événement assigné à
 AllMyActions= Tous mes événements
 AllActions= Tous les événements
 ViewList=Vue liste

From cf641194a1730c0edd97361535d218293b05b5d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Dec 2014 00:02:43 +0100
Subject: [PATCH 076/345] Fix: CRLF

---
 dev/translation/strip_language_file.php | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index d6c45d9f249..42a70c8c1a6 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,20 +1,20 @@
 #!/usr/bin/php
 <?php
 /* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * -----
  *
@@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess)
 
 	print "Output can be found at $output.\n";
 
-	print "To rename all .delta files, you can do\n";
-	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+	print "To rename all .delta files, you can do\n";
+	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 

From 146107280160f090dfd7fb1cdf8c37996ae3f7f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Dec 2014 01:12:52 +0100
Subject: [PATCH 077/345] Fix: Paypal link were broken dur to SSL v3 closed.

---
 ChangeLog                        | 2 ++
 htdocs/paypal/lib/paypal.lib.php | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7a65eef7fc9..949492346b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 3.5.7 compared to 3.5.6 *****
+Fix: Paypal link were broken dur to SSL v3 closed.
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 31ed9b97ff8..3d9dcf16d02 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -683,7 +683,8 @@ function hash_call($methodName,$nvpStr)
      exit;*/
     curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
-    curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3
+    //curl_setopt($ch, CURLOPT_SSLVERSION, 3); // Force SSLv3
+	curl_setopt($ch, CURLOPT_SSLVERSION, 1); // Force TLSv1
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);

From 666e66e78f54ca45ed926f20e41fe442c20289d3 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 9 Dec 2014 05:04:12 +0100
Subject: [PATCH 078/345] Correct link in activity box

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

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index bddeb4b957e..8e0bd6a8a21 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -114,7 +114,7 @@ class box_activity extends ModeleBoxes
 					$billurl="viewstatut=2&paye=1&year=".$objp->annee;
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
-					'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/liste.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills"
+					'text' => $objp->nb, 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills"
 					);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="right"',

From 81dc1415deabd45c2c3da2f4376d841c825166f4 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 9 Dec 2014 05:04:39 +0100
Subject: [PATCH 079/345] Untranslatable token in activity box

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

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5150f2d4e41..c54991af434 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1017,6 +1017,7 @@ class FormOther
         if ($nbboxactivated)
         {
         	$langs->load("boxes");
+			$langs->load("projects");
 
         	$emptybox=new ModeleBoxes($db);
 

From 63f2bfed24123dfde67150566a82916c99666330 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Dec 2014 11:19:16 +0100
Subject: [PATCH 080/345] Fixed: Maxi debug of withdrawal module.

---
 htdocs/admin/prelevement.php                  |  4 +-
 htdocs/compta/facture/class/facture.class.php | 25 ++++--
 htdocs/compta/facture/prelevement.php         | 77 ++++++++++++-------
 .../class/bonprelevement.class.php            | 16 ++--
 .../class/ligneprelevement.class.php          |  6 +-
 htdocs/compta/prelevement/create.php          | 21 +++--
 htdocs/compta/prelevement/fiche-stat.php      |  3 +-
 htdocs/compta/prelevement/ligne.php           |  2 +-
 htdocs/compta/prelevement/lignes.php          |  8 +-
 htdocs/compta/prelevement/stats.php           |  4 +-
 htdocs/langs/en_US/admin.lang                 |  2 +-
 htdocs/langs/en_US/withdrawals.lang           |  3 +-
 htdocs/societe/rib.php                        | 20 +++--
 13 files changed, 124 insertions(+), 67 deletions(-)

diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 6094bb7e4f1..3bff5c29118 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -153,7 +153,7 @@ print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEME
 print '</td></tr>';
 
 // ICS
-print '<tr class="impair"><td>'.$langs->trans("ICS").'</td>';
+print '<tr class="pair"><td>'.$langs->trans("ICS").'</td>';
 print '<td align="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="9" ></td>';
 print '</td></tr>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b924b059bfd..cd8ba3b06a1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2837,6 +2837,8 @@ class Facture extends CommonInvoice
 	 */
 	function demande_prelevement($user)
 	{
+		$error=0;
+		
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
 		if ($this->statut > 0 && $this->paye == 0)
@@ -2882,21 +2884,32 @@ class Facture extends CommonInvoice
                     $sql .= ",'".$bac->cle_rib."')";
 
                     dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
-                    if ($this->db->query($sql))
+                    $resql=$this->db->query($sql);
+                    if (! $resql)
                     {
-                        return 1;
-                    }
-                    else
-                  {
                         $this->error=$this->db->lasterror();
                         dol_syslog(get_class($this).'::demandeprelevement Erreur');
-                        return -1;
+                        $error++;
                     }
+
+        			if (! $error)
+        			{
+        				// Force payment mode of invoice to withdraw
+        				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement');
+        				if ($payment_mode_id > 0) 
+        				{
+        					$result=$this->setPaymentMethods($payment_mode_id);
+        				}
+        			}            
+                    
+                    if ($error) return -1;
+                    return 1;
                 }
                 else
                 {
                     $this->error="A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
+                    return 0;
                 }
             }
             else
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 48ca10afd2d..1b4f440b461 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -58,6 +58,7 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
+
 /*
  * Actions
  */
@@ -69,14 +70,14 @@ if ($action == "new")
         $result = $object->demande_prelevement($user);
         if ($result > 0)
         {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
+            setEventMessage($langs->trans("RecordSaved"));
         }
         else
         {
         	setEventMessage($object->error, 'errors');
         }
     }
+    $action='';
 }
 
 if ($action == "delete")
@@ -307,6 +308,31 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';
 
+	// Conditions de reglement
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentConditionsShort');
+	print '</td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE)
+	{
+		if ($action == 'editconditions')
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+		}
+		else
+		{
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+		}
+	}
+	else
+	{
+		print '&nbsp;';
+	}
+	print '</td></tr>';
+
 	// Date payment term
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -333,32 +359,7 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
-	// Conditions de reglement
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('PaymentConditionsShort');
-	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE)
-	{
-		if ($action == 'editconditions')
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
-		}
-		else
-		{
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
-		}
-	}
-	else
-	{
-		print '&nbsp;';
-	}
-	print '</td></tr>';
-
-	// Mode de reglement
+	// Payment mode
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
@@ -376,6 +377,26 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
+	// Bank Account
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('BankAccount');
+	print '<td>';
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editbankaccount')
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+	}
+	else
+	{
+	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+	}
+	print "</td>";
+	print '</tr>';
+	
 	// Montants
 	print '<tr><td>'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" colspan="2" nowrap>'.price($object->total_ht).'</td>';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 47ac4d1a390..5da94a28b76 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -56,7 +56,9 @@ class BonPrelevement extends CommonObject
     var $statut;    // 0-Wait, 1-Trans, 2-Done
     var $labelstatut=array();
 
+    var $invoice_in_error=array();
 
+    
     /**
      *	Constructor
      *
@@ -835,7 +837,7 @@ class BonPrelevement extends CommonObject
                             else
 							{
 								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
-                                $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name;
+                                $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name;
                             }
                         }
                         else
@@ -1814,21 +1816,21 @@ class BonPrelevement extends CommonObject
 
         if ($mode == 1)
         {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
             if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
         }
         if ($mode == 2)
         {
-            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
             if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
 
         if ($mode == 3)
         {
-            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
-            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
             if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
     }
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 9c4bf96e8b3..581fb3152af 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -138,20 +138,20 @@ class LignePrelevement
 
 		if ($mode == 1)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
 
 		if ($mode == 3)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
 			if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
 			if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 0326e4922f1..e4cb4b65c30 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -70,6 +70,10 @@ if ($action == 'create')
     if ($result == 0)
     {
         $mesg='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+        foreach($bprev->invoice_in_error as $key => $val)
+        {
+        	$mesg.=$val."<br>\n";
+        }
     }
 }
 
@@ -179,6 +183,7 @@ if ($resql)
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Invoice").'</td>';
     print '<td>'.$langs->trans("ThirdParty").'</td>';
+    print '<td>'.$langs->trans("RIB").'</td>';
     print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
     print '<td align="right">'.$langs->trans("DateRequest").'</td>';
     print '</tr>';
@@ -190,16 +195,22 @@ if ($resql)
         {
             $obj = $db->fetch_object($resql);
             $var=!$var;
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr '.$bc[$var].'>';
+            print '<td>';
             $invoicestatic->id=$obj->rowid;
             $invoicestatic->ref=$obj->facnumber;
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
+            // Thirdparty
             print '<td>';
-            $thirdpartystatic->id=$obj->socid;
-            $thirdpartystatic->name=$obj->name;
-            print $thirdpartystatic->getNomUrl(1,'customer');
+            $thirdpartystatic->fetch($obj->socid);
+            print $thirdpartystatic->getNomUrl(1,'card');
             print '</td>';
+            // RIB
+            print '<td>';
+            print $thirdpartystatic->display_rib();
+            print '</td>';
+            // Amount
             print '<td align="right">';
             print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency);
             print '</td>';
@@ -211,7 +222,7 @@ if ($resql)
             $i++;
         }
     }
-    else print '<tr><td colspan="4">'.$langs->trans("None").'</td></tr>';
+    else print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
     print "</table>";
     print "<br>\n";
 }
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 37b6c708b96..0e9174ef034 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -106,7 +106,6 @@ if ($prev_id)
 
 	/*
 	 * Stats
-	 *
 	 */
 	$ligne=new LignePrelevement($db,$user);
 
@@ -121,6 +120,8 @@ if ($prev_id)
 		$num = $db->num_rows($resql);
 		$i = 0;
 
+		print_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
+		
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index f1617979645..3e7cb5b6bd7 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -134,7 +134,7 @@ if ($id)
 		print '<table class="border" width="100%">';
 
 		print '<tr><td width="20%">'.$langs->trans("WithdrawalsReceipts").'</td><td>';
-		print '<a href="card.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
+		print $bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>'.$lipre->LibStatut($lipre->statut,1).'</td></tr>';
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 1e96e9276d8..c4724824f36 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -124,8 +124,6 @@ $pagenext = $page + 1;
 
 /*
  * Liste des lignes de prelevement
- *
- *
  */
 $sql = "SELECT pl.rowid, pl.statut, pl.amount";
 $sql.= ", s.rowid as socid, s.nom as name";
@@ -175,7 +173,11 @@ if ($result)
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';
 
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
+		$thirdparty=new Societe($db);
+		$thirdparty->fetch($obj->socid);
+		print '<td>';
+		print $thirdparty->getNomUrl(1);
+		print "</td>\n";
 
 		print '<td align="center">'.price($obj->amount)."</td>\n";
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 2c8607a9a56..c3667f8b69f 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -21,7 +21,7 @@
 /**
  *		\file       htdocs/compta/prelevement/stats.php
  *      \ingroup    prelevement
- *      \brief      Page de stats des prelevements
+ *      \brief      Page with statistics on withdrawals
  */
 
 require('../../main.inc.php');
@@ -96,7 +96,7 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
+	$var=false;
 
 	while ($i < $num)
 	{
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 29664483d18..e0c1a9152e6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -444,7 +444,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index fd4305bbd0b..a0f8078fb18 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 01d82ac0867..ab14d757f6f 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
  *
@@ -185,6 +185,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
     }
 }
 
+
 /*
  *	View
  */
@@ -317,8 +318,13 @@ if ($socid && $action != 'edit' && $action != "create")
 		print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
 	}
 
-    print "<br />";
+    print "<br>";
 
+    
+    /*
+     * List of bank accounts
+     */
+    
     print_titre($langs->trans("AllRIB"));
 
     $rib_list = $soc->get_all_rib();
@@ -339,7 +345,7 @@ if ($socid && $action != 'edit' && $action != "create")
 
         foreach ($rib_list as $rib)
         {
-            print "<tr $bc[$var]>";
+            print "<tr ".$bc[$var].">";
             // Label
             print '<td>'.$rib->label.'</td>';
             // Bank name
@@ -382,7 +388,7 @@ if ($socid && $action != 'edit' && $action != "create")
         }
 
         if (count($rib_list) == 0) {
-            print '<tr><td colspan="5" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
+            print '<tr '.$bc[0].'><td colspan="7" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
         }
 
         print '</table>';
@@ -458,7 +464,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 		if ($val == 'AccountNumber')
 		{
-			print '<td>'.$langs->trans("BankAccountNumber").'</td>';
+			print '<td class="fieldrequired">'.$langs->trans("BankAccountNumber").'</td>';
 			print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
 			print '</tr>';
 		}
@@ -475,10 +481,10 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	}
 
     // IBAN
-    print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("IBAN").'</td>';
     print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
     print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';

From 6a70af2b67ab26b4baa538d9efd7269d72f522e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Dec 2014 14:03:10 +0100
Subject: [PATCH 081/345] Fixed: bug into produc batch management

---
 htdocs/core/modules/modProductBatch.class.php |  2 +-
 .../stock/class/mouvementstock.class.php      | 41 ++++++++++++++-----
 htdocs/product/stock/product.php              | 33 ++++++++-------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 6eb358aa99d..4dd7d0a81ae 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -49,7 +49,7 @@ class modProductBatch extends DolibarrModules
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
-		$this->rights_class = 'stock';
+		$this->rights_class = 'productbatch';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'experimental';
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 9e508f41461..24ca13da355 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -163,21 +163,40 @@ class MouvementStock extends CommonObject
 			{
 				$newpmp=0;
 				$newpmpwarehouse=0;
-				// Note: PMP is calculated on stock input only (type = 0 or 3). If type == 0 or 3, qty should be > 0.
+				// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 				// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
 				if (($type == 0 || $type == 3) && $price > 0)
 				{
+					// If we will change PMP for the warehouse we edit and the product, we must first check/clean that PMP is defined
+					// on every stock entry with old value (so global updated value will match recalculated value from product_stock)
+					$sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET pmp = ".($oldpmp?$oldpmp:'0');
+					$sql.= " WHERE pmp = 0 AND fk_product = ".$fk_product;
+					dol_syslog(get_class($this)."::_create", LOG_DEBUG);
+					$resql=$this->db->query($sql);
+					if (! $resql)
+					{
+						$this->error=$this->db->lasterror();
+						$error = -4;
+					}
+					
 					$oldqtytouse=($oldqty >= 0?$oldqty:0);
 					// We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined
 					if ($oldpmp > 0) $newpmp=price2num((($oldqtytouse * $oldpmp) + ($qty * $price)) / ($oldqtytouse + $qty), 'MU');
-					else $newpmp=$price;
-					$oldqtywarehousetouse=($oldqtywarehouse >= 0?$oldqtywarehouse:0);
+					else 
+					{
+						$newpmp=$price; // For this product, PMP was not yet set. We will set it later.
+					}
+					$oldqtywarehousetouse=$oldqtywarehouse;
 					if ($oldpmpwarehouse > 0) $newpmpwarehouse=price2num((($oldqtywarehousetouse * $oldpmpwarehouse) + ($qty * $price)) / ($oldqtywarehousetouse + $qty), 'MU');
 					else $newpmpwarehouse=$price;
 
-					//print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." ";
-					//print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse;
-					//exit;
+					/*print "oldqtytouse=".$oldqtytouse." oldpmp=".$oldpmp." oldqtywarehousetouse=".$oldqtywarehousetouse." oldpmpwarehouse=".$oldpmpwarehouse." ";
+					print "qty=".$qty." newpmp=".$newpmp." newpmpwarehouse=".$newpmpwarehouse;
+					exit;*/
+				}
+				else if ($type == 1 || $type == 2)
+				{
+					// After a stock decrease, we don't change value of PMP for product.					
 				}
 				else
 				{
@@ -207,14 +226,17 @@ class MouvementStock extends CommonObject
 				{
 					$this->error=$this->db->lasterror();
 					$error = -3;
-				} else if(empty($fk_product_stock)){
+				} 
+				else if(empty($fk_product_stock))
+				{
 					$fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock");
 				}
 
-				}
+			}
 
 			// Update detail stock for sell-by date
-			if (($product->hasbatch()) && (! $error) && (! $skip_sellby)){
+			if (($product->hasbatch()) && (! $error) && (! $skip_sellby))
+			{
 				$param_batch=array('fk_product_stock' =>$fk_product_stock, 'eatby'=>$eatby,'sellby'=>$sellby,'batchnumber'=>$batch);
 				$result=$this->_create_batch($param_batch, $qty);
 				if ($result<0) $error++;
@@ -245,7 +267,6 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && ! $error)
 		{
-
 			$this->product_id = $fk_product;
 			$this->entrepot_id = $entrepot_id;
 			$this->qty = $qty;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index f6dfe3150b1..e7be28b96bd 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -122,10 +122,11 @@ if ($action == "correct_stock" && ! $cancel)
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
 			if (empty($product)) {
-			$product = new Product($db);
-			$result=$product->fetch($id);
+				$product = new Product($db);
+				$result=$product->fetch($id);
 			}
-			if ($product->hasbatch()) {
+			if ($product->hasbatch()) 
+			{
 				$d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 				$d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 				$result=$product->correct_stock_batch(
@@ -139,15 +140,17 @@ if ($action == "correct_stock" && ! $cancel)
 					$d_sellby,
 					GETPOST('batch_number')
 				);		// We do not change value of stock for a correction
-			} else {
-			$result=$product->correct_stock(
-	    		$user,
-	    		GETPOST("id_entrepot"),
-	    		GETPOST("nbpiece"),
-	    		GETPOST("mouvement"),
-	    		GETPOST("label"),
-	    		$priceunit
-			);		// We do not change value of stock for a correction
+			} 
+			else
+			{
+				$result=$product->correct_stock(
+		    		$user,
+		    		GETPOST("id_entrepot"),
+		    		GETPOST("nbpiece"),
+		    		GETPOST("mouvement"),
+		    		GETPOST("label"),
+		    		$priceunit
+				);		// We do not change value of stock for a correction
 			}
 
 			if ($result > 0)
@@ -645,8 +648,8 @@ if ($resql)
 		print '</tr>'; ;
 		$total += $obj->reel;
 		if (price2num($obj->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + price2num($obj->pmp*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
-        $totalvaluesell = $totalvaluesell + price2num($product->price*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
+		$totalvalue = $totalvalue + ($obj->pmp*$obj->reel); // Ditto : Show PMP from movement or from product
+        $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product
 		//Batch Detail
 		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) 
 		{
@@ -670,7 +673,7 @@ else dol_print_error($db);
 print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">'.$langs->trans("Total").':</td>';
 print '<td class="liste_total" align="right">'.$total.'</td>';
 print '<td class="liste_total" align="right">';
-print ($totalwithpmp?price($totalvalue/$totalwithpmp):'&nbsp;');
+print ($totalwithpmp?price(price2num(price2num($totalvalue,'MT')/$totalwithpmp,'MT')):'&nbsp;');	// This value may have rounding errors
 print '</td>';
 // Value purchase
 print '<td class="liste_total" align="right">';

From 9be99b298783d796228f26cc29e670e91473d8c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Dec 2014 14:27:02 +0100
Subject: [PATCH 082/345] Fixed: We must use PMP of product. Not warehouse.

---
 htdocs/install/mysql/tables/llx_entrepot.sql  |  2 +-
 .../mysql/tables/llx_product_stock.sql        |  2 +-
 htdocs/product/stock/card.php                 | 16 +++++++-------
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/product/stock/product.php              | 21 ++++++++++---------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index 1c49ac293f8..9e9bfc9c26f 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -33,7 +33,7 @@ create table llx_entrepot
   fk_departement  integer,
   fk_pays         integer DEFAULT 0,
   statut          tinyint DEFAULT 1,			-- 1 open, 0 close
-  valo_pmp        float(12,4),					-- valoristaion du stock en PMP
+  valo_pmp        float(12,4),					-- PMP value for this warehouse (deprecated. No sens for a warehouse)
   fk_user_author  integer,
   import_key	  varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index 5d550aadb6d..99d7d27fb77 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -25,7 +25,7 @@ create table llx_product_stock
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
   reel            real,           					-- physical stock
-  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse
+  pmp             double(24,8) default 0 NOT NULL,	-- PMP value for product in this warehouse (deprecated. no sens for warehouse)
   import_key      varchar(14)                  -- Import key
 )ENGINE=innodb;
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 2a7f64ee475..39b778536b5 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -73,13 +73,13 @@ if ($action == 'add' && $user->rights->stock->creer)
 	$object->town        = GETPOST("town");
 	$object->country_id  = GETPOST("country_id");
 
-	if (! empty($object->libelle)) 
+	if (! empty($object->libelle))
 	{
 		$id = $object->create($user);
 		if ($id > 0)
 		{
 			setEventMessage($langs->trans("RecordSaved"));
-			
+
 			if (! empty($backtopage))
 			{
 				header("Location: ".$backtopage);
@@ -180,9 +180,9 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	
+
 	dol_fiche_head();
-	
+
 	print '<table class="border" width="100%">';
 
 	// Ref
@@ -225,7 +225,7 @@ if ($action == 'create')
 	print '</table>';
 
 	dol_fiche_end();
-	
+
 	print '<center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
 
 	print '</form>';
@@ -445,10 +445,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/list.php b/htdocs/product/stock/list.php
index c55466ebdb1..c85c501fa58 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -52,7 +52,7 @@ $year = strftime("%Y",time());
  */
 
 $sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
-$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";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index e7be28b96bd..616e91d1924 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -125,7 +125,7 @@ if ($action == "correct_stock" && ! $cancel)
 				$product = new Product($db);
 				$result=$product->fetch($id);
 			}
-			if ($product->hasbatch()) 
+			if ($product->hasbatch())
 			{
 				$d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 				$d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
@@ -140,7 +140,7 @@ if ($action == "correct_stock" && ! $cancel)
 					$d_sellby,
 					GETPOST('batch_number')
 				);		// We do not change value of stock for a correction
-			} 
+			}
 			else
 			{
 				$result=$product->correct_stock(
@@ -633,9 +633,9 @@ 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($obj->pmp)?price2num($obj->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
+		print '<td align="right">'.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
 		// Value purchase
-		print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
+		print '<td align="right">'.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
         // Sell price
 		print '<td align="right">';
         if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
@@ -647,15 +647,15 @@ if ($resql)
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
-		if (price2num($obj->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + ($obj->pmp*$obj->reel); // Ditto : Show PMP from movement or from product
+		if (price2num($product->pmp)) $totalwithpmp += $obj->reel;
+		$totalvalue = $totalvalue + ($product->pmp*$obj->reel); // Ditto : Show PMP from movement or from product
         $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product
 		//Batch Detail
-		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) 
+		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
 		{
 			$details=Productbatch::findAll($db,$obj->product_stock_id);
 			if ($details<0) dol_print_error($db);
-			foreach ($details as $pdluo) 
+			foreach ($details as $pdluo)
 			{
 				print "\n".'<tr><td></td>';
 				print '<td align="right">'.$pdluo->batch.'</td>';
@@ -670,14 +670,15 @@ if ($resql)
 	}
 }
 else dol_print_error($db);
+
 print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">'.$langs->trans("Total").':</td>';
 print '<td class="liste_total" align="right">'.$total.'</td>';
 print '<td class="liste_total" align="right">';
-print ($totalwithpmp?price(price2num(price2num($totalvalue,'MT')/$totalwithpmp,'MT')):'&nbsp;');	// This value may have rounding errors
+print ($totalwithpmp?price(price2num($totalvalue/$totalwithpmp,'MU')):'&nbsp;');	// This value may have rounding errors
 print '</td>';
 // Value purchase
 print '<td class="liste_total" align="right">';
-print price(price2num($totalvalue,'MT'),1);
+print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
 if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');

From 8cae2f14482a21530319f9d2cc0f197db8c25ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 16:21:44 +0100
Subject: [PATCH 083/345] Use same size for select_produits_fournisseur and
 select_produits

---
 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 08bc3b4c85e..f782b06e7e2 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1896,7 +1896,7 @@ class Form
             // mode=2 means suppliers products
             $urloption=($socid > 0?'socid='.$socid.'&':'').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished;
             print ajax_autocompleter('', $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
-            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="16" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
+            print ($hidelabel?'':$langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'">';
         }
         else
         {

From 34b42ba7985cc1a456ef87752f40e4c0b55247f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 18:47:12 +0100
Subject: [PATCH 084/345] Truncate label different for small or big screen

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 08bc3b4c85e..1150b446637 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1720,11 +1720,13 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
         }
         $opt.= '>';
-        $opt.= $objp->ref.' - '.dol_trunc($label,32).' - ';
+        // Truncate label for small or big screen
+        $trunclabel = (($conf->dol_optimize_smallscreen==1)?32:92);
+        $opt.= $objp->ref.' - '.dol_trunc($label, $trunclabel).' - ';
 
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label,32).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label, $trunclabel).' - ';
 
         $found=0;
 
@@ -2004,8 +2006,10 @@ class Form
                 $outval.=$objRef;
                 if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')';
                 $outval.=' - ';
-                $opt.=dol_trunc($objp->label,18).' - ';
-                $outval.=dol_trunc($label,18).' - ';
+                // Truncate label for small or big screen
+                $trunclabel = (($conf->dol_optimize_smallscreen==1)?18:78);
+                $opt.=dol_trunc($label,$trunclabel).' - ';
+                $outval.=dol_trunc($label,$trunclabel).' - ';
 
                 if (! empty($objp->idprodfournprice))
                 {

From 590618eb3818d962bec136185b60d71155bf14af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 20:17:13 +0100
Subject: [PATCH 085/345] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fb587487aae..254ab6ab99e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1789,7 +1789,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
-
+	// reduce for small screen
+    if ($conf->dol_optimize_smallscreen==1) $size = round($size/3);
 	// We go always here
 	if ($trunc == 'right')
 	{

From 6a01b6982e54300637766c19cab52ec988fb87c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 20:20:52 +0100
Subject: [PATCH 086/345] Update html.form.class.php

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1150b446637..d8e05263a4e 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1720,13 +1720,11 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
         }
         $opt.= '>';
-        // Truncate label for small or big screen
-        $trunclabel = (($conf->dol_optimize_smallscreen==1)?32:92);
-        $opt.= $objp->ref.' - '.dol_trunc($label, $trunclabel).' - ';
+        $opt.= $objp->ref.' - '.dol_trunc($label, 99).' - ';
 
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label, $trunclabel).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label, 99).' - ';
 
         $found=0;
 
@@ -2006,10 +2004,8 @@ class Form
                 $outval.=$objRef;
                 if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')';
                 $outval.=' - ';
-                // Truncate label for small or big screen
-                $trunclabel = (($conf->dol_optimize_smallscreen==1)?18:78);
-                $opt.=dol_trunc($label,$trunclabel).' - ';
-                $outval.=dol_trunc($label,$trunclabel).' - ';
+                $opt.=dol_trunc($label, 72).' - ';
+                $outval.=dol_trunc($label, 72).' - ';
 
                 if (! empty($objp->idprodfournprice))
                 {

From 66f634f2173a623be48713302f0cd71c6e28bc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 20:47:54 +0100
Subject: [PATCH 087/345] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 254ab6ab99e..4c3ee24522a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1782,15 +1782,16 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
  *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap
  * 	@param	string	$stringencoding		Tell what is source string encoding
  *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.
+ *  @param  int     $display            Trunc is use to display and can be changed for small screen
  *	@return string						Truncated string
  */
-function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0)
+function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodot=0, $display=0)
 {
 	global $conf;
 
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
 	// reduce for small screen
-    if ($conf->dol_optimize_smallscreen==1) $size = round($size/3);
+    if ($conf->dol_optimize_smallscreen==1 && $display==1) $size = round($size/3);
 	// We go always here
 	if ($trunc == 'right')
 	{

From 9f1ec0e710aedf3e7a8037cc0bbfbf3c9d1d9a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 20:52:55 +0100
Subject: [PATCH 088/345] Update html.form.class.php

---
 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 d8e05263a4e..bf2f1a7f2d6 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1720,11 +1720,11 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
         }
         $opt.= '>';
-        $opt.= $objp->ref.' - '.dol_trunc($label, 99).' - ';
+        $opt.= $objp->ref.' - '.dol_trunc($label, 99, '', '', 1).' - ';
 
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label, 99).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label, 99, '', '', 1).' - ';
 
         $found=0;
 

From 275ba0e3de1832116007e7ba4081326f85e741f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 22:21:51 +0100
Subject: [PATCH 089/345] Typo

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 072c0bb5546..018b7cfbdaf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1188,7 +1188,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.js'.($ext?'?'.$ext:'').'" />'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.js'.($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 dd2b19d855300ede0bd024ff961f3ef595f2d7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 22:45:27 +0100
Subject: [PATCH 090/345] Typo

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 66b36e0320f..0f62552dcae 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -435,14 +435,14 @@ if ($result)
 				if($num<$limit){
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}
 				else
 				{
 					$var=!$var;
 					print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
-					print '<td colspan="6" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '<td colspan="6" align="right">'.price($total).'</td><td colspan="3"></td>';
 					print '</tr>';
 				}
 

From 37e5a97f84fea2e4a45d72e425e75de2faeb4810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 23:07:41 +0100
Subject: [PATCH 091/345] Typo

---
 htdocs/compta/bank/rappro.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 70e2be1cfd4..9339ff202ec 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -249,7 +249,7 @@ if ($resql)
         $objp = $db->fetch_object($resql);
 
         $var=!$var;
-        print "<tr ".$bc[$var].">";
+        print "<tr ".$bc[$var].">\n";
 //         print '<form method="post" action="rappro.php?account='.$_GET["account"].'">';
 //         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
@@ -261,9 +261,9 @@ if ($resql)
         // Date value
 		if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
 		{
-			print '<td align="center" class="nowrap">';
+			print '<td align="center" class="nowrap">'."\n";
 			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
-			print ' &nbsp';
+			print '&nbsp;';
 			print '<span>';
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$acct->id.'&amp;rowid='.$objp->rowid.'">';
 			print img_edit_remove() . "</a> ";

From 090b18f44dd3abbfea7c39ad784959f5099ec2a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 9 Dec 2014 23:23:10 +0100
Subject: [PATCH 092/345] Typo

---
 htdocs/index.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index ebc6760252c..55252f6533f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -294,15 +294,15 @@ $showweather=empty($conf->global->MAIN_DISABLE_METEO)?1:0;
 $rowspan=0;
 $dashboardlines=array();
 
-print '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">';
-print '<th class="liste_titre"colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Number").'</th>';
-print '<th class="liste_titre"align="right">'.$langs->trans("Late").'</th>';
+print '<th class="liste_titre" colspan="2">'.$langs->trans("DolibarrWorkBoard").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Number").'</th>';
+print '<th class="liste_titre" align="right">'.$langs->trans("Late").'</th>';
 print '<th class="liste_titre">&nbsp;</th>';
-print '<th class="liste_titre"width="20">&nbsp;</th>';
+print '<th class="liste_titre" width="20">&nbsp;</th>';
 if ($showweather) print '<th class="liste_titre hideonsmartphone" width="80">&nbsp;</th>';
-print '</tr>';
+print '</tr>'."\n";
 
 
 //
@@ -317,7 +317,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
     $board->load_board($user);
     $board->warning_delay=$conf->actions->warning_delay/60/60/24;
     $board->label=$langs->trans("ActionsToDo");
-    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda';
+    $board->url=DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&amp;mainmenu=agenda';
     $board->img=img_object($langs->trans("Actions"),"action");
     $rowspan++;
     $dashboardlines[]=$board;
@@ -458,7 +458,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
     {
         $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
         $board->label=$langs->trans("TransactionsToConciliate");
-        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank';
+        $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank';
         $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment");
         $rowspan++;
         $dashboardlines[]=$board;
@@ -475,7 +475,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
     $board->load_board($user);
     $board->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
     $board->label=$langs->trans("BankChecksToReceipt");
-    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=accountancy';
+    $board->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=accountancy';
     $board->img=img_object($langs->trans("BankChecksToReceipt"),"payment");
     $rowspan++;
     $dashboardlines[]=$board;
@@ -491,7 +491,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
     $board->load_board($user);
     $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24;
     $board->label=$langs->trans("MembersWithSubscriptionToReceive");
-    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=1';
+    $board->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1';
     $board->img=img_object($langs->trans("Members"),"user");
     $rowspan++;
     $dashboardlines[]=$board;

From 7834a9b0995e5920f67db8acc4dac982d49244c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Dec 2014 00:51:57 +0100
Subject: [PATCH 093/345] Add hidden constant to solve bug of too low size to
 see products label.

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 272798a6f65..771a79cd95b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1678,6 +1678,8 @@ class Form
 		$outqty=1;
 		$outdiscount=0;
 
+		$maxlengtharticle=(empty($conf->global->PRODUCT_MAX_LENGTH_COMBO)?48:$conf->global->PRODUCT_MAX_LENGTH_COMBO);
+
         $label=$objp->label;
         if (! empty($objp->label_translated)) $label=$objp->label_translated;
         if (! empty($filterkey) && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$label,1);
@@ -1697,11 +1699,11 @@ class Form
 			else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
         }
         $opt.= '>';
-        $opt.= $objp->ref.' - '.dol_trunc($label,32).' - ';
+        $opt.= $objp->ref.' - '.dol_trunc($label,$maxlengtharticle).' - ';
 
         $objRef = $objp->ref;
         if (! empty($filterkey) && $filterkey != '') $objRef=preg_replace('/('.preg_quote($filterkey).')/i','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label,32).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label,$maxlengtharticle).' - ';
 
         $found=0;
 

From cd6c72b14286d5c195f10626fb87e17d96ffa21a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Dec 2014 20:03:39 +0100
Subject: [PATCH 094/345] Fixed: Update of time consumed

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 3e6219afb40..5acdbbadddf 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -791,7 +791,7 @@ class Task extends CommonObject
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
             $sql.= " SET duration_effective = duration_effective + '".price2num($this->timespent_duration)."'";
-			$sql.= ", progress = " . $this->progress;
+			if (isset($this->progress)) $sql.= ", progress = " . $this->progress;	// Do not overwrite value if not provided
             $sql.= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
@@ -803,7 +803,7 @@ class Task extends CommonObject
             }
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
-            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";
+            $sql.= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->timespent_fk_user.")";	// set average hour rate of user
             $sql.= " WHERE rowid = ".$tasktime_id;
 
             dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);

From 99e5715f287f2702e4c8fdf30e77e80570e9107f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Dec 2014 20:09:48 +0100
Subject: [PATCH 095/345] Fixed: Length too small to see fullname.

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 15a5cf8b8ed..0b0c452020c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1795,7 +1795,7 @@ class User extends CommonObject
 			$result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin);
 			if ($withpicto != 2) $result.=' ';
 		}
-		$result.=$lien.$this->getFullName($langs,'','',16).$lienfin;
+		$result.=$lien.$this->getFullName($langs,'','',24).$lienfin;
 		return $result;
 	}
 

From b681885542d778185fb356a908e59ca4df9220a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Dec 2014 21:14:59 +0100
Subject: [PATCH 096/345] Fixed: Bad url link

---
 htdocs/fourn/commande/orderstoinvoice.php | 140 +++++++++++-----------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 6c5ce8aa11c..3397b18a30b 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -73,7 +73,7 @@ $date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["
 if ($action == 'create') {
 	if (is_array($selected) == false) {
 		$mesgs = array (
-				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>' 
+				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
 		);
 	} else {
 		$origin = GETPOST('origin');
@@ -91,11 +91,11 @@ $hookmanager->initHooks(array('orderstoinvoicesupplier'));
  */
 
 if (($action == 'create' || $action == 'add') && empty($mesgs)) {
-	
+
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
 	if (! empty($conf->projet->enabled))
 		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	
+
 	$langs->load('bills');
 	$langs->load('products');
 	$langs->load('main');
@@ -103,7 +103,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_GET['orders_to_invoice'];
 		$n = count($orders_id);
 		$i = 0;
-		
+
 		$originid = $orders_id[0];
 		$_GET['originid'] = $orders_id[0];
 	}
@@ -111,30 +111,30 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 		$orders_id = $_POST['orders_to_invoice'];
 		$nn = count($orders_id);
 		$ii = 0;
-		
+
 		$originid = $orders_id[0];
 		$_POST['originid'] = $orders_id[0];
 	}
-	
+
 	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
 	$lineid = GETPOST('lineid', 'int');
 	$userid = GETPOST('userid', 'int');
 	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
-	
+
 	// Security check
 	if ($user->societe_id)
 		$socid = $user->societe_id;
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-	
+
 	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
 	$object = new FactureFournisseur($db);
-	
+
 	// Insert new invoice in database
 	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
 		$object->socid = GETPOST('socid');
 		$db->begin();
 		$error = 0;
-		
+
 		// Standard or deposit or proforma invoice
 		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 		if (empty($datefacture)) {
@@ -154,17 +154,17 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 			$projectid = GETPOST('projectid');
 			if ($projectid > 0)
 				$object->fk_project = $projectid;
-				
+
 				// Auto calculation of date due if not filled by user
 			if (empty($object->date_echeance))
 				$object->date_echeance = $object->calculate_date_lim_reglement();
-			
+
 			if ($_POST['origin'] && $_POST['originid']) {
 				$object->origin = $_POST['origin'];
 				$object->origin_id = $orders_id[$ii];
 				$object->linked_objects = $orders_id;
 				$id = $object->create($user);
-				
+
 				if ($id > 0) {
 					foreach ( $orders_id as $origin => $origin_id ) {
 						$origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
@@ -180,14 +180,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 						$sql .= ", " . $id;
 						$sql .= ", '" . $object->element . "'";
 						$sql .= ")";
-						
+
 						if ($db->query($sql)) {
 							$db->commit();
 						} else {
 							$db->rollback();
 						}
 					}
-					
+
 					while ( $ii < $nn ) {
 						$objectsrc = new CommandeFournisseur($db);
 						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
@@ -202,10 +202,10 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 							$num = count($lines);
 							for($i = 0; $i < $num; $i ++) {
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-								
+
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-								
+
 								// Dates
 								// TODO mutualiser
 								$date_start = $lines[$i]->date_debut_prevue;
@@ -218,14 +218,14 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 									$date_end = $lines[$i]->date_fin_reel;
 								if ($lines[$i]->date_end)
 									$date_end = $lines[$i]->date_end;
-									
+
 									// Reset fk_parent_line for no child products and special product
 								if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 									$fk_parent_line = 0;
 								}
 								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
-								
+
 								if ($result > 0) {
 									$lineid = $result;
 								} else {
@@ -250,11 +250,11 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) {
 				}
 			}
 		}
-		
+
 		// End of object creation, we show it
 		if ($id > 0 && ! $error) {
 			$db->commit();
-			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
+			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
 			exit();
 		} else {
 			$db->rollback();
@@ -277,10 +277,10 @@ $companystatic = new Societe($db);
 
 // Mode creation
 if ($action == 'create' && empty($mesgs)) {
-	
+
 	llxHeader();
 	print_fiche_titre($langs->trans('NewBill'));
-	
+
 	$soc = new Societe($db);
 	if ($socid)
 		$res = $soc->fetch($socid);
@@ -289,7 +289,7 @@ if ($action == 'create' && empty($mesgs)) {
 		$mode_reglement_id = $soc->mode_reglement_id;
 	}
 	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
-	
+
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
@@ -300,21 +300,21 @@ if ($action == 'create' && empty($mesgs)) {
 	print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
 	print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
 	print '<table class="border" width="100%">';
-	
+
 	// Ref
 	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
-	
+
 	// Ref supplier
 	print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
 	print '</tr>';
-	
+
 	// Third party
 	print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
 	print $soc->getNomUrl(1);
 	print '<input type="hidden" name="socid" value="' . $soc->id . '">';
 	print '</td>';
 	print '</tr>' . "\n";
-	
+
 	// Date invoice
 	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
 	$html->select_date('', '', '', '', '', "add", 1, 1);
@@ -330,13 +330,13 @@ if ($action == 'create' && empty($mesgs)) {
 	// Project
 	if (! empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
-		
+
 		$langs->load('projects');
 		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
-	
+
 	$objectsrc = new CommandeFournisseur($db);
 	$listoforders = array ();
 	foreach ( $selected as $sel ) {
@@ -345,30 +345,30 @@ if ($action == 'create' && empty($mesgs)) {
 			$listoforders[] = $objectsrc->ref;
 		}
 	}
-	
+
 	// Other attributes
 	$parameters = array (
 			'objectsrc' => $objectsrc,
 			'idsrc' => $listoforders,
-			'colspan' => ' colspan="3"' 
+			'colspan' => ' colspan="3"'
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	                                                                                           
+
 	// Modele PDF
 	print '<tr><td>' . $langs->trans('Model') . '</td>';
 	print '<td>';
 	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
 	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
 	print "</td></tr>";
-	
+
 	// Public note
 	print '<tr>';
 	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
 	print '<td valign="top" colspan="2">';
 	print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-	
+
 	print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
-	
+
 	print '</textarea></td></tr>';
 	// Private note
 	if (empty($user->societe_id)) {
@@ -376,22 +376,22 @@ if ($action == 'create' && empty($mesgs)) {
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
 		print '<td valign="top" colspan="2">';
 		print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
-		
+
 		print '</textarea></td></tr>';
 	}
-	
+
 	print '</table>';
-	
+
 	while ( $i < $n ) {
 		print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
-		
+
 		$i ++;
 	}
-	
+
 	// Button "Create Draft"
 	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></center>';
 	print "</form>\n";
-	
+
 	print '</td></tr>';
 	print "</table>\n";
 }
@@ -411,7 +411,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	});
 	</script>
 <?php
-	
+
 	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
 	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
 	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
@@ -420,13 +420,13 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
 	$sql .= ' WHERE c.entity = ' . $conf->entity;
 	$sql .= ' AND c.fk_soc = s.rowid';
-	
+
 	// Show orders with status validated, shipping started and delivered (well any order we can bill)
 	$sql .= " AND c.fk_statut IN (5)";
-	
+
 	// Find order that are not already invoiced
 	$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
-	
+
 	if ($socid)
 		$sql .= ' AND s.rowid = ' . $socid;
 	if (! $user->rights->societe->client->voir && ! $socid)
@@ -437,20 +437,20 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 	if ($sall) {
 		$sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
 	}
-	
+
 	// Date filter
 	if ($date_start && $date_end)
 		$sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
 	if ($date_starty && $date_endy)
 		$sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
-	
+
 	if (! empty($sref_client)) {
 		$sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
 	}
 	$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
 	dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
 	$resql = $db->query($sql);
-	
+
 	if ($resql) {
 		if ($socid) {
 			$soc = new Societe($db);
@@ -463,14 +463,14 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		$i = 0;
 		$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
 		$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
-		
+
 		if (! empty($socid)) {
 			// Company
 			$companystatic->id = $socid;
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-		
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
@@ -480,7 +480,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
 		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
 		print '</tr>';
-		
+
 		// Lignes des champs de filtre
 		print '<form method="get" action="orderstoinvoice.php">';
 		print '<input type="hidden" name="socid" value="' . $socid . '">';
@@ -492,48 +492,48 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 		// print '<td class="liste_titre">';
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
-		
+
 		// DATE ORDER
 		print '<td class="liste_titre" align="center">';
 		print $period;
 		print '</td>';
-		
+
 		// DATE DELIVERY
 		print '<td class="liste_titre" align="center">';
 		print $periodely;
 		print '</td>';
-		
+
 		// SEARCH BUTTON
 		print '</td><td align="right" class="liste_titre">';
 		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
-		
+
 		// ALL/NONE
 		print '<td class="liste_titre" align="center">';
 		if ($conf->use_javascript_ajax)
 			print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
 		print '</td>';
-		
+
 		print '</td></tr>';
 		print '</form>';
-		
+
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
 		$var = True;
 		$generic_commande = new CommandeFournisseur($db);
-		
+
 		while ( $i < $num ) {
 			$objp = $db->fetch_object($resql);
 			$var = ! $var;
 			print '<tr ' . $bc[$var] . '>';
 			print '<td class="nowrap">';
-			
+
 			$generic_commande->id = $objp->rowid;
 			$generic_commande->ref = $objp->ref;
-			
+
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			print '<td class="nobordernopadding nowrap">';
 			print $generic_commande->getNomUrl(1, $objp->fk_statut);
 			print '</td>';
-			
+
 			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
 			$filename = dol_sanitizeFileName($objp->ref);
 			$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
@@ -541,35 +541,35 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 			print '</td></tr></table>';
 			print '</td>';
-			
+
 			print '<td>' . $objp->ref_supplier . '</td>';
-			
+
 			// Order date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_commande), 'day');
 			print '</td>';
-			
+
 			// Delivery date
 			print '<td align="center" nowrap>';
 			print dol_print_date($db->jdate($objp->date_livraison), 'day');
 			print '</td>';
-			
+
 			// Statut
 			print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
-			
+
 			// Checkbox
 			print '<td align="center">';
 			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
 			print '</td>';
-			
+
 			print '</tr>';
-			
+
 			$total = $total + $objp->price;
 			$subtotal = $subtotal + $objp->price;
 			$i ++;
 		}
 		print '</table>';
-		
+
 		/*
 		 * Boutons actions
 		*/

From 67cf3cb99b203c0e01444f6870f74e18418387a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 10:13:44 +0100
Subject: [PATCH 097/345] Fixed: BIC/SWIFT and IBAN must be at same level

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 15cb2f87b0b..bf2e5f2c218 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -492,7 +492,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
  *  @param  int			$curx            		X
  *  @param  int			$cury            		Y
  *  @param  Account		$account         		Bank account object
- *  @param  int			$onlynumber      		Output only number
+ *  @param  int			$onlynumber      		Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation)
  *  @param	int			$default_font_size		Default font size
  *  @return	float                               The Y PDF position
  */
@@ -513,10 +513,14 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 
 	$outputlangs->load("banks");
 
+	// Use correct name of bank id according to country
+	$bickey="BICNumber";
+	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
 	// Get format of bank account according to its country
 	$usedetailedbban=$account->useDetailedBBAN();
 
-	//$onlynumber=0; $usedetailedbban=0; // For tests
+	$onlynumber=0; $usedetailedbban=1; // For tests
 	if ($usedetailedbban)
 	{
 		$savcurx=$curx;
@@ -529,27 +533,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 			$cury+=3;
 		}
 
-		// Use correct name of bank id according to country
-		$ibankey="IBANNumber";
-		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-		if (! empty($account->iban))
-		{
-			$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
-			$ibanDisplay = "";
-
-			for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){
-				$ibanDisplay .= $ibanDisplay_temp[$i];
-				if($i%4 == 3 && $i > 0){
-					$ibanDisplay .= " ";
-				}
-			}
-
-			$pdf->SetFont('','B',$default_font_size - 3);
-			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-			$cury+=3;
-		}
-
 		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8);
 
 		if ($usedetailedbban == 1)
@@ -612,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		}
 
 		$curx=$savcurx;
-		$cury+=10;
+		$cury+=9;
 	}
 	else
 	{
@@ -629,10 +612,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		if ($diffsizecontent <= 2) $cury+=1;
 	}
 
-	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
 
 	if (empty($onlynumber) && ! empty($account->domiciliation))
@@ -647,8 +626,29 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 	}
 	else if (! $usedetailedbban) $cury+=1;
 
+	// Use correct name of bank id according to country
+	$ibankey="IBANNumber";
+	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+	if (! empty($account->iban))
+	{
+		$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
+		$ibanDisplay = "";
+
+		for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
+		{
+			$ibanDisplay .= $ibanDisplay_temp[$i];
+			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+		}
+
+		$pdf->SetFont('','B',$default_font_size - 3);
+		$pdf->SetXY($curx, $cury);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+		$cury+=3;
+	}
+
 	if (! empty($account->bic))
 	{
+		$pdf->SetFont('','B',$default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 	}

From a4e0de0d8a121d2005590c6517322035e0669644 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 13:12:05 +0100
Subject: [PATCH 098/345] Fixed: Contract must use serpis if no config set
 Fixed: Missing fetch_thirdparty.

---
 htdocs/contrat/card.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index dfdf0e95a87..8456b3e54b9 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -538,7 +538,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
 				}
 
 				$ret = $object->fetch($id); // Reload to get new records
-				
+
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
@@ -847,7 +847,7 @@ $formfile = new FormFile($db);
 $objectlignestatic=new ContratLigne($db);
 
 // Load object modContract
-$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive');
+$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 {
 	$module = substr($module, 0, dol_strlen($module)-4);
@@ -1043,6 +1043,8 @@ else
 
     if ($object->id > 0)
     {
+    	$object->fetch_thirdparty();
+
         $result=$object->fetch_lines();	// This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
         if ($result < 0) dol_print_error($db,$object->error);
 

From c0473f0246b50b0661ee951ad922382c854e3af2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 13:13:11 +0100
Subject: [PATCH 099/345] Fixed: when transvers_mode is on, a user is not
 linked to a dedicated environment (always entity 1), so we should not show
 info not reliable with this mode.

---
 htdocs/user/index.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index ac1ebc9e1c5..5d0b0ac77e4 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -114,6 +114,10 @@ if ($result)
     print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_societe",$param,"","",$sortfield,$sortorder);
+    if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+    {
+	    print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder);
+    }
     print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
@@ -165,9 +169,20 @@ if ($result)
             $companystatic->canvas=$obj->canvas;
             print $companystatic->getNomUrl(1);
         }
-        // Multicompany enabled
-        else if (! empty($conf->multicompany->enabled))
+        else if ($obj->ldap_sid)
         {
+        	print $langs->trans("DomainUser");
+        }
+        else
+       {
+        	print $langs->trans("InternalUser");
+        }
+        print '</td>';
+
+        // Multicompany enabled
+        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+        {
+        	print '<td>';
         	if (! $obj->entity)
         	{
         		print $langs->trans("AllEntities");
@@ -181,16 +196,8 @@ if ($result)
         			print $mc->label;
         		}
         	}
+        	print '</td>';
         }
-        else if ($obj->ldap_sid)
-        {
-        	print $langs->trans("DomainUser");
-        }
-        else
-        {
-        	print $langs->trans("InternalUser");
-        }
-        print '</td>';
 
         // Date creation
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';

From 036914756bf7ae0d1aebccd839b0ae4de4a19de0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 14:15:40 +0100
Subject: [PATCH 100/345] Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly
 supported

---
 htdocs/contrat/card.php           | 13 +++++++++----
 htdocs/langs/en_US/contracts.lang |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 8456b3e54b9..e4a8c644615 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
@@ -273,7 +273,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
 	                {
 	                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
 
-						if ($product_type == 1) { //only services	// TODO Exclude also deee
+						if ($product_type == 1 || (! empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0,1)))) { 	// TODO Exclude also deee
 							// service prédéfini
 							if ($lines[$i]->fk_product > 0)
 							{
@@ -1020,13 +1020,18 @@ if ($action == 'create')
 
     print "</table>\n";
 
+    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
     if (is_object($objectsrc))
     {
         print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
         print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-	}
 
-    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
+        {
+        	print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
+        }
+	}
 
     print "</form>\n";
 
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 06c05e520fa..57ba3bb15d8 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract

From 03cfff66ea518cf26c64bd82382ed7df942d645c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 14:26:34 +0100
Subject: [PATCH 101/345] Fixed: no form into table

---
 htdocs/admin/contract.php | 55 ++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 2abb2b5acad..6905156990b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -182,30 +182,15 @@ else if ($action == 'setmod')
 	dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
-else if ($action == 'set_CONTRACT_FREE_TEXT')
+else if ($action == 'set_other')
 {
 	$freetext= GETPOST('CONTRACT_FREE_TEXT','alpha');
-	$res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-}
-
-else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
-{
 	$draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha');
+	$res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
 
-	$res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
+	if (! $res1 > 0 || ! $res2 > 0) $error++;
 
  	if (! $error)
     {
@@ -217,6 +202,7 @@ else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
     }
 }
 
+
 /*
  * View
  */
@@ -506,44 +492,43 @@ print "<br>";
  *
  */
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_other">';
+
 print_titre($langs->trans("OtherOptions"));
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_CONTRACT_FREE_TEXT">';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+print '</td></tr>'."\n";
 print '</form>';
 
 //Use draft Watermark
 $var=!$var;
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_CONTRACT_DRAFT_WATERMARK\">";
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("WatermarkOnDraftContractCards").'<br>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td></tr>'."\n";
 
 print '</table>';
 
-print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+dol_fiche_end();
 
-$db->close();
 
 llxFooter();
+
+$db->close();

From c994fbe44dac72910267345b5f92e5e3d8bda39d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 14:31:47 +0100
Subject: [PATCH 102/345] Fixed: Bad style

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index cf06894dde5..1ef5045c845 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -855,7 +855,7 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				print '<tr '.$bc[$var].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
+				print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@@ -1043,7 +1043,7 @@ class FormFile
 
         if (count($filearray) == 0)
         {
-            print '<tr '.$bc[$var].'><td colspan="4">';
+            print '<tr '.$bc[false].'><td colspan="4">';
             if (empty($textifempty)) print $langs->trans("NoFileFound");
             else print $textifempty;
             print '</td></tr>';
@@ -1210,7 +1210,7 @@ class FormFile
         }
         if ($nboflinks == 0)
         {
-            print '<tr ' . $bc[$var] . '><td colspan="5">';
+            print '<tr ' . $bc[false] . '><td colspan="5">';
             print $langs->trans("NoLinkFound");
             print '</td></tr>';
         }

From 627e344c78f325cec1c15f4ad4787a2b91f54b0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 14:43:14 +0100
Subject: [PATCH 103/345] Documentation of external link.

---
 htdocs/admin/modules.php      | 7 +++++++
 htdocs/langs/en_US/admin.lang | 1 +
 2 files changed, 8 insertions(+)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 9ce93a6bc26..df9632761dd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -525,6 +525,13 @@ else
     print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
     print '</tr>';
 
+    $var=!$var;
+    print "<tr ".$bc[$var].">\n";
+    $url='http://partners.dolibarr.org';
+    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
+    print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
+    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '</tr>';
 
     print "</table>\n";
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e0c1a9152e6..f0dd8219f06 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -208,6 +208,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)  
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available

From bc4e6d4c7ee5c320f2fb19d93851d832569c1291 Mon Sep 17 00:00:00 2001
From: csv115 <csv115@csv115-PC.home>
Date: Thu, 11 Dec 2014 16:17:37 +0100
Subject: [PATCH 104/345] hooks more button function on contract card

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index cea29c96793..035ae7bee08 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1714,6 +1714,9 @@ else
         if ($user->societe_id == 0)
         {
             print '<div class="tabsAction">';
+            
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
             if ($object->statut == 0 && $nbofservices)
             {

From a0112ba724b43dae8c9526a0fcc70192ed69c4f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 21:38:53 +0100
Subject: [PATCH 105/345] Better position of elements

---
 htdocs/core/tpl/login.tpl.php             | 22 +++++++++++++---------
 htdocs/core/tpl/passwordforgotten.tpl.php | 21 +++++++++++++--------
 htdocs/theme/eldy/style.css.php           |  7 ++++---
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 8ce6e631a4a..eabf4c2ad89 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -89,17 +89,17 @@ $(document).ready(function () {
 <table class="left centpercent" summary="Login pass">
 <!-- Login -->
 <tr>
-<td valign="middle" class="nowrap">
+<td valign="middle" class="nowrap center">
 <span class="span-icon-user">
-<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="15" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </span>
 </td>
 </tr>
 <!-- Password -->
 <tr>
-<td valign="middle" class="nowrap">
+<td valign="middle" class="nowrap center">
 <span class="span-icon-password">
-<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="15" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
+<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="20" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
 </span>
 </td></tr>
 <?php
@@ -115,20 +115,24 @@ if (! empty($hookmanager->resArray['options'])) {
 ?>
 <?php
 	if ($captcha) {
-		// TODO: provide accessible captha variants
+		// Add a variable param to force not using cache (jmobile)
+		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
+		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		// TODO: provide accessible captcha variants
 ?>
 	<!-- Captcha -->
 	<tr>
-	<td valign="top" class="nowrap none" align="left">
+	<td valign="top" class="nowrap none center">
 
-	<table class="login_table_securitycode" style="width: 100px;"><tr>
+	<table class="login_table_securitycode"><tr>
 	<td>
 	<span class="span-icon-security">
 	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
+	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
 	</td></tr>
@@ -158,7 +162,7 @@ if ($forgetpasslink || $helpcenterlink)
 	if ($dol_use_jmobile)    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile;
 
 	echo '<br>';
-	echo '<div align="center" style="margin-top: 4px;">';
+	echo '<div align="center" style="margin-top: 8px;">';
 	if ($forgetpasslink) {
 		echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">(';
 		echo $langs->trans('PasswordForgotten');
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index f75804ea524..c517ec611d1 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -71,13 +71,13 @@ $(document).ready(function () {
 
 <div id="login_right">
 
-<table class="left" summary="Login pass">
+<table summary="Login pass" class="centpercent">
 
 <!-- Login -->
 <tr>
-<td valign="bottom" class="nowrap">
+<td valign="bottom" class="nowrap center">
 <span class="span-icon-user">
-<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="15" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
 </span>
 </td>
 </tr>
@@ -94,19 +94,24 @@ if (! empty($hookmanager->resArray['options'])) {
 }
 ?>
 
-<?php if ($captcha) { ?>
+<?php if ($captcha) { 
+		// Add a variable param to force not using cache (jmobile)
+		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
+		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+	?>
 	<!-- Captcha -->
 	<tr>
-	<td valign="top" class="nowrap none" align="left">
+	<td valign="top" class="nowrap none center">
 
-	<table class="login_table_securitycode" style="width: 100px;"><tr>
+	<table class="login_table_securitycode centpercent"><tr>
 	<td>
 	<span class="span-icon-security">
 	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
 	</span>
 	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
-	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
+	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
 
 	</td></tr>
@@ -127,7 +132,7 @@ if (! empty($hookmanager->resArray['options'])) {
 <br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
 
 <br>
-<div align="center" style="margin-top: 4px;">
+<div align="center" style="margin-top: 8px;">
 	<?php
 	$moreparam='';
 	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9d29707e1bf..89c779785d5 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -849,7 +849,7 @@ form#login {
 	vertical-align: middle;
 }
 .login_table_title {
-	max-width: 560px;
+	max-width: 530px;
 	color: #888888;
 	text-shadow: 1px 1px 1px #FFF;
 }
@@ -861,7 +861,7 @@ form#login {
 	margin-right: 10px;
 	padding-left:6px;
 	padding-right:6px;
-	padding-top:12px;
+	padding-top:16px;
 	padding-bottom:12px;
 	max-width: 560px;
 
@@ -973,10 +973,11 @@ img.login, img.printer, img.entity {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
 	background-repeat: no-repeat;
 }
+/*
 .span-icon-user input, .span-icon-password input {
 	margin-right: 30px;
-	width: 98%;
 }
+*/
 
 /* ============================================================================== */
 /* Menu gauche                                                                    */

From a1bba472a03e146975fd932a1c91490cdddcf57d Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 12 Dec 2014 11:57:20 +0100
Subject: [PATCH 106/345] FIX: hook insertExtraFields must return a returnvalue
 (0,1,-1)

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

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 849b6bb0370..2a54354aedf 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -131,6 +131,7 @@ class HookManager
         // Define type of hook ('output', 'returnvalue' or 'addreplace'). 'addreplace' should be type for all hooks. 'output' and 'returnvalue' are deprecated.
         $hooktype='output';
         if (preg_match('/^pdf_/',$method)) $hooktype='returnvalue';	// pdf_xxx except pdf_writelinedesc are returnvalue hooks. When there is 2 hooks of this type, only last one win.
+        if ($method =='insertExtraFields') $hooktype='returnvalue';
         if (in_array(
         	$method,
         	array(

From 27b47a4f4836f4bbb49898187a1be06d9ca00841 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 12 Dec 2014 14:31:36 +0100
Subject: [PATCH 107/345] FIX: dont put a mess with date and datetime
 extrafield value if already in right format (the bug was in
 propale/order/invoice extrafields, mainly visible with 2 datetime
 extrafields)

---
 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 5af3f5a93c3..3b7623f43ca 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2178,10 +2178,10 @@ abstract class CommonObject
             			$this->array_options[$key] = price2num($this->array_options[$key]);
             			break;
             		case 'date':
-            			$this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+            			if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
             			break;
             		case 'datetime':
-            			$this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+            			if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
             			break;
                	}
             }

From 3ee2ced22abeb5993149e95f89d6c23203bc59c0 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 13 Dec 2014 01:28:23 +0100
Subject: [PATCH 108/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/admin.lang        | 7 ++++---
 htdocs/langs/es_ES/printipp.lang     | 5 +++++
 htdocs/langs/es_ES/productbatch.lang | 3 ++-
 htdocs/langs/es_ES/projects.lang     | 2 ++
 htdocs/langs/es_ES/resource.lang     | 2 --
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 2deac3d4278..a5e4ab1fdfa 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Proyectos/Oportunidades
-Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
+Module400Name=Proyectos/Oportunidades/Leads
+Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -531,7 +531,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd
 Module50400Name=Contabilidad (avanzada)
 Module50400Desc=Gestión contable (doble partida)
 Module54000Name=PrintIPP
-Module54000Desc=Imprimir vía impresora Cups IPP.
+Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
 Module55000Name=OpenSurvey
 Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.)
 Module59000Name=Márgenes
@@ -783,6 +783,7 @@ DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Orígenes de presupuestos/pedidos
 DictionaryAccountancyplan=Plan contable
 DictionaryAccountancysystem=Modelos de planes contables
+DictionaryEMailTemplates=Plantillas E-Mails
 SetupSaved=Configuración guardada
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index b1831a86789..e97bd15c596 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -7,3 +7,8 @@ PRINTIPP_PORT=Puerto
 PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
 NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
+FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora
+NoDefaultPrinterDefined=No hay impresora por defecto definida
+DefaultPrinter=Impresora por defecto
+Printer=Impresora
+CupsServer=Servidor CUPS
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index dd61a420dbc..ceb6bd361e3 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,10 +10,11 @@ batch_number=Número Lote/Serie
 l_eatby=Fecha de caducidad
 l_sellby=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote: %s
 printEatby=Caducidad: %s
 printSellby=Límite venta: %s
 printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
 BatchDefaultNumber=Indefinido
+WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index da5a65ceb96..5ac8e82d6f9 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Tiempo dedicado en tareas
 TaskTimeUser=Usuario
 TaskTimeNote=Nota
 TaskTimeDate=Fecha
+TasksOnOpenedProject=Tareas en proyectos abiertos
+WorkloadNotDefined=Carga de trabajo no definida
 NewTimeSpent=Nuevo  tiempo dedicado
 MyTimeSpent=Mi tiempo dedicado
 MyTasks=Mis tareas
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index 5bc252fbce3..21c3311d29a 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
 RessourceSuccessfullyDeleted=Recurso eliminado correctamente
 DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modelo de E-Mails
-
 SelectResource=Seleccionar recurso

From 64507c3af1a1bd8b4851a7f5c616a3c55e501baf Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 13 Dec 2014 01:30:39 +0100
Subject: [PATCH 109/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/admin.lang        | 7 ++++---
 htdocs/langs/es_ES/printipp.lang     | 5 +++++
 htdocs/langs/es_ES/productbatch.lang | 3 ++-
 htdocs/langs/es_ES/projects.lang     | 2 ++
 htdocs/langs/es_ES/resource.lang     | 2 --
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 2deac3d4278..a5e4ab1fdfa 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
 Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
 Module330Name=Marcadores
 Module330Desc=Gestión de marcadores
-Module400Name=Proyectos/Oportunidades
-Module400Desc=Gestión de proyectos o oportunidades. Puede asignar otros elementos (facturas, pedidos, presupuestos, intervenciones, etc.) a los proyectos
+Module400Name=Proyectos/Oportunidades/Leads
+Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -531,7 +531,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd
 Module50400Name=Contabilidad (avanzada)
 Module50400Desc=Gestión contable (doble partida)
 Module54000Name=PrintIPP
-Module54000Desc=Imprimir vía impresora Cups IPP.
+Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
 Module55000Name=OpenSurvey
 Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.)
 Module59000Name=Márgenes
@@ -783,6 +783,7 @@ DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Orígenes de presupuestos/pedidos
 DictionaryAccountancyplan=Plan contable
 DictionaryAccountancysystem=Modelos de planes contables
+DictionaryEMailTemplates=Plantillas E-Mails
 SetupSaved=Configuración guardada
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
diff --git a/htdocs/langs/es_ES/printipp.lang b/htdocs/langs/es_ES/printipp.lang
index b1831a86789..e97bd15c596 100644
--- a/htdocs/langs/es_ES/printipp.lang
+++ b/htdocs/langs/es_ES/printipp.lang
@@ -7,3 +7,8 @@ PRINTIPP_PORT=Puerto
 PRINTIPP_USER=Usuario
 PRINTIPP_PASSWORD=Contraseña
 NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS)
+FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora
+NoDefaultPrinterDefined=No hay impresora por defecto definida
+DefaultPrinter=Impresora por defecto
+Printer=Impresora
+CupsServer=Servidor CUPS
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index dd61a420dbc..ceb6bd361e3 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,10 +10,11 @@ batch_number=Número Lote/Serie
 l_eatby=Fecha de caducidad
 l_sellby=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Caducidad: %s Límite venta: %s LOTE: %s (Stock : %d)
+DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote: %s
 printEatby=Caducidad: %s
 printSellby=Límite venta: %s
 printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
 BatchDefaultNumber=Indefinido
+WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index da5a65ceb96..5ac8e82d6f9 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Tiempo dedicado en tareas
 TaskTimeUser=Usuario
 TaskTimeNote=Nota
 TaskTimeDate=Fecha
+TasksOnOpenedProject=Tareas en proyectos abiertos
+WorkloadNotDefined=Carga de trabajo no definida
 NewTimeSpent=Nuevo  tiempo dedicado
 MyTimeSpent=Mi tiempo dedicado
 MyTasks=Mis tareas
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
index 5bc252fbce3..21c3311d29a 100644
--- a/htdocs/langs/es_ES/resource.lang
+++ b/htdocs/langs/es_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=¿Está seguro de querer eliminar este recurso?
 RessourceSuccessfullyDeleted=Recurso eliminado correctamente
 DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modelo de E-Mails
-
 SelectResource=Seleccionar recurso

From 81c9d12313ea889250c167ea9158c6f975ce0b85 Mon Sep 17 00:00:00 2001
From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
Date: Sat, 13 Dec 2014 21:41:29 +0800
Subject: [PATCH 110/345] Add Taiwan VAT 5%

The most common VAT in Taiwan is 5%. This commit adds the VAT for Taiwan.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
---
 htdocs/install/mysql/data/llx_c_tva.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 01d2894bca6..375b577d128 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -240,6 +240,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 6
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.5','0','VAT super-reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6,   '0','0','VAT Rate 0',  1);
 
+-- TAIWAN (id country=213)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213,   '5','0','VAT 5%',1);
+
 -- TUNISIA (id country=10)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (101,10,    '6','0','VAT 6%', 1, 1, '4', 0, 0);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (102,10,   '12','0','VAT 12%',1, 1, '4', 0, 0);

From da3bc3868d535c393390b1d55386592fbf8ec35b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 11:46:21 +0100
Subject: [PATCH 111/345] Fixed: Duplicated lang key

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

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 610bf371f29..b5aed0c683e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load('admin');
 $langs->load('compta');
+$langs->load('accountancy');
 
 if (!$user->admin)
 accessforbidden();
@@ -153,7 +154,7 @@ foreach ($list as $key)
 	print '<tr '.$bc[$var].' class="value">';
 
 	// Param
-	$libelle = $langs->trans($key); 
+	$libelle = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$libelle.'</label></td>';
 
 	// Value
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 770cb6d25bf..89a32876dc3 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties

From 83d3ee45ee16ee4fa39cde5819f3b6d7c2875a58 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 14 Dec 2014 14:44:28 +0100
Subject: [PATCH 112/345] Update fichinter.class.php

simplify the libstatut management and allow enhancing mode
---
 htdocs/fichinter/class/fichinter.class.php | 37 ++++++++--------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index bc12821530f..ccec1075ca8 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -79,6 +79,9 @@ class Fichinter extends CommonObject
 		$this->statuts_short[0]='Draft';
 		$this->statuts_short[1]='Validated';
 		$this->statuts_short[2]='StatusInterInvoiced';
+		$this->statuts_logo[0]='statut0';
+		$this->statuts_logo[1]='statut4';
+		$this->statuts_logo[2]='statut6';
 	}
 
 
@@ -508,37 +511,23 @@ class Fichinter extends CommonObject
 		global $langs;
 
 		if ($mode == 0)
-		{
 			return $langs->trans($this->statuts[$statut]);
-		}
+
 		if ($mode == 1)
-		{
 			return $langs->trans($this->statuts_short[$statut]);
-		}
+
 		if ($mode == 2)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts_short[$statut]);
-		}
+			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts_short[$statut]);
+
 		if ($mode == 3)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-		}
+			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]);
+
 		if ($mode == 4)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
+			return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
+
 		if ($mode == 5)
-		{
-			if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
-			if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-		}
+			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]);
+
 	}
 
 	/**

From 2245361a2e9453604a7b328c67e0d011fdde7cad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 15:09:30 +0100
Subject: [PATCH 113/345] Fixed: [ bug #1732 ] Tasks ressources and time
 consumption are not deleted on project / task deletion

---
 htdocs/projet/class/project.class.php | 87 +++++++++++++++++----------
 htdocs/projet/class/task.class.php    | 35 ++++++++---
 2 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ec449f009c7..41ae40a259d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -479,48 +479,71 @@ class Project extends CommonObject
             }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
-        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        // Delete tasks
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
+	        $sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
-        $sql.= " WHERE fk_projet=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
+	        $sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
-        $sql.= " WHERE rowid=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
+	        $sql.= " WHERE fk_projet=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
-        $sql.= " WHERE fk_object=" . $this->id;
-
-        dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql)
+        // Delete project
+        if (! $error)
         {
-        	$this->errors[] = $this->db->lasterror();
-        	$error++;
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet";
+	        $sql.= " WHERE rowid=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (!$resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
+        }
+
+        if (! $error)
+        {
+	        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields";
+	        $sql.= " WHERE fk_object=" . $this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql)
+	        {
+	        	$this->errors[] = $this->db->lasterror();
+	        	$error++;
+	        }
         }
 
         if (empty($error))
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 5acdbbadddf..40773879757 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -342,7 +342,7 @@ class Task extends CommonObject
 
 
     /**
-     *	Delete object in database
+     *	Delete task from database
      *
      *	@param	User	$user        	User that delete
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
@@ -379,15 +379,32 @@ class Task extends CommonObject
             }
         }
 
-        // Delete rang of line
-        //$this->delRangOfLine($this->id, $this->element);
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+	        $sql.= " WHERE fk_task=".$this->id;
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
-        $sql.= " WHERE rowid=".$this->id;
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
+	        $sql.= " WHERE fk_object=".$this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
+
+        if (! $error)
+        {
+	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
+	        $sql.= " WHERE rowid=".$this->id;
+
+	        $resql = $this->db->query($sql);
+	        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        }
 
         if (! $error)
         {
@@ -412,7 +429,7 @@ class Task extends CommonObject
             return -1*$error;
         }
         else
-        {
+		{
 			//Delete associated link file
 	        if ($conf->projet->dir_output)
 	        {

From c0afd4f174a30355c00b697508c86f5056a1fc00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 15:44:22 +0100
Subject: [PATCH 114/345] Fixed: [ bug #1654 ] Can't display margins in product
 card

---
 htdocs/margin/tabs/productMargins.php    | 52 ++++++++++++------------
 htdocs/margin/tabs/thirdpartyMargins.php | 10 ++---
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 46cf4245b60..d811f898c0b 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -131,12 +131,12 @@ if ($id > 0 || ! empty($ref))
         if ($user->rights->facture->lire) {
             $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
-            $sql.= " f.datef, f.paye, f.fk_statut as statut,";
+            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
-            $sql.= " sum(d.total_ht) as selling_price,";
-            $sql.= $db->ifsql('f.type =2','sum(d.qty *-1)','sum(d.qty)')." as qty,";
-            $sql.= $db->ifsql('f.type =2','sum(d.qty * d.buy_price_ht *-1)','sum(d.qty * d.buy_price_ht)')." as buying_price,";
-            $sql.= $db->ifsql('f.type =2','sum(-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty)))','sum(d.total_ht - (d.buy_price_ht * d.qty))')." as marge" ;
+            $sql.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
+            $sql.= " sum(d.qty) as qty,";
+            $sql.= " sum(d.qty * d.buy_price_ht) as buying_price,";					// always positive
+            $sql.= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty)) as marge" ;	// always positive
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
@@ -150,9 +150,9 @@ if ($id > 0 || ! empty($ref))
             if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
             $sql .= " AND d.buy_price_ht IS NOT NULL";
             if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-            $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut";
+            $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
-            $sql.= " ORDER BY ".$sortfield." ".$sortorder;
+            $sql.= $db->order($sortfield,$sortorder);
             // TODO: calculate total to display then restore pagination
             //$sql.= $db->plimit($conf->liste_limit +1, $offset);
             dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
@@ -192,13 +192,8 @@ if ($id > 0 || ! empty($ref))
                         $objp = $db->fetch_object($result);
                         $var=!$var;
 
-                        if ($objp->marge < 0) {
-                            $marginRate = ($objp->buying_price != 0)?-1*(100 * $objp->marge / $objp->buying_price):'' ;
-                            $markRate = ($objp->selling_price != 0)?-1*(100 * $objp->marge / $objp->selling_price):'' ;
-                        } else {
-                            $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
-                            $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
-                        }
+						$marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+						$markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
 
                         print '<tr '.$bc[$var].'>';
                         print '<td>';
@@ -208,17 +203,17 @@ if ($id > 0 || ! empty($ref))
                         print "</td>\n";
                         print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
                         print "<td>".$objp->code_client."</td>\n";
-					print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-					print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-						print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARK_RATES))
-						print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+						print "<td align=\"center\">";
+						print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+						print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARK_RATES))
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                         print "</tr>\n";
                         $i++;
                         $cumul_achat += $objp->buying_price;
@@ -230,10 +225,13 @@ if ($id > 0 || ! empty($ref))
                 // affichage totaux marges
                 $var=!$var;
                 $totalMargin = $cumul_vente - $cumul_achat;
-                if ($totalMargin < 0) {
+                if ($totalMargin < 0)
+                {
                     $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-                } else {
+                }
+                else
+              {
                     $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 144246f154a..457d55e81f0 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -143,7 +143,7 @@ if ($socid > 0)
 		$sql.= " AND d.buy_price_ht IS NOT NULL";
 		if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
 		$sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
-		$sql.= " ORDER BY ".$sortfield." ".$sortorder;
+		$sql.= $db->order($sortfield,$sortorder);
 		// TODO: calculate total to display then restore pagination
 		//$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -206,7 +206,7 @@ if ($socid > 0)
 					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
 					print "</tr>\n";
 					$i++;
-					$cumul_achat += (($objp->type == 2 ? -1 : 1) * $objp->buying_price);
+					$cumul_achat += $objp->buying_price;
 					$cumul_vente += $objp->selling_price;
 				}
 			}
@@ -255,8 +255,8 @@ $db->close();
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
-	$("#totalMargin").html("<?php echo price($totalMargin); ?>");
-	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate)."%"); ?>");
-	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate)."%"); ?>");
+	$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
+	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
+	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
 });
 </script>

From c6bb5904e72ab75f66115424f523325b978b9c5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 16:01:25 +0100
Subject: [PATCH 115/345] Fixed: Cancel button not correctly supported

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 3ff496356a8..ce2ed5f11d8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -55,11 +55,19 @@ $object = new Product($db);
 
 $error=0;
 
+
 /*
  * Actions
  */
 
-if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+if ($action == 'update_price' && GETPOST("cancel"))
+{
+
+	$action='';
+}
+
+if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit->creer || $user->rights->service->creer))
+{
 	$result = $object->fetch($id);
 
 	$error=0;
@@ -341,9 +349,9 @@ if ($isphoto) {
 print '</tr>';
 
 // MultiPrix
-if (! empty($conf->global->PRODUIT_MULTIPRICES)) 
+if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
-	if (! empty($socid)) 
+	if (! empty($socid))
 	{
 		$soc = new Societe($db);
 		$soc->id = $socid;
@@ -366,7 +374,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 
 		// Prix mini
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
-		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"]);
 		} else {
@@ -411,10 +419,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			// Prix mini
 			print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>';
 			if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT";
-			if ($object->multiprices_base_type["$i"] == 'TTC') 
+			if ($object->multiprices_base_type["$i"] == 'TTC')
 			{
 				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"]);

From 729134aad4342d2d890931bf981465f600f2e8e0 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 14 Dec 2014 17:04:56 +0100
Subject: [PATCH 116/345] Update card.php

add INTERVENTION_ADDLINE_FREEDUREATION in update line too
---
 htdocs/fichinter/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 2f067efeae2..a9888a59a24 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1486,7 +1486,9 @@ else if ($id > 0 || ! empty($ref))
 
 					// Duration
 					print '<td align="right">';
-					$form->select_duration('duration',$objp->duree);
+					$selectmode='select';
+					if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text';
+					$form->select_duration('duration',$objp->duree, $selectmode);
 					print '</td>';
 
 					print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';

From 135d6c1d1f248e8b3e5d95dc7fab060e8466ca42 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 14 Dec 2014 18:03:30 +0100
Subject: [PATCH 117/345] Update facture.php

if socid is filled and send, they no need to get the thirdparty of the object
---
 htdocs/compta/facture.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index be6ad58764a..ef5d1d90bea 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1766,8 +1766,10 @@ if ($action == 'create')
 			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
-
-			$soc = $objectsrc->thirdparty;
+			
+			// only if socid is not filled
+			if (empty($socid))
+				$soc = $objectsrc->thirdparty;
 
 			$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
 			$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
@@ -1786,7 +1788,7 @@ if ($action == 'create')
 	{
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
-        $fk_account         = $soc->fk_account;
+		$fk_account        	= $soc->fk_account;
 		$remise_percent 	= $soc->remise_percent;
 		$remise_absolue 	= 0;
 		$dateinvoice		= (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);		// Do not set 0 here (0 for a date is 1970)

From 0b6ff8f9bc855905bdc722d9a6c732cf25ace113 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 20:41:11 +0100
Subject: [PATCH 118/345] Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY.
 Dev seems to not be finished. We keep it as development status.

---
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/langs/en_US/products.lang      |  6 +--
 htdocs/product/admin/product.php      | 10 ++---
 htdocs/product/ajax/products.php      | 58 ++++++++++++------------
 htdocs/product/price.php              | 65 ++++++++++++++-------------
 5 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 771a79cd95b..eec9318f9ba 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1749,7 +1749,7 @@ class Form
         }
 
 		// Price by quantity
-		if (!empty($objp->quantity) && $objp->quantity >= 1 && $conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)
+		if (!empty($objp->quantity) && $objp->quantity >= 1 && ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$found = 1;
 			$outqty=$objp->quantity;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b38bcd150a9..1a6c5a35511 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it
 CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Price by quantity
+PriceByQuantity=Different prices by quantity
 PriceByQuantityRange=Quantity range
 ProductsDashboard=Products/Services summary
 UpdateOriginalProductLabel=Modify original label
@@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
 BarCodeDataForProduct=Barcode information of product %s :
 BarCodeDataForThirdparty=Barcode information of thirdparty %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
+PriceByCustomer=Different price for each customer
 PriceCatalogue=Unique price per product/service
-PricingRule=Pricing Rules
+PricingRule=Rules for customer prices
 AddCustomerPrice=Add price by customers
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 7ecc390516d..2d0c1cca468 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -44,13 +44,13 @@ $value = GETPOST('value','alpha');
 
 // Pricing Rules
 $select_pricing_rules=array(
-'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'),			// Unique price
-'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'),		// Several prices according to a customer level
-'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer')		// Different price for each customer
+'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'),				// Unique price
+'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'),			// Several prices according to a customer level
+'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'),		// Different price for each customer
 );
-if ($conf->global->MAIN_FEATURES_LEVEL==2)
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');
+	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');	// TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice
 	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity');
 }
 
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 61a1c3bff73..7dda37b6f2c 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -58,32 +58,32 @@ $price_by_qty_rowid = GETPOST('pbq', 'int');
 dol_syslog(join(',', $_GET));
 // print_r($_GET);
 
-if (! empty($action) && $action == 'fetch' && ! empty($id)) {
+if (! empty($action) && $action == 'fetch' && ! empty($id))
+{
 	require DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-	
+
 	$outjson = array();
-	
+
 	$object = new Product($db);
 	$ret = $object->fetch($id);
-	if ($ret > 0) {
+	if ($ret > 0)
+	{
 		$outref = $object->ref;
 		$outlabel = $object->label;
 		$outdesc = $object->description;
 		$outtype = $object->type;
 		$outqty = 1;
 		$outdiscount = 0;
-		
+
 		$found = false;
-		
+
 		// Price by qty
-		if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) 		// If we need a
-		                                                                                                                         // particular price related
-		                                                                                                                         // to qty
+		if (! empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))) 		// If we need a particular price related to qty
 		{
 			$sql = "SELECT price, unitprice, quantity, remise_percent";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty ";
 			$sql .= " WHERE rowid=" . $price_by_qty_rowid . "";
-			
+
 			$result = $db->query($sql);
 			if ($result) {
 				$objp = $db->fetch_object($result);
@@ -98,7 +98,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		// Multiprice
 		if (! $found && isset($price_level) && $price_level >= 1 && (! empty($conf->global->PRODUIT_MULTIPRICES))) 		// If we need a particular price
 		                                                                                                           // level (from 1 to 6)
@@ -110,7 +110,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 			$sql .= " AND price_level=" . $price_level;
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1";
-			
+
 			$result = $db->query($sql);
 			if ($result) {
 				$objp = $db->fetch_object($result);
@@ -123,16 +123,16 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		// Price by customer
 		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) {
-			
+
 			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-			
+
 			$prodcustprice = new Productcustomerprice($db);
-			
+
 			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $socid);
-			
+
 			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 			if ($result) {
 				if (count($prodcustprice->lines) > 0) {
@@ -144,48 +144,48 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) {
 				}
 			}
 		}
-		
+
 		if (! $found) {
 			$outprice_ht = price($object->price);
 			$outprice_ttc = price($object->price_ttc);
 			$outpricebasetype = $object->price_base_type;
 			$outtva_tx = $object->tva_tx;
 		}
-		
+
 		$outjson = array('ref' => $outref,'label' => $outlabel,'desc' => $outdesc,'type' => $outtype,'price_ht' => $outprice_ht,'price_ttc' => $outprice_ttc,'pricebasetype' => $outpricebasetype,'tva_tx' => $outtva_tx,'qty' => $outqty,'discount' => $outdiscount);
 	}
-	
+
 	echo json_encode($outjson);
 } else {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
-	
+
 	$langs->load("products");
 	$langs->load("main");
-	
+
 	top_httphead();
-	
+
 	if (empty($htmlname))
 		return;
-	
+
 	$match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET));
 	sort($match);
 	$idprod = (! empty($match [0]) ? $match [0] : '');
-	
+
 	if (! GETPOST($htmlname) && ! GETPOST($idprod))
 		return;
-		
+
 		// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));
-	
+
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1) {
 		$arrayresult = $form->select_produits_list("", $htmlname, $type, "", $price_level, $searchkey, $status, 2, $outjson, $socid);
 	} elseif ($mode == 2) {
 		$arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, $socid);
 	}
-	
+
 	$db->close();
-	
+
 	if ($outjson)
 		print json_encode($arrayresult);
 }
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index ce2ed5f11d8..98cfd675fac 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -430,12 +430,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print '</td></tr>';
 
 			// Price by quantity
-			if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+			{
 				print '<tr><td>' . $langs->trans("PriceByQuantity") . ' ' . $i;
 				print '</td><td>';
 
 				if ($object->prices_by_qty [$i] == 1) {
-					print '<table width="50%" class="noborder">';
+					print '<table width="50%" class="border" summary="List of quantities">';
 
 					print '<tr class="liste_titre">';
 					print '<td>' . $langs->trans("PriceByQuantityRange") . ' ' . $i . '</td>';
@@ -445,30 +446,30 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					print '<td>&nbsp;</td>';
 					print '</tr>';
 					foreach ($object->prices_by_qty_list [$i] as $ii => $prices) {
-						if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+						if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 							print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 							print '<input type="hidden" name="action" value="update_price_by_qty">';
-							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
-							print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
+							print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-							print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-							print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+							print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+							print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 							// print '<td align="right">&nbsp;</td>';
-							print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+							print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 							print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 							print '</tr>';
 							print '</form>';
 						} else {
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 							print '<td>' . $prices ['quantity'] . '</td>';
-							print '<td align="right">' . price($prices ['price']) . '</td>';
-							print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-							print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+							print '<td align="right">' . price($prices['price']) . '</td>';
+							print '<td align="right">' . price($prices['unitprice']) . '</td>';
+							print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 							print '<td align="center">';
 							if (($user->rights->produit->creer || $user->rights->service->creer)) {
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_edit() . '</a>';
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_delete() . '</a>';
 							} else {
 								print '&nbsp;';
@@ -480,7 +481,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 					if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 						print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 						print '<input type="hidden" name="action" value="update_price_by_qty">';
-						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
+						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
 						print '<input type="hidden" value="0" name="rowid">';
 						print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 						print '<td><input size="5" type="text" value="1" name="quantity"></td>';
@@ -524,7 +525,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	print '</td></tr>';
 
 	// Price by quantity
-	if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+	{
 		print '<tr><td>' . $langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty [0] == 0) {
 			print '&nbsp;<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=activate_price_by_qty&level=1">' . $langs->trans("Activate");
@@ -532,7 +534,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		print '</td><td>';
 
 		if ($object->prices_by_qty [0] == 1) {
-			print '<table width="50%" class="noborder">';
+			print '<table width="50%" class="border" summary="List of quantities">';
 			print '<tr class="liste_titre">';
 			print '<td>' . $langs->trans("PriceByQuantityRange") . '</td>';
 			print '<td align="right">' . $langs->trans("HT") . '</td>';
@@ -540,31 +542,33 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			print '<td align="right">' . $langs->trans("Discount") . '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-			foreach ($object->prices_by_qty_list [0] as $ii => $prices) {
-				if ($action == 'edit_price_by_qty' && $rowid == $prices ['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+			foreach ($object->prices_by_qty_list [0] as $ii => $prices)
+			{
+				if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer))
+				{
 					print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 					print '<input type="hidden" name="action" value="update_price_by_qty">';
-					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [0] . '">';
-					print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[0] . '">';
+					print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-					print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+					print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+					print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 					// print '<td align="right">&nbsp;</td>';
-					print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+					print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 					print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 					print '</tr>';
 					print '</form>';
 				} else {
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td>' . $prices ['quantity'] . '</td>';
-					print '<td align="right">' . price($prices ['price']) . '</td>';
-					print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-					print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+					print '<td>' . $prices['quantity'] . '</td>';
+					print '<td align="right">' . price($prices['price']) . '</td>';
+					print '<td align="right">' . price($prices['unitprice']) . '</td>';
+					print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 					print '<td align="center">';
 					if (($user->rights->produit->creer || $user->rights->service->creer)) {
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_edit() . '</a>';
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_delete() . '</a>';
 					} else {
 						print '&nbsp;';
@@ -803,7 +807,8 @@ if ($result) {
 				print '<td align="center">' . $objp->price_level . "</td>";
 			}
 			// Price by quantity
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+			{
 				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
 				print '<td align="center">' . $langs->trans($type) . "</td>";
 			}

From 8e6d30589d8bf452dd3d0be3aafaeca57456c075 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 20:51:28 +0100
Subject: [PATCH 119/345] Fixed: Size too low

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 133cd9e20cc..a4c4e4ee92e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -839,7 +839,7 @@ else
         print '<tr>';
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($_error)
         {
             print $langs->trans("RefAlreadyExists");
@@ -1083,7 +1083,7 @@ else
             print '<table class="border allwidth">';
 
             // Ref
-            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
 
             // Label
             print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';

From bd34f4e2473535f39005e1861d47f342e9a4360e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 14 Dec 2014 22:26:58 +0100
Subject: [PATCH 120/345] Fixed: Typo

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

diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a0f8078fb18..7894351c01f 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -79,7 +79,7 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"

From d2398dd1b1b7835d3f28b3ab114565c955dde25d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Dec 2014 10:31:40 +0100
Subject: [PATCH 121/345] Sync from transifex

---
 htdocs/langs/ar_SA/admin.lang         |  23 +-
 htdocs/langs/ar_SA/agenda.lang        |   1 +
 htdocs/langs/ar_SA/categories.lang    |  14 +-
 htdocs/langs/ar_SA/compta.lang        |   4 -
 htdocs/langs/ar_SA/contracts.lang     |   3 +-
 htdocs/langs/ar_SA/errors.lang        |  21 +-
 htdocs/langs/ar_SA/members.lang       |  30 +-
 htdocs/langs/ar_SA/products.lang      |  21 +-
 htdocs/langs/ar_SA/projects.lang      |   2 +
 htdocs/langs/ar_SA/resource.lang      |   2 -
 htdocs/langs/ar_SA/withdrawals.lang   |   3 +-
 htdocs/langs/bg_BG/admin.lang         |  19 +-
 htdocs/langs/bg_BG/agenda.lang        |   1 +
 htdocs/langs/bg_BG/compta.lang        |   4 -
 htdocs/langs/bg_BG/contracts.lang     |   3 +-
 htdocs/langs/bg_BG/errors.lang        |  25 +-
 htdocs/langs/bg_BG/members.lang       |   5 +-
 htdocs/langs/bg_BG/products.lang      |  21 +-
 htdocs/langs/bg_BG/projects.lang      |  10 +-
 htdocs/langs/bg_BG/resource.lang      |   2 -
 htdocs/langs/bg_BG/withdrawals.lang   |   3 +-
 htdocs/langs/bs_BA/accountancy.lang   |   2 +-
 htdocs/langs/bs_BA/admin.lang         |  19 +-
 htdocs/langs/bs_BA/agenda.lang        |   1 +
 htdocs/langs/bs_BA/compta.lang        |   4 -
 htdocs/langs/bs_BA/contracts.lang     |   3 +-
 htdocs/langs/bs_BA/errors.lang        |  21 +-
 htdocs/langs/bs_BA/members.lang       | 408 ++++++++--------
 htdocs/langs/bs_BA/products.lang      |  21 +-
 htdocs/langs/bs_BA/projects.lang      |   6 +-
 htdocs/langs/bs_BA/resource.lang      |   2 -
 htdocs/langs/bs_BA/withdrawals.lang   |   3 +-
 htdocs/langs/ca_ES/admin.lang         |  19 +-
 htdocs/langs/ca_ES/agenda.lang        |   1 +
 htdocs/langs/ca_ES/compta.lang        |   4 -
 htdocs/langs/ca_ES/contracts.lang     |   3 +-
 htdocs/langs/ca_ES/errors.lang        |  21 +-
 htdocs/langs/ca_ES/members.lang       |  10 +-
 htdocs/langs/ca_ES/printipp.lang      |  17 +-
 htdocs/langs/ca_ES/products.lang      |  21 +-
 htdocs/langs/ca_ES/projects.lang      |   6 +-
 htdocs/langs/ca_ES/resource.lang      |   2 -
 htdocs/langs/ca_ES/withdrawals.lang   |   3 +-
 htdocs/langs/cs_CZ/admin.lang         |  19 +-
 htdocs/langs/cs_CZ/agenda.lang        |   1 +
 htdocs/langs/cs_CZ/compta.lang        |   4 -
 htdocs/langs/cs_CZ/contracts.lang     |   3 +-
 htdocs/langs/cs_CZ/errors.lang        |  21 +-
 htdocs/langs/cs_CZ/members.lang       |  10 +-
 htdocs/langs/cs_CZ/printipp.lang      |  32 +-
 htdocs/langs/cs_CZ/products.lang      |  21 +-
 htdocs/langs/cs_CZ/projects.lang      |   6 +-
 htdocs/langs/cs_CZ/resource.lang      |   2 -
 htdocs/langs/cs_CZ/withdrawals.lang   |   3 +-
 htdocs/langs/da_DK/admin.lang         |  19 +-
 htdocs/langs/da_DK/agenda.lang        |   1 +
 htdocs/langs/da_DK/compta.lang        |   4 -
 htdocs/langs/da_DK/contracts.lang     |   3 +-
 htdocs/langs/da_DK/errors.lang        |  21 +-
 htdocs/langs/da_DK/members.lang       |  30 +-
 htdocs/langs/da_DK/products.lang      |  21 +-
 htdocs/langs/da_DK/projects.lang      |   6 +-
 htdocs/langs/da_DK/resource.lang      |   2 -
 htdocs/langs/da_DK/withdrawals.lang   |   3 +-
 htdocs/langs/de_DE/admin.lang         |  59 ++-
 htdocs/langs/de_DE/agenda.lang        |   3 +-
 htdocs/langs/de_DE/compta.lang        |   4 -
 htdocs/langs/de_DE/contracts.lang     |   5 +-
 htdocs/langs/de_DE/cron.lang          |   2 +-
 htdocs/langs/de_DE/errors.lang        |  25 +-
 htdocs/langs/de_DE/mails.lang         |   8 +-
 htdocs/langs/de_DE/members.lang       |  22 +-
 htdocs/langs/de_DE/products.lang      |  21 +-
 htdocs/langs/de_DE/projects.lang      |   4 +-
 htdocs/langs/de_DE/resource.lang      |   8 +-
 htdocs/langs/de_DE/users.lang         |   2 +-
 htdocs/langs/de_DE/withdrawals.lang   |   5 +-
 htdocs/langs/el_GR/accountancy.lang   |  14 +-
 htdocs/langs/el_GR/admin.lang         |  29 +-
 htdocs/langs/el_GR/agenda.lang        |   9 +-
 htdocs/langs/el_GR/bills.lang         |  12 +-
 htdocs/langs/el_GR/boxes.lang         |  23 +-
 htdocs/langs/el_GR/commercial.lang    |  12 +-
 htdocs/langs/el_GR/compta.lang        |   4 -
 htdocs/langs/el_GR/contracts.lang     |   5 +-
 htdocs/langs/el_GR/cron.lang          |   2 +-
 htdocs/langs/el_GR/deliveries.lang    |   4 +-
 htdocs/langs/el_GR/errors.lang        |  21 +-
 htdocs/langs/el_GR/externalsite.lang  |   2 +-
 htdocs/langs/el_GR/members.lang       |   8 +-
 htdocs/langs/el_GR/orders.lang        |   2 +-
 htdocs/langs/el_GR/paybox.lang        |   6 +-
 htdocs/langs/el_GR/products.lang      |  29 +-
 htdocs/langs/el_GR/projects.lang      |   6 +-
 htdocs/langs/el_GR/resource.lang      |   2 -
 htdocs/langs/el_GR/sendings.lang      |   4 +-
 htdocs/langs/el_GR/trips.lang         |   4 +-
 htdocs/langs/el_GR/users.lang         |   2 +-
 htdocs/langs/el_GR/withdrawals.lang   |   3 +-
 htdocs/langs/es_ES/agenda.lang        |   1 +
 htdocs/langs/es_ES/compta.lang        |   4 -
 htdocs/langs/es_ES/contracts.lang     |   1 +
 htdocs/langs/es_ES/withdrawals.lang   |   3 +-
 htdocs/langs/et_EE/admin.lang         |  19 +-
 htdocs/langs/et_EE/agenda.lang        |   1 +
 htdocs/langs/et_EE/compta.lang        |   4 -
 htdocs/langs/et_EE/contracts.lang     |   3 +-
 htdocs/langs/et_EE/errors.lang        |  21 +-
 htdocs/langs/et_EE/members.lang       |   5 +-
 htdocs/langs/et_EE/products.lang      |  21 +-
 htdocs/langs/et_EE/projects.lang      |   6 +-
 htdocs/langs/et_EE/resource.lang      |   2 -
 htdocs/langs/et_EE/withdrawals.lang   |   3 +-
 htdocs/langs/eu_ES/admin.lang         |  19 +-
 htdocs/langs/eu_ES/agenda.lang        |  19 +-
 htdocs/langs/eu_ES/bills.lang         |  58 +--
 htdocs/langs/eu_ES/bookmarks.lang     |  36 +-
 htdocs/langs/eu_ES/commercial.lang    |  14 +-
 htdocs/langs/eu_ES/companies.lang     |  30 +-
 htdocs/langs/eu_ES/compta.lang        |   4 -
 htdocs/langs/eu_ES/contracts.lang     |   3 +-
 htdocs/langs/eu_ES/cron.lang          |   2 +-
 htdocs/langs/eu_ES/dict.lang          | 644 +++++++++++++-------------
 htdocs/langs/eu_ES/errors.lang        |  21 +-
 htdocs/langs/eu_ES/ftp.lang           |  22 +-
 htdocs/langs/eu_ES/languages.lang     |  36 +-
 htdocs/langs/eu_ES/link.lang          |  16 +-
 htdocs/langs/eu_ES/mails.lang         |   4 +-
 htdocs/langs/eu_ES/main.lang          | 220 ++++-----
 htdocs/langs/eu_ES/members.lang       | 408 ++++++++--------
 htdocs/langs/eu_ES/products.lang      |  21 +-
 htdocs/langs/eu_ES/projects.lang      |   6 +-
 htdocs/langs/eu_ES/resource.lang      |   2 -
 htdocs/langs/eu_ES/salaries.lang      |  18 +-
 htdocs/langs/eu_ES/trips.lang         |  22 +-
 htdocs/langs/eu_ES/withdrawals.lang   |   3 +-
 htdocs/langs/fa_IR/admin.lang         |  19 +-
 htdocs/langs/fa_IR/agenda.lang        |   1 +
 htdocs/langs/fa_IR/compta.lang        |   4 -
 htdocs/langs/fa_IR/contracts.lang     |   3 +-
 htdocs/langs/fa_IR/errors.lang        |  21 +-
 htdocs/langs/fa_IR/members.lang       |  11 +-
 htdocs/langs/fa_IR/products.lang      |  21 +-
 htdocs/langs/fa_IR/projects.lang      |   6 +-
 htdocs/langs/fa_IR/resource.lang      |   2 -
 htdocs/langs/fa_IR/withdrawals.lang   |   3 +-
 htdocs/langs/fi_FI/admin.lang         |  19 +-
 htdocs/langs/fi_FI/agenda.lang        |   1 +
 htdocs/langs/fi_FI/bills.lang         |  14 +-
 htdocs/langs/fi_FI/compta.lang        |   4 -
 htdocs/langs/fi_FI/contracts.lang     |   3 +-
 htdocs/langs/fi_FI/dict.lang          |  64 ++-
 htdocs/langs/fi_FI/errors.lang        |  21 +-
 htdocs/langs/fi_FI/margins.lang       |  14 +-
 htdocs/langs/fi_FI/members.lang       |  30 +-
 htdocs/langs/fi_FI/products.lang      |  53 ++-
 htdocs/langs/fi_FI/projects.lang      |   6 +-
 htdocs/langs/fi_FI/resource.lang      |   2 -
 htdocs/langs/fi_FI/withdrawals.lang   |   3 +-
 htdocs/langs/fr_FR/admin.lang         |  61 +--
 htdocs/langs/fr_FR/agenda.lang        |   4 +-
 htdocs/langs/fr_FR/bills.lang         |   2 +-
 htdocs/langs/fr_FR/compta.lang        |   4 -
 htdocs/langs/fr_FR/contracts.lang     |   5 +-
 htdocs/langs/fr_FR/cron.lang          |   2 +-
 htdocs/langs/fr_FR/errors.lang        |  34 +-
 htdocs/langs/fr_FR/mails.lang         |   8 +-
 htdocs/langs/fr_FR/members.lang       |  31 +-
 htdocs/langs/fr_FR/orders.lang        |   2 +-
 htdocs/langs/fr_FR/printipp.lang      |  17 +-
 htdocs/langs/fr_FR/productbatch.lang  |  39 +-
 htdocs/langs/fr_FR/products.lang      |   7 +-
 htdocs/langs/fr_FR/projects.lang      |   2 +
 htdocs/langs/fr_FR/resource.lang      |   6 +-
 htdocs/langs/fr_FR/users.lang         |   2 +-
 htdocs/langs/fr_FR/withdrawals.lang   |   7 +-
 htdocs/langs/he_IL/admin.lang         |  19 +-
 htdocs/langs/he_IL/agenda.lang        |   1 +
 htdocs/langs/he_IL/compta.lang        |   4 -
 htdocs/langs/he_IL/contracts.lang     |   3 +-
 htdocs/langs/he_IL/errors.lang        |  21 +-
 htdocs/langs/he_IL/members.lang       | 404 ++++++++--------
 htdocs/langs/he_IL/products.lang      |  21 +-
 htdocs/langs/he_IL/projects.lang      |   6 +-
 htdocs/langs/he_IL/resource.lang      |   2 -
 htdocs/langs/he_IL/withdrawals.lang   |   3 +-
 htdocs/langs/hr_HR/admin.lang         |  19 +-
 htdocs/langs/hr_HR/agenda.lang        |   1 +
 htdocs/langs/hr_HR/compta.lang        |   4 -
 htdocs/langs/hr_HR/contracts.lang     |   3 +-
 htdocs/langs/hr_HR/errors.lang        |  21 +-
 htdocs/langs/hr_HR/members.lang       | 408 ++++++++--------
 htdocs/langs/hr_HR/products.lang      |  21 +-
 htdocs/langs/hr_HR/projects.lang      |   6 +-
 htdocs/langs/hr_HR/resource.lang      |   2 -
 htdocs/langs/hr_HR/withdrawals.lang   |   3 +-
 htdocs/langs/hu_HU/admin.lang         |  19 +-
 htdocs/langs/hu_HU/agenda.lang        |   1 +
 htdocs/langs/hu_HU/compta.lang        |   4 -
 htdocs/langs/hu_HU/contracts.lang     |   3 +-
 htdocs/langs/hu_HU/errors.lang        |  21 +-
 htdocs/langs/hu_HU/members.lang       |  30 +-
 htdocs/langs/hu_HU/products.lang      |  21 +-
 htdocs/langs/hu_HU/projects.lang      |   6 +-
 htdocs/langs/hu_HU/resource.lang      |   2 -
 htdocs/langs/hu_HU/withdrawals.lang   |   3 +-
 htdocs/langs/id_ID/accountancy.lang   |  74 +--
 htdocs/langs/id_ID/admin.lang         | 389 ++++++++--------
 htdocs/langs/id_ID/agenda.lang        |   1 +
 htdocs/langs/id_ID/companies.lang     |  54 +--
 htdocs/langs/id_ID/compta.lang        |   4 -
 htdocs/langs/id_ID/contracts.lang     |   3 +-
 htdocs/langs/id_ID/errors.lang        |  21 +-
 htdocs/langs/id_ID/install.lang       | 100 ++--
 htdocs/langs/id_ID/members.lang       | 408 ++++++++--------
 htdocs/langs/id_ID/products.lang      |  21 +-
 htdocs/langs/id_ID/projects.lang      |   6 +-
 htdocs/langs/id_ID/resource.lang      |   2 -
 htdocs/langs/id_ID/withdrawals.lang   |   3 +-
 htdocs/langs/is_IS/admin.lang         |  19 +-
 htdocs/langs/is_IS/agenda.lang        |   1 +
 htdocs/langs/is_IS/compta.lang        |   4 -
 htdocs/langs/is_IS/contracts.lang     |   3 +-
 htdocs/langs/is_IS/errors.lang        |  21 +-
 htdocs/langs/is_IS/members.lang       |  30 +-
 htdocs/langs/is_IS/products.lang      |  21 +-
 htdocs/langs/is_IS/projects.lang      |   6 +-
 htdocs/langs/is_IS/resource.lang      |   2 -
 htdocs/langs/is_IS/withdrawals.lang   |   3 +-
 htdocs/langs/it_IT/admin.lang         |  19 +-
 htdocs/langs/it_IT/agenda.lang        |  11 +-
 htdocs/langs/it_IT/banks.lang         |   4 +-
 htdocs/langs/it_IT/bills.lang         |  36 +-
 htdocs/langs/it_IT/compta.lang        |  12 +-
 htdocs/langs/it_IT/contracts.lang     |   3 +-
 htdocs/langs/it_IT/errors.lang        |  25 +-
 htdocs/langs/it_IT/exports.lang       |   6 +-
 htdocs/langs/it_IT/members.lang       |   9 +-
 htdocs/langs/it_IT/orders.lang        |   2 +-
 htdocs/langs/it_IT/products.lang      |  53 ++-
 htdocs/langs/it_IT/projects.lang      |  16 +-
 htdocs/langs/it_IT/resource.lang      |  36 +-
 htdocs/langs/it_IT/withdrawals.lang   |   3 +-
 htdocs/langs/ja_JP/admin.lang         |  19 +-
 htdocs/langs/ja_JP/agenda.lang        |   1 +
 htdocs/langs/ja_JP/compta.lang        |   4 -
 htdocs/langs/ja_JP/contracts.lang     |   3 +-
 htdocs/langs/ja_JP/errors.lang        |  21 +-
 htdocs/langs/ja_JP/members.lang       |  30 +-
 htdocs/langs/ja_JP/products.lang      |  21 +-
 htdocs/langs/ja_JP/projects.lang      |   6 +-
 htdocs/langs/ja_JP/resource.lang      |   2 -
 htdocs/langs/ja_JP/withdrawals.lang   |   3 +-
 htdocs/langs/ko_KR/admin.lang         |  19 +-
 htdocs/langs/ko_KR/agenda.lang        |   1 +
 htdocs/langs/ko_KR/compta.lang        |   4 -
 htdocs/langs/ko_KR/contracts.lang     |   3 +-
 htdocs/langs/ko_KR/errors.lang        |  21 +-
 htdocs/langs/ko_KR/members.lang       | 408 ++++++++--------
 htdocs/langs/ko_KR/products.lang      |  21 +-
 htdocs/langs/ko_KR/projects.lang      |   6 +-
 htdocs/langs/ko_KR/resource.lang      |   2 -
 htdocs/langs/ko_KR/withdrawals.lang   |   3 +-
 htdocs/langs/lt_LT/admin.lang         |  19 +-
 htdocs/langs/lt_LT/agenda.lang        |   1 +
 htdocs/langs/lt_LT/compta.lang        |   4 -
 htdocs/langs/lt_LT/contracts.lang     |   3 +-
 htdocs/langs/lt_LT/errors.lang        |  21 +-
 htdocs/langs/lt_LT/members.lang       | 408 ++++++++--------
 htdocs/langs/lt_LT/products.lang      |  21 +-
 htdocs/langs/lt_LT/projects.lang      |   6 +-
 htdocs/langs/lt_LT/resource.lang      |   2 -
 htdocs/langs/lt_LT/withdrawals.lang   |   3 +-
 htdocs/langs/lv_LV/admin.lang         |  19 +-
 htdocs/langs/lv_LV/agenda.lang        |   1 +
 htdocs/langs/lv_LV/compta.lang        |   4 -
 htdocs/langs/lv_LV/contracts.lang     |   3 +-
 htdocs/langs/lv_LV/errors.lang        |  23 +-
 htdocs/langs/lv_LV/members.lang       |   5 +-
 htdocs/langs/lv_LV/printipp.lang      |  30 +-
 htdocs/langs/lv_LV/products.lang      |  21 +-
 htdocs/langs/lv_LV/projects.lang      |   6 +-
 htdocs/langs/lv_LV/resource.lang      |   2 -
 htdocs/langs/lv_LV/withdrawals.lang   |   3 +-
 htdocs/langs/mk_MK/admin.lang         |  19 +-
 htdocs/langs/mk_MK/agenda.lang        |   1 +
 htdocs/langs/mk_MK/compta.lang        |   4 -
 htdocs/langs/mk_MK/contracts.lang     |   3 +-
 htdocs/langs/mk_MK/errors.lang        |  21 +-
 htdocs/langs/mk_MK/members.lang       | 408 ++++++++--------
 htdocs/langs/mk_MK/products.lang      |  21 +-
 htdocs/langs/mk_MK/projects.lang      |   6 +-
 htdocs/langs/mk_MK/resource.lang      |   2 -
 htdocs/langs/mk_MK/withdrawals.lang   |   3 +-
 htdocs/langs/nb_NO/admin.lang         |  19 +-
 htdocs/langs/nb_NO/agenda.lang        |   1 +
 htdocs/langs/nb_NO/compta.lang        |   4 -
 htdocs/langs/nb_NO/contracts.lang     |   3 +-
 htdocs/langs/nb_NO/errors.lang        |  21 +-
 htdocs/langs/nb_NO/members.lang       |   5 +-
 htdocs/langs/nb_NO/products.lang      |  29 +-
 htdocs/langs/nb_NO/projects.lang      |   6 +-
 htdocs/langs/nb_NO/resource.lang      |   2 -
 htdocs/langs/nb_NO/withdrawals.lang   |   3 +-
 htdocs/langs/nl_NL/admin.lang         |  19 +-
 htdocs/langs/nl_NL/agenda.lang        |   5 +-
 htdocs/langs/nl_NL/categories.lang    |   2 +-
 htdocs/langs/nl_NL/commercial.lang    |  12 +-
 htdocs/langs/nl_NL/compta.lang        |   4 -
 htdocs/langs/nl_NL/contracts.lang     |   3 +-
 htdocs/langs/nl_NL/cron.lang          |  68 +--
 htdocs/langs/nl_NL/errors.lang        |  21 +-
 htdocs/langs/nl_NL/members.lang       |   5 +-
 htdocs/langs/nl_NL/orders.lang        |  10 +-
 htdocs/langs/nl_NL/products.lang      |  21 +-
 htdocs/langs/nl_NL/projects.lang      |   6 +-
 htdocs/langs/nl_NL/resource.lang      |   2 -
 htdocs/langs/nl_NL/withdrawals.lang   |   3 +-
 htdocs/langs/pl_PL/admin.lang         |  19 +-
 htdocs/langs/pl_PL/agenda.lang        |   1 +
 htdocs/langs/pl_PL/compta.lang        |   4 -
 htdocs/langs/pl_PL/contracts.lang     |   3 +-
 htdocs/langs/pl_PL/errors.lang        |  21 +-
 htdocs/langs/pl_PL/members.lang       |  30 +-
 htdocs/langs/pl_PL/products.lang      |  21 +-
 htdocs/langs/pl_PL/projects.lang      |   6 +-
 htdocs/langs/pl_PL/resource.lang      |   2 -
 htdocs/langs/pl_PL/withdrawals.lang   |   3 +-
 htdocs/langs/pt_PT/admin.lang         |  19 +-
 htdocs/langs/pt_PT/agenda.lang        |   5 +-
 htdocs/langs/pt_PT/compta.lang        |   4 -
 htdocs/langs/pt_PT/contracts.lang     |   3 +-
 htdocs/langs/pt_PT/dict.lang          |  14 +-
 htdocs/langs/pt_PT/errors.lang        |  21 +-
 htdocs/langs/pt_PT/install.lang       |   4 +-
 htdocs/langs/pt_PT/main.lang          |  12 +-
 htdocs/langs/pt_PT/members.lang       |  21 +-
 htdocs/langs/pt_PT/products.lang      |  21 +-
 htdocs/langs/pt_PT/projects.lang      |   6 +-
 htdocs/langs/pt_PT/resource.lang      |  44 +-
 htdocs/langs/pt_PT/withdrawals.lang   |   3 +-
 htdocs/langs/ro_RO/admin.lang         | 105 +++--
 htdocs/langs/ro_RO/agenda.lang        |   3 +-
 htdocs/langs/ro_RO/banks.lang         |   2 +-
 htdocs/langs/ro_RO/bills.lang         |   4 +-
 htdocs/langs/ro_RO/cashdesk.lang      |  26 +-
 htdocs/langs/ro_RO/compta.lang        |  28 +-
 htdocs/langs/ro_RO/contracts.lang     |   5 +-
 htdocs/langs/ro_RO/cron.lang          |   2 +-
 htdocs/langs/ro_RO/donations.lang     |  10 +-
 htdocs/langs/ro_RO/errors.lang        |  18 +
 htdocs/langs/ro_RO/externalsite.lang  |   2 +-
 htdocs/langs/ro_RO/install.lang       |  60 +--
 htdocs/langs/ro_RO/mails.lang         |   8 +-
 htdocs/langs/ro_RO/members.lang       |   8 +-
 htdocs/langs/ro_RO/orders.lang        |   2 +-
 htdocs/langs/ro_RO/paybox.lang        |   6 +-
 htdocs/langs/ro_RO/products.lang      |   5 +
 htdocs/langs/ro_RO/projects.lang      |   2 +
 htdocs/langs/ro_RO/resource.lang      |  56 ++-
 htdocs/langs/ro_RO/stocks.lang        |   2 +-
 htdocs/langs/ro_RO/users.lang         |   2 +-
 htdocs/langs/ro_RO/withdrawals.lang   |   5 +-
 htdocs/langs/ru_RU/admin.lang         |  19 +-
 htdocs/langs/ru_RU/agenda.lang        |   1 +
 htdocs/langs/ru_RU/compta.lang        |   4 -
 htdocs/langs/ru_RU/contracts.lang     |   3 +-
 htdocs/langs/ru_RU/errors.lang        |  21 +-
 htdocs/langs/ru_RU/members.lang       |   5 +-
 htdocs/langs/ru_RU/products.lang      |  21 +-
 htdocs/langs/ru_RU/projects.lang      |   6 +-
 htdocs/langs/ru_RU/resource.lang      |   2 -
 htdocs/langs/ru_RU/withdrawals.lang   |   3 +-
 htdocs/langs/sk_SK/admin.lang         |  19 +-
 htdocs/langs/sk_SK/agenda.lang        |   1 +
 htdocs/langs/sk_SK/compta.lang        |   4 -
 htdocs/langs/sk_SK/contracts.lang     |   3 +-
 htdocs/langs/sk_SK/errors.lang        |  21 +-
 htdocs/langs/sk_SK/members.lang       |   8 +-
 htdocs/langs/sk_SK/printipp.lang      |  32 +-
 htdocs/langs/sk_SK/products.lang      |  21 +-
 htdocs/langs/sk_SK/projects.lang      |   6 +-
 htdocs/langs/sk_SK/resource.lang      |   2 -
 htdocs/langs/sk_SK/withdrawals.lang   |   3 +-
 htdocs/langs/sl_SI/admin.lang         |  53 ++-
 htdocs/langs/sl_SI/agenda.lang        |   7 +-
 htdocs/langs/sl_SI/bills.lang         |  32 +-
 htdocs/langs/sl_SI/categories.lang    |   2 +-
 htdocs/langs/sl_SI/compta.lang        |   4 -
 htdocs/langs/sl_SI/contracts.lang     |   5 +-
 htdocs/langs/sl_SI/errors.lang        |  21 +-
 htdocs/langs/sl_SI/main.lang          |   2 +-
 htdocs/langs/sl_SI/members.lang       |   7 +-
 htdocs/langs/sl_SI/orders.lang        |   2 +-
 htdocs/langs/sl_SI/products.lang      | 173 +++----
 htdocs/langs/sl_SI/projects.lang      |  32 +-
 htdocs/langs/sl_SI/resource.lang      |   2 -
 htdocs/langs/sl_SI/stocks.lang        |   2 +-
 htdocs/langs/sl_SI/users.lang         |   2 +-
 htdocs/langs/sl_SI/withdrawals.lang   |   3 +-
 htdocs/langs/sq_AL/admin.lang         |  19 +-
 htdocs/langs/sq_AL/agenda.lang        |   1 +
 htdocs/langs/sq_AL/compta.lang        |   4 -
 htdocs/langs/sq_AL/contracts.lang     |   3 +-
 htdocs/langs/sq_AL/errors.lang        |  21 +-
 htdocs/langs/sq_AL/members.lang       |   7 +-
 htdocs/langs/sq_AL/products.lang      |  21 +-
 htdocs/langs/sq_AL/projects.lang      |   6 +-
 htdocs/langs/sq_AL/resource.lang      |   2 -
 htdocs/langs/sq_AL/withdrawals.lang   |   3 +-
 htdocs/langs/sv_SE/accountancy.lang   |  26 +-
 htdocs/langs/sv_SE/admin.lang         | 103 ++--
 htdocs/langs/sv_SE/agenda.lang        |   3 +-
 htdocs/langs/sv_SE/banks.lang         |   6 +-
 htdocs/langs/sv_SE/bills.lang         |  38 +-
 htdocs/langs/sv_SE/boxes.lang         |   2 +-
 htdocs/langs/sv_SE/categories.lang    |   2 +-
 htdocs/langs/sv_SE/compta.lang        | 142 +++---
 htdocs/langs/sv_SE/contracts.lang     |   5 +-
 htdocs/langs/sv_SE/cron.lang          |   2 +-
 htdocs/langs/sv_SE/donations.lang     |  10 +-
 htdocs/langs/sv_SE/errors.lang        |  18 +
 htdocs/langs/sv_SE/exports.lang       |  34 +-
 htdocs/langs/sv_SE/externalsite.lang  |   2 +-
 htdocs/langs/sv_SE/interventions.lang |  32 +-
 htdocs/langs/sv_SE/ldap.lang          |   2 +-
 htdocs/langs/sv_SE/mails.lang         |  80 ++--
 htdocs/langs/sv_SE/main.lang          |   6 +-
 htdocs/langs/sv_SE/margins.lang       |  20 +-
 htdocs/langs/sv_SE/members.lang       |   1 +
 htdocs/langs/sv_SE/opensurvey.lang    |  60 +--
 htdocs/langs/sv_SE/orders.lang        |   2 +-
 htdocs/langs/sv_SE/other.lang         |  46 +-
 htdocs/langs/sv_SE/paybox.lang        |  12 +-
 htdocs/langs/sv_SE/products.lang      |  49 +-
 htdocs/langs/sv_SE/projects.lang      |  90 ++--
 htdocs/langs/sv_SE/resource.lang      |  56 ++-
 htdocs/langs/sv_SE/sendings.lang      |   4 +-
 htdocs/langs/sv_SE/stocks.lang        |  22 +-
 htdocs/langs/sv_SE/suppliers.lang     |  14 +-
 htdocs/langs/sv_SE/trips.lang         |   4 +-
 htdocs/langs/sv_SE/users.lang         |   2 +-
 htdocs/langs/sv_SE/withdrawals.lang   |  25 +-
 htdocs/langs/sv_SE/workflow.lang      |   6 +-
 htdocs/langs/th_TH/admin.lang         |  19 +-
 htdocs/langs/th_TH/agenda.lang        |   1 +
 htdocs/langs/th_TH/compta.lang        |   4 -
 htdocs/langs/th_TH/contracts.lang     |   3 +-
 htdocs/langs/th_TH/errors.lang        |  21 +-
 htdocs/langs/th_TH/members.lang       |   5 +-
 htdocs/langs/th_TH/products.lang      |  21 +-
 htdocs/langs/th_TH/projects.lang      |   6 +-
 htdocs/langs/th_TH/resource.lang      |   2 -
 htdocs/langs/th_TH/withdrawals.lang   |   3 +-
 htdocs/langs/tr_TR/admin.lang         |  89 ++--
 htdocs/langs/tr_TR/agenda.lang        |   9 +-
 htdocs/langs/tr_TR/bills.lang         |   2 +-
 htdocs/langs/tr_TR/companies.lang     |   6 +-
 htdocs/langs/tr_TR/compta.lang        |   4 -
 htdocs/langs/tr_TR/contracts.lang     |   5 +-
 htdocs/langs/tr_TR/cron.lang          |   2 +-
 htdocs/langs/tr_TR/errors.lang        |  20 +-
 htdocs/langs/tr_TR/exports.lang       |  26 +-
 htdocs/langs/tr_TR/mails.lang         |   8 +-
 htdocs/langs/tr_TR/main.lang          |   2 +-
 htdocs/langs/tr_TR/members.lang       |   5 +-
 htdocs/langs/tr_TR/orders.lang        |   2 +-
 htdocs/langs/tr_TR/printipp.lang      |  19 +-
 htdocs/langs/tr_TR/products.lang      |  19 +-
 htdocs/langs/tr_TR/projects.lang      |   4 +-
 htdocs/langs/tr_TR/resource.lang      |   6 +-
 htdocs/langs/tr_TR/users.lang         |   2 +-
 htdocs/langs/tr_TR/withdrawals.lang   |   5 +-
 htdocs/langs/uk_UA/admin.lang         |  19 +-
 htdocs/langs/uk_UA/agenda.lang        |   1 +
 htdocs/langs/uk_UA/compta.lang        |   4 -
 htdocs/langs/uk_UA/contracts.lang     |   3 +-
 htdocs/langs/uk_UA/errors.lang        |  21 +-
 htdocs/langs/uk_UA/members.lang       |   5 +-
 htdocs/langs/uk_UA/products.lang      |  21 +-
 htdocs/langs/uk_UA/projects.lang      |   6 +-
 htdocs/langs/uk_UA/resource.lang      |   2 -
 htdocs/langs/uk_UA/withdrawals.lang   |   3 +-
 htdocs/langs/uz_UZ/admin.lang         |  19 +-
 htdocs/langs/uz_UZ/agenda.lang        |   1 +
 htdocs/langs/uz_UZ/compta.lang        |   4 -
 htdocs/langs/uz_UZ/contracts.lang     |   3 +-
 htdocs/langs/uz_UZ/errors.lang        |  21 +-
 htdocs/langs/uz_UZ/members.lang       |   5 +-
 htdocs/langs/uz_UZ/products.lang      |  21 +-
 htdocs/langs/uz_UZ/projects.lang      |   6 +-
 htdocs/langs/uz_UZ/withdrawals.lang   |   3 +-
 htdocs/langs/vi_VN/admin.lang         |  19 +-
 htdocs/langs/vi_VN/agenda.lang        |   1 +
 htdocs/langs/vi_VN/compta.lang        |   4 -
 htdocs/langs/vi_VN/contracts.lang     |   3 +-
 htdocs/langs/vi_VN/ecm.lang           |   2 +-
 htdocs/langs/vi_VN/errors.lang        |  21 +-
 htdocs/langs/vi_VN/members.lang       |  51 +-
 htdocs/langs/vi_VN/products.lang      |  45 +-
 htdocs/langs/vi_VN/projects.lang      |  16 +-
 htdocs/langs/vi_VN/propal.lang        |   6 +-
 htdocs/langs/vi_VN/resource.lang      |   2 -
 htdocs/langs/vi_VN/suppliers.lang     |   8 +-
 htdocs/langs/vi_VN/withdrawals.lang   |   3 +-
 htdocs/langs/zh_CN/admin.lang         |  19 +-
 htdocs/langs/zh_CN/agenda.lang        |   1 +
 htdocs/langs/zh_CN/compta.lang        |   4 -
 htdocs/langs/zh_CN/contracts.lang     |   3 +-
 htdocs/langs/zh_CN/errors.lang        |  29 +-
 htdocs/langs/zh_CN/members.lang       |   7 +-
 htdocs/langs/zh_CN/products.lang      |  31 +-
 htdocs/langs/zh_CN/projects.lang      |   6 +-
 htdocs/langs/zh_CN/resource.lang      |   2 -
 htdocs/langs/zh_CN/withdrawals.lang   |   3 +-
 htdocs/langs/zh_TW/admin.lang         |  19 +-
 htdocs/langs/zh_TW/agenda.lang        |   1 +
 htdocs/langs/zh_TW/compta.lang        |   4 -
 htdocs/langs/zh_TW/contracts.lang     |   3 +-
 htdocs/langs/zh_TW/errors.lang        |  21 +-
 htdocs/langs/zh_TW/members.lang       |  30 +-
 htdocs/langs/zh_TW/products.lang      |  21 +-
 htdocs/langs/zh_TW/projects.lang      |   6 +-
 htdocs/langs/zh_TW/resource.lang      |   2 -
 htdocs/langs/zh_TW/withdrawals.lang   |   3 +-
 htdocs/theme/eldy/style.css.php       |  18 +-
 526 files changed, 6337 insertions(+), 4955 deletions(-)

diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index a4214d4e592..e5d0499ff88 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= أضف فلتر كخيار لعرض/إخفاء الجهات الأخرى التي تقوم بنشاط حالياً أو توقفت عنه
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=فلاتر خيارات البحث
 NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
 ViewFullDateActions=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة
@@ -208,6 +210,7 @@ ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلف
 ModulesMarketPlaceDesc=يمكنك العثور على مزيد من وحدات للتحميل على مواقع الإنترنت الخارجية على شبكة الانترنت...
 ModulesMarketPlaces=مزيد من وحدات...
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=مزودي موقع ويب يمكنك البحث للعثور على المزيد من وحدات...
 URL=رابط
 BoxesAvailable=صناديق متاحة
@@ -437,14 +440,14 @@ Module52Name=الاسهم
 Module52Desc=مخزون إدارة المنتجات
 Module53Name=الخدمات
 Module53Desc=الخدمات الإدارية
-Module54Name=عقود
-Module54Desc=العقود والخدمات الإدارية
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
 Module56Name=الخدمات الهاتفية
 Module56Desc=تكامل الخدمات الهاتفية
 Module57Name=أوامر دائمة
-Module57Desc=أوامر دائمة وسحب إدارة
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=تغذية RSS
 Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
 Module330Name=العناوين
 Module330Desc=العناوين إدارة
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar التكامل
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=الفئات
 Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
 Module2000Name=Fckeditor
 Module2000Desc=سوغ محرر
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=جدول الأعمال
@@ -503,6 +508,8 @@ Module2500Name=إدارة المحتوى الإلكتروني
 Module2500Desc=حفظ وتبادل الوثائق
 Module2600Name=WebServices
 Module2600Desc=تمكين خدمات الويب Dolibarr الملقم
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=غرفتر
 Module2700Desc=استخدام خدمة غرفتر على الانترنت (www.gravatar.com) لإظهار الصورة من المستخدمين / أعضاء (وجدت مع رسائل البريد الإلكتروني الخاصة بهم). في حاجة الى الوصول الى شبكة الانترنت
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
 Module50100Name=نقطة البيع
@@ -527,7 +534,7 @@ Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإن
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=الإعداد المحفوظة
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح
 CompanyInfo=الشركة / المؤسسة المعلومات
 CompanyIds=الشركة / المؤسسة الهويات
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index d732b03639c..0e6094546d3 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=أحداث عينت لـ
 ActionsDoneBy=أحداث انهيت بواسطة
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= كل أحداثي/ مهامي
 AllActions= جميع الأحداث / المهام
 ViewList=عرض قائمة
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index b67793fcf84..77ec72df825 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -15,20 +15,20 @@ ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة
 SuppliersCategoriesArea=الموردين منطقة الفئات
 CustomersCategoriesArea=العملاء منطقة الفئات
 ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات
-MembersCategoriesArea=أعضاء فئات المناطق
+MembersCategoriesArea=منطقة فئات الأعضاء
 ContactsCategoriesArea=Contacts categories area
 MainCats=الفئات الرئيسية
-SubCats=فرعية
-CatStatistics=احصاءات
+SubCats=الفئات الفرعية
+CatStatistics=إحصائيات
 CatList=قائمة الفئات
 AllCats=جميع الفئات
-ViewCat=وترى هذه الفئة
+ViewCat=عرض الفئة
 NewCat=إضافة فئة
 NewCategory=فئة جديدة
 ModifCat=تعديل الفئة
-CatCreated=فئة خلق
-CreateCat=خلق فئة
-CreateThisCat=تهيئة هذه الفئة
+CatCreated=تم إنشاء الفئة
+CreateCat=إنشاء فئة
+CreateThisCat=إنشاء هذه الفئة
 ValidateFields=صحة المجالات
 NoSubCat=لا فرعية.
 SubCatOf=فرعية
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 88215629f80..a086e30b48c 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index 446ea9e2fb7..133036960c0 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
 LastModifiedServices=آخر تعديل ٪ ق الخدمات
 EditServiceLine=تعديل خط الخدمات
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=ممثل مبيعات توقيع العقد
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index d25c2f5d8d0..670c99a851a 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=رمز المورد المطلوب
 ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد
 ErrorBadParameters=بارامترات سيئة
 ErrorBadValueForParameter=قيمة خاطئة &quot;%s 'ل' %s&quot; المعلمة غير صحيحة
-ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index c49ccb303ac..ee9d10f88e0 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -8,7 +8,7 @@ Members=أعضاء
 MemberAccount=دخول الأعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=أعضاء التذاكر
 FundationMembers=أعضاء المؤسسة
 Attributs=الصفات
@@ -85,8 +85,7 @@ SubscriptionLateShort=متأخر
 SubscriptionNotReceivedShort=لم يتلق
 ListOfSubscriptions=قائمة الاشتراكات
 SendCardByMail=أرسل بطاقة
-AddMember=إضافة عضو
-MemberType=عضو نوع
+AddMember=Create member
 NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء
 NewMemberType=عضو جديد من نوع
 WelcomeEMail=مرحبا بك في البريد الإلكتروني
@@ -126,12 +125,12 @@ Date=تاريخ
 DateAndTime=التاريخ والوقت
 PublicMemberCard=عضو بطاقة العامة
 MemberNotOrNoMoreExpectedToSubscribe=أو ليست عضوا في أي أكثر من المتوقع للاكتتاب
-AddSubscription=إضافة اشتراك
+AddSubscription=Create subscription
 ShowSubscription=وتظهر اكتتاب
 MemberModifiedInDolibarr=عضو في تعديل Dolibarr
 SendAnEMailToMember=البريد الإلكتروني لإرسال معلومات العضو
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=بريد إلكتروني الموضوع لautosubscription الأعضاء
 DescADHERENT_AUTOREGISTER_MAIL=البريد الإلكتروني لعضو autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=البريد الإلكتروني لعضو في موضوع المصادقة
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=موضوع البريد الإلكتروني ل
 DescADHERENT_MAIL_RESIL=البريد الإلكتروني لعضو resiliation
 DescADHERENT_MAIL_FROM=البريد الإلكتروني للمرسل البريد الإلكتروني التلقائي
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
 DescADHERENT_CARD_HEADER_TEXT=نص مطبوع على رأس عضو البطاقات
 DescADHERENT_CARD_TEXT=نص مطبوع على بطاقات الأعضاء
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=لم يرتبط بها من طرف ثالث له
 ThirdPartyDolibarr=Dolibarr طرف ثالث
 MembersAndSubscriptions= وأعضاء Subscriptions
 MoreActions=تكميلية العمل على تسجيل
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=إنشاء سجل المعاملات مباشرة على حساب
 MoreActionBankViaInvoice=إنشاء الفاتورة والدفع على حساب
 MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ
@@ -171,6 +170,8 @@ LastSubscriptionAmount=آخر مبلغ الاشتراك
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=عدد الأعضاء
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
 MembersByCountryDesc=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الدول. لكن الرسم يعتمد على خدمة غوغل الرسم البياني على الإنترنت ويتوفر فقط إذا كان على اتصال بالإنترنت ويعمل.
@@ -196,9 +197,10 @@ Collectivités=المنظمات
 Particuliers=الشخصية
 Entreprises=الشركات
 DOLIBARRFOUNDATION_PAYMENT_FORM=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 0902013f2bb..49d6fff5689 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة مح
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=عدد من السعر
 MultiPriceLevelsName=سعر الفئات
-AssociatedProductsAbility=تنشيط المنتجات
-AssociatedProducts=المنتجات
-AssociatedProductsNumber=عدد المنتجات
-ParentProductsNumber=عدد من الناتج الأم
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=المنتسبون
 Translation=الترجمة
 KeywordFilter=الكلمة الرئيسية فلتر
@@ -132,7 +132,7 @@ AddDel=إضافة / حذف
 Quantity=الكمية
 NoMatchFound=العثور على أي مباراة
 ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة)
-ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف المنتجات / الخدمات
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟
@@ -179,7 +179,7 @@ CloneProduct=استنساخ المنتجات أو الخدمات
 ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ <b>٪ ق؟</b>
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
 CustomerPrices=أسعار العملاء
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 34c6bea737f..26d051445c3 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
 MyTasks=مهمتي
diff --git a/htdocs/langs/ar_SA/resource.lang b/htdocs/langs/ar_SA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ar_SA/resource.lang
+++ b/htdocs/langs/ar_SA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 96323e4b1bb..5d7a45bbe66 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=الائتمان على
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
-DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 2300a4772e8..0516b22b16e 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Използвайте автоматично довъ
 ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Опции на филтрите за търсене
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 ViewFullDateActions=Показване на пълните събития дати в третия лист
@@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули осигуряват прост пре
 ModulesMarketPlaceDesc=Можете да намерите повече модули за изтегляне на външни уеб-сайтове в Интернет ...
 ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
 URL=Връзка
 BoxesAvailable=Налични Кутии
@@ -444,7 +447,7 @@ Module55Desc=Управление на баркод
 Module56Name=Телефония
 Module56Desc=Телефония интеграция
 Module57Name=Постоянните поръчки
-Module57Desc=Постоянни нареждания и оттегляне управление
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция на ClickToDial система (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS емисия
 Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
 Module330Name=Отметки
 Module330Desc=Управление на отметки
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Категории
 Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Дневен ред
@@ -503,6 +508,8 @@ Module2500Name=Електронно Управление на Съдържани
 Module2500Desc=Запазване и споделяне на документи
 Module2600Name=WebServices
 Module2600Desc=Активирайте сървъра на Dolibarr за уеб услуги
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Използвайте онлайн Gravatar услуга (www.gravatar.com), за да покаже снимка на потребители / членове с техните имейли. Нуждаете се от интернет
 Module2800Desc=FTP Клиент
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
 Module50100Name=Точка на продажбите
@@ -527,7 +534,7 @@ Module50200Desc=Модул предлага онлайн страница на 
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Полета
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup спаси
 BackToModuleList=Обратно към списъка с модули
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Вашата система е актуализиран успешно
 CompanyInfo=Информация за фирмата/организацията
 CompanyIds=Идентичност на фирмата/организацията
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index b97d5a8658d..6affd27cc53 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Събития възложени на
 ActionsDoneBy=Събития извършени от
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Всички мои събития/задачи
 AllActions= Всички събития/задачи
 ViewList=Списъчен изглед
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 9aa1fa85417..0830bcfd2d3 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
 ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
 ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index b78304394ed..1aa00c03e0e 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
 ListOfRunningServices=Списък на стартираните услуги
 NotActivatedServices=Неактивни услуги (сред валидирани договори)
 BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Последните %s активирани услуги
 LastModifiedServices=Последните %s променени услуги
 EditServiceLine=Редактиране на сервизна линия
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Търговски представител подписване на договора
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 494b1ede1e0..f75d1b490b1 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Доставчик изисква код
 ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва
 ErrorBadParameters=Лошите параметри
 ErrorBadValueForParameter=Грешна стойност &quot;%s&quot; за параметрите неправилни &quot;%s&quot;
-ErrorBadImageFormat=Image файла не е поддържан формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Стойност има грешна дата формат
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Неуспех при запис в директорията %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
 ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ...
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all page
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningNotRelevant=Irrelevant operation for this dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s.
+WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 15bb3fbe4ff..88566d73fdb 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Със закъснение
 SubscriptionNotReceivedShort=Не е получаван
 ListOfSubscriptions=Списък на членския внос
 SendCardByMail=Изпращане на карта по имейл
-AddMember=Добавяне на член
+AddMember=Create member
 NoTypeDefinedGoToSetup=Не са зададени типове членове. Отидете на менюто "Типове членове"
 NewMemberType=Нов тип член
 WelcomeEMail=E-mail за приветствие
@@ -125,7 +125,7 @@ Date=Дата
 DateAndTime=Дата и час
 PublicMemberCard=Публична карта на член
 MemberNotOrNoMoreExpectedToSubscribe=-Членка не може или не повече очаква да се абонирате
-AddSubscription=Добавяне на чл. внос
+AddSubscription=Create subscription
 ShowSubscription=Покажи чл. внос
 MemberModifiedInDolibarr=Члена е променен в Dolibarr
 SendAnEMailToMember=Изпращане на информационен имейл до член
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 1fdf4f81644..4d6d702069e 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ако продуктът е услуга с ограни
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Категории цени
-AssociatedProductsAbility=Активиране на виртуалните продукти да се отличават
-AssociatedProducts=Виртуален продукт
-AssociatedProductsNumber=Брой на продуктите, съставящи този виртуален продукт
-ParentProductsNumber=Брой на основния виртуален продукт
-IfZeroItIsNotAVirtualProduct=Ако е 0, този продукт не е виртуален продукт
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Асоцииране
 Translation=Превод
 KeywordFilter=Филтър по ключова дума
@@ -132,7 +132,7 @@ AddDel=Добавяне/Изтриване
 Quantity=Количество
 NoMatchFound=Не са намерени съвпадения
 ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати)
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт
 DeleteProduct=Изтриване на продукта/услугата
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга?
@@ -179,7 +179,7 @@ CloneProduct=Клониране на продукт или услуга
 ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата <b>%s?</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
 CustomerPrices=Цени за клиенти
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 95d094a6934..0b34f372aab 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Този възглед представя всички проекти
 Myprojects=Моите проекти
 ProjectsArea=Проекти област
 NewProject=Нов проект
-AddProject=Добави проект
+AddProject=Create project
 DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Сигурен ли сте, че искате да изтриете този проект?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
 MyTasks=Моите задачи
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Нова задача
-AddTask=Добавяне на задача
+AddTask=Create task
 AddDuration=Добави продължителността
 Activity=Дейност
 Activities=Задачите / дейностите
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
-UnlinkElement=Unlink element
+UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
 PlannedWorkload = Planned workload
@@ -129,4 +131,4 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
diff --git a/htdocs/langs/bg_BG/resource.lang b/htdocs/langs/bg_BG/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/bg_BG/resource.lang
+++ b/htdocs/langs/bg_BG/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index cf10ed07746..cb289ea4725 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Кредит за
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Покажи Теглене
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
-DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Плащане на постоянно нареждане %s от банката
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 39c2732ec29..954d9c60650 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
+Accounting=Računovodstvo
 Globalparameters=Global parameters
 Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 8e1c91270ef..19cb28c82fd 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Dodaj opciju filter za prikazivanje/sakrivanje trećih stranaka koji su trenutno u aktivnosti ili su prestali
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli pružaju jednostavane unparijed postavljenje post
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Upravljanje workflow-om - tokom rada
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print preko Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Postavke snimljene
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 5059966f54a..1b80e817bee 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Događaji dodijeljeni korisniku
 ActionsDoneBy=Događaji završeni od strane korisnika
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewList=Lista
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 98aa9a4e395..3cb7124de3a 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 272cd202ef8..4952376c86c 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista stavki aktivnih ugovora
 ListOfRunningServices=Lista aktivnih usluga
 NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima)
 BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Zadnjih $s aktiviranih usluga
 LastModifiedServices=Zadnjih %s izmijenjenih usluga
 EditServiceLine=Izmijeni stavku usluge
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga pred isticanje
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik prodaje koji potpisuje ugovor
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 42620a9f0e4..90ab1fa6e30 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 95c53abeecf..465c2e15488 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših koris
 Myprojects=Moji projekti
 ProjectsArea=Područje za projekte
 NewProject=Novi projekat
-AddProject=Dodaj projekat
+AddProject=Create project
 DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite obrisati ovaj projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nova provedeno vrijeme
 MyTimeSpent=Moje provedeno vrijeme
 MyTasks=Moji zadaci
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Novi zadatak
-AddTask=Dodaj zadatak
+AddTask=Create task
 AddDuration=Dodaj trajanje
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
diff --git a/htdocs/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/bs_BA/resource.lang
+++ b/htdocs/langs/bs_BA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index bbc20358aeb..e4e4dce6e69 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=Ova kartica vam omogućava da zatražite trajni nalog. Kada je potpuna, možete izvršiti plaćanje za zatvaranje računa.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 262ca3919fc..739cd6fb23b 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcions filtres de cerca
 NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
 ViewFullDateActions=Veure les dades de les accions en la seva totalitat en la fitxa de tercer
@@ -208,6 +210,7 @@ ModulesJobDesc=Els mòduls específics permeten una preconfiguració simplificad
 ModulesMarketPlaceDesc=Hi ha disponbiles per a baixar en llocs externs d'Internet altres mòduls / extensions...
 ModulesMarketPlaces=Més mòduls...
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Llocs proveïdors a consultar per trobar més mòduls
 URL=Enllaç
 BoxesAvailable=Panells disponibles
@@ -444,7 +447,7 @@ Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
 Module56Desc=Gestió de la telefonia
 Module57Name=Domiciliacions
-Module57Desc=Gestió de domiciliacions i reintegraments bancaris
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Fils RSS
 Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
 Module330Name=Bookmarks
 Module330Desc=Gestió de bookmarks
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Gestió de categories (productes, proveïdors i clients)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestor de tasques programades
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestió Electrònica de Documents
 Module2500Desc=Permet administrar una base de documents
 Module2600Name=WebServices
 Module2600Desc=Activa els serveis de servidor web services de Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilitza el servei en línia de Gravatar (www.gravatar.com) per mostrar fotos dels usuaris/membres (que es troben en els seus missatges de correu electrònic). Necessita un accés a Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
 Module50100Name=TPV
@@ -527,7 +534,7 @@ Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de c
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Márgenes
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Configuració desada
 BackToModuleList=Retornar llista de mòduls
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte a utilitzar (codi d'idioma)
 EnableMultilangInterface=Activar interface multiidioma
 EnableShowLogo=Mostra el logotip en el menú de l'esquerra
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=El seu sistema està actualitzat
 CompanyInfo=Informació de l'empresa/institució
 CompanyIds=Identificació reglamentaria
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index c66562e7c11..a9c55c4f272 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Esdeveniments assignats a
 ActionsDoneBy=Esdeveniments realitzats per
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Tots els meus esdeveniments/tasques
 AllActions= Tots els esdeveniments/tasques
 ViewList=Vista llistat
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index fc6efa906e0..098a65b11f5 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per a
 TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index bd31f48ce5d..be202d8b593 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei
 ListOfRunningServices=Llistat de serveis actius
 NotActivatedServices=Serveis no activats (amb els contractes validats)
 BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Els %s darrers serveis activats
 LastModifiedServices=Els  %s darrers serveis modificats
 EditServiceLine=Edició línia del servei
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Llistat de serveis actius a expirar
 NoteListOfYourExpiredServices=Aquest llistat conté només els serveis de contractes de tercers dels que vostè és comercial
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 61148a83890..d841687a0c3 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Codi proveïdor obligatori
 ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
 ErrorBadParameters=Paràmetres incorrectes
 ErrorBadValueForParameter=Valor '%s' incorrecte per al paràmetre '%s'
-ErrorBadImageFormat=La imatge no té un format reconegut
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=No es pot escriure a la carpeta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
 ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index c09107519fd..6a164471ba2 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -8,7 +8,7 @@ Members=Membres
 MemberAccount=Login membre
 ShowMember=Mostrar fitxa membre
 UserNotLinkedToMember=Usuari no vinculat a un membre
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Etiquetes membres
 FundationMembers=Membres de l'associació
 Attributs=Atributs
@@ -85,8 +85,7 @@ SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=No rebuda
 ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar fitxa per e-mail
-AddMember=Afegir membre
-MemberType=Tipus de membre
+AddMember=Create member
 NoTypeDefinedGoToSetup=Cap tipus de membre definit. Aneu a Configuració->Tipus de membres
 NewMemberType=Nou tipus de membre
 WelcomeEMail=E-mail
@@ -126,7 +125,7 @@ Date=Data
 DateAndTime=Data i hora
 PublicMemberCard=Fitxa pública membre
 MemberNotOrNoMoreExpectedToSubscribe=No sotmesa a cotització
-AddSubscription=Afegir afiliació
+AddSubscription=Create subscription
 ShowSubscription=Mostrar afiliació
 MemberModifiedInDolibarr=Membre modificat en Dolibarr
 SendAnEMailToMember=Enviar e-mail d'informació al membre (E-mail: <b>%s</b>)
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Import de l'última cotització
 MembersStatisticsByCountries=Estadístiques de membres per país
 MembersStatisticsByState=Estadístiques de membres per població
 MembersStatisticsByTown=Estadístiques de membres per població
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Nombre de membres
 NoValidatedMemberYet=Cap membre validat trobat
 MembersByCountryDesc=Aquesta pantalla presenta una estadística del nombre de membres per país. No obstant això, el gràfic utilitza el servei en línia de gràfics de Google i només és operatiu quan es troba disponible una connexió a Internet.
@@ -202,3 +203,4 @@ MembersByNature=Membres per naturalesa
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
 NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ca_ES/printipp.lang b/htdocs/langs/ca_ES/printipp.lang
index da015f80205..835e6827f12 100644
--- a/htdocs/langs/ca_ES/printipp.lang
+++ b/htdocs/langs/ca_ES/printipp.lang
@@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuració del mòdul Impressió directa IPP
-PrintIPPDesc=Aquest mòdul permet afegir un botó d'impressió directa dels seus documents cap a la seva impressora. Es requereix un sistema Linux equipat amb Cups.
-PRINTIPP_ENABLED=Mostra el logo "Impressió directa" en els llistats de documents
-PRINTIPP_HOST=Servidor d'impressió
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Contrasenya
-NoPrinterFound=No s'ha trobat cap impressora (comprovi la seva configuració Cups)
\ No newline at end of file
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index e15f7808bb4..e8b8b6b5053 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Si el servei és de durada limitada:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preus
 MultiPriceLevelsName=Categoria de preus
-AssociatedProductsAbility=Activar productes compostos
-AssociatedProducts=Productes compostos
-AssociatedProductsNumber=Nº de productes que composen aquest producte
-ParentProductsNumber=Nº de productes que aquest producte compon
-IfZeroItIsNotAVirtualProduct=Si 0, aquest producte no és un producte virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, aquest producte no està sent utilitzat per cap producte virtual
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Compondre
 Translation=Traducció
 KeywordFilter=Filtre per clau
@@ -132,7 +132,7 @@ AddDel=Adjuntar/Retirar
 Quantity=Quantitat
 NoMatchFound=No s'han trobat resultats
 ProductAssociationList=Llistat de productes/serveis components d'aquest producte: el nombre entre parèntesis és la quantitat afectada en aquesta composició
-ProductParentList=Llistat de productes/serveis amb aquest producte com a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
@@ -179,7 +179,7 @@ CloneProduct=Clonar producte/servei
 ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei <b>%s</b> ?
 CloneContentProduct=Clonar només la informació general del producte/servei
 ClonePricesProduct=Clonar la informació general i els preus
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del nou producte/servei
 CustomerPrices=Preus clients
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 8caccc50f04..49d18cb3d36 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritza
 Myprojects=Els meus projectes
 ProjectsArea=Àrea projectes
 NewProject=Nou projecte
-AddProject=Crear projecte
+AddProject=Create project
 DeleteAProject=Eliminar un projecte
 DeleteATask=Eliminar una tasca
 ConfirmDeleteAProject=Esteu segur de voler eliminar aquest projecte?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nou temps dedicat
 MyTimeSpent=El meu temps dedicat
 MyTasks=Les meves tasques
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nova tasca
-AddTask=Afegir tasca
+AddTask=Create task
 AddDuration=Indicar durada
 Activity=Activitat
 Activities=Tasques/activitats
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index bf3bbac2ebb..9a4eef3a705 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Veure domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
-DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Abonament de domiciliació %s pel banc
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index bcbc227a151..e4a6da486cf 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí třetích stran, které jsou v současné době v činnosti nebo ji ukončili
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Nastavení vyhledávání
 NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
 ViewFullDateActions=Zobrazit rozšířené datumy události v třetím listu
@@ -208,6 +210,7 @@ ModulesJobDesc=Obchodní moduly poskytují jednoduché nastavení systému Dolib
 ModulesMarketPlaceDesc=Více modulů naleznete ke stažení na externích webových stránkách ...
 ModulesMarketPlaces=Více modulů ...
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Weboví poskytovatelé Dolibarr modulů ...
 URL=Odkaz
 BoxesAvailable=Boxy jsou k dispozici
@@ -444,7 +447,7 @@ Module55Desc=Barcode řízení
 Module56Name=Telefonie
 Module56Desc=Telefonie integrace
 Module57Name=Trvalé příkazy
-Module57Desc=Trvalé příkazy a abstinenční řízení
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr
 Module330Name=Záložky
 Module330Desc=Správa záložek
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
 Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
@@ -495,6 +498,8 @@ Module1780Name=Kategorie
 Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plánované správu úloh
 Module2400Name=Pořad jednání
@@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakční
 Module2500Desc=Uložit a sdílet dokumenty
 Module2600Name=WebServices
 Module2600Desc=Povolit Dolibarr webových služeb serveru
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Pomocí on-line služby (Gravatar www.gravatar.com) ukázat fotku uživatelů / členů (nalezen s jejich e-maily). Potřebujete přístup k internetu
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
 Module50100Name=Bod prodeje
@@ -527,7 +534,7 @@ Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Payp
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Tisk přes poháry tiskárny IPP.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavení uloženo
 BackToModuleList=Zpět na seznam modulů
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Výchozí jazyk používat (kód jazyka)
 EnableMultilangInterface=Povolit vícejazyčné rozhraní
 EnableShowLogo=Zobrazit logo na levém menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systém byl úspěšně aktualizován
 CompanyInfo=Společnosti / Nadace informace
 CompanyIds=Společnost / nadace identity
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 08e0a334726..06b4b7d4a32 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Akce přiřazené
 ActionsDoneBy=Akce provedené
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Všechny mé akce / úkoly
 AllActions= Všechny události / úkoly
 ViewList=Zobrazení seznamu
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 84074b96401..aa187c9880e 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití <b>hotovosti evidence</b> režim není relevantní. Tato zpráva je k dispozici pouze při použití <b>zásnubní evidence</b> režimu (viz nastavení účetního modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index e8a6754c08e..792ed511937 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam běžících smluv linek
 ListOfRunningServices=Seznam spuštěných služeb
 NotActivatedServices=Neaktivní služby (u ověřených smluv)
 BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Poslední %s aktivaci služby
 LastModifiedServices=Poslední %s upravené služby
 EditServiceLine=Upravit linka
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam služeb vyprší
 NoteListOfYourExpiredServices=Tento seznam obsahuje pouze služby smluv pro třetí strany si jsou propojeny jako obchodního zástupce.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodní zástupce podpisu smlouvy
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 54a9f2bcc25..57331cb59c0 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodavatel povinen kód
 ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Chybná hodnota &quot;%s&quot; pro nastavení parametrů nesprávných &quot;%s&quot;
-ErrorBadImageFormat=Obrazový soubor nemá podporovaný formát
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávný formát data
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nepodařilo se zapsat do adresáře %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uživatel s přihlášením <b>%s</b> nebyl nalezen.
 ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces přerušena.
 ErrorBadValueForCode=Bad hodnota bezpečnostního kódu. Zkuste to znovu s novou hodnotou ...
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být negativní
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b>%s</b> použít ke spuštění webový server nemá oprávnění pro které
 ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index f7f6fde39a5..d2f00c116d8 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -8,7 +8,7 @@ Members=Členové
 MemberAccount=Vstup pro členy
 ShowMember=Zobrazit členskou kartu
 UserNotLinkedToMember=Uživatel není spojena s členem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Členové Vstupenky
 FundationMembers=Členy Nadace
 Attributs=Atributy
@@ -85,8 +85,7 @@ SubscriptionLateShort=Pozdě
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Seznam předplatné
 SendCardByMail=Poslat kartu e-mailem
-AddMember=Přidat člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žádný člen definovány typy. Jdi na menu &quot;Členové typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vítejte e-mail
@@ -126,7 +125,7 @@ Date=Datum
 DateAndTime=Datum a čas
 PublicMemberCard=Členské veřejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, který nebo ne více očekává, že k odběru
-AddSubscription=Přidat předplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobrazit předplatné
 MemberModifiedInDolibarr=Člen upraven v Dolibarr
 SendAnEMailToMember=Poslat e-mail Informace o členovi
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Poslední úpisu
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členů
 NoValidatedMemberYet=Žádné ověřené členy nalezeno
 MembersByCountryDesc=Tato obrazovka vám ukáže statistiku členů jednotlivých zemích. Grafika však závisí na Google on-line služby grafu a je k dispozici pouze v případě, je připojení k internetu funguje.
@@ -202,3 +203,4 @@ MembersByNature=Členové od přírody
 VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
 NoVatOnSubscription=Ne TVA za upsaný vlastní kapitál
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozornit při Dolibarr obdržíte potvrzení o ověřenou platby za předplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/cs_CZ/printipp.lang b/htdocs/langs/cs_CZ/printipp.lang
index 7ef2cd5649d..835e6827f12 100644
--- a/htdocs/langs/cs_CZ/printipp.lang
+++ b/htdocs/langs/cs_CZ/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: cs_CZ
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-10-26 11:58:10
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-10-26 11:58:10).
-// Reference language: en_US -> cs_CZ
-PrintIPPSetup=Nastavení modulu Přímý tisk
-PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem přímé des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháry.
-PRINTIPP_ENABLED=Zobrazit Piktogram &quot;Přímý tisk&quot; do seznamu dokumentů
-PRINTIPP_HOST=Tiskový server
-PRINTIPP_PORT=Přístav
-PRINTIPP_USER=Přihlášení
-PRINTIPP_PASSWORD=Heslo
-NoPrinterFound=Žádné tiskárny nalezeny (zkontrolujte poháry Nasta)
-// STOP - Lines generated via autotranslator.php tool (2013-10-26 12:39:36).
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 7829116108a..43becba423e 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobek je služba s omezeným trváním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cen
 MultiPriceLevelsName=Cenová kategorie
-AssociatedProductsAbility=Aktivace virtuální produkty se vyznačují
-AssociatedProducts=Virtuální produkt
-AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt
-ParentProductsNumber=Počet mateřské virtuální produkt
-IfZeroItIsNotAVirtualProduct=Pokud je 0, tento produkt není virtuální produkt
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobek není používán žádným virtuální produkt
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociovat
 Translation=Překlad
 KeywordFilter=Klíčové slovo filtr
@@ -132,7 +132,7 @@ AddDel=Přidat / Smazat
 Quantity=Množství
 NoMatchFound=Ne nalezena shoda
 ProductAssociationList=Seznam souvisejících produktů / služeb: název produktu / služby (množství ovlivněny)
-ProductParentList=Seznam virtuálních produktů / služeb s tímto produktem jako součást
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedním z vybraného produktu je rodič s aktuální produkt
 DeleteProduct=Odstranění produktu / služby
 ConfirmDeleteProduct=Jste si jisti, že chcete smazat tento výrobek / službu?
@@ -179,7 +179,7 @@ CloneProduct=Clone produkt nebo službu
 ConfirmCloneProduct=Jste si jisti, že chcete klonovat produktů nebo služeb <b>%s?</b>
 CloneContentProduct=Klon všechny hlavní informace o produktu / služby
 ClonePricesProduct=Klonovat hlavní informace a ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu / služby
 CustomerPrices=Prodejní ceny
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 52d88d6a4dd..434b6b86f3d 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské
 Myprojects=Moje projekty
 ProjectsArea=Projekty
 NewProject=Nový projekt
-AddProject=Přidat projekt
+AddProject=Create project
 DeleteAProject=Odstranit projekt
 DeleteATask=Odstranit úkol
 ConfirmDeleteAProject=Jste si jisti, že chcete smazat tento projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový strávený čas
 MyTimeSpent=Můj strávený čas
 MyTasks=Moje úkoly
@@ -45,7 +47,7 @@ TaskDateStart=Datum zahájení úkolu
 TaskDateEnd=Datum ukončení úkolu
 TaskDescription=Popis úkolu
 NewTask=Nový úkol
-AddTask=Přidat úkol
+AddTask=Create task
 AddDuration=Přidat trvání
 Activity=Činnost
 Activities=Úkoly / činnosti
diff --git a/htdocs/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/cs_CZ/resource.lang
+++ b/htdocs/langs/cs_CZ/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 086bf5db2b5..09545ace787 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Zobrazit Natáhněte
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Odstoupení soubor
 SetToStatusSent=Nastavte na stav &quot;odeslaný soubor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Platba %s trvalého příkazu bankou
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index d46556e6e38..92eb78a915a 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Brug automatisk udfyldning af felter til at vælge tred
 ActivityStateToSelectCompany= Tilføj en filter mulighed for at vise / skjule thirdparties, der i øjeblikket i aktivitet eller er ophørt den
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Brug automatisk udfyldning af felter til at vælge kontakt (i stedet for at bruge en liste).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Søg filtre optioner
 NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
 ViewFullDateActions=Vis fuld datoer aktioner i tredje ark
@@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler give simple foruddefineret opsætning af Dolibar
 ModulesMarketPlaceDesc=Du kan finde flere moduler for at downloade på eksterne hjemmesider på internettet ...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site udbydere kan du søge at finde flere moduler ...
 URL=Link
 BoxesAvailable=Bokse til rådighed
@@ -444,7 +447,7 @@ Module55Desc=Stregkoder 'ledelse
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående ordrer
-Module57Desc=Stående ordrer og tilbagetrækninger 'ledelse
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider
 Module330Name=Bogmærker
 Module330Desc=Bogmærker 'ledelse
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Elektronisk Content Management
 Module2500Desc=Gemme og dele dokumenter
 Module2600Name=WebServices
 Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Har brug for en internetadgang
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX
 Module50100Name=Cash desk
@@ -527,7 +534,7 @@ Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog til brug (sprog code)
 EnableMultilangInterface=Aktiver flersproget grænseflade
 EnableShowLogo=Vis logo på venstre menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Dit system er blevet opdateret med succes
 CompanyInfo=Company / fundament oplysninger
 CompanyIds=Company / fundament identiteter
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index bafe7810175..577f4ba40ef 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Aktioner påvirkes i
 ActionsDoneBy=Aktioner udført af
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle mine handlinger / opgaver
 AllActions= Alle les handlinger / opgaver
 ViewList=Vis liste
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 23ddcc67510..ded8d2c0619 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index f46b393f678..73a7e126d9e 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste over kører kontrakt linjer
 ListOfRunningServices=Liste over kører tjenester
 NotActivatedServices=Ikke aktiverede tjenester (blandt valideret kontrakter)
 BoardNotActivatedServices=Tjenester for at aktivere blandt valideret kontrakter
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Seneste %s aktiveret tjenester
 LastModifiedServices=Seneste %s modificerede tjenester
 EditServiceLine=Rediger service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salg repræsentant, der underskriver kontrakt
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index ca87688e893..2b99a1f9166 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandør kode kræves
 ErrorSupplierCodeAlreadyUsed=Leverandør koden allerede anvendes
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Forkert værdi &quot;%s&quot; for parameter forkerte &quot;%s forb.
-ErrorBadImageFormat=Billede fil har ikke et understøttet format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Værdi '%s' har forkert datoformat
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Det lykkedes ikke at skrive i mappen %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruger med <b>login %s</b> kunne ikke findes.
 ErrorLoginHasNoEmail=Denne bruger har ingen e-mail-adresse. Processen afbrydes.
 ErrorBadValueForCode=Bad værdi former for kode. Prøv igen med en ny værdi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Brugerkonto <b>%s</b> anvendes til at udføre web-server har ikke tilladelse til at
 ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index c638bb3c968..c0a8555be79 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -8,7 +8,7 @@ Members=Medlemmer
 MemberAccount=Medlem login
 ShowMember=Vis medlem kortet
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Medlemmer Billetter
 FundationMembers=Instituttets medlemmer
 Attributs=Attributter
@@ -85,8 +85,7 @@ SubscriptionLateShort=Sen
 SubscriptionNotReceivedShort=Aldrig modtaget
 ListOfSubscriptions=Liste over abonnementer
 SendCardByMail=Send kort
-AddMember=Tilføj medlem
-MemberType=Medlem type
+AddMember=Create member
 NoTypeDefinedGoToSetup=Intet medlem definerede typer. Gå til opsætning - Medlemmer typer
 NewMemberType=Nyt medlem type
 WelcomeEMail=Velkommen e-mail
@@ -126,12 +125,12 @@ Date=Dato
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kortet
 MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke længere forventes at abonnere
-AddSubscription=Tilføj abonnement
+AddSubscription=Create subscription
 ShowSubscription=Vis tegning
 MemberModifiedInDolibarr=Medlem ændret i Dolibarr
 SendAnEMailToMember=Send information email til medlem
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail emne til medlem autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=EMail for medlem autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=E-mail emne til medlem validering
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail emne til medlem resiliation
 DescADHERENT_MAIL_RESIL=E-mail for medlem resiliation
 DescADHERENT_MAIL_FROM=Sender e-mail for automatiske e-mails
 DescADHERENT_ETIQUETTE_TYPE=Etiketter format
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format af kort side
 DescADHERENT_CARD_HEADER_TEXT=Tekst trykt på toppen af medlem-kort
 DescADHERENT_CARD_TEXT=Tekst påtrykt medlem kort
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr. tredjepart forbundet til dette medlem
 ThirdPartyDolibarr=Dolibarr tredjepart
 MembersAndSubscriptions= Medlemmer og Subscriptions
 MoreActions=Supplerende aktion om kontrolapparatet
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Opret en direkte transaktion record på grund
 MoreActionBankViaInvoice=Opret en faktura og acontobeløb
 MoreActionInvoiceOnly=Opret en faktura uden betaling
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Sidste tegningsbeløbet
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Antal medlemmer
 NoValidatedMemberYet=Ingen validerede medlemmer fundet
 MembersByCountryDesc=Denne skærm viser dig statistikker over medlemmer af lande. Grafisk afhænger dog på Google online-graf service og er kun tilgængelig, hvis en internetforbindelse virker.
@@ -196,9 +197,10 @@ Collectivités=Organisationer
 Particuliers=Personlig
 Entreprises=Virksomheder
 DOLIBARRFOUNDATION_PAYMENT_FORM=For at gøre dit abonnement betaling med en bankoverførsel, se side <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> At betale med kreditkort eller Paypal, klik på knappen nederst på denne side. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 332c8629569..b267137b5e1 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis produktet er en tjeneste med begrænset varighed:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktiver tilhørende produkter
-AssociatedProducts=Tilhørende produkter
-AssociatedProductsNumber=Antallet af tilknyttede produkter
-ParentProductsNumber=Antal forælder produkt
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Oversættelse
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Tilføj / Slet
 Quantity=Mængde
 NoMatchFound=Ingen match fundet
 ProductAssociationList=Liste over relaterede produkter / tjenesteydelser: navn på produkt / tjeneste (mængde påvirkes)
-ProductParentList=Liste over produkter / services med dette produkt som en komponent
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet et produkt / service
 ConfirmDeleteProduct=Er du sikker på du vil slette dette produkt / service?
@@ -179,7 +179,7 @@ CloneProduct=Klon vare eller tjenesteydelse
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller <b>tjenesteydelse %s?</b>
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
 ClonePricesProduct=Klon vigtigste informationer og priser
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dette produkt er brugt
 NewRefForClone=Ref. af nye produkter / ydelser
 CustomerPrices=Kunder priser
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 1ce1b5f81bd..db358f6bdad 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertill
 Myprojects=Mine projekter
 ProjectsArea=Projekter område
 NewProject=Nyt projekt
-AddProject=Tilføj projekt
+AddProject=Create project
 DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
 ConfirmDeleteAProject=Er du sikker på du vil slette dette projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mine opgaver
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ny opgave
-AddTask=Tilføj opgave
+AddTask=Create task
 AddDuration=Tilføj varighed
 Activity=Aktivitet
 Activities=Opgaver / aktiviteter
diff --git a/htdocs/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/da_DK/resource.lang
+++ b/htdocs/langs/da_DK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index fb881515567..11dda452e35 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Vis Træk
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
-DoStandingOrdersBeforePayments=Denne faner giver dig mulighed for at anmode om en stående ordre. Når den bliver færdig, kan du skrive betalingen for at lukke fakturaen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling af stående ordre %s af banken
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index f1168a1fce5..bf4499985bc 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwen
 ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind.
 UseSearchToSelectContactTooltip=Wenn Sie eine große Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContact=Suchfeld statt Listenansicht für Kontaktauswahl verwenden.
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Suchfilter Optionen
 NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
 ViewFullDateActions=Zeige alle Terminaktionen in der Partneransicht
@@ -208,6 +210,7 @@ ModulesJobDesc=Die Geschäftstypenmodule erlauben eine einfache Einrichtung des
 ModulesMarketPlaceDesc=Hier finden Sie weitere Module auf externen Web-Sites
 ModulesMarketPlaces=Sie können zusätzliche Module im Web finden...
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Website-Anbieter für Ihre Suche nach weiteren Modulen
 URL=Link
 BoxesAvailable=Verfügbare Boxen
@@ -396,7 +399,7 @@ ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer übersc
 ExternalModule=Externes Modul - im Verzeichnis %s installiert
 BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcodes löschen?
@@ -437,14 +440,14 @@ Module52Name=Produktbestände
 Module52Desc=Produktbestandsverwaltung
 Module53Name=Leistungen
 Module53Desc=Leistungs-Verwaltung
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Kontrakte/Abonnements
+Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos)
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
 Module57Name=Daueraufträge
-Module57Desc=Daueraufträge und Retourenverwaltung (RMA)
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-Feed
 Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
 Module330Name=Lesezeichen
 Module330Desc=Lesezeichenverwaltung
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
@@ -495,6 +498,8 @@ Module1780Name=Kategorien
 Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
+Module2200Name=Dynamische Preise
+Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
 Module2300Desc=Verwaltung geplanter Aufgaben
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Inhaltsverwaltung(ECM)
 Module2500Desc=Speicherung und Verteilung von Dokumenten
 Module2600Name=WebServices
 Module2600Desc=Aktivieren Sie Verwendung von Webservices
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung
 Module2800Desc=FTP-Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
 Module39000Name=Produktstapel
-Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
+Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
 Module50000Name=PayBox
 Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
 Module50100Name=Kasse
@@ -527,7 +534,7 @@ Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlu
 Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module54000Name=PrintIPP
-Module54000Desc=Mit Cups IPP Drucker ausdrucken.
+Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
 Module55000Name=Open Poll
 Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
 Module59000Name=Gewinnspannen
@@ -606,11 +613,11 @@ Permission151=Daueraufträge einsehen
 Permission152=Dauerauftragsanträge erstellen/bearbeiten
 Permission153=Dauerauftragsbelege übertragen
 Permission154=Dauerauftragsbelege kreditieren/ablehnen
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Kontrakte/Abonnements einsehen
+Permission162=Kontrakte/Abonnements erstellen/bearbeiten
+Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren
+Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren
+Permission165=Kontrakt/Abonnement löschen
 Permission171=Reisen und Spesen einsehen (eigene und Untergebene)
 Permission172=Reisen und Spesen erstellen/ändern
 Permission173=Reisen und Spesen löschen
@@ -672,7 +679,7 @@ Permission300=Barcodes einsehen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
 Permission311=Leistungen lesen
-Permission312=Assign service/subscription to contract
+Permission312=Leistung/Abonnement einem Vertrag zuordnen
 Permission331=Lesezeichen einsehen
 Permission332=Lesezeichen erstellen/bearbeiten
 Permission333=Lesezeichen löschen
@@ -702,8 +709,8 @@ Permission701=Spenden einsehen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission1001=Warenbestände einsehen
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Warenlager erstellen/ändern
+Permission1003=Warenlager löschen
 Permission1004=Lagerbewegungen einsehen
 Permission1005=Lagerbewegungen erstellen/bearbeiten
 Permission1101=Lieferscheine einsehen
@@ -765,7 +772,7 @@ DictionaryCivility=Anredeformen
 DictionaryActions=Maßnahmen
 DictionarySocialContributions=Sozialbeitragstypen
 DictionaryVAT=MwSt.-Sätze
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryRevenueStamp=Anzahl der Steuermarken
 DictionaryPaymentConditions=Zahlungsbedingungen
 DictionaryPaymentModes=Zahlungsarten
 DictionaryTypeContact=Kontaktarten
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Bestellungen
 DictionaryAccountancyplan=Kontenplan
 DictionaryAccountancysystem=Kontenplan Modul
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gespeichert
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache der Anwendung (Sprachcode)
 EnableMultilangInterface=Mehrsprachigkeit aktivieren
 EnableShowLogo=Logo über dem linken Menü anzeigen
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Das System wurde erfolgreich aktualisiert
 CompanyInfo=Firmen-/Stiftungsinformationen
 CompanyIds=Firmen-/Stiftungs-IDs
@@ -1074,7 +1083,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:<br>* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.<br>* durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention Nummerierung Module
 TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen
 ContractsNumberingModules=Verträge Nummerierung Module
 TemplatePDFContracts=Vertragsvorlagen
 FreeLegalTextOnContracts=Freier Text auf Verträgen
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprim
 CacheByServer=Vom Server zwischengespeichert
 CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Dienstleistungen Modul Setup
@@ -1415,8 +1424,8 @@ OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s
 OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
 OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Warenlager-Modul Einstellungen
+UserWarehouse=Persönliche Warenläger verwenden
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
@@ -1482,12 +1491,12 @@ ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dess
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of Sales
 CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe 
 CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
 CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
 CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
@@ -1552,4 +1561,4 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|
 SalariesSetup=Setup of module salaries
 SortOrder=Sortierreihenfolge
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 1590b3464b3..cdf2c1620ab 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Termine zugewiesen an
 ActionsDoneBy=Termine erledigt von
 ActionsForUser=Maßnahmen für Benutzer
 ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle meine Termine/Aufgaben
 AllActions= Alle Termine / Aufgaben
 ViewList=Listenansicht
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
 ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 PropalValidatedInDolibarr=Angebot freigegeben
 InvoiceValidatedInDolibarr=Rechnung freigegeben
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
 OrderValidatedInDolibarr= Bestellung %s freigegeben
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index e1d23dec501..13aa22245fc 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Buchhaltungscode-Journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Dienstleistungen zu kaufen
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Dienstleistungen zu verkaufen
 ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen
 ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index bd84dd8ed7e..0027d817391 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Vertragsübersicht
 ListOfContracts=Liste der Verträge
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Letzte %s geänderte Kontrakte
 AllContracts=Alle Verträge
 ContractCard=Vertragskarte
 ContractStatus=Vertragsstatus
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
 ListOfRunningServices=Liste aktiver Services
 NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
 BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen)
-LastContracts=Last % contracts
+LastContracts=Letzte %s Kontrakte
 LastActivatedServices=%s zuletzt aktivierte Services
 LastModifiedServices=%s zuletzt bearbeitete Services
 EditServiceLine=Service-Position bearbeiten
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste der Services die ablaufen
 NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. 
 StandardContractsTemplate=Standard Vertragsschablone 
 ContactNameAndSignature=Für %s, Name und Unterschrift
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index f63c423a33c..dddf3eb47c6 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Ko
 CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen
 # Menu
 CronJobs=Geplante Jobs
-CronListActive=List of active/scheduled jobs
+CronListActive=Liste der aktiven/geplanten Jobs
 CronListInactive=Liste der deaktivierten Jobs
 # Page list
 CronDateLastRun=Letzte Ausführung
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index c509a7ce090..55b246e3c98 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Lieferanten-Nr. erforderlich
 ErrorSupplierCodeAlreadyUsed=Diese Lieferanten Nr. ist bereits vergeben.
 ErrorBadParameters=Ungültige Werte
 ErrorBadValueForParameter=Falscher Wert '%s' für falsche Parameter '%s'
-ErrorBadImageFormat=Imagedatei hat nicht ein unterstütztes Dateiformat
+ErrorBadImageFormat=Bildformat nicht unsterstützt (Ihr PHP hat keine Konvertierungsfunktion für dieses Format)
 ErrorBadDateFormat=Eintrag '%s' hat falsche Datumsformat
 ErrorWrongDate=Falsches Datum!
 ErrorFailedToWriteInDir=Fehler beim Schreiben in das Verzeichnis %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> konnte nicht gefunden w
 ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebrochen.
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
 ErrorBothFieldCantBeNegative=Die Felder %s und %s können nicht gleichzeitig negativ sein
+ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nicht negativ sein
 ErrorWebServerUserHasNotPermission=Der Benutzerkonto <b>%s</b> wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür.
 ErrorNoActivatedBarcode=Kein Barcode aktiviert
 ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist no
 ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich.
 ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
 ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
+ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden
+ErrorPriceExpression2=Die eingebaute Funktion '%s' kann nicht neu definiert werden
+ErrorPriceExpression3=Nicht definierte Variable '%s' in Funktionsdefinition
+ErrorPriceExpression4=Nicht erlaubtes Zeichen '%s'
+ErrorPriceExpression5='%s' unerwartet
+ErrorPriceExpression6=Falsche Anzahl Argumente (%s angegeben, %s erwartet)
+ErrorPriceExpression8=Unerwarteter operator '%s'
+ErrorPriceExpression9=Ein unerwarteter Fehler ist aufgetreten
+ErrorPriceExpression10=Operand fehlt bei Operator '%s' 
+ErrorPriceExpression11='%s' erwartet
+ErrorPriceExpression14=Division durch Null
+ErrorPriceExpression17=Nicht definierte Variable '%s
+ErrorPriceExpression19=Ausdruck nicht gefunden
+ErrorPriceExpression20=Leerer Ausdruck
+ErrorPriceExpression21=Leeres Ergebnis '%s'
+ErrorPriceExpression22=Negatives Ergebnis '%s'
+ErrorPriceExpressionInternal=Interner Fehler '%s'
+ErrorPriceExpressionUnknown=Unbekannter Fehler '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtlic
 WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte).
 WarningNotRelevant=Operation für dieses Daten-Set nicht relevant
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnungsdatum (%s) für Rechnung %s.
+WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse. Bitte nutzen Sie mehr Filter
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 881b4946d83..8a91a8911c4 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -115,7 +115,7 @@ SentBy=Gesendet von
 MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
 MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
 ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 TargetsReset=Liste leeren
 ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren
 ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
@@ -124,7 +124,7 @@ NbOfEMailingsSend=Massenmails versandt
 IdRecord=Eintrag-ID
 DeliveryReceipt=Zustellbestätigung
 YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem <b>Komma</b>
-TagCheckMail=Track mail opening
+TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
 TagSignature=Signatur des Absenders
 TagMailtoEmail=E-Mailadresses des Empfängers
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
 AddNewNotification=Neues E-Mail-Beachrichtigungsziel aktivieren
 ListOfActiveNotifications=Liste aller aktiven E-Mail-Beachrichtigungsziele
 ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden.
+MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 3bbcef686ed..02362bbd665 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Verspätet
 SubscriptionNotReceivedShort=Nie erhalten
 ListOfSubscriptions=Liste der Abonnements
 SendCardByMail=Karte per E-Mail versenden
-AddMember=Mitglied hinzufügen
-MemberType=Mitgliedsart
+AddMember=Mitglied erstellen
 NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsarten definiert. Sie können dies unter Einstellungen-Mitgliedsarten vornehmen.
 NewMemberType=Neue Mitgliedsart
 WelcomeEMail=Willkommen E-Mail
@@ -126,7 +125,7 @@ Date=Datum
 DateAndTime=Datum und Uhrzeit
 PublicMemberCard=Öffentliche Mitgliedskarte
 MemberNotOrNoMoreExpectedToSubscribe=Mitglied ohne (und ohne Aussicht auf) Abonnement
-AddSubscription=Abonnement hinzufügen
+AddSubscription=Abonnement erstellen
 ShowSubscription=Zeige Abonnement
 MemberModifiedInDolibarr=Mitglied bearbeitet
 SendAnEMailToMember=Informations-E-Mail an Mitglied senden
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Partner verknüpft
 ThirdPartyDolibarr=Partner
 MembersAndSubscriptions= Mitglieder und Abonnements
 MoreActions=Ergänzende Erfassungsmaßnahmen
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Autom. einen Einzugsermächtigunsantrag zum Mitgliedskonto erstellen
 MoreActionBankViaInvoice=Autom. eine Rechnung zum Mitgliedskonto erstellen und Zahlung auf Rechnung setzen
 MoreActionInvoiceOnly=Autom. eine Rechnung (ohne Zahlung) erstellen
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Letzter Abo-Betrag
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
+MembersStatisticsByRegion=Mitgliederstatistik nach Region
+MemberByRegion=Mitglieder nach Region
 NbOfMembers=Anzahl der Mitglieder
 NoValidatedMemberYet=Kein freizugebenden Mitglieder gefunden
 MembersByCountryDesc=Diese Form zeigt Ihnen die Mitgliederstatistik nach Ländern. Die Grafik basiert auf Googles Online-Grafik-Service ab und funktioniert nur wenn eine Internverbindung besteht.
@@ -196,9 +197,10 @@ Collectivités=Organisationen
 Particuliers=Privatpersonen
 Entreprises=Unternehmen
 DOLIBARRFOUNDATION_PAYMENT_FORM=Um Ihre Beitragszahlung mit einer Banküberweisung auszuführen, gehen Sie zur Seite: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=nach Eigenschaften
+MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften
+MembersByNature=Members by nature
+VATToUseForSubscriptions=Mehrwertsteuersatz für Abonnements
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 3d82f643187..e222cf88f90 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -118,11 +118,11 @@ MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
 MultiPricesNumPrices=Anzahl Preise
 MultiPriceLevelsName=Preiskategorien
 AssociatedProductsAbility=Untergeordnete Produkte aktivieren
-AssociatedProducts=Unterprodukte
+AssociatedProducts=Package product
 AssociatedProductsNumber=Anzahl der Unterprodukte
-ParentProductsNumber=Anzahl der übergeordnete Produkt
-IfZeroItIsNotAVirtualProduct=Fall 0 eingestellt ist, ist das Produkt kein Unterprodukt
-IfZeroItIsNotUsedByVirtualProduct=Fall 0 eingestellt ist, wird das Produkt von keinem Unterprodukt verwendet
+ParentProductsNumber=Anzahl der übergeordneten Produkte
+IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt
+IfZeroItIsNotUsedByVirtualProduct=Falls 0 wird das Produkt von keinem Unterprodukt verwendet
 EditAssociate=Verbinden
 Translation=Übersetzung
 KeywordFilter=Stichwortfilter
@@ -132,7 +132,7 @@ AddDel=Hinzufügen/Löschen
 Quantity=Stückzahl
 NoMatchFound=Kein Eintrag gefunden
 ProductAssociationList=Liste der verknüpften Produkte/Leistungen: Name des Produkts/der Leistung (Stückzahl)
-ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als ein Bestandteil
+ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als Bestandteil
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Dienstleistung löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen?
@@ -144,7 +144,7 @@ ExportDataset_service_1=Dienstleistungen
 ImportDataset_produit_1=Produkte
 ImportDataset_service_1=Dienstleistungen
 DeleteProductLine=Produktlinie löschen
-ConfirmDeleteProductLine=Möchten Sie diese Produktlinie wirklich löschen?
+ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen?
 NoProductMatching=Kein Produkt/Leistung entspricht Ihren Suchkriterien
 MatchingProducts=Passende Produkte/Leistungen
 NoStockForThisProduct=Kein Warenbestand für dieses Produkt
@@ -179,7 +179,7 @@ CloneProduct=Produkt/Leistung duplizieren
 ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
 CustomerPrices=Kundenpreise
@@ -237,8 +237,13 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Preis des Kunden
 PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
 PricingRule=Preisregeln
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Preis je Kunde hinzufügen
 ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein
 MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Nummer
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 3569bc378b6..107b4eef252 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
 TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Neuer Zeitaufwand
 MyTimeSpent=Mein Zeitaufwand
 MyTasks=Meine Aufgaben
@@ -129,4 +131,4 @@ ProjectReferers=Bezugnahmen
 SearchAProject=Suchen Sie ein Projekt
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
 ProjectDraft=Projekt-Entwürfe
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index 6dd94c6cfc5..edcfcf065c8 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -20,10 +20,10 @@ ResourcesLinkedToElement=mit Element verknüpfte Ressourcen
 ShowResourcePlanning=Ressourcen-Planung zeigen
 GotoDate=Gehe zu Datum
 
-ResourceElementPage=Element resources
+ResourceElementPage=Element-Ressourcen
 ResourceCreatedWithSuccess=Ressource erfolgreich erstellt
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Ressourcen-Zeile erfolgreich gelöscht
+RessourceLineSuccessfullyUpdated=Ressourcen-Zeile erfolgreich aktualisiert
 ResourceLinkedWithSuccess=Ressource erfolgreich verknüpft
 
 TitleResourceCard=Ressourcen-Karte
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Ressource wirklich löschen?
 RessourceSuccessfullyDeleted=Ressource erfolgreich gelöscht
 DictionaryResourceType=Ressourcen-Typ
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Ressource wählen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index f574590148e..e7f84a4c27f 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Benutzer %s deaktiviert
 UserEnabled=Benutzer %s aktiviert
 UserDeleted=Benutzer %s entfernt
 NewGroupCreated=Gruppe %s erstellt
-GroupModified=Group %s modified
+GroupModified=Gruppe %s geändert
 GroupDeleted=Gruppe %s entfernt
 ConfirmCreateContact=Möchten Sie für diesen Kontakt wirklich ein Systembenutzerkonto anlegen?
 ConfirmCreateLogin=Möchten Sie für dieses Mitglied wirklich ein Benutzerkonto erstellen?
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 8289f34fa77..2f66393922b 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ablehnungsdatum
 RefusedReason=Ablehnungsgrund
 RefusedInvoicing=Ablehnung in Rechnung stellen
 NoInvoiceRefused=Ablehnung nicht in Rechnung stellen
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen)
 Status=Status
 StatusUnknown=Unbekannt
 StatusWaiting=Wartend
@@ -79,10 +79,11 @@ CreditDate=Am
 WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
 ShowWithdraw=Zeige Abbuchung
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn eine Rechnung mindestens eine noch zu bearbeitende Verbuchung vorweist, kann diese nicht als bezahlt markiert werden.
-DoStandingOrdersBeforePayments=Dies erlaubt Ihnen, einen Dauerauftrag anzulegen. Sobald dieser vollständig ist, können Sie den Zahlbetrag eingeben, um die Rechnung abzuschließen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Zahlung des Dauerauftrags %s
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index c3c355390c5..d77b366a57c 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -66,7 +66,7 @@ Lineofinvoice=Γραμμή τιμολογίου
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
@@ -77,9 +77,9 @@ AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρ
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
+ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο
 ACCOUNTING_CASH_JOURNAL=Cash journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
@@ -130,15 +130,15 @@ ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπο
 ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Λίστα των λογιστικών λογαριασμών
 
-Pcgversion=Version of the plan
+Pcgversion=Έκδοση του σχεδίου
 Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 Active=Statement
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Νέα οικονομική χρονιά
 
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
@@ -151,7 +151,7 @@ DescVentilSupplier=Consult here the annual breakdown accounting of your invoices
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Αυτόματη επικύρωση
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 24c2ac930a1..14ccab0887d 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Χρησιμοποιήστε τα πεδία αυτόμ
 ActivityStateToSelectCompany= Προσθέστε μια επιλογή φίλτρου για εμφάνιση / απόκρυψη ΠΕΛ./ΠΡΟΜ. τα οποία βρίσκονται σε λειτουργία ή έχει παύσει
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContact=Χρησιμοποιήστε τα πεδία αυτόματης συμπλήρωσης για να επιλέξετε την επαφή (αντί της χρήσης ενός πλαισίου λίστας).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Αναζήτηση επιλογές φίλτρων
 NumberOfKeyToSearch=Πλήθος χαρακτήρων για να ξεκινήσει η αναζήτηση: %s
 ViewFullDateActions=Εμφάνιση πλήρους χρονοδιαγράμματος γεγονότων στο φύλλο ΠΕΛ./ΠΡΟΜ.
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=Περισσότερα Αρθρώματα...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Ιστοσελίδα
 BoxesAvailable=Διαθέσιμα Πλαίσια
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Τηλεφωνία
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Σελιδοδείκτες
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
@@ -495,6 +498,8 @@ Module1780Name=Κατηγορίες
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Μενού
 Module2300Desc=Scheduled task management
 Module2400Name=Ατζέντα
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Διαχείρισης Ροών Εργασιών
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Παρτίδα προϊόντων
-Module39000Desc=Αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία διαχείριση για τα προϊόντα
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox
 Module50100Name=Σημείο Πωλήσεων
@@ -527,7 +534,7 @@ Module50200Desc=Ενότητα για να προσφέρει μια σε απε
 Module50400Name=Λογιστική (για προχωρημένους)
 Module50400Desc=Λογιστική διαχείριση (διπλά μέρη)
 Module54000Name=PrintIPP
-Module54000Desc=Εκτύπωση μέσω Cups IPP εκτυπωτή.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Ανοικτή Ψηφοφορία
 Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας
 DictionarySource=Προέλευση των προτάσεων/παραγγελιών
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς
 CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού
 CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού
@@ -1544,12 +1553,12 @@ Opened=Ανοίξτε
 Closed=Κλείστε
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
+NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
+NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
+NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων
+NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
 SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
 TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 932a236ab4a..cf4031d8785 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
 ActionsForUser=Γεγονότα για τον χρήστη
 ActionsForUsersGroup=Γεγονότα όλων των χρηστών της ομάδας
+ActionAssignedTo=Event assigned to
 AllMyActions= Όλες οι ενέργειες/εργασίες μου
 AllActions= Όλες οι ενέργειες/εργασίες
 ViewList=Εμφάνιση Λίστας
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυ
 ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα
 PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε
 InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το  POS
 InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
 InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
 OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε
@@ -68,9 +69,9 @@ DateActionStart= Ημερομηνία έναρξης
 DateActionEnd= Ημερομηνία λήξης
 AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα:
 AgendaUrlOptions2=<b>login=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη<b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας
 Busy=Απασχολ.
@@ -87,5 +88,5 @@ ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .i
 ExtSiteNoLabel=Χωρίς Περιγραφή
 WorkingTimeRange=Εύρος χρόνου εργασίας
 WorkingDaysRange=Εύρος ημερών εργασίας
-AddEvent=Create event
+AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 1c0ff4d72c9..c8a0d2af2e3 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -222,12 +222,12 @@ NonPercuRecuperable=Non-recoverable
 SetConditions=Set payment conditions
 SetMode=Set payment mode
 Billed=Τιμολογημένο
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
+RepeatableInvoice=Πρότυπο τιμολογίου
+RepeatableInvoices=Πρότυπο τιμολόγιο
+Repeatable=Πρώτυπο
+Repeatables=Πρώτυπα
+ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
+CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
 CreateFromRepeatableInvoice=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 61543f9747e..c011ce85374 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ
 BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
 BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
 BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Τελευταία Βιβλία
 BoxLastActions=Τελευταίες Ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Πλήθος πελατών
 BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
 BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες
 BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα
-BoxTitleLastCustomerOrders=Οι %s πιο πρόσφατα τροποποιημένες παραγγελίες πελατών
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές
 BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες
 BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές
 BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες
-BoxTitleLastCustomersOrProspects=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες ή προοπτικές
-BoxTitleLastPropals=Οι %s πιο πρόσφατα καταχωρημένες προσφορές
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών
-BoxTitleLastProspects=Οι %s πιο πρόσφατες προσφορές
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές
 BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες
-BoxTitleLastModifiedMembers=Τελευταία %s τροποποίηση των μελών
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης
-BoxTitleOldestUnpaidCustomerBills=Τα %s παλαιότερα απλήρωτα τιμολόγια πελατών
-BoxTitleOldestUnpaidSupplierBills=Τα %s παλαιότερα απλήρωτα τιμολόγια προμηθευτών
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών
 BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων
 BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών
-BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Οι  τελευταίες %s τροποποιημένες επαφές / διευθύνσεις
 BoxMyLastBookmarks=Οι %s νεότεροι σελιδοδείκτες μου
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
@@ -76,7 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
 NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών
-BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών
 BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα
 BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 0ad9573f800..605097a3a19 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Προοπτική
 Prospects=Προοπτικές
 DeleteAction=Διαγραφή Ενέργειας/Εργασίας
 NewAction=Νέα Ενέργεια/Εργασία
-AddAction=Προσθήκη Ενέργειας/Εργασίας
-AddAnAction=Προσθήκη Ενέργειας/Εργασίας
-AddActionRendezVous=Προσθήκη Συνάντησης
+AddAction=Δημιουργία συμβάντος/εργασίας
+AddAnAction=Δημιουργία συμβάντος/εργασίας
+AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού
 Rendez-Vous=Συναντήσεις
 ConfirmDeleteAction=Είστε σίγουροι ότι θέλετε να διαγράψετε την ενέργεια;
 CardAction=Καρτέλα Ενέργειας
@@ -44,8 +44,8 @@ DoneActions=Ολοκληρωμένες Ενέργειες
 DoneActionsFor=Ολοκληρωμένες Ενέργειες γιά %s
 ToDoActions=Ημιτελείς Ενέργειες
 ToDoActionsFor=Ημιτελείς Ενέργειες για %s
-SendPropalRef=Αποστολή εμπορικής προσφοράς %s
-SendOrderRef=Αποστολή παραγγελίας %s
+SendPropalRef=Υποβολή των προσφορών %s
+SendOrderRef=Υποβολή της παραγγελίας %s
 StatusNotApplicable=Δεν ισχύει
 StatusActionToDo=Να γίνουν
 StatusActionDone=Ολοκληρωμένη
@@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε
 DateActionPlanned=Ημερ. προγραμματισμού
 DateActionDone=Ημερ. ολοκλήρωσης
 ActionAskedBy=Η ενέργεια ζητήθηκε από
-ActionAffectedTo=Η ενέργεια αφορά τον/την
+ActionAffectedTo=Εκδήλωση που ανήκει
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionUserAsk=Καταγράφηκε από τον/την
 ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο '<b>Date done</b>' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο '<b>Status</b>' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 2e5b6951bc6..c9aaba74e1a 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακής λογιστικής</b> mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστικής δέσμευσης</b> τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για αγορά των προϊόντων
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση προϊόντων
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για αγορές υπηρεσιών
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση υπηρεσιών
 ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
 ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ
 ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 6b3e508c9af..cff09df3981 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Περιοχή Συμβολαίων
 ListOfContracts=Λίστα Συμβολαίων
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Τελευταίες τροποποιημένες συμβάσεις %s
 AllContracts=Όλα τα συμβόλαια
 ContractCard=Κάρτέλα  Συμβολαίου
 ContractStatus=Κατάσταση συμβολαίου
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια
-LastContracts=Last % contracts
+LastContracts=Τελευταίες συμβάσεις %s
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Κατάλογος Υπηρεσιών προς λήξει
 NoteListOfYourExpiredServices=Αυτή η λίστα περιέχει μόνο τις υπηρεσίες των συμβάσεων για λογαριασμό ΠΕΛ./ΠΡΟΜ. που συνδέονται ως εκπρόσωπος πώληση.
 StandardContractsTemplate=Οι πρότυπες συμβάσεις
 ContactNameAndSignature=Για %s, το όνομα και η υπογραφή:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Σύμβαση πώλησης υπογραφή εκπροσώπου
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index a9a19f31b89..4163539e47f 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Σχετικά με το περιβάλλον Unix θα
 CronExplainHowToRunWin=Στο Microsoft (tm) των Windows environement, μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελεστεί μια γραμμή εντολών κάθε λιγα λεπτά
 # Menu
 CronJobs=Προγραμματισμένες εργασίες
-CronListActive=List of active/scheduled jobs
+CronListActive=Λίστα ενεργών/προγραμματισμένων εργασιών
 CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες
 # Page list
 CronDateLastRun=Τελευταία εκτέλεση
diff --git a/htdocs/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang
index f4c2175888a..9fe9b52b375 100644
--- a/htdocs/langs/el_GR/deliveries.lang
+++ b/htdocs/langs/el_GR/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Παραδόθηκαν τα παραπάνω σε καλή
 Deliverer=Διανομέας :
 Sender=Αποστολέας
 Recipient=Παραλήπτης
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=Δεν υπάρχει αρκετό απόθεμα
+Shippable=Για Αποστολή
+NonShippable=Δεν αποστέλλονται
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 885dc185b8e..67f1d9a24cd 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Κωδικός προμηθευτή που απαιτ
 ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που ήδη χρησιμοποιείται
 ErrorBadParameters=Λάθος παράμετρος
 ErrorBadValueForParameter=%s Λάθος τιμή για την παράμετρο λάθος %s
-ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια μορφή που υποστηρίζεται
+ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής)
 ErrorBadDateFormat=«%s« Αξία έχει λάθος μορφή ημερομηνίας
 ErrorWrongDate=Η ημερομηνία δεν είναι σωστή!
 ErrorFailedToWriteInDir=Αποτυχία εγγραφής στο %s κατάλογο
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορ
 ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε.
 ErrorBadValueForCode=Κακό αξία για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή ...
 ErrorBothFieldCantBeNegative=Πεδία %s %s και δεν μπορεί να είναι τόσο αρνητικές όσο
+ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή στα τιμολόγια των πελατών δεν μπορεί να είναι αρνητική
 ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη <b>%s</b> χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη
 ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, το μέλος
 ErrorThereIsSomeDeliveries=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε.
 ErrorCantDeletePaymentReconciliated=Δεν μπορείτε να διαγράψετε μια πληρωμή με τραπεζική συναλλαγή που είχε φτάσει σε συμβιβασμό
 ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν μπορείτε να διαγράψετε μια πληρωμή που σχετίζεται με ένα τουλάχιστον τιμολόγιο με καθεστώς πληρωμένο
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
index 97d9a9ed48b..d9331df4fa4 100644
--- a/htdocs/langs/el_GR/externalsite.lang
+++ b/htdocs/langs/el_GR/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website
 ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας
 ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Καταχώρηση του μενού μου
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 3b5743499f8..49147dc78f2 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Καθυστ.
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Προσθήκη μέλους
-MemberType=Τύπος μέλους
+AddMember=Δημιουργία μέλους
 NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών
 NewMemberType=Νέος τύπος μέλους
 WelcomeEMail=Welcome e-mail
@@ -126,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Δημιουργία εγγραφής
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Τελευταία ποσό συνδρομής
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
+MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή
+MemberByRegion=Μέλη ανά περιοχή
 NbOfMembers=Αριθμός μελών
 NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
 MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
@@ -202,3 +203,4 @@ MembersByNature=Μέλη εκ φύσεως
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Στείλτε e-mail για να προειδοποιήσει όταν Dolibarr λάβετε μια επιβεβαίωση της μια επικυρωμένη πληρωμής για την εγγραφή
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index bee3ae37dd9..96495ea8aea 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Μια αποστολή, υπάρχει
 DraftOrWaitingApproved=Draft or approved not yet ordered
 DraftOrWaitingShipped=Draft or validated not yet shipped
 MenuOrdersToBill=Παραγγελίες προς χρέωση
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Χρεώσιμες παραγγελίες
 SearchOrder=Εύρεση παραγγελίας
 SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
 ShipProduct=Ship product
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index f5df39595f7..54a2746121e 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Μήνυμα για την ακύρωση σελίδα επιστρο
 NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε
 NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν
 PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Τιμή για PBX SITE
+PAYBOX_PBX_RANG=Τιμή για PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Τιμή για PBX ID
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 34449987715..bdc764a85d2 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -80,12 +80,12 @@ ContractStatusClosed=Κλειστό
 ContractStatusRunning=Ενεργό
 ContractStatusExpired=Ληγμένο
 ContractStatusOnHold=Ανενεργό
-ContractStatusToRun=To get running
+ContractStatusToRun=Για να πάρετε την εκτέλεση
 ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
 ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Σφάλμα η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστο τιμή.
 Suppliers=Προμηθευτές
 SupplierRef=Κωδ. Προμηθευτή
 ShowProduct=Εμφάνιση προϊόντων
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσί
 MultiPricesAbility=Πολλά επίπεδα των τιμών ανά προϊόν/υπηρεσία
 MultiPricesNumPrices=Αριθμός τιμής
 MultiPriceLevelsName=Κατηγορίες τιμών
-AssociatedProductsAbility=Ενεργοποίηση υποπροϊόντων
-AssociatedProducts=Υποπροϊόντα
-AssociatedProductsNumber=Πλήθος προϊόντων που συνθέτουν αυτό το προϊόν
-ParentProductsNumber=Αριθμός προϊόντος μητρικής
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων
+AssociatedProducts=Πακέτο προϊόντων
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Συσχέτιση
 Translation=Μετάφραση
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -132,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή
 Quantity=Ποσότητα
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα)
-ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
@@ -179,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία <b>%s;</b>
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
-CloneCompositionProduct=Εικονικός κλώνος προϊόντων/υπηρεσιών
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Τιμές πελατών
@@ -240,5 +240,10 @@ PricingRule=Κανόνες τιμολόγησης
 AddCustomerPrice=Προσθέστε τιμή των πελατών
 ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
 PriceByCustomerLog=Τιμή ανά πελάτη log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι μικρότερη από %s
+MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
+PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
+PriceExpressionSelected=Επιλογή συνάρτησης τιμών
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Αριθμός
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 77b4de1917c..eba1f92f7b3 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα κ
 Myprojects=Τα έργα μου
 ProjectsArea=Περιοχή Έργων
 NewProject=Νέο Έργο
-AddProject=Προσθήκη Έργου
+AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
 DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
@@ -36,6 +36,8 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
 MyTasks=Οι Εργασίες μου
@@ -45,7 +47,7 @@ TaskDateStart=Ημερομηνία έναρξης εργασιών
 TaskDateEnd=Ημερομηνία λήξης εργασιών
 TaskDescription=Περιγραφή των εργασιών
 NewTask=Νέα Εργασία
-AddTask=Προσθήκη Εργασίας
+AddTask=Δημιουργία εργασίας
 AddDuration=Προσθήκη Διάρκειας
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
index 1139926a95e..a28060f39b6 100644
--- a/htdocs/langs/el_GR/resource.lang
+++ b/htdocs/langs/el_GR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτο
 RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
 DictionaryResourceType=Το είδος των πόρων
 
-DictionaryEMailTemplates=Μοντέλα  των Emails
-
 SelectResource=Επιλέξτε πόρο
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index f0364df4db5..2b00a7dfb0b 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργί
 RelatedShippings=Σχετικές αποστολές
 ShipmentLine=Σειρά αποστολής
 CarrierList=Κατάλογος των μεταφορέων
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Προϊόν από παραγγελία του πελάτη που έχει ήδη αποσταλεί
+SuppliersReceiptRunning=Προϊόν από παραγγελία προμηθευτή έχει ληφθεί
 
 # Sending methods
 SendingMethodCATCH=Πιάσε τον πελάτη
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index c826f4f78e6..4de061f4c84 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -4,7 +4,7 @@ Trips=Ταξίδια
 TripsAndExpenses=Ταξίδια και έξοδα
 TripsAndExpensesStatistics=Στατιστικά ταξιδιών και εξόδων
 TripCard=Καρτέλα ταξιδιού
-AddTrip=Προσθήκη ταξιδιού
+AddTrip=Δημιουργία ταξιδιού
 ListOfTrips=Λίστα ταξιδιών
 ListOfFees=Λίστα φόρων
 NewTrip=Νέο ταξίδι
@@ -19,4 +19,4 @@ TF_TRIP=Ταξίδι
 ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων
 ExpensesArea=Ταξίδια και έξοδα περιοχή
 SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Ταξινομήστε «επιστραφεί»
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 318a2054c4d..68794752db8 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=User %s disabled
 UserEnabled=User %s activated
 UserDeleted=User %s removed
 NewGroupCreated=Group %s created
-GroupModified=Group %s modified
+GroupModified=Ομάδα %s τροποποιημένη
 GroupDeleted=Group %s removed
 ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
 ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 68a92beb6cf..fe1365fda56 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Από τη στιγμή που έχει ολοκληρωθεί, μπορείτε να πληκτρολογήσετε την πληρωμή για να κλείσει το τιμολόγιο.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index feb1581d674..db154055b67 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Acontecimientos del usuario
 ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo
+ActionAssignedTo=Event assigned to
 AllMyActions= Todos mis eventos/tareas
 AllActions= Todos los eventos/tareas
 ViewList=Vista listado
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index ded2c3c764e..f6eaf40f12b 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo <b>contabilidad de caja</b> no es relevante. Este informe sólo está disponible cuando se utiliza en modo <b>contabilidad de compromiso</b> (consulte la configuración del módulo de contabilidad).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios
 ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido
 ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 6e8cc61b5c4..c9e59a17cd6 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Listado de servicios activos a expirar
 NoteListOfYourExpiredServices=Este listado contiene solamente los servicios de contratos de terceros de los que usted es comercial
 StandardContractsTemplate=Modelo de contrato estandar 
 ContactNameAndSignature=Para %s, nombre y firma:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 1762411d3c8..98c4a32016d 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 521306c2df7..105335add8e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Kasuta kolmandate isikute valimiseks nimekirja asemel a
 ActivityStateToSelectCompany= Lisa filter, mis võimaldab filtreerida kolmandaid isikuid nende aktiivsuse järgi. 
 UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectContact=Kasuta kontakti valimiseks nimekirja asemel automaatsete vastete pakkumisega välju 
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Otsingufiltrite seaded
 NumberOfKeyToSearch=Sisestatud märkide arv otsingu käivitamiseks: %s
 ViewFullDateActions=Näita terve päev kestvaid sündmusi kolmandal lehel
@@ -208,6 +210,7 @@ ModulesJobDesc=Ärimoodulid pakuvad lihtsat, eelnevalt määratletud Dolibarri s
 ModulesMarketPlaceDesc=Alla laadimiseks leiad rohkem mooduleid Internetist.
 ModulesMarketPlaces=Rohkem mooduleid...
 DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Veebimajutuse pakkujad, kust võib otsida rohkem mooduleid.
 URL=Link
 BoxesAvailable=Saadaval kastid
@@ -444,7 +447,7 @@ Module55Desc=Vöötkoodide haldamine
 Module56Name=Telefonitehnika
 Module56Desc=Telefonitehnika integratsioon
 Module57Name=Püsikorraldused
-Module57Desc=Püsikorralduste ja väljamaksete haldamine
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS voog
 Module320Desc=Lisa RSS voog Dolibarri lehtedele
 Module330Name=Järjehoidjad
 Module330Desc=Järjehoidjate haldamine
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
 Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
@@ -495,6 +498,8 @@ Module1780Name=Kategooriad
 Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Luba mõnede tekstialade toimetamist võimsama toimetiga
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cro
 Module2300Desc=Ajastatud tegevuste haldamine
 Module2400Name=Päevakava
@@ -503,6 +508,8 @@ Module2500Name=Dokumendihaldus
 Module2500Desc=Salvesta ja jaga dokumente
 Module2600Name=Veebiteenused
 Module2600Desc=Lülita Dolibarri veebiteenuste server sisse
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Kasuta Gravatar (www.gravatar.com) teenust, et näidata kasutajate/liikmete pilte (loodud nende e-posti aadresside põhjal). Vajab Interneti ligipääsu.
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Töövoo haldamine
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga PayBoxi abil
 Module50100Name=Kassa
@@ -527,7 +534,7 @@ Module50200Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Trüki Cups IPP printeri abil
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Ava küsitlus
 Module55000Desc=Online küsitluste korraldamise moodul (nagu Doodle, Studs, Rdvz jms)
 Module59000Name=Marginaalid
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Tellimisviisid
 DictionarySource=Pakkumiste/tellimuste päritolu
 DictionaryAccountancyplan=Kontode graafik
 DictionaryAccountancysystem=Kontoplaani mudelid
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Seadistused salvestatud
 BackToModuleList=Tagasi moodulite nimekirja
 BackToDictionaryList=Tagasi sõnastike nimekirja
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm
 DefaultLanguage=Vaikimisi kasutatav keel (keele kood)
 EnableMultilangInterface=Luba mitmekeelne liides
 EnableShowLogo=Näita vasakul menüüs logo
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Süsteem on edukalt uuendatud
 CompanyInfo=Ettevõtte/ühenduse info
 CompanyIds=Ettevõtte/ühenduse andmed
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 33637161b33..743d827082a 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Tegevused, mis on seotud
 ActionsDoneBy=Tegevused, mille tegi
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Kõik minu tegevused/ülesanded
 AllActions= Kõik tegevused/ülesanded
 ViewList=Nimekirja vaade
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index ef36af93d4a..4dba49aa2f3 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r
 TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index a141c00a1e9..cdf9a5c2b82 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Aktiivsete lepinguridade nimekiri
 ListOfRunningServices=Aktiivsete teenuste nimekiri
 NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel)
 BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Viimased %s aktiveeritud teenust
 LastModifiedServices=Viimased %s muudetud teenust
 EditServiceLine=Muuda teenuse rida
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Aeguvate teenuste nimekiri
 NoteListOfYourExpiredServices=See nimekiri sisaldab vaid nende lepingute teenuseid, millega seotud kolmandate isikute kohta oled märgitud müügiesindajaks
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Lepingu allkirjastanud müügiesindaja
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 745184c4a4a..ade13da068e 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Hankija kood on nõutud
 ErrorSupplierCodeAlreadyUsed=Hankija kood on juba kasutuses
 ErrorBadParameters=Halvad parameetrid
 ErrorBadValueForParameter=Vale väärtus '%s' parameetri jaoks ebaõige '%s'
-ErrorBadImageFormat=Pildifaili vorming ei ole toetatud
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Väärtus '%s' on vales kuupäeva vormingus
 ErrorWrongDate=Kuupäev pole korrektne!
 ErrorFailedToWriteInDir=Ei suutnud kirjutada kausta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Kasutajanime <b>%s</b> ei leitud.
 ErrorLoginHasNoEmail=Antud kasutajal ei ole e-posti aadressi. Protsess katkestatud.
 ErrorBadValueForCode=Turvakoodi halb väärtus. Proovi uuesti...
 ErrorBothFieldCantBeNegative=Mõlemad väljad %s ja %s ei saa olla negatiivse väärtusega
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Veebiserveri käivitamiseks kasutataval kontrol <b>%s</b> ei ole selleks õigusi
 ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 69780d9c441..7eeb8340553 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Hilinenud
 SubscriptionNotReceivedShort=Pole kunagi saanud
 ListOfSubscriptions=Liikmemaksude nimekir
 SendCardByMail=Saada kaart e-postiga
-AddMember=Lisa liige
+AddMember=Create member
 NoTypeDefinedGoToSetup=Liikmetüüpe pole määratletud. Mine menüüsse "Liikmetüübid"
 NewMemberType=Uus liikmetüüp
 WelcomeEMail=E-kiri tervitamiseks
@@ -125,7 +125,7 @@ Date=Kuupäev
 DateAndTime=Kuupäev ja kellaaeg
 PublicMemberCard=Liikme avalik kaar
 MemberNotOrNoMoreExpectedToSubscribe=Ei ole liige või ei ole oodatud liikmeks astuma
-AddSubscription=Lisa liikmelisus
+AddSubscription=Create subscription
 ShowSubscription=Kuva liikmelisus
 MemberModifiedInDolibarr=Liige on Dolibarris muudetud
 SendAnEMailToMember=Saada informatsioon e-posti teel liikmele
@@ -203,3 +203,4 @@ MembersByNature=Liikmed loomuse alusel
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
 NoVatOnSubscription=Liikmemaksudel ei ole KM
 MEMBER_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse hoiatus, kui Dolibarr on saanud liikmemaksu tasumise kinnituse
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index e37fa0d2eb5..df8001d04b8 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Hindasid
 MultiPriceLevelsName=Kategooriate hinnad
-AssociatedProductsAbility=Aktiveeri virtuaalsete toodete võimalus
-AssociatedProducts=Virtuaalne toode
-AssociatedProductsNumber=Toodete arv, millest antud virtuaalne toode koosenb
-ParentProductsNumber=Antud toodet kasutavate virtuaalsete toodete arv
-IfZeroItIsNotAVirtualProduct=Kui 0, siis ei ole tegu virtuaalse tootega
-IfZeroItIsNotUsedByVirtualProduct=Kui 0, siis ei kasuta seda toodet ükski virtuaalne toode
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Seosta
 Translation=Tõlge
 KeywordFilter=Märksõnade filter
@@ -132,7 +132,7 @@ AddDel=Lisa/kustuta
 Quantity=Kogus
 NoMatchFound=Ühtki vastet ei leitud
 ProductAssociationList=Seotud toodete/teenuste nimekiri: toote/teenuse nimi (mõjutatud kogusest)
-ProductParentList=Virtuaalsete toodete/teenuste nimekiri, mis kasutavad ühe komponendina antud toodet
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet
 DeleteProduct=Kustuta toode/teenus
 ConfirmDeleteProduct=Kas oled täiesti kindel, et soovid antud toote/teenuse kustutada?
@@ -179,7 +179,7 @@ CloneProduct=Klooni toode või teenus
 ConfirmCloneProduct=Kas oled täiesti kindel, et soovid kloonida toote või teenuse <b>%s</b>?
 CloneContentProduct=Klooni toote/teenuse kogu põhiline info
 ClonePricesProduct=Klooni põhiline info ja hinnad
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
 CustomerPrices=Klientide hinnad
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index ecb040b20a8..2cf8253da79 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõiguse
 Myprojects=Minu projektid
 ProjectsArea=Projektide ala
 NewProject=Uus projekt
-AddProject=Lisa projekt
+AddProject=Create project
 DeleteAProject=Kustuta projekt
 DeleteATask=Kustuta ülesanne
 ConfirmDeleteAProject=Kas oled kindel, et soovid selle projekti kustutada?
@@ -36,6 +36,8 @@ TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
 TaskTimeDate=Kuupäev
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aeg kulutatud uuesti
 MyTimeSpent=Minu poolt kulutatud aeg
 MyTasks=Minu ülesanded
@@ -45,7 +47,7 @@ TaskDateStart=Ülesande alguse kuupäev
 TaskDateEnd=Ülesande lõpu kuupäev
 TaskDescription=Ülesande kirjeldus
 NewTask=Uus ülesanne
-AddTask=Lisa ülesanne
+AddTask=Create task
 AddDuration=Lisa kestus
 Activity=Aktiivsus
 Activities=Ülesanded/toimingud
diff --git a/htdocs/langs/et_EE/resource.lang b/htdocs/langs/et_EE/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/et_EE/resource.lang
+++ b/htdocs/langs/et_EE/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 91e9f23d8db..be438a477ad 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Krediteeri
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Näita väljamakset
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Juhul kui arvel on vähemalt üks töötlemata väljamakse, ei märgita seda makstuks, et lubada eelnevat väljamakse haldamist.
-DoStandingOrdersBeforePayments=See sakk võimaldab taotleda püsikorraldust. Pärast selle lõpetamist saad sisestada makse arve sulgemiseks.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Väljamaksete fail
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
 ThisWillAlsoAddPaymentOnInvoice=See rakendub ka arvetega seotud maksetele ja liigitab nad "Makstud"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Otsekorralduse makse %s panga poolt
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index af502ac5720..cbdb7bc6d98 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Bilaketa-iragazien aukerak
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=Modulu gehiago...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Esteka
 BoxesAvailable=Eskuragarri dauden kutxak
@@ -444,7 +447,7 @@ Module55Desc=Barra-kodeak kudeatzea
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS kanala
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Laster-markak
 Module330Desc=Laster-markak kudeatzea
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriak
 Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
 Module2000Name=WYSIWYG editorea
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Dokumentuak gorde eta partekatu
 Module2600Name=Web-zerbitzuak
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Bezeroa
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Marjinak
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index 1ed4e637d14..e5470c8011a 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID event
-Actions=Events
+Actions=Gertaerak
 ActionsArea=Events area (Actions and tasks)
 Agenda=Agenda
-Agendas=Agendas
-Calendar=Calendar
-Calendars=Calendars
+Agendas=Agendak
+Calendar=Egutegia
+Calendars=Egutegiak
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by
 AffectedTo=Assigned to
 DoneBy=Done by
 Event=Event
-Events=Events
-EventsNb=Number of events
-MyEvents=My events
+Events=Gertaerak
+EventsNb=Gertaera kopurua
+MyEvents=Nire gertaerak
 OtherEvents=Other events
-ListOfActions=List of events
-Location=Location
+ListOfActions=Gertaeren zerrenda
+Location=Kokapena
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
 MenuToDoActions=All incomplete events
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 81b7515a8b8..d20b6762937 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -56,28 +56,28 @@ SupplierBill=Supplier invoice
 SupplierBills=suppliers invoices
 Payment=Payment
 PaymentBack=Payment back
-Payments=Payments
+Payments=Ordainketak
 PaymentsBack=Payments back
 PaidBack=Paid back
-DatePayment=Payment date
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment ?
+DatePayment=Ordainketa data
+DeletePayment=Ordainketa ezabatu
+ConfirmDeletePayment=Ziur zaude ordainketa hay ezabatu nahi duzuna?
 ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-SupplierPayments=Suppliers payments
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
+SupplierPayments=Hornitzaileei ordainketak
+ReceivedPayments=Jasotako ordainketak
+ReceivedCustomersPayments=Bezeroen jasotako ordainketak
 PayedSuppliersPayments=Payments payed to suppliers
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
+ReceivedCustomersPaymentsToValid=Balidatu beharreko bezeroen jasotako ordainketak
+PaymentsReportsForYear=%s ordainketen txostena
+PaymentsReports=Ordainketen txostena
+PaymentsAlreadyDone=Jada egindako ordainketak
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
-PaymentMode=Payment type
+PaymentMode=Ordainketa mota
 PaymentConditions=Payment term
 PaymentConditionsShort=Payment term
-PaymentAmount=Payment amount
-ValidatePayment=Validate payment
+PaymentAmount=Ordainketaren zenbatekoa
+ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
@@ -93,8 +93,8 @@ DeleteBill=Delete invoice
 SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
+SendRemindByMail=Oroigarria e-postaz bidali
+DoPayment=Ordainketa egin
 DoPaymentBack=Do payment back
 ConvertToReduc=Convert into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -140,13 +140,13 @@ NewBill=New invoice
 LastBills=Last %s invoices
 LastCustomersBills=Last %s customers invoices
 LastSuppliersBills=Last %s suppliers invoices
-AllBills=All invoices
+AllBills=Faktura guztiak
 OtherBills=Other invoices
-DraftBills=Draft invoices
+DraftBills=Fakturen zirriborroak
 CustomersDraftInvoices=Customers draft invoices
 SuppliersDraftInvoices=Suppliers draft invoices
-Unpaid=Unpaid
-ConfirmDeleteBill=Are you sure you want to delete this invoice ?
+Unpaid=Ordaindu gabekoak
+ConfirmDeleteBill=Ziur zaude faktura hau ezabatu nahi duzuna?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b> ?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
 ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
@@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely.
 ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Bezero txarra
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
 ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
@@ -171,21 +171,21 @@ ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other case
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
 ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
 ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
+ValidateBill=Faktura balioztatu
+UnvalidateBill=Faktura baliogabeta
 NumberOfBills=Nb of invoices
 NumberOfBillsByMonth=Nb of invoices by month
-AmountOfBills=Amount of invoices
+AmountOfBills=Faktura kopurua
 AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
 ShowSocialContribution=Show social contribution
-ShowBill=Show invoice
-ShowInvoice=Show invoice
+ShowBill=Faktura erakutsi
+ShowInvoice=Faktura erakutsi
 ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show deposit invoice
-ShowPayment=Show payment
-File=File
-AlreadyPaid=Already paid
+ShowPayment=Ordainketa erakutsi
+File=Fitxategia
+AlreadyPaid=Jada ordainduta
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
 Abandoned=Abandoned
diff --git a/htdocs/langs/eu_ES/bookmarks.lang b/htdocs/langs/eu_ES/bookmarks.lang
index c04d25c328d..c8c45f1b49e 100644
--- a/htdocs/langs/eu_ES/bookmarks.lang
+++ b/htdocs/langs/eu_ES/bookmarks.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - marque pages
-# AddThisPageToBookmarks=Add this page to bookmarks
-# Bookmark=Bookmark
-# Bookmarks=Bookmarks
-# NewBookmark=New bookmark
-# ShowBookmark=Show bookmark
-# OpenANewWindow=Open a new window
-# ReplaceWindow=Replace current window
-# BookmarkTargetNewWindowShort=New window
-# BookmarkTargetReplaceWindowShort=Current window
-# BookmarkTitle=Bookmark title
-# UrlOrLink=URL
-# BehaviourOnClick=Behaviour when a URL is clicked
-# CreateBookmark=Create bookmark
-# SetHereATitleForLink=Set a title for the bookmark
-# UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-# ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
-# BookmarksManagement=Bookmarks management
-# ListOfBookmarks=List of bookmarks
+AddThisPageToBookmarks=Orrialde hau laster-marketara gehitu
+Bookmark=Laster-marka
+Bookmarks=Laster-markak
+NewBookmark=Laster-marka berria
+ShowBookmark=Erakutsi laster-marka
+OpenANewWindow=Leiho berria irekia
+ReplaceWindow=Oraingo leihoa ordezkatu
+BookmarkTargetNewWindowShort=Leiho berria
+BookmarkTargetReplaceWindowShort=Oraingo leihoa
+BookmarkTitle=Laster-markaren izenburua
+UrlOrLink=URL
+BehaviourOnClick=Behaviour when a URL is clicked
+CreateBookmark=Laster-marka sortu
+SetHereATitleForLink=Laster-markaren izenburua ezarri
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window
+BookmarksManagement=Laster-marken kudeaketa
+ListOfBookmarks=Laster-marken zerrenda
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index e7d2de76503..b83fe1d4671 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Prospects
 DeleteAction=Delete an event/task
 NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
 Rendez-Vous=Rendezvous
 ConfirmDeleteAction=Are you sure you want to delete this event/task ?
 CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
 DoneActionsFor=Completed events for %s
 ToDoActions=Incomplete events
 ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
 StatusNotApplicable=Not applicable
 StatusActionToDo=To do
 StatusActionDone=Complete
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Event owned by
 ActionDoneBy=Event done by
 ActionUserAsk=Reported by
 ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
@@ -90,7 +90,7 @@ FromTo=from %s to %s
 MargeOrder=Margins (validated orders)
 RecapAnnee=Summary of the year
 NoData=There is no data
-StatusProsp=Prospect status
+StatusProsp=Proiektuaren egoera
 DraftPropals=Draft commercial proposals
 SearchPropal=Search a commercial proposal
 CommercialDashboard=Commercial summary
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 5580d87b517..e51242ae01b 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -233,15 +233,15 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=VAT number
-VATIntraShort=VAT number
-VATIntraVeryShort=VAT
+VATIntra=BEZ zenbakia
+VATIntraShort=BEZ zenbakia
+VATIntraVeryShort=BEZ
 VATIntraSyntaxIsValid=Syntax is valid
 VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
-Customer=Customer
+Customer=Bezeroa
 CustomerDiscount=Customer Discount
 CustomerRelativeDiscount=Relative customer discount
 CustomerAbsoluteDiscount=Absolute customer discount
@@ -257,19 +257,19 @@ CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
 DefaultDiscount=Default discount
 AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
-Supplier=Supplier
+Supplier=Hornitzailea
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact
-ContactsAddresses=Contacts/Addresses
+AddContact=Kontaktua sortu
+AddContactAddress=Kontua/helbidea sortu
+EditContact=Kontaktua editatu
+EditContactAddress=Kontaktua/helbidea editatu
+Contact=Kontaktua
+ContactsAddresses=Kontaktua/helbidea
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 195ad43c87c..85438821b7b 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -76,7 +76,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 # Info
-CronInfoPage=Information
+CronInfoPage=Informazioa
 # Common
 CronType=Task type
 CronType_method=Call method of a Dolibarr Class
diff --git a/htdocs/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang
index a662b0f7573..a89480fcc0c 100644
--- a/htdocs/langs/eu_ES/dict.lang
+++ b/htdocs/langs/eu_ES/dict.lang
@@ -1,329 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=Frantzia
+CountryBE=Belgika
+CountryIT=Italia
+CountryES=Espainia
+CountryDE=Alemania
+CountryCH=Suitza
+CountryGB=Britania Handia
+CountryUK=United Kingdom
+CountryIE=Irlanda
+CountryCN=Txina
+CountryTN=Tunisia
+CountryUS=Estatu Batuak
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Kanada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Errusia
+CountrySE=Suetzia
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Kamerun
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brasil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Kongo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Kroazia
+CountryCU=Kuba
+CountryCY=Cyprus
+CountryCZ=Txekiar Errepublika
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egipto
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Grezia
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haiti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Icelande
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Irak
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenia
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrghyztan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lituania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagaskar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Birmania (Myanmar)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=Zelanda Berria
+CountryNI=Nikaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Filipinak
+CountryPN=Pitcairn Islands
+CountryPL=Polonia
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=Hego Afrika
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Cailos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukrania
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=Mrs.
+CivilityMR=Jauna
+CivilityMLE=Anderea
+CivilityMTRE=Master
+CivilityDR=Doctor
 ##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Euroak
+CurrencyAUD=AU dolarrak
+CurrencySingAUD=AU dolarra
+CurrencyCAD=CAN dolarrak
+CurrencySingCAD=CAN dollar
+CurrencyCHF=Suitzako frankoak
+CurrencySingCHF=Suitzako frankoa
+CurrencyEUR=Euroak
+CurrencySingEUR=Euroa
+CurrencyFRF=Frantziako frankoak
+CurrencySingFRF=Frantziako frankoa
+CurrencyGBP=GB librak
+CurrencySingGBP=GB libra
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian krone
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US dolarrak
+CurrencySingUSD=US dolarra
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/ftp.lang b/htdocs/langs/eu_ES/ftp.lang
index 6f135997201..4997aaa1306 100644
--- a/htdocs/langs/eu_ES/ftp.lang
+++ b/htdocs/langs/eu_ES/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-# FTPClientSetup=FTP Client module setup
-# NewFTPClient=New FTP connection setup
-# FTPArea=FTP Area
-# FTPAreaDesc=This screen show you content of a FTP server view
-# SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-# FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-# FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-# FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-# FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-# FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-# FTPPassiveMode=Passive mode
+FTPClientSetup=FTP bezero modulua konfiguratu
+NewFTPClient=FTP konexio berria konfiguratu
+FTPArea=FTP Area
+FTPAreaDesc=This screen show you content of a FTP server view
+SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
+FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
+FTPPassiveMode=Passive mode
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 1116e29c21c..f0a375c7f1f 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -4,45 +4,45 @@ Language_ar_AR=Arabic
 Language_ar_SA=Arabic
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
-Language_ca_ES=Catalan
+Language_ca_ES=Katalana
 Language_cs_CZ=Czech
 Language_da_DA=Danish
 Language_da_DK=Danish
-Language_de_DE=German
+Language_de_DE=Alemana
 Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_en_AU=English (Australia)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
-Language_en_NZ=English (New Zealand)
+Language_de_CH=Alemana (Suitza)
+Language_el_GR=Greziera
+Language_en_AU=Ingelesa (Australia)
+Language_en_GB=Ingelesa (Erresuma Batua)
+Language_en_IN=Ingelesa (India)
+Language_en_NZ=Ingelesa (Zelanda Berria)
 Language_en_SA=English (Saudi Arabia)
-Language_en_US=English (United States)
+Language_en_US=Ingelesa (Estatu Batuak)
 Language_en_ZA=English (South Africa)
-Language_es_ES=Spanish
+Language_es_ES=Gaztelania
 Language_es_DO=Spanish (Dominican Republic)
-Language_es_AR=Spanish (Argentina)
+Language_es_AR=Gaztelania (Argentina)
 Language_es_CL=Spanish (Chile)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
+Language_es_PE=Gaztelania (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_et_EE=Estonian
-Language_eu_ES=Basque
+Language_eu_ES=Euskera
 Language_fa_IR=Persian
 Language_fi_FI=Fins
-Language_fr_BE=French (Belgium)
-Language_fr_CA=French (Canada)
-Language_fr_CH=French (Switzerland)
-Language_fr_FR=French
+Language_fr_BE=Frantsesa (Belgika)
+Language_fr_CA=Frantsesa (Kanada)
+Language_fr_CH=Frantsea (Suitza)
+Language_fr_FR=Frantsesa
 Language_fr_NC=French (New Caledonia)
 Language_he_IL=Hebrew
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
-Language_it_IT=Italian
+Language_it_IT=Italiera
 Language_ja_JP=Japanese
 Language_ko_KR=Korean
 Language_lt_LT=Lithuanian
diff --git a/htdocs/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang
index 8b1efb75ef3..50b49b036b2 100644
--- a/htdocs/langs/eu_ES/link.lang
+++ b/htdocs/langs/eu_ES/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Fitxategi/dokumentu berria estekatu
+LinkedFiles=Estekatutako fitxategi eta dokumentuak
+NoLinkFound=Ez dago gordetako estekarik
+LinkComplete=Fitxategia ondo estekatu da
+ErrorFileNotLinked=Ezin izan da fitxategia estekatu
+LinkRemoved=%s esteka ezabatua izan da
+ErrorFailedToDeleteLink= Ezin izan da '<b>%s</b>' esteka ezabatu
+ErrorFailedToUpdateLink= Ezin izan da '<b>%s</b>' esteka berritu
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 7a211198822..697b6e3bc97 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -16,7 +16,7 @@ MailTo=Receiver(s)
 MailCC=Copy to
 MailCCC=Cached copy to
 MailTopic=EMail topic
-MailText=Message
+MailText=Mezua
 MailFile=Attached files
 MailMessage=EMail body
 ShowEMailing=Show emailing
@@ -110,7 +110,7 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
+SendMail=e-posta bidali
 SentBy=Sent by
 MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index d51879601be..103789691ef 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -99,19 +99,19 @@ NotePublic=Note (public)
 NotePrivate=Note (private)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=Test
-ToFilter=Filter
+ToFilter=Iragazia
 WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
+yes=bai
+Yes=Bai
+no=ez
+No=Ez
 All=All
 Home=Home
-Help=Help
+Help=Laguntza
 OnlineHelp=Online help
-PageWiki=Wiki page
-Always=Always
-Never=Never
+PageWiki=Wiki orrialdea
+Always=Beti
+Never=Inoiz
 Under=under
 Period=Period
 PeriodEndDate=End date for period
@@ -119,29 +119,29 @@ Activate=Activate
 Activated=Activated
 Closed=Closed
 Closed2=Closed
-Enabled=Enabled
+Enabled=Gaituta
 Deprecated=Deprecated
 Disable=Disable
 Disabled=Disabled
-Add=Add
-AddLink=Add link
-Update=Update
+Add=Gehitu
+AddLink=Esteka gehitu
+Update=Berritu
 AddActionToDo=Add event to do
 AddActionDone=Add event done
-Close=Close
-Close2=Close
+Close=Itxi
+Close2=Itxi
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b> ?
-Delete=Delete
-Remove=Remove
+Delete=Ezabatu
+Remove=Kendu
 Resiliate=Resiliate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
+Cancel=Utzi
+Modify=Eraldatu
+Edit=Editatu
 Validate=Validate
 ToValidate=To validate
-Save=Save
-SaveAs=Save As
+Save=Gorde
+SaveAs=Gorde honela
 TestConnection=Test connection
 ToClone=Clone
 ConfirmClone=Choose data you want to clone :
@@ -150,10 +150,10 @@ Of=of
 Go=Go
 Run=Run
 CopyOf=Copy of
-Show=Show
+Show=Erakutsi
 ShowCardHere=Show card
-Search=Search
-SearchOf=Search
+Search=Bilatu
+SearchOf=Bilatu
 Valid=Valid
 Approve=Approve
 ReOpen=Re-Open
@@ -165,57 +165,57 @@ ChooseLangage=Please choose your language
 Resize=Resize
 Recenter=Recenter
 Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-Password=Password
+User=Erabiltzailea
+Users=Erabiltzaileak
+Group=Taldea
+Groups=Taldeak
+Password=Pasahitza
 PasswordRetype=Retype your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
+Name=Izena
+Person=Pertsona
 Parameter=Parameter
 Parameters=Parameters
-Value=Value
+Value=Balioa
 GlobalValue=Global value
 PersonalValue=Personal value
-NewValue=New value
+NewValue=Balio berria
 CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
+Code=Kodea
+Type=Mota
+Language=Hizkuntza
 MultiLanguage=Multi-language
-Note=Note
+Note=Oharra
 CurrentNote=Current note
 Title=Title
 Label=Label
 RefOrLabel=Ref. or label
 Info=Log
-Family=Family
-Description=Description
-Designation=Description
+Family=Familia
+Description=Deskribapena
+Designation=Deskribapena
 Model=Model
 DefaultModel=Default model
 Action=Event
 About=About
-Number=Number
+Number=Zenbakia
 NumberByMonth=Number by month
 AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
+Numero=Zenbakia
+Limit=Limitea
+Limits=Limiteak
 DevelopmentTeam=Development Team
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Konexia
 Setup=Setup
 Alert=Alert
-Previous=Previous
-Next=Next
+Previous=Aurrekoa
+Next=Hurrengoa
 Cards=Cards
 Card=Card
-Now=Now
-Date=Date
+Now=Orain
+Date=Data
 DateStart=Date start
 DateEnd=Date end
 DateCreation=Creation date
@@ -418,8 +418,8 @@ Paid=Paid
 Topic=Sujet
 ByCompanies=By third parties
 ByUsers=By users
-Links=Links
-Link=Link
+Links=Estekak
+Link=Esteka
 Receipts=Receipts
 Rejects=Rejects
 Preview=Preview
@@ -429,81 +429,81 @@ Datas=Data
 None=None
 NoneF=None
 Late=Late
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
+Photo=Irudia
+Photos=Irudiak
+AddPhoto=Irudia gehitu
 Login=Login
 CurrentLogin=Current login
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
+January=Urtarrila
+February=Otsaila
+March=Martxoa
+April=Apirila
+May=Maiatza
+June=Ekaina
+July=Uztaila
+August=Abuztua
+September=Iraila
+October=Urria
+November=Azaroa
+December=Abendua
+JanuaryMin=Urt
+FebruaryMin=Ots
 MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
+AprilMin=Api
+MayMin=Mai
+JuneMin=Eka
+JulyMin=Uzt
+AugustMin=Abu
+SeptemberMin=Ira
+OctoberMin=Urr
+NovemberMin=Aza
+DecemberMin=Abe
+Month01=Urtarrila
+Month02=Otsaila
+Month03=Martxoa
+Month04=Apirila
+Month05=Maiatza
+Month06=Ekaina
+Month07=Uztaila
+Month08=Abuztua
+Month09=Iraila
+Month10=Urria
+Month11=Azaroa
+Month12=Abendua
+MonthShort01=Urt
+MonthShort02=Ots
 MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
+MonthShort04=Api
+MonthShort05=Mai
+MonthShort06=Eka
+MonthShort07=Uzt
+MonthShort08=Abu
+MonthShort09=Ira
+MonthShort10=Urr
+MonthShort11=Aza
+MonthShort12=Abe
 AttachedFiles=Attached files and documents
 FileTransferComplete=File was uploaded successfuly
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+DateFormatYYYYMM=UUUU-HH
+DateFormatYYYYMMDD=UUUU-HH-EE
+DateFormatYYYYMMDDHHMM=UUUU-HH-EE OO:SS
 ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Description
-Report=Report
+Report=Txostena
 Keyword=Mot clé
 Legend=Legend
 FillTownFromZip=Fill city from zip
-Fill=Fill
+Fill=Bete
 Reset=Reset
 ShowLog=Show log
-File=File
-Files=Files
+File=Fitxategia
+Files=Fitxategiak
 NotAllowed=Not allowed
 ReadPermissionNotAllowed=Read permission not allowed
 AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
+Example=Adibidea
+Examples=Adibideak
 NoExample=No example
 FindBug=Report a bug
 NbOfThirdParties=Number of third parties
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/eu_ES/resource.lang b/htdocs/langs/eu_ES/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/eu_ES/resource.lang
+++ b/htdocs/langs/eu_ES/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index edca71a1829..31629a4ee99 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -1,8 +1,12 @@
 # Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Soldata
+Salaries=Soldatak
+Employee=Langilea
+NewSalaryPayment=Soldata ordainketa berria
+SalaryPayment=Soldata ordainketa
+SalariesPayments=Soldaten ordainketak
+ShowSalaryPayment=Soldataren ordainketa erakutsi
+THM=Batezbesteko orduko prezioa
+TJM=Batezbesteko eguneko prezioa
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index 4b0501a8346..e9d7c242e07 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
+Trip=Bidaia
+Trips=Bidaiak
 TripsAndExpenses=Trips and expenses
 TripsAndExpensesStatistics=Trips and expenses statistics
 TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+AddTrip=Bidaia sortu
+ListOfTrips=Bidaien zerrenda
 ListOfFees=List of fees
-NewTrip=New trip
-CompanyVisited=Company/foundation visited
-Kilometers=Kilometers
+NewTrip=Bidai berria
+CompanyVisited=Bisitatutako konpania/erakundea
+Kilometers=Kilometroak
 FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+DeleteTrip=Bidaia ezabatu
+ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna?
 TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
+TF_LUNCH=Bazkaria
+TF_TRIP=Bidaia
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 542848189c1..a5889dd5197 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=استفاده از رشته های تکمیل خودک
 ActivityStateToSelectCompany= اضافه کردن یک گزینه فیلتر برای نشان دادن / پنهان کن thirdparties که در حال حاضر در فعالیت و یا تا به آن متوقف شد
 UseSearchToSelectContactTooltip=همچنین اگر شما تعداد زیادی از اشخاص ثالث (> 100 000)، شما می توانید سرعت با تنظیم CONTACT_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است.
 UseSearchToSelectContact=استفاده از رشته های تکمیل خودکار را انتخاب کنید تماس با (به جای استفاده از جعبه لیست).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=جستجو فیلتر گزینه
 NumberOfKeyToSearch=اسمشو نبر از شخصیت های به ماشه جستجو:٪ s را
 ViewFullDateActions=نمایش رویدادهای تاریخ های کامل در برگه سوم
@@ -208,6 +210,7 @@ ModulesJobDesc=ماژول های کسب و کار راه اندازی از پی
 ModulesMarketPlaceDesc=شما می توانید ماژول های بیشتری برای دانلود در وب سایت های خارجی را در اینترنت پیدا کنید ...
 ModulesMarketPlaces=ماژول های بیشتر ...
 DoliStoreDesc=DoliStore، محل رسمی بازار برای ماژول های خارجی Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=ارائه دهندگان وب سایت شما می توانید جستجو برای پیدا کردن ماژول های بیشتر ...
 URL=پیوند
 BoxesAvailable=جعبه دسترس
@@ -444,7 +447,7 @@ Module55Desc=مدیریت بارکد
 Module56Name=تلفن
 Module56Desc=یکپارچه سازی تلفن
 Module57Name=سفارشات ایستاده
-Module57Desc=ایستاده سفارشات و مدیریت خروج
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=کلیک برای تماس
 Module58Desc=یکپارچه سازی سیستم ClickToDial (ستاره، ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=خوراک RSS
 Module320Desc=اضافه کردن خوراک RSS در داخل صفحات صفحه نمایش Dolibarr
 Module330Name=بوک مارک ها
 Module330Desc=مدیریت چوب الف
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
 Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام)
@@ -495,6 +498,8 @@ Module1780Name=دسته بندی ها
 Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان)
 Module2000Name=ویرایشگر WYSIWYG
 Module2000Desc=اجازه می دهد به ویرایش برخی از متن با استفاده از ویرایشگر پیشرفته
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=cron را
 Module2300Desc=وظیفه مدیریت برنامه ریزی
 Module2400Name=دستور کار
@@ -503,6 +508,8 @@ Module2500Name=الکترونیکی مدیریت محتوا
 Module2500Desc=ذخیره و به اشتراک اسناد
 Module2600Name=سرویس دهنده وب
 Module2600Desc=فعال کردن Dolibarr خدمات وب سرور
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar در
 Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت
 Module2800Desc=FTP کارفرما
@@ -517,7 +524,7 @@ Module6000Desc=مدیریت گردش کار
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=خزانه
 Module50000Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با خزانه
 Module50100Name=نقطه ای از فروش
@@ -527,7 +534,7 @@ Module50200Desc=ماژول برای ارائه یک صفحه پرداخت آنل
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=چاپ از طریق جام IPP پرینتر.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=نظرسنجی گسترش
 Module55000Desc=ماژول را به نظر سنجی آنلاین (مانند دودل، خاتم کاری، Rdvz، ...)
 Module59000Name=حاشیه
@@ -779,6 +786,7 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
+DictionaryEMailTemplates=Emails templates
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ
 DefaultLanguage=زبان پیش فرض برای استفاده از (زبان)
 EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه
 EnableShowLogo=نمایش لوگو را در منوی سمت چپ
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=سیستم شما با موفقیت به روز رسانی شده است
 CompanyInfo=شرکت / اطلاعات پایه
 CompanyIds=هویت شرکت / بنیاد
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 01e2beb85d5..31bd6a514ab 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=رویدادهای اختصاص یافته به
 ActionsDoneBy=رویدادهای انجام شده توسط
 ActionsForUser=رویدادهای ها برای کاربر
 ActionsForUsersGroup=رویدادها برای همه کاربران گروه
+ActionAssignedTo=Event assigned to
 AllMyActions= همه رویدادها من / وظایف
 AllActions= همه رویدادها / وظایف
 ViewList=مشاهده لیست
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index f7f285a021f..ecc5cfbf660 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م
 TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
 CalculationMode=حالت محاسبه
 AccountancyJournal=کد حسابداری مجله
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 2192fa807e9..66101dfbec6 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد
 ListOfRunningServices=لیست خدمات در حال اجرا
 NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار)
 BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=تاریخ و زمان آخرین٪ s به خدمات فعال
 LastModifiedServices=تاریخ و زمان آخرین٪ بازدید کنندگان خدمات اصلاح شده
 EditServiceLine=خط ویرایش خدمات
@@ -91,6 +91,7 @@ ListOfServicesToExpire=فهرست خدمات دات کام
 NoteListOfYourExpiredServices=این لیست فقط شامل خدمات قرارداد برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است.
 StandardContractsTemplate=قراردادهای استاندارد قالب
 ContactNameAndSignature=برای٪ s، نام و امضا:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=نمایندگی فروش امضای قرارداد
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 12220688262..8ac54cde918 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=کد تامین کننده مورد نیاز
 ErrorSupplierCodeAlreadyUsed=کد تامین کننده در حال حاضر استفاده می شود
 ErrorBadParameters=پارامترهای بد
 ErrorBadValueForParameter=ارزش اشتباه '٪ s' را برای پارامتر نادرست '٪ s' را
-ErrorBadImageFormat=فایل تصویر است نه یک فرمت پشتیبانی
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=مقدار «٪ s 'است قالب تاریخ اشتباه
 ErrorWrongDate=تاریخ صحیح نمی باشد!
 ErrorFailedToWriteInDir=برای نوشتن در پوشه٪ s شکست خورد
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=کاربر با ورود <b>به٪ s را</b> می تو
 ErrorLoginHasNoEmail=این کاربر هیچ آدرس ایمیل. فرآیند سقط شده.
 ErrorBadValueForCode=ارزش بد برای کد امنیتی. دوباره سعی کنید با ارزش جدید ...
 ErrorBothFieldCantBeNegative=زمینه های٪ s و٪ s نمی تواند هر دو منفی
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=حساب <b>کاربری٪ s را</b> برای اجرای وب سرور بدون اجازه که
 ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
 ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنو
 ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 142a3e9dd00..d9b24f6e89b 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=نوع کاربران تعریف نشده
 ListOfPublicMembers=فهرست کاربران عمومی
 ListOfValidatedPublicMembers=فهرست کاربران عمومی معتبر
 ErrorThisMemberIsNotPublic=این عضو است عمومی نمی
-ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:%s)</b> در حال حاضر به شخص <b>ثالث%s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
+ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:٪ s)</b> در حال حاضر به شخص <b>ثالث٪ s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
 ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست.
 ThisIsContentOfYourCard=این جزئیات از کارت شما است
 CardContent=محتوا از کارت عضو شما
@@ -85,7 +85,7 @@ SubscriptionLateShort=دیر
 SubscriptionNotReceivedShort=هرگز دریافت
 ListOfSubscriptions=فهرست اشتراک ها
 SendCardByMail=ارسال کارت توسط ایمیل
-AddMember=اضافه کردن کاربر
+AddMember=Create member
 NoTypeDefinedGoToSetup=هیچ نوع عضو تعریف شده است. برو به منوی "انواع کاربران"
 NewMemberType=نوع عضو جدید
 WelcomeEMail=خوش آمدید ایمیل
@@ -116,7 +116,7 @@ ExportDataset_member_1=کاربران و اشتراک
 ImportDataset_member_1=کاربران
 LastMembers=عضو تاریخ و زمان آخرین٪ بازدید کنندگان
 LastMembersModified=تاریخ و زمان آخرین٪ اعضای اصلاح شده
-LastSubscriptionsModified=تاریخ و زمان آخرین%s به اشتراک اصلاح شده
+LastSubscriptionsModified=تاریخ و زمان آخرین٪ s به اشتراک اصلاح شده
 AttributeName=نام صفت
 String=رشته
 Text=متن
@@ -125,7 +125,7 @@ Date=تاریخ
 DateAndTime=تاریخ و زمان
 PublicMemberCard=کاربران کارت های عمومی
 MemberNotOrNoMoreExpectedToSubscribe=کاربران بیشتری انتظار می رود نیست و یا هیچ به اشتراک
-AddSubscription=اضافه کردن اشتراک
+AddSubscription=Create subscription
 ShowSubscription=نمایش اشتراک
 MemberModifiedInDolibarr=کاربران تغییر در Dolibarr
 SendAnEMailToMember=ارسال ایمیل به اطلاعات به عضو
@@ -149,7 +149,7 @@ DescADHERENT_CARD_TEXT_RIGHT=متن چاپ شده بر روی کارت های ع
 DescADHERENT_CARD_FOOTER_TEXT=متن چاپ شده در پایین از کارت های عضو
 GlobalConfigUsedIfNotDefined=متن تعریف شده در راه اندازی ماژول بنیاد استفاده خواهد شد اگر در اینجا تعریف نشده
 MayBeOverwrited=این متن را می توان با مقدار مشخص شده برای نوع عضو overwrited
-ShowTypeCard=نمایش نوع «%s '
+ShowTypeCard=نمایش نوع «٪ s '
 HTPasswordExport=نسل فایل htpassword
 NoThirdPartyAssociatedToMember=بدون شخص ثالث مرتبط به این کاربر
 ThirdPartyDolibarr=شخص ثالث Dolibarr
@@ -203,3 +203,4 @@ MembersByNature=کاربران از طبیعت
 VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها
 NoVatOnSubscription=بدون TVA برای اشتراک
 MEMBER_PAYONLINE_SENDEMAIL=ایمیل برای هشدار دادن به هنگام Dolibarr دریافت تایید از پرداخت اعتبار برای اشتراک
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 1015252b3e2..dc472f3b7c8 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=اگر محصول یک سرویس با مدت زمان م
 MultiPricesAbility=سطح بسیاری از قیمت هر محصول / خدمات
 MultiPricesNumPrices=تعداد قیمت
 MultiPriceLevelsName=مقوله های قیمت
-AssociatedProductsAbility=فعال محصولات مجازی از ویژگی های
-AssociatedProducts=محصول مجازی
-AssociatedProductsNumber=تعدادی از محصولات ساخت این محصول مجازی
-ParentProductsNumber=تعداد پدر و مادر محصول مجازی
-IfZeroItIsNotAVirtualProduct=اگر 0، این محصول یک محصول مجازی
-IfZeroItIsNotUsedByVirtualProduct=اگر 0، این محصول با هر نوع محصول مجازی استفاده نمی شود
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=وابسته
 Translation=ترجمه
 KeywordFilter=فیلتر کلمه کلیدی
@@ -132,7 +132,7 @@ AddDel=اضافه کردن / حذف
 Quantity=مقدار
 NoMatchFound=هیچ بازی یافت
 ProductAssociationList=فهرست محصولات مرتبط / خدمات: نام محصول / خدمات (مقدار تحت تاثیر قرار)
-ProductParentList=لیست محصولات مجازی / خدمات با این محصول به عنوان یک جزء
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=یکی از محصول انتخاب پدر و مادر با محصول فعلی است
 DeleteProduct=حذف یک محصول / خدمات
 ConfirmDeleteProduct=آیا مطمئن هستید که می خواهید به حذف این محصول / خدمات؟
@@ -179,7 +179,7 @@ CloneProduct=محصول کلون یا خدمات
 ConfirmCloneProduct=آیا مطمئن هستید که می خواهید به کلون کردن محصول و یا خدمات <b>از٪ s؟</b>
 CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات
 ClonePricesProduct=اطلاعات اصلی کلون و قیمت
-CloneCompositionProduct=کلون مجازی محصولات / خدمات
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=این محصول مورد استفاده قرار گیرد
 NewRefForClone=کد عکس. محصول جدید / خدمات
 CustomerPrices=مشتریان قیمت
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=همان قيمت تعيين شده در شرکت ها
 PriceByCustomerLog=قيمت های ورود مشتری
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 211b2834b13..841b7ab1a35 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف
 Myprojects=پروژه های من
 ProjectsArea=منطقه پروژه ها
 NewProject=پروژه های جدید
-AddProject=اضافه کردن پروژه
+AddProject=Create project
 DeleteAProject=حذف یک پروژه
 DeleteATask=حذف کار
 ConfirmDeleteAProject=آیا مطمئن هستید که می خواهید این پروژه را حذف کنید؟
@@ -36,6 +36,8 @@ TaskTimeSpent=مدت زمان صرف شده در کارها
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=زمان جدید به سر برد
 MyTimeSpent=وقت من صرف
 MyTasks=کارهای من
@@ -45,7 +47,7 @@ TaskDateStart=تاریخ شروع کار
 TaskDateEnd=تاریخ پایان کار
 TaskDescription=شرح وظیفه
 NewTask=کار جدید
-AddTask=اضافه کردن کار
+AddTask=Create task
 AddDuration=اضافه کردن مدت زمان
 Activity=فعالیت
 Activities=وظایف / فعالیت ها
diff --git a/htdocs/langs/fa_IR/resource.lang b/htdocs/langs/fa_IR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/fa_IR/resource.lang
+++ b/htdocs/langs/fa_IR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 5f527bfefd6..5262a10dba1 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=در اعتباری
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=نمایش برداشت
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=با این حال، اگر فاکتور حداقل یک عقب نشینی پرداخت هنوز پردازش نشده، آن را مجموعه ای به عنوان پرداخت می شود اجازه می دهد تا مدیریت خروج قبل.
-DoStandingOrdersBeforePayments=در این تب شما اجازه می دهد به درخواست حکم ایستاده. پس از آن کامل شده است، شما می توانید پرداخت تایپ برای بستن صورتحساب.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=فایل برداشت
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فاکتورها اعمال می شود و آنها را طبقه بندی به عنوان "پرداخت"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 43df8c5feb8..311fd107278 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Lisää suodin näyttää / piilottaa thirdparties jotka ovat nykyisin toimintaa tai on lopettanut sen
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Hakusuodattimiani vaihtoehtoja
 NumberOfKeyToSearch=Nbr merkkien laukaista haku: %s
 ViewFullDateActions=Näytä koko päivämäärät toimia kolmannen arkin
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules antamaan yksinkertaisia ennalta asennusohjelma D
 ModulesMarketPlaceDesc=Löydät lisää moduuleja ladata Pat internetissä ...
 ModulesMarketPlaces=Lisää moduuleja ...
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web-sivuston tarjoajat voit etsiä löytää lisää moduuleja ...
 URL=Linkki
 BoxesAvailable=Laatikot saatavilla
@@ -444,7 +447,7 @@ Module55Desc=Viivakoodi hallinto
 Module56Name=Puhelimet
 Module56Desc=Puhelimet yhdentyminen
 Module57Name=Pysyvän tilaukset
-Module57Desc=Pysyvän tilauksista ja vetämiset hallinto
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Lisää RSS-syöte sisällä Dolibarr näytön sivuilla
 Module330Name=Kirjanmerkit
 Module330Desc=Kirjanmerkit hallinto
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriat
 Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-editori
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Sähköinen Content Management
 Module2500Desc=Tallentaa ja jakaa asiakirjoja
 Module2600Name=WebServices
 Module2600Desc=Ota Dolibarr verkkopalvelut palvelimen
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Käytä online Gravatar palvelu (www.gravatar.com) näyttää kuvan käyttäjät / jäsenet (löytyi niiden sähköpostit). Tarvitsetko internetyhteys
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moduuli tarjoaa online-maksu sivun luottokortti Paybox
 Module50100Name=Kassa
@@ -527,7 +534,7 @@ Module50200Desc=Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup tallennettu
 BackToModuleList=Palaa moduulien luetteloon
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa
 DefaultLanguage=Oletuskieltä käyttää (kieli-koodi)
 EnableMultilangInterface=Ota monikielinen käyttöliittymä
 EnableShowLogo=Show logo vasemmalla valikossa
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Järjestelmä on päivitetty onnistuneesti
 CompanyInfo=Yritys / säätiö tiedot
 CompanyIds=Yritys / perusta identiteettien
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index e5976e31938..88c4c033422 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Toimet vaikuttaa
 ActionsDoneBy=Toimet tehdään
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Kaikki toimet / tehtävät
 AllActions= Toutes les actions / tehtävät
 ViewList=Näytä lista
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 81d6e4b52ba..8bcaee8c4c9 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -77,17 +77,17 @@ PaymentMode=Maksutapa
 PaymentConditions=Maksuaika
 PaymentConditionsShort=Maksuaika
 PaymentAmount=Maksusumma
-ValidatePayment=Validate payment
+ValidatePayment=Vahvista maksu
 PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
 HelpPaymentHigherThanReminderToPay=Huomio, maksusumman yhden tai useamman laskut on korkeampi kuin muualla maksamaan. <br> Muokkaa merkintä, muuten vahvistaa ja mieti luoda menoilmoitus sen ylittävältä osalta saatu kunkin overpaid laskut.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Luokittele "maksetaan"
-ClassifyPaidPartially=Luokittele "maksetaan osittain"
+ClassifyPaid=Luokittele "Maksettu"
+ClassifyPaidPartially=Luokittele "Osittain maksettu"
 ClassifyCanceled=Luokittele "Hylätty"
 ClassifyClosed=Luokittele "Suljettu"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Luokittele 'Laskuttamatta'
 CreateBill=Luo lasku
-AddBill=Create invoice or credit note
+AddBill=Luo lasku / hyvityslasku
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Poista lasku
 SearchACustomerInvoice=Haku asiakkaan laskussa
@@ -294,7 +294,7 @@ ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 
 # PaymentConditions
 PaymentConditionShortRECEP=Välittömät
@@ -393,7 +393,7 @@ ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid
 AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
+ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 35ca76fe5a4..2d006ade127 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index 2086a0d1c27..8d44a9b256e 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Luettelo käynnissä sopimuksen linjat
 ListOfRunningServices=Luettelo käynnissä olevat palvelut
 NotActivatedServices=Ei aktivoitu palvelut (muun muassa validoitava sopimukset)
 BoardNotActivatedServices=Palvelut aktivoida kesken validoitava sopimukset
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Viimeisin %s aktivoitu palvelut
 LastModifiedServices=Viimeisin %s muunnettu palvelut
 EditServiceLine=Muokkaa palvelulinja
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Myyntiedustajaasi allekirjoittamalla sopimuksen
diff --git a/htdocs/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang
index 23ddc892605..759c36326b8 100644
--- a/htdocs/langs/fi_FI/dict.lang
+++ b/htdocs/langs/fi_FI/dict.lang
@@ -5,8 +5,8 @@ CountryIT=Italia
 CountryES=Espanja
 CountryDE=Saksa
 CountryCH=Sveitsi
-CountryGB=Ison-Britannian
-# CountryUK=United Kingdom
+CountryGB=Iso-Britannia
+CountryUK=United Kingdom
 CountryIE=Irlanti
 CountryCN=Kiina
 CountryTN=Tunisia
@@ -20,7 +20,7 @@ CountryNL=Alankomaat
 CountryHU=Unkari
 CountryRU=Venäjä
 CountrySE=Ruotsi
-CountryCI=Ivoiry Coast
+CountryCI=Norsunluurannikko
 CountrySN=Senegal
 CountryAR=Argentiina
 CountryCM=Kamerun
@@ -252,8 +252,7 @@ CivilityMME=Mrs
 CivilityMR=Mr.
 CivilityMLE=Ms
 CivilityMTRE=Mestari
-# CivilityDR=Doctor
-
+CivilityDR=Doctor
 ##### Currencies #####
 Currencyeuros=Euroa
 CurrencyAUD=Dollar AU
@@ -290,10 +289,10 @@ CurrencyXOF=CFA-frangia BCEAO
 CurrencySingXOF=CFA: n frangin BCEAO
 CurrencyXPF=YKP Francs
 CurrencySingXPF=CFP-frangi
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Tietoa kampanjasta
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Puhelin kampanja
 DemandReasonTypeSRC_CAMP_FAX=Fax kampanja
 DemandReasonTypeSRC_COMM=Kaupalliset yhteystiedot
 DemandReasonTypeSRC_SHOP=Kauppa Yhteystiedot
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Employee
+DemandReasonTypeSRC_SPONSORING=Sponsorship
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 09fdff1071f..f685e4443c4 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Toimittaja-koodi tarvitaan
 ErrorSupplierCodeAlreadyUsed=Toimittaja koodi jo käytössä
 ErrorBadParameters=Bad parametrit
 ErrorBadValueForParameter=Väärä arvo &quot;%s&quot; parametrien väärä &quot;%s&quot;
-ErrorBadImageFormat=Image-tiedosto ei ole tuettu formaatti
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Arvo &quot;%s&quot; on väärä päivämäärä muoto
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Epäonnistui kirjoittaa hakemistoon %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Käyttäjälle <b>sisäänkirjoittautumissivuksesi %s</b
 ErrorLoginHasNoEmail=Tämä käyttäjä ei ole sähköpostiosoitetta. Process aborted.
 ErrorBadValueForCode=Bad arvotyypeillä koodin. Yritä uudelleen uuteen arvoon ...
 ErrorBothFieldCantBeNegative=Kentät %s ja %s voi olla sekä kielteisiä
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Käyttäjätili <b>%s</b> käyttää myös toteuttaa web-palvelimella ei ole lupaa, että
 ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index c9f0a1d0926..157c88b9941 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
+Margin=Kate
+Margins=Katteet
+TotalMargin=Kate yhteensä
+MarginOnProducts=Kate / Tuotteet
+MarginOnServices=Kate / Palvelut
 MarginRate=Margin rate
 MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
@@ -17,8 +17,8 @@ ProductMargins=Product margins
 CustomerMargins=Customer margins
 SalesRepresentativeMargins=Sales representative margins
 ProductService=Tuote tai palvelu
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Kaikki tuotteet ja palvelut
+ChooseProduct/Service=Valitse tuote tai palvelu
 StartDate=Aloituspäivämäärä
 EndDate=Lopetuspäivä
 Launch=Alku
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 7f090046839..ea028ebe4eb 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -8,7 +8,7 @@ Members=Jäsenet
 MemberAccount=Kirjaudu
 ShowMember=Näytä jäsenen kortti
 UserNotLinkedToMember=Käyttäjää ei liity jäseneksi
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Jäsenet Liput
 FundationMembers=Säätiön jäsenet
 Attributs=Määritteet
@@ -85,8 +85,7 @@ SubscriptionLateShort=Myöhäinen
 SubscriptionNotReceivedShort=Koskaan saanut
 ListOfSubscriptions=Luettelo tilaukset
 SendCardByMail=Lähetä kortti
-AddMember=Lisää jäsen
-MemberType=Jäsen tyyppi
+AddMember=Create member
 NoTypeDefinedGoToSetup=Jäsen tyypit määritelty. Go to setup - Jäsenet tyypit
 NewMemberType=Uusi jäsen tyyppi
 WelcomeEMail=Tervetuloa e-mail
@@ -126,12 +125,12 @@ Date=Päivämäärä
 DateAndTime=Päivämäärä ja kellonaika
 PublicMemberCard=Osakkeenomistajan julkinen kortti
 MemberNotOrNoMoreExpectedToSubscribe=Jäsen tai ei ole enää odotettavissa tilata
-AddSubscription=Lisää tilaus
+AddSubscription=Create subscription
 ShowSubscription=Näytä tilaus
 MemberModifiedInDolibarr=Jäsen muutettu Dolibarr
 SendAnEMailToMember=Lähetä tiedot sähköpostitse jäsen
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Viestin aihe ja jäsen autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=Sähköpostitse jäsenen autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail aihe jäsen validointi
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail aihe jäsen résiliation
 DescADHERENT_MAIL_RESIL=EMail jäsenen résiliation
 DescADHERENT_MAIL_FROM=Sender EMail automaattisen sähköpostit
 DescADHERENT_ETIQUETTE_TYPE=Etiketit muodossa
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Muotoile korttien sivu
 DescADHERENT_CARD_HEADER_TEXT=Teksti painettu päälle jäsen kortit
 DescADHERENT_CARD_TEXT=Teksti painettu jäsen kortit
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Kolmansista osapuolista ei näihin jäsen
 ThirdPartyDolibarr=Dolibarr kolmannen osapuolen
 MembersAndSubscriptions= Jäsenet ja Subscriptions
 MoreActions=Täydentäviä toimia tallennus
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Luo suoraan tiliotteensa takia
 MoreActionBankViaInvoice=Luo lasku ja ennakkomaksu
 MoreActionInvoiceOnly=Luo laskun maksua
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Viime merkinnän määrästä
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Jäsenmäärä
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
 MembersByCountryDesc=Tämä ruutu näyttää tilastoja jäseniä maittain. Graphic riippuu kuitenkin Googlen online-käyrä palvelu ja on käytettävissä vain, jos internet-yhteys toimii.
@@ -196,9 +197,10 @@ Collectivités=Organisaatiot
 Particuliers=Henkilökohtainen
 Entreprises=Yritykset
 DOLIBARRFOUNDATION_PAYMENT_FORM=Voit tehdä tilauksen maksun avulla pankkisiirrolla sivulla <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Voit maksaa luottokortilla tai PayPal, klikkaa painiketta sivun alalaidassa. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index f5af02e9123..aa890f3d6fa 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Tuote ref.
-ProductLabel=Tuotemerkki
+ProductRef=Tuote nro.
+ProductLabel=Tuotenimike
 ProductServiceCard=Tuotteet / Palvelut kortti
 Products=Tuotteet
 Services=Palvelut
 Product=Tuote
-Service=Service
+Service=Palvelu
 ProductId=Tuote / palvelu id
 Create=Luo
 Reference=Viite
 NewProduct=Uusi tuote
 NewService=Uusi palvelu
 ProductCode=Tuotekoodi
-ServiceCode=Service-koodi
+ServiceCode=Palvelukoodi
 ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
@@ -22,17 +22,17 @@ ProductAccountancySellCode=Kirjanpidon koodi (myydä)
 ProductOrService=Tuote tai palvelu
 ProductsAndServices=Tuotteet ja palvelut
 ProductsOrServices=Tuotteet tai palvelut
-ProductsAndServicesOnSell=Tuotteet ja Palvelut myydä
-ProductsAndServicesNotOnSell=Tuotteet ja palvelut pois myydä
-ProductsAndServicesStatistics=Tuotteet ja palvelut tilastojen
-ProductsStatistics=Tuotteet tilastot
-ProductsOnSell=Tuotteita myyvät
-ProductsNotOnSell=Tuotteet pois myydä
+ProductsAndServicesOnSell=Myytävät Tuotteet ja Palvelut
+ProductsAndServicesNotOnSell=Ei myytävät Tuotteet ja palvelut
+ProductsAndServicesStatistics=Tuotteiden ja Palveluiden tilastot
+ProductsStatistics=Tuotteiden tilastot
+ProductsOnSell=Myytävät Tuotteet
+ProductsNotOnSell=Ei Myytävät Tuotteet
 ProductsOnSellAndOnBuy=Products not for sale nor purchase
-ServicesOnSell=Palvelut myydä
-ServicesNotOnSell=Palvelut pois myydä
+ServicesOnSell=Myytävät palvelut
+ServicesNotOnSell=Ei Myytävät Palvelut
 ServicesOnSellAndOnBuy=Services not for sale nor purchase
-InternalRef=Kertomus
+InternalRef=Sisäinen viite
 LastRecorded=Uusimmat tuotteet / palvelut myydä kirjataan
 LastRecordedProductsAndServices=Viimeisin %s kirjataan tuotteet / palvelut
 LastModifiedProductsAndServices=Viimeisin %s muunneltuja tuotteita / palveluita
@@ -42,10 +42,10 @@ LastProducts=Uusimmat tuotteet
 CardProduct0=Tuote-kortti
 CardProduct1=Palvelukortti
 CardContract=Sopimus-kortti
-Warehouse=Warehouse
+Warehouse=Varasto
 Warehouses=Varastot
-WarehouseOpened=Warehouse avattu
-WarehouseClosed=Warehouse suljettu
+WarehouseOpened=Varasto avattu
+WarehouseClosed=Varasto suljettu
 Stock=Kanta
 Stocks=Varastot
 Movement=Movement
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Lukumäärä hinta
 MultiPriceLevelsName=Hintakategorioissa
-AssociatedProductsAbility=Ota niihin liittyvät tuotteet
-AssociatedProducts=Vastaavat tuotteet
-AssociatedProductsNumber=Määrä vastaavat tuotteet
-ParentProductsNumber=Lukumäärä emoyhtiön tuote
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Käännös
 KeywordFilter=Hakusanalla suodatin
@@ -132,7 +132,7 @@ AddDel=Lisää / Poista
 Quantity=Määrä
 NoMatchFound=Ei hakutuloksia löytyi
 ProductAssociationList=Luettelo niihin liittyvät tuotteet / palvelut: nimi tuotteen / palvelun (määrä vaikuta)
-ProductParentList=Luettelo tuotteista / palveluista tämän tuotteen komponentti
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Yksi valittu tuote on vanhempi nykyinen tuote
 DeleteProduct=Poista tuotteen / palvelun
 ConfirmDeleteProduct=Oletko varma, että haluat poistaa tämän tuotteen / palvelun?
@@ -179,7 +179,7 @@ CloneProduct=Klooni tuotteen tai palvelun
 ConfirmCloneProduct=Oletko varma, että haluat klooni tuotteen tai <b>palvelun %s?</b>
 CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun
 ClonePricesProduct=Klooni tärkeimmät tiedot ja hinnat
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
 CustomerPrices=Asiakkaat hinnat
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index fee10556bfa..b63e1c65861 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjä
 Myprojects=Omat hankkeet
 ProjectsArea=Projektit alueella
 NewProject=Uusi projekti
-AddProject=Lisää hanke
+AddProject=Create project
 DeleteAProject=Poista hanke
 DeleteATask=Poista tehtävä
 ConfirmDeleteAProject=Oletko varma, että haluat poistaa tämän hankkeen?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Uusi käytetty aika
 MyTimeSpent=Oma käytetty aika
 MyTasks=Omat tehtävät
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Uusi tehtävä
-AddTask=Lisää tehtävä
+AddTask=Create task
 AddDuration=Lisää kesto
 Activity=Toiminto
 Activities=Tehtävät / toiminnot
diff --git a/htdocs/langs/fi_FI/resource.lang b/htdocs/langs/fi_FI/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/fi_FI/resource.lang
+++ b/htdocs/langs/fi_FI/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 3e66966383b..9b24ab1f9d3 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Luottoa
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Näytä Nosta
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Kuitenkin, jos lasku on ainakin yksi poistamista määrä ei kuitenkaan ole vielä käsitelty, sitä ei voida määrittää koska maksoivat sallimaan hallita poistettaviksi.
-DoStandingOrdersBeforePayments=Tällä välilehtien avulla voit pyytää ja kestotilauksena. Kun se on valmis, voit kirjoittaa maksun sulkea laskun.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Maksaminen kestotilaus %s pankin
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bdb6912ebe4..13c55401371 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilisez un champ avec auto-complétion pour choisir le
 ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessé d'exercer
 UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectContact=Utilisez un champ avec auto-complétion pour choisir les contacts (plutôt qu'une liste déroulante).
+DelaiedFullListToSelectCompany=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les tiers (Cela peut augmenter les performances si vous avez un grand nombre de tiers)
+DelaiedFullListToSelectContact=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste les contacts (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
 SearchFilter=Options des filtres de recherche
 NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s
 ViewFullDateActions=Afficher les dates complètes des événements dans la fiche de tiers
@@ -208,6 +210,7 @@ ModulesJobDesc=Les modules métiers très spécifiques permettent une préconfig
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesMarketPlaces=Plus de modules...
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
+DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure  (Remarque: Toute société Open Source connaissant le langage PHP peut fournir du développement spécifique)
 WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules...
 URL=Lien
 BoxesAvailable=Boîtes disponibles
@@ -437,14 +440,14 @@ Module52Name=Stocks
 Module52Desc=Gestion des stocks de produits
 Module53Name=Services
 Module53Desc=Gestion des services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contrats/Abonnements
+Module54Desc=Gestion des contrats (services ou abonnements récurrents)
 Module55Name=Codes-barres
 Module55Desc=Gestion des codes-barres
 Module56Name=Téléphonie
 Module56Desc=Gestion de la téléphonie
 Module57Name=Prélèvements
-Module57Desc=Gestion des prélèvements et retraits bancaires
+Module57Desc=Gestion des paiements par prélèvements. Inclut également la génération du fichier de virement des paiements SEPA pour les pays européens.
 Module58Name=ClickToDial
 Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Flux RSS
 Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr
 Module330Name=Marque-pages
 Module330Desc=Gestion des marque-pages
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projets/Opportunités/Affaires
+Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet.
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
@@ -495,6 +498,8 @@ Module1780Name=Catégories
 Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents)
 Module2000Name=Éditeur WYSIWYG
 Module2000Desc=Permet la saisie de certaines zones de textes grace à un éditeur avancé
+Module2200Name=Prix calculés dynamiquement
+Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux programmés
 Module2300Desc=Gestionnaire de travaux programmés (Cron)
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestion électronique de documents
 Module2500Desc=Permet de stocker et administrer une base de documents
 Module2600Name=WebServices
 Module2600Desc=Active le serveur de Web Services de Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Activez les Web services client (Peut être utilisé pour pousser données/requêtes vers des serveurs externes. Commandes fournisseurs prises en charge seulement pour le moment)
 Module2700Name=Gravatar
 Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur email). Besoin d'un accès Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gérer le Workflow
 Module20000Name=Gestion de la demande de congès
 Module20000Desc=Déclaration et suivi des congès des employés
 Module39000Name=Lot
-Module39000Desc=Gestion de numéro de lot ou date de péremption pour les produits
+Module39000Desc=Gestion des lots et numéro de série, et date de péremption sur les produits
 Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
 Module50100Name=Point de vente
@@ -527,7 +534,7 @@ Module50200Desc=Module permettant d'offrir en ligne une page de paiement par car
 Module50400Name=Comptabilité (avancée)
 Module50400Desc=Gestion de la comptabilité (doubles parties)
 Module54000Name=PrintIPP
-Module54000Desc=Impression via Cups IPP Printer.
+Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
 Module55000Name=Sondages
 Module55000Desc=Module pour intégrer un sondage (comme Doodle, Studs, Rdvz, ...)
 Module59000Name=Marges
@@ -606,11 +613,11 @@ Permission151=Consulter les prélèvements
 Permission152=Créer/modifier une demande de prélèvements
 Permission153=Émettre des bons de prélèvements
 Permission154=Créditer/rejeter les bons de prélèvements
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Lire les contrats/abonnements
+Permission162=Créer/modifier les contrats/abonnements
+Permission163=Activer un service/abonnement
+Permission164=Désactiver un service/abonnements
+Permission165=Supprimer les contrats/abonnements
 Permission171=Lire les notes de frais (Les vôtres et les utilisateurs autorisés)
 Permission172=Créer/modifier les notes de frais / déplacements
 Permission173=Supprimer les notes de frais / déplacements
@@ -672,7 +679,7 @@ Permission300=Consulter les codes-barres
 Permission301=Créer/modifier les codes-barres
 Permission302=Supprimer les codes-barres
 Permission311=Consulter les services
-Permission312=Assign service/subscription to contract
+Permission312=Affecter le service/abonnement au contrat
 Permission331=Lire les marque-pages
 Permission332=Créer/modifier les marque-pages
 Permission333=Supprimer les marque-pages
@@ -702,8 +709,8 @@ Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
 Permission1001=Consulter les stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Créer/modifier entrepôts
+Permission1003=Supprimer entrepôts
 Permission1004=Consulter les mouvements de stocks
 Permission1005=Créer/modifier les mouvements de stocks
 Permission1101=Consulter les bons de livraison
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Méthodes de commandes
 DictionarySource=Origines des propales/commandes
 DictionaryAccountancyplan=Plan comptable
 DictionaryAccountancysystem=Modèles de plan comptable
+DictionaryEMailTemplates=Modèles des courriels
 SetupSaved=Configuration sauvegardée
 BackToModuleList=Retour liste des modules
 BackToDictionaryList=Retour liste des dictionnaires
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
 DefaultLanguage=Langue à utiliser par défaut (code langue)
 EnableMultilangInterface=Activer l'interface multi-langue
 EnableShowLogo=Afficher le logo dans le menu gauche
+EnableHtml5=Activer Html5 (Développement - Supporté uniquement avec le thème Eldy)
 SystemSuccessfulyUpdated=Votre système a été correctement mis à jour
 CompanyInfo=Informations sur la société/institution
 CompanyIds=Identifiants règlementaires
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
 UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle est considérée comme une option
 FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
 ##### Orders #####
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modèles de numérotation des fiches d'intervention
 TemplatePDFInterventions=Modèles de document des fiches d'intervention
 WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'intervention (aucun si vide)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configuration du module Contrats/Abonnements
 ContractsNumberingModules=Modèles de numérotation des contrats
 TemplatePDFContracts=Modèles de document de contrats
 FreeLegalTextOnContracts=Mention complémentaire sur les contrats
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP
 CacheByServer=Cache par le serveur
 CacheByClient=Cache par le navigateur
 CompressionOfResources=Compression des réponses HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant
 ##### Products #####
 ProductSetup=Configuration du module Produits
 ServiceSetup=Configuration du module Services
@@ -1415,9 +1424,9 @@ OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur
 OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
 OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configuration du module Entrepôt
+UserWarehouse=Utiliser des emplacements/entrepôts propres à chaque utilisateur
+IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
 ##### Menu #####
 MenuDeleted=Menu supprimé
 TreeMenu=Arborescence des menus
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Ce module permet d'ajouter la possibilité de cliquer sur les nu
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Caisse enregistreuse
 CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ventes
 CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
 CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
 CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Ne pas réduire le stock quand une vente est faite depuis le Point de Vente. Sinon, la réduction est faite par défaut.
+CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
+StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
+CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index a4e5e7e0a03..bd3c25da359 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Événements affectés à
 ActionsDoneBy=Événements réalisés par
 ActionsForUser=Evénements de l'utilisateur
 ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe
-ActionAssignedTo=Événement assigné à
+ActionAssignedTo=Evénement assigné à
 AllMyActions= Tous mes événements
 AllActions= Tous les événements
 ViewList=Vue liste
@@ -45,7 +45,7 @@ AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers extern
 ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
 PropalValidatedInDolibarr=Proposition %s validée
 InvoiceValidatedInDolibarr=Facture %s validée
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
 InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
 InvoiceDeleteDolibarr=Facture %s supprimée
 OrderValidatedInDolibarr= Commande %s validée
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index fa1eff4b0af..24ebe5ff923 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Aucune facture
 ClassifyBill=Classer la facture
 SupplierBillsToPay=Factures fournisseurs à payer
 CustomerBillsUnpaid=Factures clients impayées
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Les factures écrites par des procédures mecanographic sont distribuées par l'ordre en lettres
 NonPercuRecuperable=Non perçue réc.
 SetConditions=Définir conditions de règlement
 SetMode=Définir mode de règlement
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 5c826d54301..6b29fa82fec 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse
 TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptabilité
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
 ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
 ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 5f9a8b4427d..895e3c95cad 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Espace contrats
 ListOfContracts=Liste des contrats
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Les %s derniers contrats modifiés
 AllContracts=Tous les contrats
 ContractCard=Fiche contrat
 ContractStatus=État du contrat
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste des lignes de contrats en service
 ListOfRunningServices=Liste des services actifs
 NotActivatedServices=Services non activés (parmi les contrats validés)
 BoardNotActivatedServices=Services à activer en contrat validé
-LastContracts=Last % contracts
+LastContracts=Les %s derniers contrats
 LastActivatedServices=Les %s derniers services activés
 LastModifiedServices=Les %s derniers services modifiés
 EditServiceLine=Edition ligne du service
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste des services actifs en expiration
 NoteListOfYourExpiredServices=Cette list ne contient que les contrats de services des tiers pour lesquels vous êtes liés comme représentant commercial.
 StandardContractsTemplate=Modèle standard de contrats
 ContactNameAndSignature=Pour %s, nom et signature:
+OnlyLinesWithTypeServiceAreUsed=Seules les lignes de type "Service" seront clonées
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index e559c9e5bcd..92deeb11c20 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser 'crontab'
 CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâche pour lancer une commande toute les minutes
 # Menu
 CronJobs=Travaux programmés
-CronListActive=List of active/scheduled jobs
+CronListActive=Liste des travaux actifs/programmés
 CronListInactive=Liste des travaux inactifs
 # Page list
 CronDateLastRun=Dernier lancement
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 0ccafc3843c..e880dbdac8d 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -6,9 +6,9 @@ NoErrorCommitIsDone=Pas d'erreur, on valide
 Error=Erreur
 Errors=Erreurs
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
-ErrorBadEMail=e-mail %s invalide
+ErrorBadEMail=email %s invalide
 ErrorBadUrl=Url %s invalide
-ErrorLoginAlreadyExists=Le login %s existe déjà.
+ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
@@ -37,15 +37,15 @@ ErrorSupplierCodeRequired=Code fournisseur obligatoire
 ErrorSupplierCodeAlreadyUsed=Code fournisseur déjà utilisé
 ErrorBadParameters=Paramètres incorrects
 ErrorBadValueForParameter=Valeur '%s' incorrecte pour le paramètre '%s'
-ErrorBadImageFormat=Cet image a un format non supporté (Votre PHP ne supporte pas les fonctions de conversion de ce format d'image).
+ErrorBadImageFormat=Cet image est dans un format non pris en charge (Votre PHP ne prend pas en charge les fonctions de conversion de ce format d'image).
 ErrorBadDateFormat=La valeur '%s' a un format de date non reconnu
 ErrorWrongDate=La date est incorrecte
 ErrorFailedToWriteInDir=Impossible d'écrire dans le répertoire %s
-ErrorFoundBadEmailInFile=Syntaxe de mail incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
+ErrorFoundBadEmailInFile=Syntaxe d'email incorrecte trouvée pour %s lignes dans le fichier (exemple ligne %s avec email=%s)
 ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Peut-être est-il associé à des éléments de Dolibarr.
 ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
-ErrorNoMailDefinedForThisUser=EMail non défini pour cet utilisateur
+ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
@@ -99,18 +99,18 @@ ErrorFailedToSendPassword=Échec de l'envoi du mot de passe
 ErrorFailedToLoadRSSFile=Echec de la récupération du flux RSS. Ajoutez la constante MAIN_SIMPLEXMLLOAD_DEBUG si le message d'erreur n'est pas assez explicite.
 ErrorPasswordDiffers=Les mots de passe ne sont pas identiques, veuillez les saisir à nouveau
 ErrorForbidden=Accès non autorisé.<br>Vous essayez d'accéder à une page, zone ou fonction sans être au sein d'une session authentifiée ou qui n'est pas autorisée pour votre compte utilisateur.
-ErrorForbidden2=Les permissions pour ce login peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s.
+ErrorForbidden2=Les permissions pour cet identifiant peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s.
 ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre...).
 ErrorNoImagickReadimage=La classe Imagick n'est pas présente sur cette installation de PHP. L'aperçu n'est donc pas disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
 ErrorRecordAlreadyExists=Enregistrement déjà existant
 ErrorCantReadFile=Échec de lecture du fichier '%s'
 ErrorCantReadDir=Échec de lecture du répertoire '%s'
 ErrorFailedToFindEntity=Échec de lecture de l'environnement '%s'
-ErrorBadLoginPassword=Identifiants login ou mot de passe incorrect
+ErrorBadLoginPassword=Identifiant ou mot de passe incorrect
 ErrorLoginDisabled=Votre compte est désactivé
 ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par votre serveur PHP. Si le <b>Safe Mode</b> PHP est actif, vérifiez que la commande se trouve dans un répertoire défini dans le paramètre <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Échec de modification du mot de passe
-ErrorLoginDoesNotExists=Le compte utilisateur de login <b>%s</b> n'a pu être trouvé.
+ErrorLoginDoesNotExists=Le compte utilisateur identifié par <b>%s</b> n'a pu être trouvé.
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
 ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est li
 ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée.
 ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture bancaire qui a été rapprochée
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée.
+ErrorPriceExpression1=Ne peut assigner la constante '%s'
+ErrorPriceExpression2=Ne peut redéfinir la fonction '%s'
+ErrorPriceExpression3=Variable '%s' non définie dans la définition de fonction
+ErrorPriceExpression4=Caractère illégal '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Nombre incorrect d'arguments (%s donné,%s attendu)
+ErrorPriceExpression8=Operateur '%s' non attendu
+ErrorPriceExpression9=Une erreur inattendue s'est produite
+ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s' 
+ErrorPriceExpression11=Attendu '%s'
+ErrorPriceExpression14=Division par zéro
+ErrorPriceExpression17=Variable '%s' non définie
+ErrorPriceExpression19=Expression introuvable
+ErrorPriceExpression20=Expression vide
+ErrorPriceExpression21=Résultat '%s' vide
+ErrorPriceExpression22=Résultat négatif '%s'
+ErrorPriceExpressionInternal=Erreur interne '%s'
+ErrorPriceExpressionUnknown=Erreur inconnue '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 7316d81aebe..8cb4cdcecd1 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Envoyé par
 MailingNeedCommand=Pour des raisons de sécurité, les emailings fonctionnent mieux depuis la ligne de commande. Si vous en avez un, demandez à votre administrateur de lancer la commande suivante pour envoyer l'emailing à tous les destinataires :
 MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
 ConfirmSendingEmailing=Si vous n'en avez pas ou préferrez envoyer via votre navigateur web, confirmez simplement que vous désirez envoyer l'emailing maintenant depuis le mode web ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Remarque: L'envoi d'Emailings à partir de l'interface web se fait en plusieurs fois pour des raisons de sécurité et de timeout, <b>%s</b> bénéficiaires à la fois pour chaque session d'envoi.
 TargetsReset=Vider liste
 ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton
 ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
 AddNewNotification=Activer une nouvelle cible de notification email
 ListOfActiveNotifications=Liste des cibles de notifications emails actives
 ListOfNotificationsDone=Liste des notifications emails envoyées
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
+MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
+MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 3404ee5d3cb..849a6ad0245 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -5,7 +5,7 @@ MemberCard=Fiche adhérent
 SubscriptionCard=Fiche cotisation
 Member=Adhérent
 Members=Adhérents
-MemberAccount=Login adhérent
+MemberAccount=Identifiant adhérent
 ShowMember=Afficher fiche adhérent
 UserNotLinkedToMember=Utilisateur non lié à un adhérent
 ThirdpartyNotLinkedToMember=Tiers non lié à un adhérent
@@ -16,7 +16,7 @@ ErrorMemberTypeNotDefined=Le type d'adhérent n'est pas choisi
 ListOfPublicMembers=Liste des adhérents publics
 ListOfValidatedPublicMembers=Liste des adhérents publics validés
 ErrorThisMemberIsNotPublic=Cet adhérent n'est pas public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, login: <b>%s</b>) est déjà lié au tiers <b>%s</b>. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa).
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, identifiant : <b>%s</b>) est déjà lié au tiers <b>%s</b>. Supprimer le lien existant d'abord car un tiers ne peut être lié qu'à un seul adhérent (et vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même.
 ThisIsContentOfYourCard=Voici les détails de votre fiche
 CardContent=Contenu de votre fiche adhérent
@@ -76,7 +76,7 @@ EditMember=Édition adhérent
 SubscriptionEndDate=Date de fin adhésion
 MembersTypeSetup=Configuration des types d'adhérents
 NewSubscription=Nouvelle adhésion
-NewSubscriptionDesc=Ce formulaire permet de vous enregistrer comme nouvel adhérent de l'association. Pour un renouvellement si vous êtes déjà adhérent, contactez plutôt l'association par mail %s.
+NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s.
 Subscription=Adhésion/cotisation
 Subscriptions=Adhésions/cotisations
 SubscriptionLate=En retard
@@ -84,7 +84,7 @@ SubscriptionNotReceived=Cotisation non reçue
 SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=Non reçue
 ListOfSubscriptions=Liste des cotisations
-SendCardByMail=Envoyer fiche par mail
+SendCardByMail=Envoyer fiche par email
 AddMember=Créer adhérent
 NoTypeDefinedGoToSetup=Aucun type d'adhérent défini. Allez dans le menu "Types d'adhérents"
 NewMemberType=Nouveau type de membre
@@ -129,17 +129,17 @@ AddSubscription=Créer cotisation
 ShowSubscription=Afficher adhésion
 MemberModifiedInDolibarr=Adhérent modifié dans Dolibarr
 SendAnEMailToMember=Envoyer email d'information à l'adhérent
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet du mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail reçu en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet du mail envoyé en cas d'auto-inscription d'un invité
-DescADHERENT_AUTOREGISTER_MAIL=Mail envoyé en cas d'auto-inscription d'un invité
-DescADHERENT_MAIL_VALID_SUBJECT=Sujet du mail de validation adhérent
-DescADHERENT_MAIL_VALID=Mail de validation adhérent
-DescADHERENT_MAIL_COTIS_SUBJECT=Sujet du mail de validation adhésion
-DescADHERENT_MAIL_COTIS=Mail de validation d'une adhésion
-DescADHERENT_MAIL_RESIL_SUBJECT=Sujet du mail de résiliation
-DescADHERENT_MAIL_RESIL=Mail de résiliation
-DescADHERENT_MAIL_FROM=Mail émetteur pour les mails automatiques
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Sujet de l'email envoyé en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_MAIL=Email envoyé en cas d'auto-inscription d'un invité
+DescADHERENT_MAIL_VALID_SUBJECT=Sujet de l'email de validation adhérent
+DescADHERENT_MAIL_VALID=Email de validation adhérent
+DescADHERENT_MAIL_COTIS_SUBJECT=Sujet de l'email de validation adhésion
+DescADHERENT_MAIL_COTIS=Email de validation d'une adhésion
+DescADHERENT_MAIL_RESIL_SUBJECT=Sujet de l'email de résiliation
+DescADHERENT_MAIL_RESIL=Email de résiliation
+DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
 DescADHERENT_CARD_TYPE=Format pages cartes d'adhérent
@@ -203,3 +203,4 @@ MembersByNature=Adhérents par nature
 VATToUseForSubscriptions=Taux de TVA pour les adhésions
 NoVatOnSubscription=Pas de TVA sur les adhésions
 MEMBER_PAYONLINE_SENDEMAIL=Email à avertir en cas de retour de paiement validé pour une cotisation
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit utilisé pour la ligne d'abonnement dans la facture: %s
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 1abf48003b9..2b5cfa336ab 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Une expédition existe
 DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
 DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
 MenuOrdersToBill=Commandes délivrées
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Commandes facturables
 SearchOrder=Rechercher une commande
 SearchACustomerOrder=Rechercher une commande client
 ShipProduct=Expédier produit
diff --git a/htdocs/langs/fr_FR/printipp.lang b/htdocs/langs/fr_FR/printipp.lang
index 3680b42bb87..13e24fc7408 100644
--- a/htdocs/langs/fr_FR/printipp.lang
+++ b/htdocs/langs/fr_FR/printipp.lang
@@ -1,9 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Configuration du module Impression direct IPP
-PrintIPPDesc=Ce module permet d'ajouter un bouton d'impression direct des documents vers votre imprimante. Il requiert un systeme Linux équipé de Cups.
-PRINTIPP_ENABLED=Affiche le logo "Impression directe" sur les listes de documents
-PRINTIPP_HOST=Serveur impression
+PrintIPPSetup=Réglages du module Direct Print
+PrintIPPDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante. Un système Linux installé avec CUPS est nécessaire.
+PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents
+PRINTIPP_HOST=Serveur d'impression
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
+PRINTIPP_USER=Identifiant
 PRINTIPP_PASSWORD=Mot de passe
-NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration Cups)
\ No newline at end of file
+NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS)
+FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante
+NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut
+DefaultPrinter=Imprimante par défaut
+Printer=Imprimante
+CupsServer=Serveur CUPS
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 83f37508b8d..6871657b6a3 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,19 +1,20 @@
-# ProductBATCH language file - fr_FR - ProductBATCH
-CHARSET= UTF-8
-ProductStatusOnBatch= Gérer
-ProductStatusNotOnBatch= Non gérer
-ProductStatusOnBatchShort= Gérer
-ProductStatusNotOnBatchShort= Non gérer
-Batch=Lot
-atleast1batchfield= DLC ou DLUO ou Numéro de lot
-batch_number= Numéro de lot
-l_eatby= DLC
-l_sellby= DLUO
-DetailBatchNumber= Détails des lots
-DetailBatchFormat= Lot/Serie: %s - C:%s - UO: %s (Qté : %d)
-printBatch= Lot: %s
-printEatby= DLC: %s
-printSellby= DLUO: %s
-printQty= Qté: %d
-AddDispatchBatchLine=Ajouter une ligne de dispatch
-BatchDefaultNumber= Indéfini
\ No newline at end of file
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestion des lots/séries
+ProductStatusOnBatch=Géré
+ProductStatusNotOnBatch=Non géré
+ProductStatusOnBatchShort=Géré
+ProductStatusNotOnBatchShort=Non géré
+Batch=Lot/Série
+atleast1batchfield=Date de péremption ou numéro de lot/série
+batch_number=Lot/Numéro de série
+l_eatby=Date limite de consommation
+l_sellby=Date de péremption
+DetailBatchNumber=Détails Lot/Série
+DetailBatchFormat=Lot/Série: %s - E:%s - S: %s (Qty : %d)
+printBatch=Lot/Série: %s
+printEatby=Limite de consommation : %s
+printSellby=Péremption : %s
+printQty=Qté: %d
+AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation
+BatchDefaultNumber=Non défini
+WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 58dcbb0844e..a1af422e24b 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -118,7 +118,7 @@ MultiPricesAbility=Plusieurs niveaux de prix par produit/service
 MultiPricesNumPrices=Nombre de prix
 MultiPriceLevelsName=Catégorie de prix
 AssociatedProductsAbility=Prise en charge des produits virtuels/packs
-AssociatedProducts=Produit virtual/package
+AssociatedProducts=Produit virtuel/package
 AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel/package
 ParentProductsNumber=Nbre de produits virtuels/packages parent
 IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel/package
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
 PriceByCustomerLog=Trace des prix par clients
 MinimumPriceLimit=Le prix minimum ne peut être inférieur à %s
 MinimumRecommendedPrice=Prix minimum recommandé : %s
+PriceExpressionEditor=Éditeur d'expression de prix
+PriceExpressionSelected=Expression de prix sélectionnée
+PriceExpressionEditorHelp=« price = 2 + 2 » ou « 2 + 2 » afin de positionner le prix<br>Les champs personnalisés sont des variables de la forme « #options_macléchampperso# * 2 »<br>Il y a des variables spéciales telles que « #quantity# » et « #tva_tx# »<br>Utiliser « ; » pour séparer les expressions.
+PriceMode=Mode de tarification
+PriceNumeric=Nombre
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 7148ae0c1c0..29a11afec29 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Temps consommé sur les tâches
 TaskTimeUser=Utilisateur
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tâches sur projets ouverts
+WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Nouveau consommé
 MyTimeSpent=Mon consommé
 MyTasks=Mes tâches
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
index c7fb29d3372..3ae29d4d0b6 100644
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -22,8 +22,8 @@ GotoDate=Aller à un date
 
 ResourceElementPage=Ressources
 ResourceCreatedWithSuccess=Ressource créée avec succès
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Ligne de ressource supprimée
+RessourceLineSuccessfullyUpdated=Ligne de ressource mise à jour avec succès
 ResourceLinkedWithSuccess=Ressource liée avec succès
 
 TitleResourceCard=Fiche ressource
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirmer la suppression de cette ressource ?
 RessourceSuccessfullyDeleted=Ressource supprimée avec succès
 DictionaryResourceType=Type de ressource
 
-DictionaryEMailTemplates=Modèles d'emails
-
 SelectResource=Sélectionner ressource
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 5aaa2672627..6b0f7772e37 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Désactivation utilisateur %s
 UserEnabled=Activation utilisateur %s
 UserDeleted=Suppression utilisateur %s
 NewGroupCreated=Création groupe %s
-GroupModified=Group %s modified
+GroupModified=Groupe %s modifié
 GroupDeleted=Suppression groupe %s
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact ?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour cet adhérent ?
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index a8d290c25fa..d19c4909b4e 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -11,7 +11,7 @@ Withdrawal=Retrait
 WithdrawalsReceipts=Bons de prélèvements
 WithdrawalReceipt=Bon de prélèvement
 WithdrawalReceiptShort=Bon
-LastWithdrawalReceipts=Les %s derniers bons de traitement
+LastWithdrawalReceipts=Les %s derniers bons de prélèvements
 WithdrawedBills=Factures prélevées
 WithdrawalsLines=Lignes de prélèvements
 RequestStandingOrderToTreat=Demandes de prélèvements à traiter
@@ -47,7 +47,7 @@ RefusedData=Date du rejet
 RefusedReason=Motif du rejet
 RefusedInvoicing=Facturation du rejet
 NoInvoiceRefused=Ne pas facturer le rejet
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Facture refusée (Charges de rejet imputable au client) 
 Status=État
 StatusUnknown=Inconnu
 StatusWaiting=En attente
@@ -79,10 +79,11 @@ CreditDate=Crédité le
 WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté)
 ShowWithdraw=Voir prélèvement
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord.
-DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clôturer.
+DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un ordre de virement. Une fois réalisé, allez dans le menu par la Banque -> Virements pour générer l'ordre. Lorsque l'ordre de virement est clos, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul.
 WithdrawalFile=Fichier de prélèvement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
 ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées
+StatisticsByLineStatus=Statistiques par statut des lignes
 
 ### Notifications
 InfoCreditSubject=Crédit prélèvement %s à la banque
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index d43027916e7..d04253ac0d9 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= הוספת אפשרות סינון להראות / להסתיר thirdparties שהם כיום בפעילות או חדל זה
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=מסננים אפשרויות חיפוש
 NumberOfKeyToSearch=NBR של תווים כדי להפעיל חיפוש: %s
 ViewFullDateActions=הצג מלאים תאריכים לאירועים גיליון 3
@@ -208,6 +210,7 @@ ModulesJobDesc=מודולים עסקיים לספק התקנה מוגדרת מר
 ModulesMarketPlaceDesc=תוכל למצוא רכיבים נוספים כדי להוריד באתרי אינטרנט חיצוניים באינטרנט ...
 ModulesMarketPlaces=מודולים נוספים ...
 DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=אתר ספקי האינטרנט שבהם אתה יכול לחפש למצוא מודולים נוספים ...
 URL=קשר
 BoxesAvailable=הזמינות תיבות
@@ -444,7 +447,7 @@ Module55Desc=ברקוד של ההנהלה
 Module56Name=טלפוניה
 Module56Desc=שילוב טלפוניה
 Module57Name=הוראות קבע
-Module57Desc=הוראות קבע וניהול של נסיגה
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=עדכוני RSS
 Module320Desc=הוסף עדכון RSS בתוך דפי Dolibarr מסך
 Module330Name=הסימניות
 Module330Desc=הפוך ההנהלה
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=קטגוריות
 Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות)
 Module2000Name=עורך WYSIWYG
 Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=סדר היום
@@ -503,6 +508,8 @@ Module2500Name=תוכן אלקטרוני ניהול
 Module2500Desc=לשמור ולשתף מסמכים
 Module2600Name=WebServices
 Module2600Desc=אפשר האינטרנט Dolibarr שירותי שרת
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=השתמש באינטרנט בשירות Gravatar (www.gravatar.com) להראות תמונה של משתמשים / חברים (נמצא עם מיילים שלהם). צריך גישה לאינטרנט
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם PayBox
 Module50100Name=נקודת מכירות
@@ -527,7 +534,7 @@ Module50200Desc=מודול להציע בדף התשלום באינטרנט בא
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=הגדרת הציל
 BackToModuleList=חזרה לרשימת מודולים
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה)
 EnableMultilangInterface=אפשר ממשק רב לשוני
 EnableShowLogo=הצג את הלוגו בתפריט השמאלי
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=המערכת עודכנה בהצלחה
 CompanyInfo=החברה / בסיס מידע
 CompanyIds=החברה / קרן זהויות
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 9dac68e1252..38507100e11 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index b0b9b337ac4..e962d4de7ce 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 3181cfe4836..52c05d495ad 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index b1319786708..ee28fcb125c 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
 Members=משתמשים
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
 ImportDataset_member_1=משתמשים
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index a87d7bc3003..6cc95b19193 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 481a006cb7a..a235a0df787 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/he_IL/resource.lang b/htdocs/langs/he_IL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/he_IL/resource.lang
+++ b/htdocs/langs/he_IL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 1bf0cf1f42d..42b6ed1e19c 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 3cc430078af..a9ded699060 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index f7775cea7e7..508164a1448 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Događaj dodjeljen
 ActionsDoneBy=Događaji završeni od strane korisnika
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Svi moji događaji/zadaci
 AllActions= Svi događaji/zadaci
 ViewList=Lista
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index d8a68e60e86..26ec3f1e5a4 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista otvorenih stavki ugovora
 ListOfRunningServices=Lista usluga koje se odvijaju
 NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima)
 BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Zadnje %s aktivne usluge
 LastModifiedServices=Zadnje %s modificirane usluge
 EditServiceLine=Uredi liniju usluge
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista usluga koja ističe
 NoteListOfYourExpiredServices=Ova lista sadrži samo usluge kontakata treće strane sa kojima ste linkani kao prodajni predstavnik
 StandardContractsTemplate=Predložak uobičajenog ugovora
 ContactNameAndSignature=Za %s, ime i potpis
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik trgovca potpisuje ugovor
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index e22304f8b38..765c7e211a2 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Broj cijena
 MultiPriceLevelsName=Grupe cijena
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtualni proizvod
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije virtualnni proizvod
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Pridruži
 Translation=Prijevod
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Dodaj/izbriši
 Quantity=Količina
 NoMatchFound=Ništa slično nije pronađeno
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index e1c66b34417..2f9a63d5319 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=Moji projekti
 ProjectsArea=Projects area
 NewProject=Novi projekt
-AddProject=Dodaj projekt
+AddProject=Create project
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite izbrisati ovaj projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/hr_HR/resource.lang
+++ b/htdocs/langs/hr_HR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 61ccfb87d49..b5757284f28 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Keresés szűrők lehetőségek
 NumberOfKeyToSearch=NBR karakterek kiváltó keresés: %s
 ViewFullDateActions=Mutasd a teljes időpontok események a harmadik lapra
@@ -208,6 +210,7 @@ ModulesJobDesc=Üzleti modulok olyan egyszerű, előre definiált beállítás a
 ModulesMarketPlaceDesc=Még több modult letölteni a külső internetes oldalak az interneten ...
 ModulesMarketPlaces=További modulok ...
 DoliStoreDesc=DoliStore, a hivatalos piaci hely Dolibarr ERP / CRM külső modulok
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site szolgáltatók kereshet, így több modult ...
 URL=Link
 BoxesAvailable=Dobozok elérhető
@@ -444,7 +447,7 @@ Module55Desc=Vonalkód vezetése
 Module56Name=Telefonálás
 Module56Desc=Telephony Integration
 Module57Name=Állandó megbízás
-Module57Desc=Állandó megbízások visszavonása és vezetése
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed belül Dolibarr képernyőre
 Module330Name=Könyvjelzők
 Module330Desc=Bookmark vezetése
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategóriák
 Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők)
 Module2000Name=WYSIWYG szerkesztő
 Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Napirend
@@ -503,6 +508,8 @@ Module2500Name=Elektronikus Content Management
 Module2500Desc=Mentés és dokumentumok megosztása
 Module2600Name=WebServices
 Module2600Desc=Engedélyezze a Dolibarr web szerver szolgáltatás
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Használja online szolgáltatást Gravatar (www.gravatar.com), hogy fotó a felhasználók / tagok (találtak a levelek). Szüksége van egy internet-hozzáférési
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modult kínál online fizetési oldalra bankkártyáját Paybox
 Module50100Name=Értékesítési
@@ -527,7 +534,7 @@ Module50200Desc=Modult kínál online fizetési oldalra hitelkártya Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Beállítás mentett
 BackToModuleList=Visszalép a modulok listáját
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv használatát (nyelv kód)
 EnableMultilangInterface=Engedélyezze a többnyelvű interfész
 EnableShowLogo=Mutasd logo a bal menüben
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=A rendszer már sikeresen frissítve
 CompanyInfo=Cég / alapítvány adatai
 CompanyIds=Cég / alapítvány identitások
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index 3a6a949b9c6..45bc191ced2 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Eseményeket befolyásolhatja
 ActionsDoneBy=Actions done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Az én cselekvéseim/feladataim
 AllActions= Az összes cselekvés/feladat
 ViewList=Lista megtekintése
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index cc6dabc7a18..91d9d5fe9b7 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index b22dcf89dc7..df24822ebb1 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Futó szerződések listája
 ListOfRunningServices=Futó szolgáltatások listája
 NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között)
 BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Utolós %s aktivált szolgáltatás
 LastModifiedServices=Utolsó %s módosított szolgáltatás
 EditServiceLine=Szolgáltatás sor szerkesztése
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Értékesítési képviselő a szerződés aláírásakor
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 21b3252c7df..e79edfa3418 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Szállító kód szükséges
 ErrorSupplierCodeAlreadyUsed=Szállító kód már használatban
 ErrorBadParameters=Hibás paraméterek
 ErrorBadValueForParameter=Rossz érték &quot;%s&quot; helytelen paraméter &quot;%s&quot;
-ErrorBadImageFormat=Kép fájl formátuma nem támogatott
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Érték &quot;%s&quot; rossz a dátum formátumát
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nem sikerült írni a könyvtárban %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Felhasználó bejelentkezési <b>%s</b> nem található.
 ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címre. Folyamat megszakítva.
 ErrorBadValueForCode=Rossz érték a biztonsági kódot. Próbálja újra, az új érték ...
 ErrorBothFieldCantBeNegative=Fields %s %s és nem lehet egyszerre negatív
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Felhasználói fiók <b>%s</b> végrehajtására használnak web szerver nincs engedélye az adott
 ErrorNoActivatedBarcode=Nem vonalkód típus aktivált
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index cff1a2c4e8f..bdac075a8b4 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -8,7 +8,7 @@ Members=Tagok
 MemberAccount=Belépés
 ShowMember=Mutasd tagja kártya
 UserNotLinkedToMember=A felhasználó nem kapcsolódik egy tagja
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Tagok Jegyek
 FundationMembers=Alapítvány tagjai
 Attributs=Attribútumok
@@ -85,8 +85,7 @@ SubscriptionLateShort=Késő
 SubscriptionNotReceivedShort=Soha nem kapott
 ListOfSubscriptions=Előfizetések listája
 SendCardByMail=Elküldöm e-mailben
-AddMember=Add tagja
-MemberType=Tagság típusa
+AddMember=Create member
 NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok
 NewMemberType=Új tag írja
 WelcomeEMail=Üdvözöljük az e-mail
@@ -126,12 +125,12 @@ Date=Dátum
 DateAndTime=Dátum és idő
 PublicMemberCard=Tagállamban közvélemény-kártya
 MemberNotOrNoMoreExpectedToSubscribe=Nem vagy tag többé várhatóan feliratkozáshoz
-AddSubscription=Add előfizetés
+AddSubscription=Create subscription
 ShowSubscription=Mutasd előfizetés
 MemberModifiedInDolibarr=Tagja módosított Dolibarr
 SendAnEMailToMember=Küldés e-mailben tájékoztatást tagja
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-mail tárgya a tagállamok autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail szolgáltatás tagja autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=E-mail tárgya a tagállamok hitelesítési
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=E-mail tárgya a tagállamok resiliation
 DescADHERENT_MAIL_RESIL=E-mail szolgáltatás tagja resiliation
 DescADHERENT_MAIL_FROM=Feladó e-mail címet automatikus e-maileket
 DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Formátuma kártyák oldal
 DescADHERENT_CARD_HEADER_TEXT=Nyomtatott szöveg tetején tag kártyák
 DescADHERENT_CARD_TEXT=Nyomtatott szöveg tagja kártyák (igazítsa a bal)
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Harmadik félnek nem társult a tag
 ThirdPartyDolibarr=Dolibarr harmadik fél
 MembersAndSubscriptions= A tagok és Subscriptions
 MoreActions=Kiegészítő fellépés a felvételi
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Hozzon létre egy közvetlen tranzakciós rekord miatt
 MoreActionBankViaInvoice=Hozzon létre egy számlát és előleg
 MoreActionInvoiceOnly=Hozzon létre egy számlát nem kell fizetni
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Utolsó előfizetés összege
 MembersStatisticsByCountries=Tagok statisztikája ország
 MembersStatisticsByState=Tagok statisztikája állam / tartomány
 MembersStatisticsByTown=Tagok statisztikája város
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Tagok száma
 NoValidatedMemberYet=Nem hitelesített tagok található
 MembersByCountryDesc=Ez a képernyő megmutatja statisztikát tagok országokban. Grafikus függ azonban a Google online grafikon szolgáltatást és csak akkor elérhető, ha az internet kapcsolat működik.
@@ -196,9 +197,10 @@ Collectivités=Szervezetek
 Particuliers=Személyes
 Entreprises=Cégek
 DOLIBARRFOUNDATION_PAYMENT_FORM=Ahhoz, hogy az előfizetés befizetését a banki átutalást, lásd <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Fizetni hitelkártyával vagy PayPal, kattintson gombra a lap alján. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 12fca359dda..bdcddfabdcf 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Árak száma
 MultiPriceLevelsName=Ár kategóriák
-AssociatedProductsAbility=Aktiválja a kapcsolódó termékeket
-AssociatedProducts=Kapcsolódó termékek
-AssociatedProductsNumber=Kapcsolódó termékek száma
-ParentProductsNumber=Számos szülő termék
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Kapcsolás
 Translation=Fordítás
 KeywordFilter=Kulcsszó szűrés
@@ -132,7 +132,7 @@ AddDel=Hozzáadás/Törlés
 Quantity=Mennyiség
 NoMatchFound=Nincs találat
 ProductAssociationList=Vonatkozó szolgáltatások/termékek listája: Termék/szolgáltatás neve (mennyiség érintett)
-ProductParentList=Jegyzéke termékek / szolgáltatások ezzel a termékkel, mint egy komponens
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek
 DeleteProduct=Termék/szolgáltatás törlése
 ConfirmDeleteProduct=Biztos törölni akarja ezt a terméket/szolgáltatást?
@@ -179,7 +179,7 @@ CloneProduct=Termék vagy szolgáltatás klónozása
 ConfirmCloneProduct=Biztos, hogy klónozni akarja ezt a szolgáltatást: <b>%s</b> ?
 CloneContentProduct=A termék/szolgáltatás minden fő információjának a klónozása
 ClonePricesProduct=Fő információk és árak klónozása
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
 CustomerPrices=Fogyasztói árának
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 535514cb225..7db1eb84ad1 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ez a nézet minden projektet tartalmaz.
 Myprojects=Projektjeim
 ProjectsArea=Projektek terület
 NewProject=Új projekt
-AddProject=Projekt hozzáadása
+AddProject=Create project
 DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
 ConfirmDeleteAProject=Biztos törölni akarja ezt a projektet?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Új eltöltött idő
 MyTimeSpent=Az én eltöltött időm
 MyTasks=Feladataim
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Új feladat
-AddTask=Feladat hozzáadása
+AddTask=Create task
 AddDuration=Időtartam hozzáadása
 Activity=Aktivitás
 Activities=Feladatok/aktivitások
diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/hu_HU/resource.lang
+++ b/htdocs/langs/hu_HU/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 08145016926..48ef1688bc0 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Hitelt
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mutasd Kifizetés
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Azonban, ha számlát legalább egy fizetési visszavonása még nem feldolgozott, akkor nem kell beállítani, hogy fizetni kell kezelni visszavonása előtt.
-DoStandingOrdersBeforePayments=Ez a lap lehetővé teszi, hogy kérje a fennálló rendelés. Amint kész lesz, akkor írja be a fizetési zárja be a számlát.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Kifizetése érdekében állt a bank által %s
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index c8fa072f8b1..dd797a93449 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -18,37 +18,37 @@ Selectmodelcsv=Pilih satu model Ekspor
 Modelcsv_normal=Ekspor Klasik
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Akun pembalik
-Back=Retur
+Back=Kembali
 
-Definechartofaccounts=Jelaskan satu akun
-Selectchartofaccounts=Pilih satu akun
+Definechartofaccounts=Menetapkan bagan akun
+Selectchartofaccounts=Pilih bagan akun
 Validate=Validasi
 Addanaccount=Tambahkan sebuah akun akuntansi
 AccountAccounting=Akun akuntansi
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Ventilation=Perincian
+ToDispatch=Untuk Pengiriman
+Dispatched=Dikirim
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Margin Usaha
+CustomersVentilation=Perincian pelanggan
+SuppliersVentilation=Perincian pemasok
+TradeMargin=Margin Perdagangan
 Reports=Laporan
 ByCustomerInvoice=Berdasarkan invoice langganan
 ByMonth=Bulanan
 NewAccount=Akun akuntansi baru
-Update=Update
+Update=Membarui
 List=Daftar
 Create=Buat
-UpdateAccount=Modifikasi satu akun akuntansi
+UpdateAccount=Modifikasi akun akuntansi
 UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+WriteBookKeeping=Mencatat akun di buku besar
+Bookkeeping=Buku besar
+AccountBalanceByMonth=Saldo per bulan
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=Perincian Akunting
+AccountingVentilationSupplier=Perincian Akunting Pemasok
+AccountingVentilationCustomer=Perincian Akunting Pelanggan
+Line=Baris
 
 CAHTF=Total purchase supplier HT
 InvoiceLines=Lines of invoice to be ventilated
@@ -56,17 +56,17 @@ InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=In the accounting account
 
 Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+VentilationAuto=Perincian Otomatis
 
-Processing=Processing
-EndProcessing=The end of processing
+Processing=Pengolahan
+EndProcessing=Akhir dari pengolahan
 AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
+SelectedLines=Baris yg dipilih
 Lineofinvoice=Line of invoice
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=pembatas CSV
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
@@ -78,7 +78,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum
 ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
-ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembayaran
+ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
 ACCOUNTING_BANK_JOURNAL=Jurnal Bank
 ACCOUNTING_CASH_JOURNAL=Jurnal Kas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain
@@ -101,36 +101,36 @@ Labelcompte=Label Akun
 Debit=Debet
 Credit=Kredit
 Amount=Jumlah
-Sens=Sens
+Sens=Sen
 Codejournal=Jurnal
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Hapus catatan buku besar
 
 SellsJournal=Jurnal Penjualan
-PurchasesJournal=Jurnal Pembayaran
+PurchasesJournal=Jurnal Pembelian
 DescSellsJournal=Jurnal Penjualan
-DescPurchasesJournal=Jurnal Pembayaran
+DescPurchasesJournal=Jurnal Pembelian
 BankJournal=Jurnal Bank
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Jurnal Kas
-DescCashJournal=Cash journal including the type of payment cash
+DescBankJournal=Jurnal Bank termasuk semua tipe pembayaran kecuali tunai
+CashJournal=Jurnal Tunai
+DescCashJournal=Jurnal Tunai termasuk tipe pembayaran tunai
 
-CashPayment=Cash Payment
+CashPayment=Pembayaran Tunai
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Pembayaran Nota Pemasok
+CustomerInvoicePayment=Pembayaran Nota Pelanggan
 
 ThirdPartyAccount=Akun pihak ketiga
 
 NewAccountingMvt=New movement
 NumMvts=Number of movement
 ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Daftar akun pihak ketiga
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Daftar akun-akun akunting
 
 Pcgversion=Version of the plan
 Pcgtype=Class of account
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 48d4ac06c66..fbbe0bd037b 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -4,7 +4,7 @@ Version=Versi
 VersionProgram=Program Versi
 VersionLastInstall=Versi instalasi awal
 VersionLastUpgrade=Versi upgrade terakhir
-VersionExperimental=Eksperimental
+VersionExperimental=Percobaan
 VersionDevelopment=Pengembangan
 VersionUnknown=Tidak diketahui
 VersionRecommanded=Direkomendasikan
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gunakan penyelesaian-otomatis di 'field' untuk memilih
 ActivityStateToSelectCompany= Tambah pilihan penyaringan / filter untuk menunjukkan / menyembunyikan pihak-ke-tiga ( third parties ) di dalam aktifitas atau yang sedang tidak aktif saat ini
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Gunakan bidang autocompletion untuk memilih kontak (bukan menggunakan kotak daftar).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Cari filter Pilihan
 NumberOfKeyToSearch=Nbr karakter untuk memicu pencarian:% s
 ViewFullDateActions=Tampilkan tanggal penuh peristiwa dalam lembar ketiga
@@ -117,76 +119,76 @@ ModulesSpecial=Modul yang sangat spesifik
 ParameterInDolibarr=Parameter% s
 LanguageParameter=Parameter Bahasa% s
 LanguageBrowserParameter=Parameter% s
-LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
+LocalisationDolibarrParameters=Parameter Lokalisasi
+ClientTZ=Zona Waktu Klien (Pengguna)
+ClientHour=Jam Klien (Pengguna)
+OSTZ=Zona Waktu System Operasi Server
+PHPTZ=Zona Waktu Server PHP
 PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
 ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
 DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
+CurrentHour=Jam PHP (Server)
+CompanyTZ=Zona Waktu Perusahaan (Perusahaan Utama)
+CompanyHour=Jam Perusahaan (Perusahaan Utama)
 CurrentSessionTimeOut=Current session timeout
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 OSEnv=OS Environment
-Box=Box
-Boxes=Boxes
+Box=Kotak
+Boxes=Kotak-Kotak
 MaxNbOfLinesForBoxes=Max number of lines for boxes
-PositionByDefault=Default order
-Position=Position
+PositionByDefault=Pesanan Standar
+Position=Posisi
 MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar).
 MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemTools=System tools
-SystemToolsArea=System tools area
+MenuForUsers=Menu Pengguna
+LangFile=berkas .lang
+System=Sistem
+SystemInfo=Sistem Informasi
+SystemTools=Alat-alat Sistem
+SystemToolsArea=Daerah Alat-Alat Sistem
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
+Purge=Perbersihan
 PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
+PurgeDeleteTemporaryFiles=Hapus semua data sementara (Tidak ada resiko data hilang)
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or file to delete.
+PurgeRunNow=Bersihkan sekarang
+PurgeNothingToDelete=Tidak ada direktori atau berkas untuk di hapus
 PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
 PurgeAuditEvents=Purge all security events
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed.
-NewBackup=New backup
+NewBackup=Backup Baru
 GenerateBackup=Generate backup
 Backup=Backup
-Restore=Restore
+Restore=Mengembalikan
 RunCommandSummary=Backup has been launched with the following command
 RunCommandSummaryToLaunch=Backup can be launched with the following command
 WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
+BackupResult=Hasil Backup
+BackupFileSuccessfullyCreated=Berkas backup berhasil dihasilkan
+YouCanDownloadBackupFile=Berkas yg dihasilkan siap di download
+NoBackupFileAvailable=Tidak ada berkas backup yang tersedia
+ExportMethod=Metode ekspor
+ImportMethod=Metode Impor
+ToBuildBackupFileClickHere=Untuk menghasilkan berkas backup, klik <a href="%s">disini</a>.
 ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
 ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
+FileNameToGenerate=Nama berkas yang dihasilkan
+Compression=Kompresi
 CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
 CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
 ExportCompatibility=Compatibility of generated export file
 MySqlExportParameters=MySQL export parameters
 PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
+UseTransactionnalMode=Gunakan mode transaksi
 FullPathToMysqldumpCommand=Full path to mysqldump command
 FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
+ExportOptions=Opsi Ekspor
 AddDropDatabase=Add DROP DATABASE command
 AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
+ExportStructure=Struktur
 Datas=Data
 NameColumn=Name columns
 ExtendedInsert=Extended INSERT
@@ -194,11 +196,11 @@ NoLockBeforeInsert=No lock commands around INSERT
 DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
-Yes=Yes
-No=No
+Yes=Ya
+No=Tidak
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
-Rights=Permissions
+Rights=Izin
 BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
@@ -208,34 +210,35 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
 BoxesActivated=Boxes activated
 ActivateOn=Activate on
 ActiveOn=Activated on
-SourceFile=Source file
+SourceFile=Berkas sumber
 AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
 AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
+Required=Diperlukan
 UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
+Security=Keamanan
+Passwords=Kata Sandi
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
 MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-DolibarrProjectLeader=Project leader
-Developpers=Developers/contributors
+Feature=Keistimewaan
+DolibarrLicense=Lisensi
+DolibarrProjectLeader=Pemimpin Proyek
+Developpers=Pembangun/Penyumbang
 OtherDeveloppers=Other developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
+OfficialWebSite=Situs resmi Dolibarr International
+OfficialWebSiteFr=Situs resmi Perancis
+OfficialWiki=Dokumentasi Dolibarr di Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
@@ -249,9 +252,9 @@ CurrentTopMenuHandler=Current top menu handler
 CurrentLeftMenuHandler=Current left menu handler
 CurrentMenuHandler=Current menu handler
 CurrentSmartphoneMenuHandler=Current smartphone menu handler
-MeasuringUnit=Measuring unit
-Emails=E-mails
-EMailsSetup=E-mails setup
+MeasuringUnit=Unit Pengukuran
+Emails=E-Mails
+EMailsSetup=Setup E-Mails
 EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
@@ -264,25 +267,25 @@ MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of prop
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
+MAIN_MAIL_SENDMODE=Metode Pengiriman EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
 MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
 MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_SMS_SENDMODE=Metode Pengiriman SMS
 MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
-ModuleFamilyBase=System
+ModuleSetup=Setup Modul
+ModulesSetup=Setup Modul-Modul
+ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
 ModuleFamilyProducts=Products Management
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
+ModuleFamilyOther=Lainnya
 ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
+ModuleFamilyExperimental=Modul Percobaan
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
 MenuHandlers=Menu handlers
@@ -291,16 +294,16 @@ DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is setup to process:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package.
+DownloadPackageFromWebSite=Download Packet
 UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
+YouCanSubmitFile=Pilih Modul
+CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
-LastStableVersion=Last stable version
+LastStableVersion=Versi stabil terakhir
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
@@ -311,9 +314,9 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
+DoTestServerAvailability=Koneksi Server Test
+DoTestSend=Mencoba Mengirim
+DoTestSendHTML=Mencoba Mengirim HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
@@ -326,7 +329,7 @@ AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on docu
 ModuleDisabled=Module disabled
 ModuleDisabledSoNoEvent=Module disabled so event never created
 ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
+MinLength=Panjang Minimum
 LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
 ExamplesWithCurrentSetup=Examples with current running setup
 ListOfDirectories=List of OpenDocument templates directories
@@ -335,14 +338,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
+FirstnameNamePosition=Posisi Nama/Nama Belakang
 DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 TestSubmitForm=Input test form
 ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
 ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
+ConnectionTimeout=batas waktu Koneksi
+ResponseTimeout=Batas Waktu Balasan
 SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
 ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
 SecurityToken=Key to secure URLs
@@ -354,14 +357,14 @@ 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
-Library=Library
+Library=Perpustakaan
 UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
 ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+OldVATRates=Suku VAT lama
+NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
@@ -369,14 +372,14 @@ TextLong=Long text
 Int=Integer
 Float=Float
 DateAndTime=Date and hour
-Unique=Unique
+Unique=Unik
 Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
+ExtrafieldPhone = Telepon
+ExtrafieldPrice = Harga
 ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSelect = Daftar Pilihan
+ExtrafieldSelectList = Pilih dari tabel
+ExtrafieldSeparator=Pembatas
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
@@ -391,7 +394,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
+DefaultLink=Link Standar
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
 ExternalModule=External module - Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
@@ -405,37 +408,37 @@ NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into bar
 NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 
 # Modules
-Module0Name=Users & groups
+Module0Name=Pengguna & Grup
 Module0Desc=Users and groups management
-Module1Name=Third parties
+Module1Name=Pihak Ketiga
 Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
+Module2Name=Komersil
 Module2Desc=Commercial management
-Module10Name=Accounting
+Module10Name=Akunting
 Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
+Module20Name=Proposal
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
 Module22Desc=Mass E-mailing management
-Module23Name= Energy
+Module23Name= Energi
 Module23Desc= Monitoring the consumption of energies
-Module25Name=Customer Orders
+Module25Name=Pesanan Pelanggan
 Module25Desc=Customer order management
-Module30Name=Invoices
+Module30Name=Nota
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
+Module40Name=Pemasok
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
 Module42Desc=Logging facilities (file, syslog, ...)
 Module49Name=Editors
 Module49Desc=Editor management
-Module50Name=Products
+Module50Name=Produk
 Module50Desc=Product management
 Module51Name=Mass mailings
 Module51Desc=Mass paper mailing management
-Module52Name=Stocks
+Module52Name=Stok
 Module52Desc=Stock management (products)
-Module53Name=Services
+Module53Name=Jasa
 Module53Desc=Service management
 Module54Name=Contracts/Subscriptions
 Module54Desc=Management of contracts (services or reccuring subscriptions)
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -453,11 +456,11 @@ Module70Name=Interventions
 Module70Desc=Intervention management
 Module75Name=Expense and trip notes
 Module75Desc=Expense and trip notes management
-Module80Name=Shipments
+Module80Name=Pengiriman
 Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
+Module85Name=Bank dan Kas
 Module85Desc=Management of bank or cash accounts
-Module100Name=External site
+Module100Name=Situs luar
 Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
 Module105Name=Mailman and SPIP
 Module105Desc=Mailman or SPIP interface for member module
@@ -465,36 +468,38 @@ Module200Name=LDAP
 Module200Desc=LDAP directory synchronisation
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
-Module240Name=Data exports
+Module240Name=Ekspor Data
 Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
+Module250Name=Impor Data
 Module250Desc=Tool to import datas in Dolibarr  (with assistants)
-Module310Name=Members
+Module310Name=Anggota
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
-Module600Name=Notifications
+Module600Name=Notifikasi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
-Module700Name=Donations
+Module700Name=Sumbangan
 Module700Desc=Donation management
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
-Module1400Name=Accounting
+Module1400Name=Akunting
 Module1400Desc=Accounting management (double parties)
-Module1780Name=Categories
+Module1780Name=Kategori
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,32 +534,32 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
+Module59000Name=Margin
 Module59000Desc=Module to manage margins
-Module60000Name=Commissions
+Module60000Name=Komisi
 Module60000Desc=Module to manage commissions
 Module150010Name=Batch number, eat-by date and sell-by date
 Module150010Desc=batch number, eat-by date and sell-by date management for product
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
+Permission11=Membaca Nota Pelanggan
+Permission12=Membuat/Merubah Nota Pelanggan
 Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
+Permission14=Validasi Nota Pelanggan
+Permission15=Mengirim Nota Pelanggan Menggunakan EMail
+Permission16=Mencatat Pembayaran Untuk Nota Pelanggan
+Permission19=Menghapus Nota Pelanggan
+Permission21=Membaca Proposal Komersil
+Permission22=Membuat/Merubah Proposal Komersil
+Permission24=Validasi Proposal Komersil
+Permission25=Mengirim Proposal Komersil
+Permission26=Menutup Proposal Komersil
+Permission27=Menghapus Proposal Komersil
 Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
+Permission31=Membaca Produk
+Permission32=Membuat/Merubah produk
+Permission34=Menghapus Produk
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects (shared project and projects i'm contact for)
@@ -562,25 +569,25 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
+Permission71=Membaca Data Anggota
+Permission72=Membuat/Merubah Data Anggota
+Permission74=Menghapus Data Anggota
 Permission75=Setup types and attributes for members
 Permission76=Export datas
 Permission78=Read subscriptions
 Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social contributions and vat
-Permission92=Create/modify social contributions and vat
-Permission93=Delete social contributions and vat
+Permission81=Membaca Pesanan Pelanggan
+Permission82=Membuat/Merubah Pesanan Pelanggan
+Permission84=Validasi Pesanan Pelanggan
+Permission86=Mengirim Pesanan Pelanggan
+Permission87=Menutup Pesanan Pelanggan
+Permission88=Membatalkan Pesanan Pelanggan
+Permission89=Menghapus Pesanan Pelanggan
+Permission91=Membaca Kontribusi Sosial dan VAT
+Permission92=Membuat/Merubah Kontribusi Sosial dan VAT
+Permission93=Menghapus Kontribusi Sosial dan VAT
 Permission94=Export social contributions
-Permission95=Read reports
+Permission95=Membaca Laporan
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -589,9 +596,9 @@ Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
 Permission113=Setup financiel accounts (create, manage categories)
-Permission114=Consolidate transactions
+Permission114=Konsolidasi Transaksi
 Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
+Permission116=Transfer antar akun
 Permission117=Manage cheques dispatching
 Permission121=Read third parties linked to user
 Permission122=Create/modify third parties linked to user
@@ -616,7 +623,7 @@ Permission172=Create/modify trips and expenses
 Permission173=Delete trips and expenses
 Permission174=Read all trips and expenses
 Permission178=Export trips and expenses
-Permission180=Read suppliers
+Permission180=Membaca Data Pemasok
 Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
 Permission183=Validate supplier orders
@@ -649,21 +656,21 @@ Permission241=Read categories
 Permission242=Create/modify categories
 Permission243=Delete categories
 Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
+Permission251=Membaca Data Pengguna Lain dan Grup
+PermissionAdvanced251=Membaca Data Pengguna Lain
+Permission252=Membaca Izin Pengguna Lain
 Permission253=Create/modify other users, groups and permisssions
 PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
-Permission255=Modify other users password
+Permission255=Merubah Kata Sandi Pengguna Lain
 Permission256=Delete or disable other users
 Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
 Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
+Permission272=Membaca Nota
+Permission273=Mengeluarkan Nota
+Permission281=Membaca Kontrak
+Permission282=Membuat/Merubah Kontrak
+Permission283=Menghapus Kontrak
 Permission286=Export contacts
 Permission291=Read tariffs
 Permission292=Set permissions on the tariffs
@@ -680,9 +687,9 @@ Permission341=Read its own permissions
 Permission342=Create/modify his own user information
 Permission343=Modify his own password
 Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
+Permission351=Membaca Data Grup
+Permission352=Membaca Izin Grup
+Permission353=Membuat/Merubah Grup
 Permission354=Delete or disable groups
 Permission358=Export users
 Permission401=Read discounts
@@ -693,24 +700,24 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
+Permission531=Membaca Jasa
+Permission532=Membuat/Merubah Jasa
+Permission534=Menghapus Jasa
 Permission536=See/manage hidden services
 Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
+Permission701=Membaca Sumbangan
+Permission702=Membuat/Merubah Sumbangan
+Permission703=Menghapus Sumbangan
+Permission1001=Membaca Stok
+Permission1002=Membuat/Merubah Gudang
+Permission1003=Menghapus Gudang
+Permission1004=Membaca pergerakan stok
 Permission1005=Create/modify stock movements
 Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
-Permission1181=Read suppliers
+Permission1181=Mambaca Pemasok
 Permission1182=Read supplier orders
 Permission1183=Create/modify supplier orders
 Permission1184=Validate supplier orders
@@ -720,11 +727,11 @@ Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
+Permission1231=Mambaca Nota Pemasok
+Permission1232=Membuat/Merubah Nota Pemasok
+Permission1233=Validasi Nota Pemasok
+Permission1234=Menghapus Nota Pemasok
+Permission1235=Mengirim Nota Pemasok Melalui Email
 Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
@@ -747,7 +754,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission50101=Use Point of sales
-Permission50201=Read transactions
+Permission50201=Membaca Data Transaksi
 Permission50202=Import transactions
 Permission54001=Print
 Permission55001=Read polls
@@ -779,8 +786,9 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
-BackToModuleList=Back to modules list
+BackToModuleList=Kembali Ke Daftar Modul
 BackToDictionaryList=Back to dictionaries list
 VATReceivedOnly=Special rate not charged
 VATManagement=VAT Management
@@ -824,9 +832,9 @@ CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
-AtEndOfMonth=At end of month
+AtEndOfMonth=diakhir bulan
 Offset=Offset
-AlwaysActive=Always active
+AlwaysActive=Selalu Aktif
 UpdateRequired=Your system needs to be updated. To do this, click on <a href="%s">Update now</a>.
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
@@ -837,17 +845,17 @@ DataRootServer=Data files directory
 IP=IP
 Port=Port
 VirtualServerName=Virtual server name
-AllParameters=All parameters
-OS=OS
+AllParameters=Semua Parameter
+OS=Sistem Operasi
 PhpEnv=Env
-PhpModules=Modules
+PhpModules=Modul-Modul
 PhpConf=Conf
 PhpWebLink=Web-Php link
 Pear=Pear
 PearPackages=Pear Packages
 Browser=Browser
 Server=Server
-Database=Database
+Database=Basis Data
 DatabaseServer=Database host
 DatabaseName=Database name
 DatabasePort=Database port
@@ -864,12 +872,12 @@ ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry
 AllMustBeOk=All of these must be checked
 Host=Server
 DriverType=Driver type
-SummarySystem=System information summary
+SummarySystem=Ringkasan Sistem Informasi
 SummaryConst=List of all Dolibarr setup parameters
 SystemUpdate=System update
 SystemSuccessfulyUpdate=Your system has been updated successfuly
 MenuCompanySetup=Company/Foundation
-MenuNewUser=New user
+MenuNewUser=Pengguna Baru
 MenuTopManager=Top menu manager
 MenuLeftManager=Left menu manager
 MenuManager=Menu manager
@@ -882,21 +890,22 @@ Skin=Skin theme
 DefaultSkin=Default skin theme
 MaxSizeList=Max length for list
 DefaultMaxSizeList=Default max length for list
-MessageOfDay=Message of the day
+MessageOfDay=Berita Hari Ini
 MessageLogin=Login page message
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
+EnableShowLogo=Tampilkan Logo dimenu kiri
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
+CompanyName=Nama
+CompanyAddress=Alamat
+CompanyZip=Kode Pos
+CompanyTown=Kota
+CompanyCountry=Negara
+CompanyCurrency=Mata Uang
 Logo=Logo
 DoNotShow=Do not show
 DoNotSuggestPaymentMode=Do not suggest
@@ -906,7 +915,7 @@ BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show link "Report a bug"
 ShowWorkBoard=Show "workbench" on homepage
 Alerts=Alerts
-Delays=Delays
+Delays=Penundaan
 DelayBeforeWarning=Delay before warning
 DelaysBeforeWarning=Delays before warning
 DelaysOfToleranceBeforeWarning=Tolerance delays before warning
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 05e67508b1a..369ba05b614 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Acara ditugaskan untuk
 ActionsDoneBy=Acara yang dilakukan oleh
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Semua acara saya / tugas
 AllActions= Semua acara / tugas
 ViewList=Tampilan daftar
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 5580d87b517..15a3668333c 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
+ErrorCompanyNameAlreadyExists=Nama Perusahaan %s telah terdaftar. Silahkan masukan nama lain.
 ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-DeleteThirdParty=Delete a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
-MenuNewThirdParty=New third party
-MenuNewCompany=New company
-MenuNewCustomer=New customer
-MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+ErrorSetACountryFirst=Set Negara dulu
+SelectThirdParty=Pilih Pihak Ketiga
+DeleteThirdParty=Hapus pihak ketiga
+ConfirmDeleteCompany=Apakah anda ingin menghapus perusahaan ini bersama dengan semua informasinya?
+DeleteContact=Hapus kontak/alamat
+ConfirmDeleteContact=Apakah anda ingin menghapus kontak ini bersama dengan semua informasinya?
+MenuNewThirdParty=Pihak Ketiga Baru
+MenuNewCompany=Perusahaan Baru
+MenuNewCustomer=Pelanggan Baru
+MenuNewProspect=Prospek Baru
+MenuNewSupplier=Pemasok Baru
 MenuNewPrivateIndividual=New private individual
-MenuSocGroup=Groups
+MenuSocGroup=Grup
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 NewSocGroup=New company group
@@ -21,16 +21,16 @@ NewPrivateIndividual=New private individual (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
 ProspectionArea=Prospection area
 SocGroup=Group of companies
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-Contacts=Contacts/Addresses
-ThirdPartyContacts=Third party contacts
+IdThirdParty=ID Pihak Ketiga
+IdCompany=ID Perusahaan
+IdContact=ID Kontak
+Contacts=Kontak/Alamat
+ThirdPartyContacts=Kontak Pihak Ketiga
 ThirdPartyContact=Third party contact/address
 StatusContactValidated=Status of contact/address
-Company=Company
-CompanyName=Company name
-Companies=Companies
+Company=Perusahaan
+CompanyName=Nama Perusahaan
+Companies=Perusahaan
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
 ThirdParty=Third party
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Absolute discounts available
 DiscountNone=None
 Supplier=Supplier
 CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
+AddContact=Create contact
+AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
@@ -268,8 +268,8 @@ ContactsAddresses=Contacts/Addresses
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
-AddCompany=Add company
-AddThirdParty=Add third party
+AddCompany=Create company
+AddThirdParty=Create third party
 DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accountancy code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Delivery address label
 DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add address
-AddAddress=Add address
+AddDeliveryAddress=Create address
+AddAddress=Create address
 NoOtherDeliveryAddress=No alternative delivery address defined
 SupplierCategory=Supplier category
 JuridicalStatus200=Independant
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 5d0c83e3173..3e236cfac61 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-DolibarrWelcome=Welcome to Dolibarr
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+InstallEasy=Ikuti setiap langkah sesuai dengan instruksi
+MiscellaneousChecks=Peninjauan prasyarat
+DolibarrWelcome=Selamat Datang di Dolibarr
+ConfFileExists=File konfigurasi <b>%s</b> telah ada
+ConfFileDoesNotExists=File konfigurasi <b>%s</b> tidak ada
+ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi <b>%s</b>  tidak ada dan tidak dapat dibuat
+ConfFileCouldBeCreated=File konfigurasi <b>%s</b>  dapat dibuat
+ConfFileIsNotWritable=File konfigurasi <b>%s</b>  tidak dapat ditulis ulang. Periksa hak akses file. Untuk instalasi pertama kali, web server harus dapat menulisi file tersebut selama proses konfigurasi (sebagai contoh perintah "chmod 666" pada sistem operasi berbasis Unix").
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileReload=Reload all information from configuration file.
+ConfFileReload=memuat ulang semua informasi dari berkas konfigurasi
 PHPSupportSessions=This PHP supports sessions.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
+PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportUTF8=This PHP support UTF8 functions.
+PHPSupportGD=PHP ini mendukung fungsi grafik GD
+PHPSupportUTF8=PHP ini mendukung fungsi UTF8
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
+ErrorPHPDoesNotSupportGD=PHP anda tidak mendukung fungsi grafik GD. Grafik tidak dapat ditampilkan
+ErrorPHPDoesNotSupportUTF8=PHP anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat berfungsi semestinya. Selesaikan hal tersebut sebelum proses instalasi Dolibarr
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported.
-ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found.
+ErrorFailedToConnectToDatabase=Gagal untuk terhubung pada basis data '%s'
+ErrorDatabaseVersionTooLow=Versi basis data (%s) terlalu lama. Dibutuhkan versi %s atau lebih
+ErrorPHPVersionTooLow=Versi PHP terlalu lama. Dibutuhkan versi %s
+WarningPHPVersionTooLow=Versi PHP terlalu lama. Disarankan untuk menggunakan versi %s atau lebih. Pada versi ini proses instalasi dapat dijalankan namun tidak didukung
+ErrorConnectedButDatabaseNotFound=Koneksi pada server sukses namun basis data '%s' tidak dapat ditemukan
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
 IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
-PHPVersion=PHP Version
-YouCanContinue=You can continue...
-PleaseBePatient=Please be patient...
-License=Using license
-ConfigurationFile=Configuration file
+WarningBrowserTooOld=Versi peramban terlalu lama. Sangat disarankan untuk pemutakhiran peramban Firefox, Chrome atau Opera  pada versi terkini.
+PHPVersion=Versi PHP
+YouCanContinue=Anda dapat melanjutkan
+PleaseBePatient=Mohon tunggu
+License=Penggunaan lisensi
+ConfigurationFile=Berkas Konfigurasi
 WebPagesDirectory=Directory where web pages are stored
 DocumentsDirectory=Directory to store uploaded and generated documents
 URLRoot=URL Root
 ForceHttps=Force secure connections (https)
 CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseChoice=Database choice
-DatabaseType=Database type
+DolibarrDatabase=Basis Data Dolibarr
+DatabaseChoice=Pilihan Basis Data 
+DatabaseType=Jenis Basis Data
 DriverType=Driver type
 Server=Server
 ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
 ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
+DatabaseServer=Server Database
+DatabaseName=Nama Database
 DatabasePrefix=Database prefix table
 Login=Login
 AdminLogin=Login for Dolibarr database owner.
-Password=Password
-PasswordAgain=Retype password a second time
+Password=Kata kunci
+PasswordAgain=Ketikkan ulang kata kunci
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
 CreateUser=Create owner
@@ -67,9 +67,9 @@ Experimental=(experimental)
 DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists.
 KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
-ConfigurationSaving=Saving configuration file
-ServerConnection=Server connection
-DatabaseConnection=Database connection
+ConfigurationSaving=Menyimpan berkas konfigurasi
+ServerConnection=Koneksi Server
+DatabaseConnection=Koneksi Database
 DatabaseCreation=Database creation
 UserCreation=User creation
 CreateDatabaseObjects=Database objects creation
@@ -80,11 +80,11 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=Foreign keys and indexes creation
 FunctionsCreation=Functions creation
 AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed !
+PleaseTypePassword=Mohon ketikkan kata kunci, tidak diperbolehkan untuk mengosongkan kata kunci !
 PleaseTypeALogin=Please type a login !
 PasswordsMismatch=Passwords differs, please try again !
 SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
+SystemIsInstalled=Proses Instalasi telah selesai
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
 YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfuly.
@@ -92,10 +92,10 @@ GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
 MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
 GoToUpgradePage=Go to upgrade page again
-Examples=Examples
+Examples=Contoh
 WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages.
-LoginAlreadyExists=Already exists
+DirectoryRecommendation=Direkomendasikan untuk menggunakan direktori diluar dari direktori halaman web anda
+LoginAlreadyExists=Telah ada
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
@@ -103,22 +103,22 @@ ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to
 FunctionNotAvailableInThisPHP=Not available on this PHP
 MigrateScript=Migration script
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
+DataMigration=Migrasi Data
 DatabaseMigration=Structure database migration
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
 FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
+Upgrade=Pemutakhiran
 UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
+Start=Mulai
 InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-NotAvailable=Not available
+NotAvailable=Tidak tersedia
 YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page.
+CorrectProblemAndReloadPage=Mohon perbaiki kesalahan dan tekan F5 untuk memuat ulang halaman
 AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
+DatabaseVersion=Versi Database
+ServerVersion=Versi Server Database
 YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
 CharsetChoice=Character set choice
 CharacterSetClient=Character set used for generated HTML web pages
@@ -151,7 +151,7 @@ NextStepMightLastALongTime=Current step may last several minutes. Please wait un
 MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
+MigrationFinished=Proses migrasi selesai
 LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
@@ -164,8 +164,8 @@ MigrationSupplierOrder=Data migration for supplier's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
+MigrationSuccessfullUpdate=Proses Pemutakhiran berhasil
+MigrationUpdateFailed=Proses pemutakhiran gagal
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
 MigrationPaymentsNumberToUpdate=%s payment(s) to update
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/id_ID/resource.lang b/htdocs/langs/id_ID/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/id_ID/resource.lang
+++ b/htdocs/langs/id_ID/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 60edf794f82..a72321ea970 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Bæta síu möguleika til að sýna / fela thirdparties sem nú eru í starfsemi eða hætt henni
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Leita síur valkostir
 NumberOfKeyToSearch=NBR af stöfum til að kalla fram leit: %s
 ViewFullDateActions=Sýna fullur dagsetningar aðgerðir í þriðja blaði
@@ -208,6 +210,7 @@ ModulesJobDesc=Viðskipti mát veita einfalda fyrirfram uppsetningu Dolibarr fyr
 ModulesMarketPlaceDesc=Þú getur fundið fleiri einingar til að hlaða niður á yfirborð vefsíðum á Internetinu ...
 ModulesMarketPlaces=Meira mát ...
 DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Vefsíða veitendur þú getur leitað til að finna fleiri mát ...
 URL=Link
 BoxesAvailable=Hnefaleikar boði
@@ -444,7 +447,7 @@ Module55Desc=Strikamerki er stjórnun
 Module56Name=Símtækni
 Module56Desc=Símtækni sameining
 Module57Name=Standandi pantanir
-Module57Desc=Standandi fyrirmæli og stjórnun afturköllun á
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sameining
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Bæta við RSS straum inni Dolibarr skjár síður
 Module330Name=Bókamerki
 Module330Desc=Bókamerki í stjórnun
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Flokkar
 Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Dagskrá
@@ -503,6 +508,8 @@ Module2500Name=Rafræn Innihald Stjórnun
 Module2500Desc=Vista og samnýta skjöl
 Module2600Name=WebServices
 Module2600Desc=Virkja Dolibarr vefþjónusta miðlara
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Nota online Gravatar þjónusta (www.gravatar.com) til að sýna mynd af notendum og meðlimum (stofna með tölvupósti þeirra). Vantar internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox
 Module50100Name=Point of sölu
@@ -527,7 +534,7 @@ Module50200Desc=Module til að bjóða upp á netinu greiðslu síðu með kredi
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Skipulag vistuð
 BackToModuleList=Til baka í mát lista
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd
 DefaultLanguage=Sjálfgefið tungumál til að nota (tungumálið code)
 EnableMultilangInterface=Virkja Fjöltyng tengi
 EnableShowLogo=Sýna merki á vinstri valmynd
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Vélin þín hefur verið uppfærð
 CompanyInfo=Fyrirtæki / stofnun upplýsingar
 CompanyIds=Fyrirtæki / stofnun auðkenni
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index a5614eca50f..9426f2e6177 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Actions áhrif til
 ActionsDoneBy=Actions gert með því að
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Allar aðgerðir mínar / verkefni
 AllActions= Allar aðgerðir / verkefni
 ViewList=Skoða lista
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index cf099f5789b..e793677dee7 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index e58b93f1b03..8faf347b95c 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listi yfir gangi samningur línur
 ListOfRunningServices=Listi af hlaupandi þjónusta
 NotActivatedServices=Óvirkur þjónustu (meðal gildi samninga)
 BoardNotActivatedServices=Þjónusta til virkja meðal gildi samninga
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s  virkt þjónusta
 LastModifiedServices=Last %s  breytt þjónusta
 EditServiceLine=Breyta þjónustu línu
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sölufulltrúi undirrita samning
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index a21ac67cabe..2e910c852e4 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Birgir merkjamál þurfa
 ErrorSupplierCodeAlreadyUsed=Birgir sem notaður er þegar
 ErrorBadParameters=Bad breytur
 ErrorBadValueForParameter=Rangt gildi '%s &quot;fyrir breytu rangt að' %s að '
-ErrorBadImageFormat=Mynd skrá hefur ekki studdur snið
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat='Á %s' gildi hefur rangt snið dagsetningar
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Tókst ekki að skrifa í möppunni %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Notandi með <b>notandanafn %s </b> fannst ekki.
 ErrorLoginHasNoEmail=Þessi notandi hefur ekki netfang. Aðferð aflýst.
 ErrorBadValueForCode=Bad gerðir gildi fyrir kóða. Prófaðu aftur með nýtt gildi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s getur ekki verið bæði neikvæð
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Notandi Reikningur <b>%s</b> notað til að framkvæma vefur framreiðslumaður hefur ekki leyfi til að
 ErrorNoActivatedBarcode=Nei barcode gerð virk
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 4766f33b8e1..a151150fd4c 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -8,7 +8,7 @@ Members=Members
 MemberAccount=Aðildarríkin Innskráning
 ShowMember=Sýna meðlimur kort
 UserNotLinkedToMember=Notandi tengist ekki meðlimur
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Members Miðasala
 FundationMembers=Stofnun meðlimir
 Attributs=Eiginleiki
@@ -85,8 +85,7 @@ SubscriptionLateShort=Seint
 SubscriptionNotReceivedShort=Aldrei fengið
 ListOfSubscriptions=Listi yfir áskriftir
 SendCardByMail=Senda kort
-AddMember=Bæta við félagi
-MemberType=Aðildarríkin tegund
+AddMember=Create member
 NoTypeDefinedGoToSetup=Enginn tegundir skilgreindar. Fara til skipulag - Members tegundir
 NewMemberType=Nýr meðlimur tegund
 WelcomeEMail=Velkomin í tölvupósti
@@ -126,12 +125,12 @@ Date=Dagsetning
 DateAndTime=Dagsetning og tími
 PublicMemberCard=Aðildarríkin almenningi kort
 MemberNotOrNoMoreExpectedToSubscribe=Aðildarríkin ekki eða ekki fleiri ráð til að gerast áskrifandi
-AddSubscription=Bæta við áskrift
+AddSubscription=Create subscription
 ShowSubscription=Sýna áskrift
 MemberModifiedInDolibarr=Aðildarríkin breytt í Dolibarr
 SendAnEMailToMember=Senda upplýsingar email til félagi
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Netfang efni fyrir aðildarríki autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=Tölvupóstur fyrir aðild autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=Netfang efni fyrir aðildarríki löggilding
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=Netfang efni fyrir aðildarríki resiliation
 DescADHERENT_MAIL_RESIL=Tölvupóstur fyrir aðild resiliation
 DescADHERENT_MAIL_FROM=Sendandi Email fyrir sjálfvirka tölvupósti
 DescADHERENT_ETIQUETTE_TYPE=Snið af merki síðu
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Snið af kortum síðu
 DescADHERENT_CARD_HEADER_TEXT=Texti prentuð á toppur af félagi kort
 DescADHERENT_CARD_TEXT=Texti prentaðir á meðlimur spil (samræma til vinstri)
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Engar þriðja aðila í tengslum við þennan
 ThirdPartyDolibarr=Dolibarr þriðja aðila
 MembersAndSubscriptions= Aðilar og Subscriptions
 MoreActions=Fjölbreyttari aðgerðir á upptöku
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Búa beinni viðskipti færslu á reikning
 MoreActionBankViaInvoice=Búa til reikning og greiðslu á reikning
 MoreActionInvoiceOnly=Búa til reikning án greiðslu
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Síðast áskrift upphæð
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Fjöldi félaga
 NoValidatedMemberYet=Engar fullgiltar meðlimir fundust
 MembersByCountryDesc=Þessi skjár sýnir þér tölfræði á meðlimum með löndum. Grafísk veltur þó á Google netinu línurit þjónustu og er aðeins í boði ef nettengingin er er að vinna.
@@ -196,9 +197,10 @@ Collectivités=Félög
 Particuliers=Starfsfólk
 Entreprises=Stofnanir
 DOLIBARRFOUNDATION_PAYMENT_FORM=Til að gera áskrift greiðslu með millifærslu, sjá síðu <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Til að greiða með kreditkorti eða PayPal, smelltu á hnappinn neðst á síðunni. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 3838200a716..861e2f2c32e 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ef varan er þjónusta við takmarkaðan tíma:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Fjöldi verð
 MultiPriceLevelsName=Verð flokkar
-AssociatedProductsAbility=Virkja sub-vörur
-AssociatedProducts=Sub-vörur
-AssociatedProductsNumber=Fjöldi vara að semja þessa vöru
-ParentProductsNumber=Fjöldi vara foreldra
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Félagi
 Translation=Þýðing
 KeywordFilter=Leitarorð sía
@@ -132,7 +132,7 @@ AddDel=Bæta við / Eyða
 Quantity=Magn
 NoMatchFound=Engin samsvörun fannst
 ProductAssociationList=Listi yfir tengdum vörum / þjónustu: nafn á vöru / þjónustu (magn áhrifum)
-ProductParentList=Listi yfir vörur og þjónustu með þessa vöru sem hluti
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Einn af völdum vöru er foreldri með núverandi vöru
 DeleteProduct=Eyða vöru / þjónustu
 ConfirmDeleteProduct=Ertu viss um að þú viljir eyða þessari vöru / þjónustu?
@@ -179,7 +179,7 @@ CloneProduct=Klóna vöru eða þjónustu
 ConfirmCloneProduct=Ertu viss um að þú viljir klón vöru eða <b>þjónustu %s ?</b>
 CloneContentProduct=Klóna allar helstu upplýsingar um vöru / þjónustu
 ClonePricesProduct=Klóna helstu upplýsingar og verð
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Þessi vara er notuð
 NewRefForClone=Tilv. nýrra vara / þjónusta
 CustomerPrices=Viðskiptavinir verð
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 347428bf607..4e1de0881dc 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér
 Myprojects=Verkefnin mín
 ProjectsArea=Verkefni area
 NewProject=Ný verkefni
-AddProject=Bæta við verkefnið
+AddProject=Create project
 DeleteAProject=Eyða verkefni
 DeleteATask=Eyða verkefni
 ConfirmDeleteAProject=Ertu viss um að þú viljir eyða þessu verkefni?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nýr tími
 MyTimeSpent=Minn tími var
 MyTasks=verkefni mitt
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ný verkefni
-AddTask=Bæta við verkefni
+AddTask=Create task
 AddDuration=Bæta við lengd
 Activity=Afþreying
 Activities=Verkefni / starfsemi
diff --git a/htdocs/langs/is_IS/resource.lang b/htdocs/langs/is_IS/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/is_IS/resource.lang
+++ b/htdocs/langs/is_IS/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 0ef7747d4a1..d73332b8408 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Útlán á
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Sýna Dragið
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hins vegar, ef reikningur hefur að minnsta kosti einn hætt greiðslu ekki enn afgreidd, mun það ekki vera eins og borgað til að leyfa að stjórna afturköllun áður.
-DoStandingOrdersBeforePayments=Þetta tabs leyfa þér að biðja fyrir standandi röð. Þegar það verður lokið, getur þú slegið greiðslu til loka reikning.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Greiðsla standa röð %s af bankanum
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 3efcd058a7f..b0a7137761f 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Per scegliere una terza parte usare i campi di auto-com
 ActivityStateToSelectCompany= Aggiungere un filtro per visualizzare/nascondere i terzi attualmente in attività o meno
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Per scegliere i contatti usare i campi di auto-completamento (invece di una lista di selezione).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opzioni dei filtri di ricerca
 NumberOfKeyToSearch=N ° di caratteri per attivare ricerca: %s
 ViewFullDateActions=Visualizzazione di tutte le date delle azioni nel foglio dei terzi
@@ -208,6 +210,7 @@ ModulesJobDesc=I moduli business forniscono delle semplici configurazioni predef
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su vari siti web esterni...
 ModulesMarketPlaces=Più moduli ...
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
 URL=Collegamento
 BoxesAvailable=Caselle disponibili
@@ -444,7 +447,7 @@ Module55Desc=Gestione codici a barre
 Module56Name=Telefonia
 Module56Desc=Integrazione telefonia
 Module57Name=Ordini permanenti
-Module57Desc=Gestione ordini permanenti (RID) e domiciliazioni
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Feed RSS
 Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr
 Module330Name=Segnalibri
 Module330Desc=Gestione segnalibri
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
@@ -495,6 +498,8 @@ Module1780Name=Categorie
 Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestione dei task programmati
 Module2400Name=Ordine del giorno
@@ -503,6 +508,8 @@ Module2500Name=Gestione dei contenuti digitali
 Module2500Desc=Salvare e condividere documenti
 Module2600Name=WebServices
 Module2600Desc=Attivare i webservices di Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Usa il servizio online Gravatar (www.gravatar.com) per mostrare le foto degli utenti/membri. Necessita dell'accesso a Internet
 Module2800Desc=Client FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gestione flussi di lavoro
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Modulo per offrire il pagamento online con PayBox
 Module50100Name=Punti vendita
@@ -527,7 +534,7 @@ Module50200Desc=Modulo per offrire il pagamento online con Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Stampa tramite Stampante IPP Cups
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Sondaggio aperto
 Module55000Desc=Modulo per creare sondaggi online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Impostazioni salvate
 BackToModuleList=Torna alla lista moduli
 BackToDictionaryList=Torna alla lista dei dizionari
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=La lingua da impostare come predefinita (codice lingua)
 EnableMultilangInterface=Attiva l'interfaccia multilingua
 EnableShowLogo=Abilita la visualizzazione del logo
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Il sistema è stato aggiornato con successo
 CompanyInfo=Informazioni società/fondazione
 CompanyIds=Identità società/fondazione
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 8e0c4d9f732..7a63495c2c1 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -2,8 +2,8 @@
 IdAgenda=ID evento
 Actions=Azioni
 ActionsArea=Area eventi (azioni e compiti)
-Agenda=Ordine del giorno
-Agendas=Ordini del giorno
+Agenda=Agenda
+Agendas=Agende
 Calendar=Calendario
 Calendars=Calendari
 LocalAgenda=Calendario interno
@@ -29,6 +29,7 @@ ActionsToDoBy=Eventi assegnati a
 ActionsDoneBy=Azioni fatte da
 ActionsForUser=Eventi per utente
 ActionsForUsersGroup=Eventi per tutti gli utenti del gruppo
+ActionAssignedTo=Event assigned to
 AllMyActions= Tutte i miei compiti/azioni
 AllActions= Tutte i compiti/azioni
 ViewList=Vista elenco
@@ -39,12 +40,12 @@ ViewPerUser=Visualizzazione per utente
 ViewWithPredefinedFilters= Vista con filtri predefiniti
 AutoActions= Riempimento automatico
 AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente.
-AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo ordine del giorno.
-AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni.
+AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo calendario.
+AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni da includere nell'agenda di dolibarr.
 ActionsEvents=Eventi per i quali creare un'azione
 PropalValidatedInDolibarr=Proposta convalidata
 InvoiceValidatedInDolibarr=Fattura convalidata
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS
 InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza
 InvoiceDeleteDolibarr=La fattura %s è stata cancellata
 OrderValidatedInDolibarr= Ordine convalidato
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index c3f16a3d40e..a0d411e1db6 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -116,8 +116,8 @@ TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due recor
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
-CheckTransmitter=Emittente
-ValidateCheckReceipt=Convalidare questo deposito di assegno?
+CheckTransmitter=Ordinante
+ValidateCheckReceipt=Convalidare la ricevuta dell'assegno?
 ConfirmValidateCheckReceipt=Vuoi davvero convalidare questa ricevuta?<br/>Non sarà possibile fare cambiamenti una volta convalidata.
 DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 197311e45c0..4c3e86002d4 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -15,25 +15,25 @@ DisabledBecauseNotErasable=Disabilitate perché non cancellabili
 InvoiceStandard=Fattura Standard
 InvoiceStandardAsk=Fattura Standard
 InvoiceStandardDesc=Questo tipo di fattura è la fattura più comune.
-InvoiceDeposit=Deposito fattura
-InvoiceDepositAsk=Deposito fattura
-InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un deposito.
+InvoiceDeposit=Fattura d'acconto
+InvoiceDepositAsk=Fattura d'acconto
+InvoiceDepositDesc=Fattura emessa quando è stato ricevuto un acconto.
 InvoiceProForma=Fattura proforma
 InvoiceProFormaAsk=Fattura proforma
 InvoiceProFormaDesc=La <b>fattura proforma</b> è uguale ad una fattura vera, ma non ha valore contabile.
 InvoiceReplacement=Fattura sostitutiva
-InvoiceReplacementAsk=Sostituzione fattura per fattura
-InvoiceReplacementDesc=La <b>sostituzione fattura</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è già stata chiusa, questa verrà automaticamente chiusa come "abbandonata".
-InvoiceAvoir=Nota di credito a correzione
+InvoiceReplacementAsk=Fattura sostitutiva
+InvoiceReplacementDesc=La <b>fattura sostitutiva</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è ancora stata chiusa, questa verrà automaticamente chiusa come "abbandonata".
+InvoiceAvoir=Nota di credito
 InvoiceAvoirAsk=Nota di credito per correggere fattura
-InvoiceAvoirDesc=La <b>nota di credito a correzione</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore, o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).<br/><br/>Nota: la fattura originale deve essere già chiusa ( "pagata" o "parzialmente pagata") per consentire la creazione di una nota di credito a correzione.
+InvoiceAvoirDesc=La <b>nota di credito</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).
 invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine.
 invoiceAvoirWithPaymentRestAmount=Crea nota di credito con il restante da pagare della fattura originale
 invoiceAvoirLineWithPaymentRestAmount=Crea nota di credito con il restante da pagare
 ReplaceInvoice=Sostituire fattura %s
-ReplacementInvoice=Sostituzione fattura
+ReplacementInvoice=Fattura sostitutiva
 ReplacedByInvoice=Sostituita dalla fattura %s
-ReplacementByInvoice=Sostituzione della fattura
+ReplacementByInvoice=Sostituita dalla fattura
 CorrectInvoice=Corretta fattura %s
 CorrectionInvoice=Correzione fattura
 UsedByInvoice=Usato per pagare fattura %s
@@ -94,7 +94,7 @@ SearchACustomerInvoice=Cerca una fattura attiva
 SearchASupplierInvoice=Cerca una fattura fornitore
 CancelBill=Annulla una fattura
 SendRemindByMail=Promemoria tramite email
-DoPayment=Emetti pagamento
+DoPayment=Registra pagamento
 DoPaymentBack=Emetti rimborso
 ConvertToReduc=Converti in futuro sconto
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
@@ -148,7 +148,7 @@ SuppliersDraftInvoices=Bozze di fattura fornitore
 Unpaid=Non pagato
 ConfirmDeleteBill=Vuoi davvero cancellare questa fattura?
 ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento <b> %s </b>?
-ConfirmUnvalidateBill=Vuoi davvero portare la fattura <b>%s</b> allo stato di progetto?
+ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura <b>%s</b> in bozza?
 ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagata"?
 ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
 ConfirmCancelBillQuestion=Perché si desidera classificare questa fattura come "abbandonata" ?
@@ -167,7 +167,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>cattivo cliente</b> è u
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Questa scelta viene utilizzata quando il pagamento non è completo perché alcuni dei prodotti sono stati restituiti
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate, per esempio: <br/>- il pagamento non è completo, in quanto alcuni prodotti sono stati restituiti.<br/>- l'importo richiesto è troppo oneroso per essere trasformato in uno sconto.<br/>Per correttezza contabile dovrà essere emessa una nota di credito.
 ConfirmClassifyAbandonReasonOther=Altro
-ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura in sostituzione.
+ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva.
 ConfirmCustomerPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
@@ -182,7 +182,7 @@ ShowBill=Visualizza fattura
 ShowInvoice=Visualizza fattura
 ShowInvoiceReplace=Visualizza la fattura sostitutiva
 ShowInvoiceAvoir=Visualizza nota di credito
-ShowInvoiceDeposit=Visualizza deposito fattura
+ShowInvoiceDeposit=Visualizza fattura d'acconto
 ShowPayment=Visualizza pagamento
 File=File
 AlreadyPaid=Già pagato
@@ -252,10 +252,10 @@ RelativeDiscount=Sconto relativo
 GlobalDiscount=Sconto assoluto
 CreditNote=Nota di credito
 CreditNotes=Note di credito
-Deposit=Deposito
+Deposit=Acconto
 Deposits=Depositi
 DiscountFromCreditNote=Sconto da nota di credito per %s
-DiscountFromDeposit=Pagamenti dal deposito della fattura %s
+DiscountFromDeposit=Pagamenti dalla fattura d'acconto %s
 AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida
 CreditNoteDepositUse=La fattura deve essere convalidata per l'utilizzo di questo credito
 NewGlobalDiscount=Nuovo sconto globale
@@ -346,8 +346,8 @@ ExtraInfos=Extra info
 RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
-ChequeMaker=Emittente assegno
-ChequeBank=Banca dell'assegno
+ChequeMaker=Traente dell'assegno
+ChequeBank=Banca emittente
 NetToBePaid=Netto a pagare
 PhoneNumber=Tel
 FullPhoneNumber=Telefono
@@ -371,7 +371,7 @@ UseCreditNoteInInvoicePayment=Riduci l'ammontare del pagamento con la nota di cr
 MenuChequeDeposits=Depositi assegni
 MenuCheques=Assegni
 MenuChequesReceipts=Ricezione assegni
-NewChequeDeposit=Nuovo deposito
+NewChequeDeposit=Nuovo acconto
 ChequesReceipts=Ricevute assegni
 ChequesArea=Area assegni
 ChequeDeposits=Depositi assegni
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index c0b713303fa..d32a581c27b 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -109,7 +109,7 @@ SuppliersProductsSellSalesTurnover=Fatturato generato dalle vendite di prodotti
 CheckReceipt=Ricevuta di versamento assegno
 CheckReceiptShort=Ricevuta assegno
 LastCheckReceiptShort=Last %s check receipts
-NewCheckReceipt=Nuovo assegno
+NewCheckReceipt=Nuovo sconto
 NewCheckDeposit=Nuovo deposito
 NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
@@ -141,8 +141,8 @@ RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
 RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.<br/>- Si basa sulla data di tali fatture.<br/>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
-DepositsAreNotIncluded=- Ricevute di deposito non incluse
-DepositsAreIncluded=- Ricevute di deposito incluse
+DepositsAreNotIncluded=- Le fatture d'acconto non sono incluse
+DepositsAreIncluded=- Le fatture d'acconto sono incluse
 LT2ReportByCustomersInInputOutputModeES=IRPF soggetti terzi(Spagna)
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
@@ -177,7 +177,7 @@ InvoiceRef=Rif. fattura
 CodeNotDef=Non definito
 AddRemind=Invia importo disponibile
 RemainToDivide= Ancora da inviare:
-WarningDepositsNotIncluded=Le ricevute di deposito non sono incluse in questa versione del modulo contabilità.
+WarningDepositsNotIncluded=Le fatture d'acconto non sono incluse in questa versione del modulo contabilità.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
 Pcg_version=Versione pcg
 Pcg_type=Tipo pcg
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Codice del giornale di contabilità
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 31a3df9e376..30637765163 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Elenco delle righe di contratto in esecuzione
 ListOfRunningServices=Elenco dei servizi in esecuzione
 NotActivatedServices=Servizi non attivati (con contratti convalidati)
 BoardNotActivatedServices=Servizi da attivare con contratti convalidati
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Ultimi %s servizi attivati
 LastModifiedServices=Ultimi %s servizi modificati
 EditServiceLine=Modifica riga del servizio
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista dei servizi in scadenza
 NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali.
 StandardContractsTemplate=Template standard per i contratti
 ContactNameAndSignature=Per %s, Nome e firma:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 63153883a4c..96edeef52f2 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Il codice fornitore è obbligatorio
 ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato
 ErrorBadParameters=Parametri errati
 ErrorBadValueForParameter=Valore '%s' errato per il parametro '%s'
-ErrorBadImageFormat=Formato del file immagine non supportato
+ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato)
 ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato
 ErrorWrongDate=La data non è corretta!
 ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> inesistente
 ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto.
 ErrorBadValueForCode=Valore del codice errato. Riprova con un nuovo valore...
 ErrorBothFieldCantBeNegative=I campi %s e %s non possono essere entrambi negativi
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fattura cliente non può essere negativa
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è s
 ErrorThereIsSomeDeliveries=Errore, ci sono alcune consegne collegate a questa spedizione. Cancellazione rifiutata.
 ErrorCantDeletePaymentReconciliated=Impossibile cancellare un pagamento che ha generato una transazione bancaria che è stata conciliata
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossibile cancellare un pagamento condiviso con almeno una fattura con lo stato Pagato
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
@@ -155,5 +174,5 @@ WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantem
 WarningClickToDialUserSetupNotComplete=Le impostazioni di informazione del ClickToDial per il tuo utente non sono complete (vedi la scheda ClickToDial sulla tua scheda utente)
 WarningNotRelevant=Operazione irrilevante per questo dataset
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningPaymentDateLowerThanInvoiceDate=La scadenza del pagamento (%s) risulta antecedente alla data di fatturazione (%s) per la fattura %s
+WarningTooManyDataPleaseUseMoreFilters=Troppi risultati. Per favore applica filtri più restrittivi
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index 6246fadfae7..ede6d91614d 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -22,7 +22,7 @@ ImportableFields=Campi importabili
 ImportedFields=Campi importati
 DatasetToExport=Dati da esportare
 DatasetToImport=Dataset da importare
-NoDiscardedFields=N. campi in file di origine vengono scartate
+NoDiscardedFields=Nessun campo del file sorgente sarà scartato
 Dataset=Dataset
 ChooseFieldsOrdersAndTitle=Scegli l'ordine dei campi
 FieldsOrder=Ordine campi
@@ -66,7 +66,7 @@ SourceFileFormat=Fonte formato di file
 FieldsInSourceFile=Campi nel file sorgente
 FieldsInTargetDatabase=Campi di destinazione nel database di Dolibarr (grassetto=obbligatorio)
 Field=Campo
-NoFields=N. campi
+NoFields=Nessun campo
 MoveField=Spostare campo %s numero di colonna
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=Salva questo profilo di importazione
@@ -125,7 +125,7 @@ BankAccountNumber=Num. conto
 BankAccountNumberKey=Chiave
 SpecialCode=Codice speciale
 ExportStringFilter=%% permette di sostituire uno o più caratteri nel testo
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtra per un anno/mese/giorno<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtra con un intervallo di anni/mesi/giorni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtra sui seguenti anni/mesi/giorni<br> < YYYY, < YYYYMM, < YYYYMMDD : filtra su tutti i precedenti anni/mesi/giorni
 ExportNumericFilter='NNNNN' filtra per un solo valore<br>'NNNNN+NNNNN' filtra su un range di valori<br>'&gt;NNNNN' filtra per valori inferiori<br>'&gt;NNNNN' filtra per valori superiori
 ## filters
 SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore.
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 1dd3ff637b5..638f17657e1 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -79,13 +79,13 @@ NewSubscription=Nuova adesione
 NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email.
 Subscription=Adesione
 Subscriptions=Adesioni
-SubscriptionLate=Tardi
+SubscriptionLate=Ritardi
 SubscriptionNotReceived=Sottoscrizione mai ricevuta
-SubscriptionLateShort=Tardi
+SubscriptionLateShort=Ritardi
 SubscriptionNotReceivedShort=Mai ricevuto
 ListOfSubscriptions=Elenco adesioni
 SendCardByMail=Invia scheda per email
-AddMember=Aggiungi membro
+AddMember=Crea membro
 NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro
 NewMemberType=Nuovo tipo di membro
 WelcomeEMail=Email di benvenuto
@@ -125,7 +125,7 @@ Date=Data
 DateAndTime=Data e ora
 PublicMemberCard=Scheda membro pubblico
 MemberNotOrNoMoreExpectedToSubscribe=Membri non iscritti o non più attesi per iscrizione
-AddSubscription=Aggiungi adesione
+AddSubscription=Crea sottoscrizione
 ShowSubscription=Visualizza adesione
 MemberModifiedInDolibarr=Membri modificati su Dolibarr
 SendAnEMailToMember=Invia email ai membri
@@ -203,3 +203,4 @@ MembersByNature=Membri per natura
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
 NoVatOnSubscription=Nessuna IVA per gli abbonamenti
 MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 0e4bfada2ce..de1e4921269 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Esiste una spedizione
 DraftOrWaitingApproved=In bozza o approvato, ma non ancora ordinato
 DraftOrWaitingShipped=In bozza o convalidato, ma non ancora spedito
 MenuOrdersToBill=Ordini spediti
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Ordini fatturabili
 SearchOrder=Ricerca ordine
 SearchACustomerOrder=Cerca un ordine cliente
 ShipProduct=Spedisci prodotto
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 35c32720c0b..82fb5481e67 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -15,8 +15,8 @@ ProductCode=Codice prodotto
 ServiceCode=Codice  servizio
 ProductVatMassChange=Modifica di massa dell'IVA
 ProductVatMassChangeDesc=Questa pagina è utile a modificare le tariffe delle tasse definite nei prodotti o servizi da un valore ad un altro. Attenzione: questa modifica influenza l'intero database
-MassBarcodeInit=Inizializzazione di massa del barcode
-MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un barcode di un oggetto che non ha ancora un barcode definito. Controlla prima che il setup del modulo barcode sia completo. 
+MassBarcodeInit=Inizializzazione di massa dei codici a barre
+MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. 
 ProductAccountancyBuyCode=Codice contabilità (acquisto)
 ProductAccountancySellCode=Codice contabilità (vendita)
 ProductOrService=Prodotto o servizio
@@ -80,12 +80,12 @@ ContractStatusClosed=Chiuso
 ContractStatusRunning=In corso
 ContractStatusExpired=Scaduto
 ContractStatusOnHold=In attesa
-ContractStatusToRun=To get running
+ContractStatusToRun=Da avviare
 ContractNotRunning=Il presente contratto non è attivo
 ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
 ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
 ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Errore. Il prezzo non può essere inferiore del Prezzo minimo
 Suppliers=Fornitori
 SupplierRef=Rif. fornitore
 ShowProduct=Visualizza prodotto
@@ -118,11 +118,11 @@ MultiPricesAbility=Livello diverso di prezzi per prodotto/servizio
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 MultiPriceLevelsName=Categorie di prezzo
 AssociatedProductsAbility=Attiva i prodotti associati
-AssociatedProducts=Prodotti associati
-AssociatedProductsNumber=Numero di prodotti associati
-ParentProductsNumber=Numero del prodotto padre
-IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale
-IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale
+AssociatedProducts=Prodotto associato
+AssociatedProductsNumber=Numero di sottoprodotti che compongono questo prodotto associato
+ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
+IfZeroItIsNotAVirtualProduct=Se vale 0, questo non è un prodotto associato
+IfZeroItIsNotUsedByVirtualProduct=Se vale 0, questo prodotto non è utilizzato da nessun prodotto associato come sottoprodotto
 EditAssociate=Modifica associazione
 Translation=Traduzione
 KeywordFilter=Filtro per parola chiave
@@ -132,7 +132,7 @@ AddDel=Aggiungi/Elimina
 Quantity=Quantità
 NoMatchFound=Nessun risultato trovato
 ProductAssociationList=Elenco dei prodotti/servizi associati: nome del prodotto/servizio (quantità interessata)
-ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto
+ProductParentList=Elenco dei prodotti/servizi associati che includono questo sottoprodotto
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
 ConfirmDeleteProduct=Vuoi davvero eliminare questo prodotto/servizio?
@@ -179,7 +179,7 @@ CloneProduct=Clona prodotto/servizio
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio <b>%s</b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
 ClonePricesProduct=Clona principali informazioni e prezzi
-CloneCompositionProduct=Clona prodotto/servizio virtuale
+CloneCompositionProduct=Clona prodotto/servizio associato
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 CustomerPrices=Prezzi al cliente
@@ -221,24 +221,29 @@ Quarter1=Primo trimestre
 Quarter2=Secondo trimestre
 Quarter3=Terzo trimestre
 Quarter4=Quarto trimestre
-BarCodePrintsheet=Stampa barcode
-PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di barcode. Scegli il formato del foglio adesivo, tipo di barcode e valore del barcode, poi clicca sul bottone <b>%s</b>.
+BarCodePrintsheet=Stampa codice a barre
+PageToGenerateBarCodeSheets=Con questo strumento, puoi stampare fogli adesivi di codici a barre. Scegli il formato del foglio adesivo, il tipo di codice a barre e il valore del codice a barre, poi clicca sul bottone <b>%s</b>.
 NumberOfStickers=Numero di etichette da stampare sulla pagina
-PrintsheetForOneBarCode=Stampa più etichette per singolo barcode
+PrintsheetForOneBarCode=Stampa più etichette per singolo codice a barre
 BuildPageToPrint=Genera pagina da stampare
-FillBarCodeTypeAndValueManually=Riempi il tipo di barcode e il valore manualmente
-FillBarCodeTypeAndValueFromProduct=Riempi il tipo di barcode e valore dal barcode del prodotto
-FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di barcode e il valore da un barcode di terze parti
-DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del barcode non è completa per il prodotto %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del barcode non è completa per la terzaparte %s.
-BarCodeDataForProduct=Informazioni barcode del brodotto %s :
-BarCodeDataForThirdparty=Informazioni barcode di terzeparti %s :
-ResetBarcodeForAllRecords=Definisci il valore del barcode per tutti quelli inseriti (questo resetta anche i valori già definiti dei barcode con nuovi valori)
+FillBarCodeTypeAndValueManually=Riempi il tipo di codice a barre e il valore manualmente
+FillBarCodeTypeAndValueFromProduct=Riempi il tipo di codice a barre e valore dal codice a barre del prodotto
+FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di codice a barre e il valore da un codice a barre di terze parti
+DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del codice a barre non è completa per il prodotto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del codice a barre non è completa per la terzaparte %s.
+BarCodeDataForProduct=Informazioni codice a barre del prodotto %s :
+BarCodeDataForThirdparty=Informazioni codice a barre della terza parte %s :
+ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quelli inseriti (questo resetta anche i valori già definiti dei codice a barre con nuovi valori)
 PriceByCustomer=Prezzo per cliente
 PriceCatalogue=Prezzo unico per prodotto/servizio
 PricingRule=Regole prezzi
 AddCustomerPrice=Aggiungi un prezzo per cliente
 ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
 PriceByCustomerLog=Prezzo per log cliente
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Il prezzo minimo non può essere inferiore di %s
+MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 22dff95f489..62d699144c6 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i priv
 Myprojects=I miei progetti
 ProjectsArea=Area progetti
 NewProject=Nuovo progetto
-AddProject=Aggiungi progetto
+AddProject=Crea progetto
 DeleteAProject=Elimina un progetto
 DeleteATask=Cancella un compito
 ConfirmDeleteAProject=Vuoi davvero eliminare il progetto?
@@ -36,6 +36,8 @@ TaskTimeSpent=Tempo speso sulle attività
 TaskTimeUser=Utente
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aggiungi tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
 MyTasks=I miei compiti
@@ -45,7 +47,7 @@ TaskDateStart=Data inizio attività
 TaskDateEnd=Data fine attività
 TaskDescription=Descrizione attività
 NewTask=Nuovo compito
-AddTask=Aggiungere compito
+AddTask=Crea attività
 AddDuration=Aggiungi periodo
 Activity=Operatività
 Activities=Compiti/operatività
@@ -85,13 +87,13 @@ ActionsOnProject=Azioni sul progetto
 YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato
 DeleteATimeSpent=Cancella il tempo lavorato
 ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
+ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
 TaskRessourceLinks=Risorse
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Attività non assegnate a te
 ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto
 ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono <b>%s</b> compiti) e tutto il tempo lavorato già inserito.
 IfNeedToUseOhterObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo.
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore
 SelectElement=Seleziona elemento
 AddElement=Link all'elemento
-UnlinkElement=Unlink element
+UnlinkElement=Rimuovi collegamento
 # Documents models
 DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..)
 PlannedWorkload = Carico di lavoro previsto
@@ -129,4 +131,4 @@ ProjectReferers=Elementi correlati
 SearchAProject=Cerca un progetto
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
 ProjectDraft=Progetti bozza
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang
index d64075dfbf5..ec76b191873 100644
--- a/htdocs/langs/it_IT/resource.lang
+++ b/htdocs/langs/it_IT/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
+MenuResourceIndex=Risorse
+MenuResourceAdd=Nuova risorsa
 MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
+DeleteResource=Elimina risorsa
 ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+NoResourceInDatabase=Nessuna risorsa nel database
+NoResourceLinked=Nessuna risorsa collegata
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
+ResourcePageIndex=Elenco delle risorse
+ResourceSingular=Risorsa
 ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+AddResource=Crea una risorsa
+ResourceFormLabel_ref=Nome della risorsa
+ResourceType=Tipo di risorsa
+ResourceFormLabel_description=Descrizione della risorsa
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Risorse collegate all'elemento
 
 ShowResourcePlanning=Show resource planning
 GotoDate=Go to date
 
-ResourceElementPage=Element resources
+ResourceElementPage=Risorse dell'elemento
 ResourceCreatedWithSuccess=Resource successfully created
 RessourceLineSuccessfullyDeleted=Resource line successfully deleted
 RessourceLineSuccessfullyUpdated=Resource line successfully updated
 ResourceLinkedWithSuccess=Resource linked with success
 
 TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Conferma l'eliminazione di questa risorsa
+RessourceSuccessfullyDeleted=Risorsa eliminata con successo
+DictionaryResourceType=Tipo di risorse
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Seleziona risorse
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 9158af3aed8..ae26dee0a4c 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Data di accredito
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostra domiciliazione
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuttavia, se per la fattura ci sono ancora pagamenti da elaborare, non sarà impostata come pagata per consentire prima la gestione dei domiciliazioni.
-DoStandingOrdersBeforePayments=Questa scheda consente di richiedere un ordine permanente. Una volta finito, è possibile inserire il pagamento per chiudere la fattura.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Ricevuta bancaria
 SetToStatusSent=Imposta stato come "file inviato"
 ThisWillAlsoAddPaymentOnInvoice=Verranno anche creati dei pagamenti tra le ricevuti e saranno classificati come pagati
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Il pagamento dell'ordine permanente %s da parte della banca
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 8244aa168a4..06e48cdad56 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= 活動に現在thirdparties表示/非表示切り替えフィルタオプションを追加したり、それを停止している
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=検索フィルタのオプション
 NumberOfKeyToSearch=検索を開始する文字のNBR：%s
 ViewFullDateActions=3つ目のシートの完全な日付のイベントを表示
@@ -208,6 +210,7 @@ ModulesJobDesc=ビジネス·モジュールは、特定のビジネスのため
 ModulesMarketPlaceDesc=あなたは、インターネット上の外部のWebサイトでダウンロードする複数のモジュールを見つけることができます...
 ModulesMarketPlaces=複数のモジュール...
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webサイトのプロバイダは、あなたが複数のモジュールを見つけるために検索することができます...
 URL=リンク
 BoxesAvailable=利用可能なボックス
@@ -444,7 +447,7 @@ Module55Desc=バーコードの管理
 Module56Name=テレフォニー
 Module56Desc=テレフォニー統合
 Module57Name=立っている受注
-Module57Desc=立っている注文と出金の管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDialシステムの統合（アスタリスク、...）
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSSフィード
 Module320Desc=Dolibarr画面のページ内でRSSフィードを追加
 Module330Name=ブックマーク
 Module330Desc=ブックマークの管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=カテゴリー
 Module1780Desc=Categorieの管理（製品、サプライヤー、顧客）
 Module2000Name=WYSIWYGエディタ
 Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=議題
@@ -503,6 +508,8 @@ Module2500Name=電子コンテンツ管理
 Module2500Desc=ドキュメントを保存および共有
 Module2600Name=Webサービス
 Module2600Desc=Dolibarr Webサービスのサーバをイネーブルにします。
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=グラバター
 Module2700Desc=ユーザー/メンバーの写真を（それらのメールに見られる）を表示するオンライングラバターサービス（www.gravatar.com）を使用します。インターネットへのアクセスを必要とする
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=切符売り場
 Module50000Desc=切符売り場でクレジットカードによるオンライン決済のページを提供するモジュール
 Module50100Name=売上高のポイント
@@ -527,7 +534,7 @@ Module50200Desc=Paypalとクレジットカードによるオンライン決済
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=セットアップは、保存された
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=お使いのシステムは正常に更新されました
 CompanyInfo=会社概要/基礎情報
 CompanyIds=会社概要/基礎アイデンティティ
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 8492595eac6..d2ed716615c 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=イベントへの影響を受けた
 ActionsDoneBy=によって行われたイベント
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= すべての私のイベント/タスク
 AllActions= すべてのイベント/タスク
 ViewList=リストビュー
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 4b385d678cd..7e09ff1ecfa 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index b4e2e7ca76d..3f44104d7fb 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=実行中の契約品目のリスト
 ListOfRunningServices=実行中のサービスのリスト
 NotActivatedServices=非アクティブなサービス（検証済みの契約の中で）
 BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=最後%s活性化サービス
 LastModifiedServices=最後%sは、サービスを変更
 EditServiceLine=編集サービスライン
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=営業担当者の署名の契約
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index fa925a3f694..9742a4ad7c7 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=サプライヤーコードが必要です
 ErrorSupplierCodeAlreadyUsed=サプライヤーコードが既に使用され
 ErrorBadParameters=パラメータが不正で
 ErrorBadValueForParameter=パラメータが正しくない &quot;%s&quot;のために間違った値 &quot;%s&quot;
-ErrorBadImageFormat=イメージファイルはサポートされている形式を持っていないと
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=値 '%s'に間違った日付の形式になっています
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗しました
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけ
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていません。プロセスが中止されました。
 ErrorBadValueForCode=セキュリティコードの値が正しくありません。新しい値で再試行してください...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできません
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化バーコード·タイプません
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 37609615f03..7455ea4d526 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -8,7 +8,7 @@ Members=メンバー
 MemberAccount=メンバーログイン
 ShowMember=メンバーカードを提示
 UserNotLinkedToMember=ユーザーがメンバーにリンクされていません
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=メンバーチケット
 FundationMembers=Foundationのメンバー
 Attributs=属性
@@ -85,8 +85,7 @@ SubscriptionLateShort=遅い
 SubscriptionNotReceivedShort=受信しませんでした
 ListOfSubscriptions=サブスクリプションのリスト
 SendCardByMail=メールでカードを送る
-AddMember=メンバーを追加する
-MemberType=メンバー型
+AddMember=Create member
 NoTypeDefinedGoToSetup=いいえメンバーのタイプが定義されていません。セットアップに行く - メンバーの種類
 NewMemberType=新しいメンバの型
 WelcomeEMail=電子メール歓迎
@@ -126,12 +125,12 @@ Date=日付
 DateAndTime=日時
 PublicMemberCard=メンバーパブリックカード
 MemberNotOrNoMoreExpectedToSubscribe=メンバーは、より多くのサブスクライブしないと予想されていないかない
-AddSubscription=サブスクリプションを追加します。
+AddSubscription=Create subscription
 ShowSubscription=サブスクリプションを表示する
 MemberModifiedInDolibarr=メンバーはDolibarrで変更
 SendAnEMailToMember=メンバーへの情報メールを送る
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=メンバーautosubscriptionための電子メールの件名
 DescADHERENT_AUTOREGISTER_MAIL=メンバーautosubscriptionの電子メール
 DescADHERENT_MAIL_VALID_SUBJECT=メンバーの検証のための電子メールの件名
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=メンバーresiliationための電子メール
 DescADHERENT_MAIL_RESIL=メンバーresiliationの電子メール
 DescADHERENT_MAIL_FROM=自動電子メールの送信者の電子メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
 DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト
 DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバーカードに印刷
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=このメンバに関連付けられているサ
 ThirdPartyDolibarr=Dolibarrサードパーティ
 MembersAndSubscriptions= メンバーとSubscriptions
 MoreActions=記録上の相補的なアクション
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=アカウントに直接トランザクション·レコードを作成します。
 MoreActionBankViaInvoice=アカウントの請求書と支払いを作成します。
 MoreActionInvoiceOnly=なし支払いで請求書を作成します。
@@ -171,6 +170,8 @@ LastSubscriptionAmount=最後のサブスクリプションの量
 MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=都道府県/州によってメンバーの統計
 MembersStatisticsByTown=町によってメンバーの統計
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=会員数
 NoValidatedMemberYet=いいえ検証メンバーが見つかりませんでした
 MembersByCountryDesc=この画面には、国によるメンバーの統計情報を表示します。グラフィックは、Googleのオンライングラフサービスに依存しますが、インターネット接続が機能している場合にのみ使用できます。
@@ -196,9 +197,10 @@ Collectivités=組織
 Particuliers=個人的な
 Entreprises=企業
 DOLIBARRFOUNDATION_PAYMENT_FORM=銀行振込を使用してサブスクリプション費用の支払いを行うには、ページ参照<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribeを</a> 。 <br>クレジットカードまたはPayPalでお支払いには、このページの下部にあるボタンをクリックします。 <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index d02dfb5bad9..8753a3c1353 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=価格数
 MultiPriceLevelsName=価格カテゴリ
-AssociatedProductsAbility=サブプロダクトをアクティブにする
-AssociatedProducts=サブプロダクト
-AssociatedProductsNumber=この製品を構成する製品の数
-ParentProductsNumber=親製品の数
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=関連付ける
 Translation=翻訳
 KeywordFilter=キーワードフィルタ
@@ -132,7 +132,7 @@ AddDel=追加/削除
 Quantity=量
 NoMatchFound=マッチするものが見つからない
 ProductAssociationList=関連製品/サービスのリスト：製品/サービスの名前（量の影響）
-ProductParentList=コンポーネントとしては、この製品と製品/サービスのリスト
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
 DeleteProduct=製品/サービスを削除します。
 ConfirmDeleteProduct=この製品/サービスを削除してもよろしいですか？
@@ -179,7 +179,7 @@ CloneProduct=クローン製品やサービス
 ConfirmCloneProduct=あなたが製品やサービス<b>%sの</b>クローン<b>を作成</b>してもよろしいですか？
 CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する
 ClonePricesProduct=主な情報と価格のクローンを作成する
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=本製品が使用されます
 NewRefForClone=REF。新製品/サービスの
 CustomerPrices=お客様の価格
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index ad6075c0514..5c876e6dd1b 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=このビューは、すべてのプロジェクトとタスク（あ
 Myprojects=私のプロジェクト
 ProjectsArea=プロジェクトエリア
 NewProject=新しいプロジェクト
-AddProject=プロジェクトを追加する
+AddProject=Create project
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
 ConfirmDeleteAProject=このプロジェクトを削除してもよろしいですか？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新たに費やされた時間は
 MyTimeSpent=私の時間を費やし
 MyTasks=私の仕事
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新しいタスク
-AddTask=タスクを追加する
+AddTask=Create task
 AddDuration=期間を追加します。
 Activity=アクティビティ
 Activities=タスク/活動
diff --git a/htdocs/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ja_JP/resource.lang
+++ b/htdocs/langs/ja_JP/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index c8d4567a644..17e7c8c42b5 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=クレジットで
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=引き出しを表示
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=請求書は、まだ少なくとも一つの引き出しの支払いを処理していない場合、前に撤退を管理できるようにするために支払ったとして、しかし、それが設定されません。
-DoStandingOrdersBeforePayments=このタブでは、立っている順序のために要求することができます。それが終了されますしたら、請求書を閉じるには、支払を入力することができます。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=銀行によって立っている順序%sの支払い
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index a8873ee150c..c8f846c9e55 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 35a7cd38655..b2ab74c91bc 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index cf892ddac82..259ba9c91ec 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/ko_KR/resource.lang b/htdocs/langs/ko_KR/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ko_KR/resource.lang
+++ b/htdocs/langs/ko_KR/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 5039352d999..3d1cd8a7cb2 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Parodyti/paslėpti trečiasias šalis vykdančias ar nutraukusias veiklą, pridėkite filtro pasirinkimą
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Paieškos filtrų nustatymai
 NumberOfKeyToSearch=Paieškai paleisti reikalingas simbolių skaičius: %s
 ViewFullDateActions=Rodyti pilnas įvykių datas trečiajame lape
@@ -208,6 +210,7 @@ ModulesJobDesc=Verslo moduliuose yra paprastos iš anksto nustatytos Dolibarr nu
 ModulesMarketPlaceDesc=Galite rasti daugiau modulių ir atsisiųsti iš išorinių web svetainių internete ...
 ModulesMarketPlaces=Daugiau modulių ...
 DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Galite ieškoti ir rasti daugiau modulių per Web svetainių tiekėjus...
 URL=Nuoroda
 BoxesAvailable=Prieinami langeliai
@@ -444,7 +447,7 @@ Module55Desc=Brūkšninių kodų valdymas
 Module56Name=Telefonija
 Module56Desc=Telefonijos integracija
 Module57Name=Pastovūs užsakymai
-Module57Desc=Pastovių užsakymų ir atšaukimų valdymas
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sistemos integracija (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS mechanizmas
 Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje
 Module330Name=Žymekliai
 Module330Desc=Žymeklių valdymas
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
 Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai)
@@ -495,6 +498,8 @@ Module1780Name=Kategorijos
 Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai)
 Module2000Name=WYSIWYG redaktorius
 Module2000Desc=Leisti redaguoti tam tikrą teksto sritį naudojant pažangų redaktorių
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Numatomų užduočių valdymas
 Module2400Name=Darbotvarkė
@@ -503,6 +508,8 @@ Module2500Name=Elektroninis Turinio Valdymas
 Module2500Desc=Išsaugoti dokumentus ir dalintis jais
 Module2600Name=WebServices
 Module2600Desc=Įjungti Dolibarr interneto paslaugas serveryje
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Naudokite Gravatar interneto paslaugą (www.gravatar.com) kad parodyti nuotrauką vartotojams/nariams (surandami prie jų laiškų). Reikalinga interneto prieiga.
 Module2800Desc=FTP klientas
@@ -517,7 +524,7 @@ Module6000Desc=Darbo eigos valdymas
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per Paybox puslapį
 Module50100Name=Pardavimų taškas
@@ -527,7 +534,7 @@ Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayP
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Spausdinti per Cups IPP spausdintuvą.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Atidaryti apklausą
 Module55000Desc=Modulis interneto apklausų sudarymui (pvz.: Doodle, Studs, Rdvz, ...)
 Module59000Name=Paraštės
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Užsakymų metodai
 DictionarySource=Pasiūlymų/užsakymų kilmė
 DictionaryAccountancyplan=Sąskaitų planas
 DictionaryAccountancysystem=Sąskaitų plano modeliai
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nustatymai išsaugoti
 BackToModuleList=Atgal į modulių sąrašą
 BackToDictionaryList=Atgal į žodynų sąrašą
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu
 DefaultLanguage=Naudojama kalba pagal nutylėjimą (kalbos kodas)
 EnableMultilangInterface=Įjungti daugiakalbę sąsają
 EnableShowLogo=Rodyti logotipą kairiajame meniu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Jūsų sistema sėkmingai atnaujinta
 CompanyInfo=Įmonės/Organizacijos informacija
 CompanyIds=Įmonės/Organizacijos tapatybės
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index e56ed276d04..3d2da4f6b67 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Įvykiai priskirti
 ActionsDoneBy=Įvykiai atlikti
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Visi mano įvykiai/užduotys
 AllActions= Visi įvykiai/užduotys
 ViewList=Sąrašo vaizdas
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index f07b82c6e96..f029909d1db 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index bc325523e1c..669a370db74 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Veikiančių sutarčių eilučių sąrašas
 ListOfRunningServices=Veikiančių paslaugų sąrašas
 NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių)
 BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Paskutinės %s aktyvuotos paslaugos
 LastModifiedServices=Paskutinės %s modifikuotos paslaugos
 EditServiceLine=Redaguoti paslaugos eilutę
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Paslaugų, kurios baigiasi, sąrašas
 NoteListOfYourExpiredServices=Šiame sąraše yra tik paslaugos sutarčių trečiosioms šalims, su kuriom Jūs susijęs kaip pardavimo atstovas.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Pardavimų atstovas pasirašantis sutartį
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 3393282345b..785d3b9be28 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Tiekėjo kodas reikalingas
 ErrorSupplierCodeAlreadyUsed=Tiekėjo kodas jau naudojamas
 ErrorBadParameters=Blogi parametrai
 ErrorBadValueForParameter=Nekorektiško parametro '%s' neteisinga reikšmė '%s'
-ErrorBadImageFormat=Paveikslėlio failo nepalaikomas formatas
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Reikšmė '%s' turi neteisingą datos formatą
 ErrorWrongDate=Data yra neteisinga !
 ErrorFailedToWriteInDir=Nepavyko įrašyti į katalogą %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Vartotojas su prisijungimu <b>%s</b> nerastas
 ErrorLoginHasNoEmail=Šis vartotojas neturi e-pašto adreso. Procesas nutrauktas.
 ErrorBadValueForCode=Netinkama saugumo kodo reikšmė. Pabandykite dar kartą su nauja reikšme ...
 ErrorBothFieldCantBeNegative=Laukai %s ir %s negali būti abu neigiami
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Vartotojo sąskaita <b>%s</b> naudojama web serverio vykdymui neturi leidimo tam.
 ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo
 ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susij
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 9246a04ced9..ac6e97831b8 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Narių sritis
+PublicMembersArea=Vieša narių sritis
+MemberCard=Nario kortelė
+SubscriptionCard=Prenumeratos kortelė
+Member=Narys
+Members=Nariai
+MemberAccount=Nario prisijungimas
+ShowMember=Rodyti nario kortelę
+UserNotLinkedToMember=Vartotojas nėra susietas su nariu
+ThirdpartyNotLinkedToMember=Trečioji šalis nesusieta su nariu
+MembersTickets=Narių kortelės
+FundationMembers=Organizacijos nariai
+Attributs=Atributai
+ErrorMemberTypeNotDefined=Nario tipas nėra apibrėžtas
+ListOfPublicMembers=Viešųjų narių sąrašas
+ListOfValidatedPublicMembers=Patvirtintų viešųjų narių sąrašas
+ErrorThisMemberIsNotPublic=Šis narys nėra viešas
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: <b>%s</b>, prisijungimas: <b>%s</b>) jau yra susietas su trečiąja šalimi <b>%s</b>. Pirmiausia pašalinti šį saitą, nes trečioji šalis negali būti susieta tik su nariu (ir atvirkščiai).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų.
+ThisIsContentOfYourCard=Tai yra Jūsų kortelės detalės
+CardContent=Jūsų nario kortelės turinys
+SetLinkToUser=Saitas su Dolibarr vartotoju
+SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi
+MembersCards=Narių vizitinės kortelės
+MembersList=Narių sąrašas
+MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
+MembersListValid=Patvirtintų galiojančių narių sąrašas
+MembersListUpToDate=Patvirtintų galiojančių narių su atnaujintu pasirašymu sąrašas
+MembersListNotUpToDate=Patvirtintų galiojančių narių su pasenusiu pasirašymu sąrašas
+MembersListResiliated=Atkurtų narių sąrašas
+MembersListQualified=Slaptų narių sąrašas (qualified)
+MenuMembersToValidate=Numatomi nariai
+MenuMembersValidated=Patvirtinti galiojantys nariai
+MenuMembersUpToDate=Atnaujinti nariai
+MenuMembersNotUpToDate=Pasenę nariai
+MenuMembersResiliated=Atkurti nariai
+MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
+DateAbonment=Pasirašymo data
+DateSubscription=Pasirašymo data
+DateNextSubscription=Sekantis pasirašymas
+DateEndSubscription=Pasirašymo pabaigos data
+EndSubscription=Pasirašymo pabaiga
+SubscriptionId=Pasirašymo ID
+MemberId=Nario ID
+NewMember=Naujas narys
+NewType=Naujo nario tipas
+MemberType=Nario tipas
+MemberTypeId=Nario tipo ID
+MemberTypeLabel=Nario tipo etiketė
+MembersTypes=Narių tipai
+MembersAttributes=Narių atributai
+SearchAMember=Ieškoti nario
+MemberStatusDraft=Projektas (turi būti patvirtintas)
+MemberStatusDraftShort=Projektas
+MemberStatusActive=Patvirtintas (laukiama pasirašymo)
+MemberStatusActiveShort=Patvirtintas
+MemberStatusActiveLate=Pasirašymas pasibaigęs
+MemberStatusActiveLateShort=Pasibaigęs
+MemberStatusPaid=Pasirašymas atnaujintas
+MemberStatusPaidShort=Atnaujintas
+MemberStatusResiliated=Atkurtas narys
+MemberStatusResiliatedShort=Atkurtas
+MembersStatusToValid=Projektiniai nariai
+MembersStatusToValidShort=Projektiniai nariai
+MembersStatusValidated=Patvirtinti nariai
+MembersStatusPaid=Pasirašymas atnaujintas
+MembersStatusPaidShort=Atnaujinta
+MembersStatusNotPaid=Pasirašymas pasenęs
+MembersStatusNotPaidShort=Pasenusi
+MembersStatusResiliated=Atkurti nariai
+MembersStatusResiliatedShort=Atkurti nariai
+NewCotisation=Nauja įmoka
+PaymentSubscription=Naujas įmokos mokėjimas
+EditMember=Redaguoti narį
+SubscriptionEndDate=Pasirašymo pabaigos data
+MembersTypeSetup=Narių tipo nustatymai
+NewSubscription=Naujas pasirašymas
+NewSubscriptionDesc=Ši forma leidžia įrašyti Jūsų pasirašymą kaip naują organizacijos narį. Jei norite atnaujinti savo pasirašymą (jei jau narys), prašome vietoj susisiekti su Organizacijos valdyba e-paštu %s.
+Subscription=Pasirašymas
+Subscriptions=Pasirašymai
+SubscriptionLate=Vėlai
+SubscriptionNotReceived=Pasirašymas negautas
+SubscriptionLateShort=Vėlai
+SubscriptionNotReceivedShort=Niekada negautas
+ListOfSubscriptions=Pasirašymų sąrašas
+SendCardByMail=Siųsti kortelę E-paštu
+AddMember=Create member
+NoTypeDefinedGoToSetup=Nė apibrėžtų nario tipų. Eiti į meniu "Narių tipai"
+NewMemberType=Naujas nario tipas
+WelcomeEMail=Sveikinimo e-laiškas
+SubscriptionRequired=Reikalingas pasirašymas
+EditType=Redaguoti nario tipą
+DeleteType=Ištrinti
+VoteAllowed=Balsuoti leidžiama
+Physical=Fizinis
+Moral=Moralinis
+MorPhy=Moralinis/Fizinis
+Reenable=Įjungti vėl
+ResiliateMember=Atkurti narį
+ConfirmResiliateMember=Ar tikrai norite atkurti šį narį ?
+DeleteMember=Ištrinti narį
+ConfirmDeleteMember=Ar tikrai norite ištrinti šį narį (nario ištrynimas kartu ištrins visus jo pasirašymus) ?
+DeleteSubscription=Ištrinti pasirašymą
+ConfirmDeleteSubscription=Ar tikrai norite ištrinti šį pasirašymą ?
+Filehtpasswd=htpasswd failas
+ValidateMember=Patvirtinti narį
+ConfirmValidateMember=Ar tikrai norite patvirtinti šį narį ?
+FollowingLinksArePublic=Sekantys saitai yra atidaryti puslapiai neapsaugoti jokiais Dolibarr leidimais. Jie nėra suformatuoti puslapiai, pateikti kaip pavyzdys, kad parodyti, kaip vartyti narių duomenų bazę.
+PublicMemberList=Viešų narių sąrašas
+BlankSubscriptionForm=Viešo auto pasirašymo forma
+BlankSubscriptionFormDesc=Dolibarr gali suteikti Jums viešą URL ir leisti išorinius lankytojus pateikti užklausimus dėl pasirašymo į organizaciją. Jei mokėjimo internetu modulis įjungtas, mokėjimo forma bus pateikiama automatiškai.
+EnablePublicSubscriptionForm=Įjungti viešą auto pasirašymo formą
+MemberPublicLinks=Vieši saitai/puslapiai
+ExportDataset_member_1=Nariai ir pasirašymai
+ImportDataset_member_1=Nariai
+LastMembers=Paskutiniai %s nariai
+LastMembersModified=Paskutiniai %s modifikuoti nariai
+LastSubscriptionsModified=Paskutiniai %s modifikuoti pasirašymai
+AttributeName=Atributo pavadinimas
+String=Sąlyga
+Text=Tekstas
+Int=Vidinis
+Date=Data
+DateAndTime=Data ir laikas
+PublicMemberCard=Nario vieša kortelė
+MemberNotOrNoMoreExpectedToSubscribe=Narys, kurio pasirašymo nėra ir daugiau nesitikima
+AddSubscription=Create subscription
+ShowSubscription=Rodyti pasirašymą
+MemberModifiedInDolibarr=Narys modifikuotas Dolibarr
+SendAnEMailToMember=Nusiųsti informacinį e-laišką nariui
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Gauto e-laiško subjektas svečio auto įrašo atveju
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Gautas e-laiškas svečio auto įrašo atveju
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=E-laiško tema nario auto pasirašymui
+DescADHERENT_AUTOREGISTER_MAIL=E-laiškas nario auto pasirašymui
+DescADHERENT_MAIL_VALID_SUBJECT=E-laiško tema nario patvirtinimui
+DescADHERENT_MAIL_VALID=E-laiškas nario patvirtinimui
+DescADHERENT_MAIL_COTIS_SUBJECT=E-laiško tema pasirašymui
+DescADHERENT_MAIL_COTIS=E-laiškas pasirašymui
+DescADHERENT_MAIL_RESIL_SUBJECT=E-laiško tema nario atstatymui
+DescADHERENT_MAIL_RESIL=E-laiškas nario atstatymui
+DescADHERENT_MAIL_FROM=Siuntėjo e-paštas automatiniams e-laiškams
+DescADHERENT_ETIQUETTE_TYPE=Etikečių puslapio formatas
+DescADHERENT_ETIQUETTE_TEXT=Spausdinamas tekstas ant nario adreso puslapių
+DescADHERENT_CARD_TYPE=Kortelių puslapio formatas
+DescADHERENT_CARD_HEADER_TEXT=Spausdinamas tekstas ant nario kortelių viršuje
+DescADHERENT_CARD_TEXT=Spausdinamas tekstas ant nario kortelių (lygiuoti į kairę)
+DescADHERENT_CARD_TEXT_RIGHT=Spausdinamas tekstas ant nario kortelių (lygiuoti į dešinę)
+DescADHERENT_CARD_FOOTER_TEXT=Spausdinamas tekstas ant nario kortelių apačioje
+GlobalConfigUsedIfNotDefined=Bus naudojamas Organizacijos modulyje apibrėžtas tekstas, jei čia neapibrėžiama kitaip
+MayBeOverwrited=Šis tekstas gali būti perrašomas pagal apibrėžtą reikšmę šiam nario tipui
+ShowTypeCard=Rodyti tipą '%s'
+HTPasswordExport=htpassword failo generavimas
+NoThirdPartyAssociatedToMember=Nė viena trečioji šalis nėra asocijuota su šiuo nariu
+ThirdPartyDolibarr=Dolibarr trečioji šalis
+MembersAndSubscriptions= Nariai ir Pasirašymai
+MoreActions=Papildomi veiksmai įrašomi
+MoreActionsOnSubscription=Papildomi veiksmai siūlomi pagal nutylėjimą, kai registruojamas pasirašymas
+MoreActionBankDirect=Sukurti tiesioginį operacijos įrašą sąskaitoje
+MoreActionBankViaInvoice=Sukurti sąskaitą-faktūrą ir mokėjimą sąskaitoje
+MoreActionInvoiceOnly=Sukurti sąskaitą-faktūrą be mokėjimo
+LinkToGeneratedPages=Sukurti apsilankymų korteles
+LinkToGeneratedPagesDesc=Šis ekranas leidžia Jums sukurti PDF failus su vizitinėmis kortelėmis visiems Jūsų nariams ar tik tam tikriems nariams.
+DocForAllMembersCards=Sukurti vizitines korteles visiems nariams
+DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams
+DocForLabels=Sukurti adresų lapus
+SubscriptionPayment=Pasirašymo apmokėjimas
+LastSubscriptionDate=Paskutinio pasirašymo data
+LastSubscriptionAmount=Paskutinio pasirašymo suma
+MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
+MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
+MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
+MembersStatisticsByRegion=Narių statistika pagal regionus
+MemberByRegion=Nariai pagal regionus
+NbOfMembers=Narių skaičius
+NoValidatedMemberYet=Patvirtintų narių nerasta
+MembersByCountryDesc=Šis ekranas rodo narių statistiką pagal šalis. Grafika priklauso nuo Google interneto grafikos ir yra prieinamas tik tada, kai interneto ryšys veikia.
+MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus
+MembersByTownDesc=Šis ekranas rodo narių statistiką pagal miestus
+MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti
+MenuMembersStats=Statistika
+LastMemberDate=Paskutinio nario data
+Nature=Kilmė
+Public=Informacija yra vieša
+Exports=Eksportai
+NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
+NewMemberForm=Naujo nario forma
+SubscriptionsStatistics=Pasirašymų statistika
+NbOfSubscriptions=Pasirašymų skaičius
+AmountOfSubscriptions=Pasirašymų apimtis
+TurnoverOrBudget=Apyvarta (įmonės) arba Biudžeto (organizacijos)
+DefaultAmount=Pasirašymo apimtis (pagal nutylėjimą)
+CanEditAmount=Lankytojas gali pasirinkti/redaguoti savo pasirašymo apimtį
+MEMBER_NEWFORM_PAYONLINE=Peršokti į integruotą interneto mokėjimo puslapį
+Associations=Organizacijos
+Collectivités=Organizacijos
+Particuliers=Asmens
+Entreprises=Įmonės
+DOLIBARRFOUNDATION_PAYMENT_FORM=Norint atlikti pasirašymo apmokėjimą naudojant banko pervedimą, žiūrėti psl.: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br> Mokėti naudojant kreditinę kortelę arba PayPal, spauskite mygtuką šio puslapio apačioje.<br>
+ByProperties=Pagal savybes
+MembersStatisticsByProperties=Narių statistiniai duomenys pagal savybes
+MembersByNature=Nariai pagal kilmę
+VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
+NoVatOnSubscription=Pasirašymams nėra PVM
+MEMBER_PAYONLINE_SENDEMAIL=Įspėti, kai Dolibarr gauna patvirtinimą apie mokėjimą už pasirašymą, nusiunčiant e-laišką
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index a9db1492e92..d2b0da1e0f3 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Kainų skaičius
 MultiPriceLevelsName=Kainų kategorijos
-AssociatedProductsAbility=Įjungti virtualią produktų funkciją
-AssociatedProducts=Virtualus produktas
-AssociatedProductsNumber=Produktų, sudarančių šį virtualų produktą, skaičius
-ParentProductsNumber=Patronuojančio virtualaus produkto skaičius
-IfZeroItIsNotAVirtualProduct=Jei 0, šis produktas nėra virtualus produktas
-IfZeroItIsNotUsedByVirtualProduct=Jei 0, šis produktas nėra naudojamas nei vieno virtualaus produkto
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Prisijungti
 Translation=Vertimas
 KeywordFilter=Raktažodižio filtras
@@ -132,7 +132,7 @@ AddDel=Pridėti/Ištrinti
 Quantity=Kiekis
 NoMatchFound=Atitikimų nerasta
 ProductAssociationList=Susijusių produktų/paslaugų sąrašas: produkto/paslaugos pavadinimas (paveiktas kiekis)
-ProductParentList=Virtualių prekių/paslaugų su šiuo produktu, kaip komponentu, sąrašas
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Vienas iš pasirinkto produkto yra patronuojantis einamam produktui
 DeleteProduct=Ištrinti produktą/paslaugą
 ConfirmDeleteProduct=Ar tikrai norite ištrinti šį produktą/paslaugą ?
@@ -179,7 +179,7 @@ CloneProduct=Klonuoti produktą ar paslaugą
 ConfirmCloneProduct=Ar tikrai norite klonuoti produktą ar paslaugą <b>%s</b> ?
 CloneContentProduct=Klonuoti visą pagrindinę produkto/paslaugos informaciją
 ClonePricesProduct=Klonuoti pagrindinę informaciją ir kainas
-CloneCompositionProduct=Klonuoti virtualų produktą/paslaugą
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Šis produktas naudojamas
 NewRefForClone=Naujo produkto/paslaugos nuoroda
 CustomerPrices=Klientų kainos
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms
 PriceByCustomerLog=Kaina pagal kliento žurnalą
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 77744b81fd3..357d4516d4b 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teis
 Myprojects=Mano projektai
 ProjectsArea=Projektų sritis
 NewProject=Naujas projektas
-AddProject=Pridėti projektą
+AddProject=Create project
 DeleteAProject=Ištrinti projektą
 DeleteATask=Ištrinti užduotį
 ConfirmDeleteAProject=Ar tikrai norite ištrinti šį projektą?
@@ -36,6 +36,8 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Naujas praleistas laikas
 MyTimeSpent=Mano praleistas laikas
 MyTasks=Mano užduotys
@@ -45,7 +47,7 @@ TaskDateStart=Užduoties pradžios data
 TaskDateEnd=Užduoties pabaigos data
 TaskDescription=Užduoties aprašymas
 NewTask=Nauja užduotis
-AddTask=Pridėti užduotį
+AddTask=Create task
 AddDuration=Pridėti trukmę
 Activity=Veikla
 Activities=Užduotys/veikla
diff --git a/htdocs/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/lt_LT/resource.lang
+++ b/htdocs/langs/lt_LT/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 57893855393..9181af3d105 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kreditą
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Rodyti Išėmimą
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą.
-DoStandingOrdersBeforePayments=Ši kortelė leidžia prašyti periodinio užsakymo. Kai jis bus įvykdytas, galite įvesti mokėjimą sąskaitos-faktūros uždarymui.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Išėmimo failas
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
 ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 36406135905..5debf8efd8c 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Izmantojiet automātiskos laukus, lai izvēlētos treš
 ActivityStateToSelectCompany= Pievienot filtru iespēja parādīt / slēpt thirdparties kas pašlaik darbībā vai ir pārtraucis to
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Izmantojiet automātiskos laukus, lai izvēlētos kontaktu (tā vietā, lai izmantojot sarakstlodziņu).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Meklēšanas filtru iespējas
 NumberOfKeyToSearch=Rakstzīmju skaits, lai iedarbinātu meklēšanu: %s
 ViewFullDateActions=Rādīt pilnu datumus notikumus trešajā lapā
@@ -208,6 +210,7 @@ ModulesJobDesc=Biznesa moduļi nodrošina vienkāršu iepriekš iestatīšanu Do
 ModulesMarketPlaceDesc=Jūs varat atrast vairāk moduļus, lai lejupielādētu uz ārējām tīmekļa vietnēm internetā ...
 ModulesMarketPlaces=Papildus moduļi ...
 DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Tīmekļa vietnes pakalpojumu sniedzēji, jūs varat meklēt, lai atrastu jaunus moduļus ...
 URL=Saite
 BoxesAvailable=Pieejamie logi
@@ -444,7 +447,7 @@ Module55Desc=Svītrkodu vadība
 Module56Name=Telefonija
 Module56Desc=Telefonijas integrācija
 Module57Name=Regulārie maksājumi
-Module57Desc=Regulārie maksājumi un atsaukšana vadība
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=NospiedLaiSavienotos
 Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS barotne
 Module320Desc=Pievienot RSS plūsmu Dolibarr lapās
 Module330Name=Grāmatzīmes
 Module330Desc=Grāmatzīmju pārvaldība
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Sadaļas
 Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plānotais uzdevumu pārvaldība
 Module2400Name=Darba kārtība
@@ -503,6 +508,8 @@ Module2500Name=Elektroniskā satura pārvaldība
 Module2500Desc=Saglabāt un nošārēt dokumentus
 Module2600Name=WEB pakalpojumi
 Module2600Desc=Ļautu Dolibarr tīmekļa pakalpojumu serveri
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Izmantot tiešsaistes Gravatar pakalpojumu (www.gravatar.com), lai parādītu fotogrāfijas lietotāju / dalībnieku (atrasts ar saviem e-pastiem). Nepieciešams interneta piekļuves
 Module2800Desc=FTP klients
@@ -517,7 +524,7 @@ Module6000Desc=Plūsmas vadība
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox
 Module50100Name=Tirdzniecības punkts
@@ -527,7 +534,7 @@ Module50200Desc=Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Drukāt ar Kausi IPP printeri.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Atvērta aptauja
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Malas
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Kontu līknes
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Iestatījumi saglabāti
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē
 DefaultLanguage=Noklusējuma izmantošanas valoda (valodas kods)
 EnableMultilangInterface=Iespējot daudzvalodu interfeisu
 EnableShowLogo=Rādīt logotipu kreisajā izvēlnē
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Jūsu sistēma ir veiksmīgi atjaunināta
 CompanyInfo=Uzņēmuma / nodibinājums informācija
 CompanyIds=Uzņēmuma / nodibinājums identitātes
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index ac398549ce7..f6a8e0897fd 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Pasākums piešķirts
 ActionsDoneBy=Pasākumi, ko veikuši
 ActionsForUser=Lietotāja notikumi
 ActionsForUsersGroup=Notikumi visiem grupas lietotājiem
+ActionAssignedTo=Event assigned to
 AllMyActions= Visi mani notikumi/uzdevumi
 AllActions= Visi notikumi/uzdevumi
 ViewList=Saraksta skats
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 8c1e60218e2..51818210e66 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Kontu žurnāls
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 9ba92ea73c9..47372bde2af 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Saraksts darbojas līguma līniju
 ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem
 NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem)
 BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Pēdējais %s aktivizētais pakalpojums
 LastModifiedServices=Pēdējais %s labotais pakalpojums
 EditServiceLine=Edit servisa līnija
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Saraksts pakalpojumu beigsies
 NoteListOfYourExpiredServices=Šajā sarakstā ir tikai pakalpojumu līgumi par trešo pušu jums ir saistītas kā pārdošanas pārstāvis.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Tirdzniecības pārstāvis, parakstot līgumu,
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c0a9555b153..257f6ce5e0e 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Piegādātāja kods nepieciešams
 ErrorSupplierCodeAlreadyUsed=Piegādātāja kods jau tiek izmantots
 ErrorBadParameters=Slikts parametrs
 ErrorBadValueForParameter=Nepareiza vērtība '%s' parametrs nepareizs '%s'
-ErrorBadImageFormat=Attēla fails nav pareizā formātā
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Vērtībai '%s' ir nepareizs datuma formāts
 ErrorWrongDate=Datums nav pareizs
 ErrorFailedToWriteInDir=Neizdevās ierakstīt direktorijā %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Lietotājs ar pieteikšanās <b>%s</b> nevar atrast.
 ErrorLoginHasNoEmail=Šim lietotājam nav e-pasta adrese. Process atcelts.
 ErrorBadValueForCode=Nepareiza drošības koda vērtība. Mēģiniet vēlreiz ar jauno vērtību ...
 ErrorBothFieldCantBeNegative=Lauki %s un %s nevar būt abi negatīvi
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Lietotāja konts <b>%s</b> izmantot, lai veiktu web serveri nav atļauja, kas
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
@@ -156,4 +175,4 @@ WarningClickToDialUserSetupNotComplete=Iestatīšana ClickToDial informāciju pa
 WarningNotRelevant=Nozīmes operācija šajā datu
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad iestatījumi ir optimizēti aklai persionai vai teksta pārlūkprogrammām
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningTooManyDataPleaseUseMoreFilters=Par daudz datu, lūdzu izmantojiet vairāk filtru 
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 4038bc8ad6b..027c6024f71 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Vēlu
 SubscriptionNotReceivedShort=Nekad nav saņemts
 ListOfSubscriptions=Saraksts abonementu
 SendCardByMail=Nosūtīt kartiņu pa e-pastu
-AddMember=Pievienot dalībnieku
+AddMember=Create member
 NoTypeDefinedGoToSetup=Neviens dalībnieka veids nav definēts. Iet uz izvēlnes "Dalībnieku veidi"
 NewMemberType=Jauns dalībnieka veids
 WelcomeEMail=Welcome e-pastu
@@ -125,7 +125,7 @@ Date=Datums
 DateAndTime=Datums un laiks
 PublicMemberCard=Dalībnieku publiskā kartiņa
 MemberNotOrNoMoreExpectedToSubscribe=Dalībvalsts nevar vai vairs sagaidāms, ka parakstīties
-AddSubscription=Pievienot abonementu
+AddSubscription=Create subscription
 ShowSubscription=Rādīt abonementu
 MemberModifiedInDolibarr=Dalībvalsts grozīts Dolibarr
 SendAnEMailToMember=Sūtīt informāciju e-pastu loceklim
@@ -203,3 +203,4 @@ MembersByNature=Dalībnieki pēc būtības
 VATToUseForSubscriptions=PVN likme izmantot abonementu
 NoVatOnSubscription=Nav TVA par abonēšanu
 MEMBER_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu, kad Dolibarr saņem apstiprinājumu par apstiprinātu maksājuma parakstīšanas
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang
index 4a1fa4d4ed3..835e6827f12 100644
--- a/htdocs/langs/lv_LV/printipp.lang
+++ b/htdocs/langs/lv_LV/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: lv_LV
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-11-09 12:40:15
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15).
-// Reference language: en_US -> lv_LV
-PrintIPPSetup=Setup moduļa Direct Print
-PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi.
-PRINTIPP_ENABLED=Rādīt Picto &quot;Direct print&quot; par dokumentu saraksts
-PRINTIPP_HOST=Drukas serveris
-PRINTIPP_PORT=Osta
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Parole
-NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup)
-// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40).
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index b575e82a1c9..d81b413812e 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks
 MultiPricesAbility=Vairāku pakāpju cenas precēm / pakalpojumiem
 MultiPricesNumPrices=Cenu skaits
 MultiPriceLevelsName=Cenu sadaļa
-AssociatedProductsAbility=Aktivizētu virtuālo produktu funkciju
-AssociatedProducts=Virtuāls produkts
-AssociatedProductsNumber=Produktu skaits kas veido šo virtuālo produktu
-ParentProductsNumber=Skaits mātes virtuālā produkta
-IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts ir ne virtuālā produkts
-IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots ar jebkuru virtuālo produkta
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociēt
 Translation=Tulkojums
 KeywordFilter=Atslēgvārda filtru
@@ -132,7 +132,7 @@ AddDel=Pievienot / Dzēst
 Quantity=Daudzums
 NoMatchFound=Nekas netika atrasts
 ProductAssociationList=Saraksts saistītu produktu / pakalpojumu: nosaukums, produkta / pakalpojuma (daudzums ietekmē)
-ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu
 DeleteProduct=Dzēst produktu / pakalpojumu
 ConfirmDeleteProduct=Vai tiešām vēlaties dzēst šo produktu / pakalpojumu?
@@ -179,7 +179,7 @@ CloneProduct=Klonēt produktu vai pakalpojumu
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
 CloneContentProduct=Klons visus galvenos informations par produktu / pakalpojumu
 ClonePricesProduct=Klons galvenos informations un cenas
-CloneCompositionProduct=Klonēt virtuālo preci / pakalpojumu
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
 CustomerPrices=Klientu cenas
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimālā cena nevar būt zemāka par %s
 MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 6e826e0f93d..63affb41543 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotā
 Myprojects=Mani projekti
 ProjectsArea=Projektu sadaļa
 NewProject=Jauns projekts
-AddProject=Pievienot projektu
+AddProject=Izveidot projektu
 DeleteAProject=Dzēst projektu
 DeleteATask=Izdzēst uzdevumu
 ConfirmDeleteAProject=Vai tiešām vēlaties dzēst šo projektu?
@@ -36,6 +36,8 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
 TaskTimeDate=Datums
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Jauns pavadītais laiks
 MyTimeSpent=Mans pavadīts laiks
 MyTasks=Mani uzdevumi
@@ -45,7 +47,7 @@ TaskDateStart=Uzdevuma sākuma datums
 TaskDateEnd=Uzdevuma beigu datums
 TaskDescription=Uzdevuma apraksts
 NewTask=Jauns uzdevums
-AddTask=Pievienot uzdevumu
+AddTask=Izveidot uzdevumu
 AddDuration=Pievienot ilgumu
 Activity=Aktivitāte
 Activities=Uzdevumi/aktivitātes
diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/lv_LV/resource.lang
+++ b/htdocs/langs/lv_LV/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index df6d59bd321..5341718719f 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredīts
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Rādīt izņemšana
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķins satur vismaz vienu maksājums, kas nav apstrādāts, to nevar noteikt kā apmaksātu.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Maksājumu pastāvīgā rīkojuma %s banka
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 9246a04ced9..40bca8e85fb 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -1,204 +1,206 @@
 # Dolibarr language file - Source file is en_US - members
-# MembersArea=Members area
-# PublicMembersArea=Public members area
-# MemberCard=Member card
-# SubscriptionCard=Subscription card
-# Member=Member
-# Members=Members
-# MemberAccount=Member login
-# ShowMember=Show member card
-# UserNotLinkedToMember=User not linked to a member
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
-# MembersTickets=Members Tickets
-# FundationMembers=Foundation members
-# Attributs=Attributes
-# ErrorMemberTypeNotDefined=Member type not defined
-# ListOfPublicMembers=List of public members
-# ListOfValidatedPublicMembers=List of validated public members
-# ErrorThisMemberIsNotPublic=This member is not public
-# ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-# ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-# ThisIsContentOfYourCard=This is details of your card
-# CardContent=Content of your member card
-# SetLinkToUser=Link to a Dolibarr user
-# SetLinkToThirdParty=Link to a Dolibarr third party
-# MembersCards=Members business cards
-# MembersList=List of members
-# MembersListToValid=List of draft members (to be validated)
-# MembersListValid=List of valid members
-# MembersListUpToDate=List of valid members with up to date subscription
-# MembersListNotUpToDate=List of valid members with subscription out of date
-# MembersListResiliated=List of resiliated members
-# MembersListQualified=List of qualified members
-# MenuMembersToValidate=Draft members
-# MenuMembersValidated=Validated members
-# MenuMembersUpToDate=Up to date members
-# MenuMembersNotUpToDate=Out of date members
-# MenuMembersResiliated=Resiliated members
-# MembersWithSubscriptionToReceive=Members with subscription to receive
-# DateAbonment=Subscription date
-# DateSubscription=Subscription date
-# DateNextSubscription=Next subscription
-# DateEndSubscription=Subscription end date
-# EndSubscription=End subscription
-# SubscriptionId=Subscription id
-# MemberId=Member id
-# NewMember=New member
-# NewType=New member type
-# MemberType=Member type
-# MemberTypeId=Member type id
-# MemberTypeLabel=Member type label
-# MembersTypes=Members types
-# MembersAttributes=Members attributes
-# SearchAMember=Search a member
-# MemberStatusDraft=Draft (needs to be validated)
-# MemberStatusDraftShort=Draft
-# MemberStatusActive=Validated (waiting subscription)
-# MemberStatusActiveShort=Validated
-# MemberStatusActiveLate=subscription expired
-# MemberStatusActiveLateShort=Expired
-# MemberStatusPaid=Subscription up to date
-# MemberStatusPaidShort=Up to date
-# MemberStatusResiliated=Resiliated member
-# MemberStatusResiliatedShort=Resiliated
-# MembersStatusToValid=Draft members
-# MembersStatusToValidShort=Draft members
-# MembersStatusValidated=Validated members
-# MembersStatusPaid=Subscription up to date
-# MembersStatusPaidShort=Up to date
-# MembersStatusNotPaid=Subscription out of date
-# MembersStatusNotPaidShort=Out of date
-# MembersStatusResiliated=Resiliated members
-# MembersStatusResiliatedShort=Resiliated members
-# NewCotisation=New contribution
-# PaymentSubscription=New contribution payment
-# EditMember=Edit member
-# SubscriptionEndDate=Subscription's end date
-# MembersTypeSetup=Members type setup
-# NewSubscription=New subscription
-# NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-# Subscription=Subscription
-# Subscriptions=Subscriptions
-# SubscriptionLate=Late
-# SubscriptionNotReceived=Subscription never received
-# SubscriptionLateShort=Late
-# SubscriptionNotReceivedShort=Never received
-# ListOfSubscriptions=List of subscriptions
-# SendCardByMail=Send card by Email
-# AddMember=Add member
-# MemberType=Member type
-# NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-# NewMemberType=New member type
-# WelcomeEMail=Welcome e-mail
-# SubscriptionRequired=Subscription required
-# EditType=Edit member type
-# DeleteType=Delete
-# VoteAllowed=Vote allowed
-# Physical=Physical
-# Moral=Moral
-# MorPhy=Moral/Physical
-# Reenable=Reenable
-# ResiliateMember=Resiliate a member
-# ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-# DeleteMember=Delete a member
-# ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-# DeleteSubscription=Delete a subscription
-# ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-# Filehtpasswd=htpasswd file
-# ValidateMember=Validate a member
-# ConfirmValidateMember=Are you sure you want to validate this member ?
-# FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-# PublicMemberList=Public member list
-# BlankSubscriptionForm=Public auto-subscription form
-# BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-# EnablePublicSubscriptionForm=Enable the public auto-subscription form
-# MemberPublicLinks=Public links/pages
-# ExportDataset_member_1=Members and subscriptions
-# ImportDataset_member_1=Members
-# LastMembers=Last %s members
-# LastMembersModified=Last %s modified members
-# LastSubscriptionsModified=Last %s modified subscriptions
-# AttributeName=Attribute name
-# String=String
-# Text=Text
-# Int=Int
-# Date=Date
-# DateAndTime=Date and time
-# PublicMemberCard=Member public card
-# MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-# AddSubscription=Add subscription
-# ShowSubscription=Show subscription
-# MemberModifiedInDolibarr=Member modified in Dolibarr
-# SendAnEMailToMember=Send information email to member
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-# DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-# DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-# DescADHERENT_MAIL_VALID=EMail for member validation
-# DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-# DescADHERENT_MAIL_COTIS=EMail for subscription
-# DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-# DescADHERENT_MAIL_RESIL=EMail for member resiliation
-# DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-# DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-# DescADHERENT_CARD_TYPE=Format of cards page
-# DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-# DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-# DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-# DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-# GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
-# MayBeOverwrited=This text can be overwrited by value defined for member's type
-# ShowTypeCard=Show type '%s'
-# HTPasswordExport=htpassword file generation
-# NoThirdPartyAssociatedToMember=No third party associated to this member
-# ThirdPartyDolibarr=Dolibarr third party
-# MembersAndSubscriptions= Members and Subscriptions
-# MoreActions=Complementary action on recording
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-# MoreActionBankDirect=Create a direct transaction record on account
-# MoreActionBankViaInvoice=Create an invoice and payment on account
-# MoreActionInvoiceOnly=Create an invoice with no payment
-# LinkToGeneratedPages=Generate visit cards
-# LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-# DocForAllMembersCards=Generate business cards for all members
-# DocForOneMemberCards=Generate business cards for a particular member
-# DocForLabels=Generate address sheets
-# SubscriptionPayment=Subscription payment
-# LastSubscriptionDate=Last subscription date
-# LastSubscriptionAmount=Last subscription amount
-# MembersStatisticsByCountries=Members statistics by country
-# MembersStatisticsByState=Members statistics by state/province
-# MembersStatisticsByTown=Members statistics by town
-# NbOfMembers=Number of members
-# NoValidatedMemberYet=No validated members found
-# MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-# MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-# MembersByTownDesc=This screen show you statistics on members by town.
-# MembersStatisticsDesc=Choose statistics you want to read...
-# MenuMembersStats=Statistics
-# LastMemberDate=Last member date
-# Nature=Nature
-# Public=Information are public
-# Exports=Exports
-# NewMemberbyWeb=New member added. Awaiting approval
-# NewMemberForm=New member form
-# SubscriptionsStatistics=Statistics on subscriptions
-# NbOfSubscriptions=Number of subscriptions
-# AmountOfSubscriptions=Amount of subscriptions
-# TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-# DefaultAmount=Default amount of subscription
-# CanEditAmount=Visitor can choose/edit amount of its subscription
-# MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-# Associations=Foundations
-# Collectivités=Organizations
-# Particuliers=Personal
-# Entreprises=Companies
-# DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+MembersArea=Members area
+PublicMembersArea=Public members area
+MemberCard=Member card
+SubscriptionCard=Subscription card
+Member=Member
+Members=Members
+MemberAccount=Member login
+ShowMember=Show member card
+UserNotLinkedToMember=User not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
+MembersTickets=Members Tickets
+FundationMembers=Foundation members
+Attributs=Attributes
+ErrorMemberTypeNotDefined=Member type not defined
+ListOfPublicMembers=List of public members
+ListOfValidatedPublicMembers=List of validated public members
+ErrorThisMemberIsNotPublic=This member is not public
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
+ThisIsContentOfYourCard=This is details of your card
+CardContent=Content of your member card
+SetLinkToUser=Link to a Dolibarr user
+SetLinkToThirdParty=Link to a Dolibarr third party
+MembersCards=Members business cards
+MembersList=List of members
+MembersListToValid=List of draft members (to be validated)
+MembersListValid=List of valid members
+MembersListUpToDate=List of valid members with up to date subscription
+MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListResiliated=List of resiliated members
+MembersListQualified=List of qualified members
+MenuMembersToValidate=Draft members
+MenuMembersValidated=Validated members
+MenuMembersUpToDate=Up to date members
+MenuMembersNotUpToDate=Out of date members
+MenuMembersResiliated=Resiliated members
+MembersWithSubscriptionToReceive=Members with subscription to receive
+DateAbonment=Subscription date
+DateSubscription=Subscription date
+DateNextSubscription=Next subscription
+DateEndSubscription=Subscription end date
+EndSubscription=End subscription
+SubscriptionId=Subscription id
+MemberId=Member id
+NewMember=New member
+NewType=New member type
+MemberType=Member type
+MemberTypeId=Member type id
+MemberTypeLabel=Member type label
+MembersTypes=Members types
+MembersAttributes=Members attributes
+SearchAMember=Search a member
+MemberStatusDraft=Draft (needs to be validated)
+MemberStatusDraftShort=Draft
+MemberStatusActive=Validated (waiting subscription)
+MemberStatusActiveShort=Validated
+MemberStatusActiveLate=subscription expired
+MemberStatusActiveLateShort=Expired
+MemberStatusPaid=Subscription up to date
+MemberStatusPaidShort=Up to date
+MemberStatusResiliated=Resiliated member
+MemberStatusResiliatedShort=Resiliated
+MembersStatusToValid=Draft members
+MembersStatusToValidShort=Draft members
+MembersStatusValidated=Validated members
+MembersStatusPaid=Subscription up to date
+MembersStatusPaidShort=Up to date
+MembersStatusNotPaid=Subscription out of date
+MembersStatusNotPaidShort=Out of date
+MembersStatusResiliated=Resiliated members
+MembersStatusResiliatedShort=Resiliated members
+NewCotisation=New contribution
+PaymentSubscription=New contribution payment
+EditMember=Edit member
+SubscriptionEndDate=Subscription's end date
+MembersTypeSetup=Members type setup
+NewSubscription=New subscription
+NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
+Subscription=Subscription
+Subscriptions=Subscriptions
+SubscriptionLate=Late
+SubscriptionNotReceived=Subscription never received
+SubscriptionLateShort=Late
+SubscriptionNotReceivedShort=Never received
+ListOfSubscriptions=List of subscriptions
+SendCardByMail=Send card by Email
+AddMember=Create member
+NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
+NewMemberType=New member type
+WelcomeEMail=Welcome e-mail
+SubscriptionRequired=Subscription required
+EditType=Edit member type
+DeleteType=Delete
+VoteAllowed=Vote allowed
+Physical=Physical
+Moral=Moral
+MorPhy=Moral/Physical
+Reenable=Reenable
+ResiliateMember=Resiliate a member
+ConfirmResiliateMember=Are you sure you want to resiliate this member ?
+DeleteMember=Delete a member
+ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
+DeleteSubscription=Delete a subscription
+ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
+Filehtpasswd=htpasswd file
+ValidateMember=Validate a member
+ConfirmValidateMember=Are you sure you want to validate this member ?
+FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
+PublicMemberList=Public member list
+BlankSubscriptionForm=Public auto-subscription form
+BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
+EnablePublicSubscriptionForm=Enable the public auto-subscription form
+MemberPublicLinks=Public links/pages
+ExportDataset_member_1=Members and subscriptions
+ImportDataset_member_1=Members
+LastMembers=Last %s members
+LastMembersModified=Last %s modified members
+LastSubscriptionsModified=Last %s modified subscriptions
+AttributeName=Attribute name
+String=String
+Text=Text
+Int=Int
+Date=Date
+DateAndTime=Date and time
+PublicMemberCard=Member public card
+MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
+AddSubscription=Create subscription
+ShowSubscription=Show subscription
+MemberModifiedInDolibarr=Member modified in Dolibarr
+SendAnEMailToMember=Send information email to member
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
+DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
+DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
+DescADHERENT_MAIL_VALID=EMail for member validation
+DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
+DescADHERENT_MAIL_COTIS=EMail for subscription
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
+DescADHERENT_ETIQUETTE_TYPE=Format of labels page
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_CARD_TYPE=Format of cards page
+DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
+DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
+DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
+DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
+GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
+MayBeOverwrited=This text can be overwrited by value defined for member's type
+ShowTypeCard=Show type '%s'
+HTPasswordExport=htpassword file generation
+NoThirdPartyAssociatedToMember=No third party associated to this member
+ThirdPartyDolibarr=Dolibarr third party
+MembersAndSubscriptions= Members and Subscriptions
+MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionBankDirect=Create a direct transaction record on account
+MoreActionBankViaInvoice=Create an invoice and payment on account
+MoreActionInvoiceOnly=Create an invoice with no payment
+LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+DocForAllMembersCards=Generate business cards for all members
+DocForOneMemberCards=Generate business cards for a particular member
+DocForLabels=Generate address sheets
+SubscriptionPayment=Subscription payment
+LastSubscriptionDate=Last subscription date
+LastSubscriptionAmount=Last subscription amount
+MembersStatisticsByCountries=Members statistics by country
+MembersStatisticsByState=Members statistics by state/province
+MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
+NbOfMembers=Number of members
+NoValidatedMemberYet=No validated members found
+MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
+MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
+MembersByTownDesc=This screen show you statistics on members by town.
+MembersStatisticsDesc=Choose statistics you want to read...
+MenuMembersStats=Statistics
+LastMemberDate=Last member date
+Nature=Nature
+Public=Information are public
+Exports=Exports
+NewMemberbyWeb=New member added. Awaiting approval
+NewMemberForm=New member form
+SubscriptionsStatistics=Statistics on subscriptions
+NbOfSubscriptions=Number of subscriptions
+AmountOfSubscriptions=Amount of subscriptions
+TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
+DefaultAmount=Default amount of subscription
+CanEditAmount=Visitor can choose/edit amount of its subscription
+MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
+Associations=Foundations
+Collectivités=Organizations
+Particuliers=Personal
+Entreprises=Companies
+DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/mk_MK/resource.lang b/htdocs/langs/mk_MK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/mk_MK/resource.lang
+++ b/htdocs/langs/mk_MK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index c84d2eba95a..af6294c16fe 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stede
 ActivityStateToSelectCompany= Legg til en filter alternativ for å vise / skjule thirdparties som i dag er i aktivitet eller har opphørt det
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Bruk autofullfør-felt for å velge kontakt (i stedet for å bruke listeboks).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Søkefiltrene alternativer
 NumberOfKeyToSearch=NBR tegn til å utløse søk: %s
 ViewFullDateActions=Vis fulle datoer i tredje ark
@@ -208,6 +210,7 @@ ModulesJobDesc=Forretningsmoduler gir et enkelt forhåndsinnstilt oppsett av Dol
 ModulesMarketPlaceDesc=Du kan finne flere moduler for å laste ned på eksterne nettsider på Internett ...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for Dolibarr ERP / CRM eksterne moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webområde leverandører du kan søke å finne flere moduler ...
 URL=Link
 BoxesAvailable=Tilgjengelige bokser
@@ -444,7 +447,7 @@ Module55Desc=Behandling av strekkoder
 Module56Name=Telefoni
 Module56Desc=Telefoniintegrasjon
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawals' management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS nyhetsstrøm
 Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider
 Module330Name=Bookmerker
 Module330Desc=Behandling av bokmerker
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Intergrasjon med webkalender
 Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Behandling av kategorier (varer, leverandører og kunder)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Behandle planlagte oppgaver
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Lagre og dele dokumenter
 Module2600Name=SOAP baserte WebServices
 Module2600Desc=Aktiver Dolibarr webtjenester server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Bruke elektronisk Gravatar tjeneste (www.gravatar.com) for å vise bilde av brukere / medlemmer (funnet med e-post). Trenger du en Internett-tilgang
 Module2800Desc=FTP-klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PAYBOX
 Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX
 Module50100Name=Kassaapparat
@@ -527,7 +534,7 @@ Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Marginer
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordremetoder
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Innstillinger lagret
 BackToModuleList=Tilbake til moduloversikt
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Ønsket standardspråk (språkkode)
 EnableMultilangInterface=Aktiver flerspråklig grensesnitt
 EnableShowLogo=Vis logo på venstre meny
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systemet ditt er oppdatert!
 CompanyInfo=Firma/organisasjonsinformasjon
 CompanyIds=Firma/organisasjons IDer
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 5f9c624b305..b277a015704 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Handlinger relatert til
 ActionsDoneBy=Handlinger utført av
 ActionsForUser=Hendelser for brukere
 ActionsForUsersGroup=Hendelser for alle brukerene i gruppen
+ActionAssignedTo=Event assigned to
 AllMyActions= Alle mine handlinger/oppgaver
 AllActions= Alle handlinger/oppgaver
 ViewList=Vis liste
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 98d6fdd4f5f..a2c7df48a4d 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 65aa8892fc3..e8fe7fe9637 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Oversikt over løpende kontraktslinjer
 ListOfRunningServices=Overikt over løpende tjenster
 NotActivatedServices=Ikke aktiverte tjenester (blant godkjente kontrakter)
 BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Siste %s aktiverte tjenester
 LastModifiedServices=Siste %s endrede tjenester
 EditServiceLine=Rediger tjenestelinje
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Liste over utløpende tjenester
 NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant.
 StandardContractsTemplate=Standard kontraktskjema
 ContactNameAndSignature=For %s, navn og signatur:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 1e993ae8706..5b4f25054b9 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverandørkode påkrevet
 ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt
 ErrorBadParameters=Ugyldige parametere
 ErrorBadValueForParameter=Feil verdi &quot;%s 'for parameter feil' Choice %s 'Choice
-ErrorBadImageFormat=Bildet filen har ikke et støttet format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Verdien '%s' har feil dato format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Kan ike skrive til mappen %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Bruker med logg <b>%s</b> kunne ikke bli funnet.
 ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Behandle avbrutt.
 ErrorBadValueForCode=Bad verdi for sikkerhetskode. Prøv igjen med ny verdi ...
 ErrorBothFieldCantBeNegative=Fields %s og %s kan ikke være både negativt
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> brukes til å utføre web-server har ikke tillatelse til at
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 1d4c388b824..ad0d955a3cf 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Fikk aldri
 ListOfSubscriptions=Liste av abonnementer
 SendCardByMail=Send kortet via e-post
-AddMember=Legg medlem
+AddMember=Create member
 NoTypeDefinedGoToSetup=Ingen medlemmer typer definert. Gå til setup - Medlemmer typer
 NewMemberType=Nytt medlem type
 WelcomeEMail=Velkommen e-post
@@ -125,7 +125,7 @@ Date=Dato
 DateAndTime=Dato og tid
 PublicMemberCard=Medlem offentlige kort
 MemberNotOrNoMoreExpectedToSubscribe=Medlem ikke eller ikke mer forventes å abonnere
-AddSubscription=Legg abonnement
+AddSubscription=Create subscription
 ShowSubscription=Vis abonnement
 MemberModifiedInDolibarr=Medlem endret i Dolibarr
 SendAnEMailToMember=Send informasjon epost til medlem
@@ -203,3 +203,4 @@ MembersByNature=Medlemmer av natur
 VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer
 NoVatOnSubscription=Ingen TVA for abonnementer
 MEMBER_PAYONLINE_SENDEMAIL=Send e-post når Dolibarr mottar en bekreftelse på en validert betaling for abonnement
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 0abab5ff6f6..6590ee183f2 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Prisnummer
 MultiPriceLevelsName=Priskategorier
-AssociatedProductsAbility=Aktiver tilknyttede varer
-AssociatedProducts=Tilknyttede varer
-AssociatedProductsNumber=Antall tilknyttede varer
-ParentProductsNumber=Antall foreldre produkt
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Tilknytninger
 Translation=Oversettelse
 KeywordFilter=Nøkkelordfilter
@@ -132,7 +132,7 @@ AddDel=Ny/slett
 Quantity=Mengde
 NoMatchFound=Ingen treff
 ProductAssociationList=Overikt over tilknyttede varer/tjenester: navn på vare/tjeneste (mengdepåvirket)
-ProductParentList=Liste over produkter / tjenester med dette produktet som en komponent
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=En av de valgte varene er foreldre til gjeldende vare
 DeleteProduct=Slett vare/tjeneste
 ConfirmDeleteProduct=Er du sikker på at du vil slette valgte vare/tjeneste?
@@ -155,11 +155,11 @@ QtyMin=Minimum Qty
 PriceQty=Pris for dette kvantum
 PriceQtyMin=Price for this min. qty (w/o discount)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+DiscountQtyMin=Standard
 NoPriceDefinedForThisSupplier=Ingen pris/mengde definert for denne leverandør/varekombinasjonen
 NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/mengde definert for varen
 RecordedProducts=Registrerte varer
-RecordedServices=Services recorded
+RecordedServices=Registrerte tjenester
 RecordedProductsAndServices=Registrete varer/tjenester
 PredefinedProductsToSell=Predefined products to sell
 PredefinedServicesToSell=Predefined services to sell
@@ -179,7 +179,7 @@ CloneProduct=Klon produkt eller tjeneste
 ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b>%s?</b>
 CloneContentProduct=Klon alle de viktigste informasjoner av produkt / tjeneste
 ClonePricesProduct=Klone viktigste informasjon og priser
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dette produktet brukes
 NewRefForClone=Ref. av nye produkt / tjeneste
 CustomerPrices=Kunder priser
@@ -191,9 +191,9 @@ HiddenIntoCombo=Gjemt i enkelte lister
 Nature=Natur
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
+AddThisProductCard=Opprett produktkort
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
+AddThisServiceCard=Opprett tjenestekort
 HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
 CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 62e4b1ce453..7b9132b42fb 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukerti
 Myprojects=Mine prosjekter
 ProjectsArea=Prosjektområde
 NewProject=Nytt prosjekt
-AddProject=Legg til prosjekt
+AddProject=Create project
 DeleteAProject=Slett et prosjekt
 DeleteATask=Slette en oppgave
 ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid brukt
 MyTimeSpent=Mitt tidsforbruk
 MyTasks=Mine oppgaver
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Ny oppgave
-AddTask=Legg til oppgave
+AddTask=Create task
 AddDuration=Legg til varighet
 Activity=Aktivitet
 Activities=Oppgaver / aktiviteter
diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/nb_NO/resource.lang
+++ b/htdocs/langs/nb_NO/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 92614725008..5de436e0476 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kreditt på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Vis Angrerett
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men hvis faktura har minst én tilbaketrekning betaling ennå ikke behandlet, vil det ikke bli satt som utbetales å tillate å administrere uttak før.
-DoStandingOrdersBeforePayments=Dette faner lar deg for å be om en stående ordre. Når det blir ferdig, kan du skrive inn betaling for å lukke fakturaen.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling av fast oppdrag %s av banken
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 2594d6c0ff3..91728e6f234 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Gebruik automatisch aanvullende velden om relaties te k
 ActivityStateToSelectCompany= Voeg een filter optie voor het tonen / verbergen thirdparties die momenteel in de activiteiten of niet langer het
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Gebruik automatisch aanvullende velden om contacten te kiezen ipv een lijst.
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Zoekfilters opties
 NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s
 ViewFullDateActions=Toon volledige data-acties in het derden 'sheet'
@@ -208,6 +210,7 @@ ModulesJobDesc=Bedrijfsmodules zorgen voor een eenvoudige voorgeconfigureerde in
 ModulesMarketPlaceDesc=U kunt meer downloadbare modules vinden op externe websites op het internet.
 ModulesMarketPlaces=Meer modules
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Websiteaanbieders waarop u naar meer modules kunt zoeken
 URL=Link
 BoxesAvailable=Beschikbare vakken
@@ -444,7 +447,7 @@ Module55Desc=Streepjescodesbeheer
 Module56Name=Telefonie
 Module56Desc=Telefoniebeheer
 Module57Name=Tekenen
-Module57Desc=Beheer van heffingen en bankonttrekkingen
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-feeds
 Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr
 Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven)
 Module330Desc=weblinkbeheer
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
 Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
@@ -495,6 +498,8 @@ Module1780Name=Categorieën
 Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers)
 Module2000Name=Fckeditor
 Module2000Desc=Een WYSIWYG editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Beheer taakplanning
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Opslaan en delen van documenten
 Module2600Name=Webdiensten
 Module2600Desc=Activeer de Dolibarr webdienstenserver
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Gebruik de online dienst 'Gravatar' (www.gravatar.com) voor het posten van afbeeldingen van gebruikers / leden (gevonden door hun e-mails). Internet toegang vereist.
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow beheer
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Module om een ​​online betaling pagina te bieden door creditcard met Paybox
 Module50100Name=Verkooppunt
@@ -527,7 +534,7 @@ Module50200Desc=Module om een ​​online betaling pagina te bieden per credit
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module om online polls (zoals Doodle, Studs, Rdvz, ...) te maken
 Module59000Name=Marges
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyplan=Rekeningschema
 DictionaryAccountancysystem=Modellen voor rekeningschema
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Instellingen opgeslagen
 BackToModuleList=Terug naar moduleoverzicht
 BackToDictionaryList=Terug naar de woordenboeken lijst
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard te gebruiken taal (taal-code)
 EnableMultilangInterface=Inschakelen meertalige interface
 EnableShowLogo=Toon logo in het linker menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Uw systeem is bijgewerkt
 CompanyInfo=Bedrijf / stichting informatie
 CompanyIds=Bedrijf / stichting identiteiten
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 8c50ac2720c..7ba26ccd595 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -6,7 +6,7 @@ Agenda=Agenda
 Agendas=Agenda's
 Calendar=Kalender
 Calendars=Kalenders
-LocalAgenda=Internal calendar
+LocalAgenda=Interne kalender
 ActionsOwnedBy=Event owned by
 AffectedTo=Geaffecteerden
 DoneBy=Gedaan door
@@ -23,12 +23,13 @@ MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
 MenuToDoMyActions=Mijn openstaande acties
 MenuDoneMyActions=Mijn beëindigde acties
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lijst van evenement (interne kalender)
 ActionsAskedBy=Acties geregistreerd door
 ActionsToDoBy=Acties toegewezen aan
 ActionsDoneBy=Acties gedaan door
 ActionsForUser=Evenementen voor gebruiker
 ActionsForUsersGroup=Evenementen voor alle gebruikers van de groep
+ActionAssignedTo=Event assigned to
 AllMyActions= Al mijn acties / taken
 AllActions= Alle acties / taken
 ViewList=Bekijk de lijst
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 0ff141ea1ed..1819c47be8f 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Opzetten categorieën
 CategorieRecursiv=Automatisch linken met bovenliggende categorie
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-ShowCategory=Show category
+ShowCategory=Laat categorie zien
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 37631e3b272..807bdccd23b 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Prospecten
 DeleteAction=Verwijder een actie
 NewAction=Nieuwe actie
-AddAction=Toevoegen actie
-AddAnAction=Voeg een actie toe
-AddActionRendezVous=Voeg een vergadering toe
+AddAction=Creëer gebeurtenis/taak
+AddAnAction=Creëer een gebeurtenis/taak
+AddActionRendezVous=Creëer een afspraak
 Rendez-Vous=Vergadering
 ConfirmDeleteAction=Weet u zeker dat u deze actie wilt verwijderen?
 CardAction=Actiedetails
@@ -44,8 +44,8 @@ DoneActions=Voltooide acties
 DoneActionsFor=Voltooide acties voor %s
 ToDoActions=Onvolledige acties
 ToDoActionsFor=Onvolledige acties voor %s
-SendPropalRef=Stuur offerte %s
-SendOrderRef=Stuur Opdracht %s
+SendPropalRef=Indienen van commerciëel voorstel %s
+SendOrderRef=Indienen van de order %s
 StatusNotApplicable=Niet van toepassing
 StatusActionToDo=Te doen
 StatusActionDone=Gedaan
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact opgevolgd
 DateActionPlanned=Datum actie gepland voor
 DateActionDone=Datum actie uitgevoerd
 ActionAskedBy=Actie gevraagd door
-ActionAffectedTo=Toewijzen aan
+ActionAffectedTo=Gebeurtenis is eigendom van
 ActionDoneBy=Actie gedaan door
 ActionUserAsk=Geregistreerd door
 ErrorStatusCantBeZeroIfStarted=Als veld '<b>Datum uitgevoerd</b>' is gevuld, is de actie gestart (of afgelopen), dus veld '<b>Status</b>' kan niet 0%% worden.
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 66c85f33f0e..2a093d76225 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 5178ce872a3..80c0173ed8d 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lijst van de lopende contractregels
 ListOfRunningServices=Lijst van lppende diensten
 NotActivatedServices=Inactieve diensten (onder gevalideerde contracten)
 BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Laatste %s geactiveerd diensten
 LastModifiedServices=Laatste %s bewerkte diensten
 EditServiceLine=Bewerk dienstenregel
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lijst van Diensten te vervallen
 NoteListOfYourExpiredServices=Deze lijst bevat alleen de diensten van contracten voor relatiesdie zijn gekoppeld aan een vertegenwoordiger.
 StandardContractsTemplate=Standaard contracten sjabloon
 ContactNameAndSignature=Voor %s, naam en handtekening:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Vertegenwoordiger ondertekening contract
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 2f63daa41a1..e12bceca15f 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -1,63 +1,63 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = Over
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = Over Cron
+CronAboutPage = Over Cron pagina
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Lees geplande taak
+Permission23102 = Maak/wijzig geplande taak
+Permission23103 = Verwijder geplande taak
+Permission23104 = Voer geplande taak uit
 # Admin
-CronSetup= Scheduled job management setup
+CronSetup= Beheer taakplanning
 URLToLaunchCronJobs=URL to check and launch cron jobs if required
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+FileToLaunchCronJobs=Commando regel om cron jobs uit te voeren
+CronExplainHowToRunUnix=In een Unix omgeving dien je de crontab te gebruiken om commando's geplanned uit te voeren
 CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
 # Menu
-CronJobs=Scheduled jobs
-CronListActive=List of active/scheduled jobs
+CronJobs=Geplande taken
+CronListActive=Lijst van active/geplande taken
 CronListInactive=List of disabled jobs
 # Page list
 CronDateLastRun=Last run
 CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
-CronCommand=Command
+CronCommand=Commando
 CronList=Jobs list
 CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
+CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen?
+CronExecute=Voer taak uit
+CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren
 CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
-CronTask=Job
+CronWaitingJobs=Wachtende taken
+CronTask=Taak
 CronNone= Geen
 CronDtStart=Begindatum
 CronDtEnd=Einddatum
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
-CronClass=Classe
+CronDtNextLaunch=Volgende uitvoering
+CronDtLastLaunch=Laatste uitvoering
+CronFrequency=Frequentie
+CronClass=Klasse
 CronMethod=Methode
 CronModule=Module
-CronAction=Action
+CronAction=Aktie
 CronStatus=Status
 CronStatusActive=Ingeschakeld
 CronStatusInactive=Uitgeschakeld
-CronNoJobs=No jobs registered
+CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
 CronLabel=Beschrijving
 CronNbRun=Nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronEach=Elke
+JobFinished=Taak gestart en be-eindigd
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronAdd= Taak toevoegen
+CronHourStart= Start uur en datum van de taak
+CronEvery= Taak uitvoeren elke
+CronObject= Instantie/Object om te creeren
 CronArgs=Instellingen
 CronSaveSucess=Save succesfully
 CronNote=Reactie
@@ -76,11 +76,11 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 # Info
-CronInfoPage=Information
+CronInfoPage=Informatie
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Taak type
+CronType_method=Aanroep methode van Dolibarr Class
+CronType_command=Shell commando
 CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Kan klasse %s of object %s niet laden
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index f56a053b476..6f146184c81 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Leverancierscode vereist
 ErrorSupplierCodeAlreadyUsed=Leverancierscode al gebruikt
 ErrorBadParameters=Verkeerde parameters
 ErrorBadValueForParameter=Verkeerde waarde %s voor parameter incorrect %s
-ErrorBadImageFormat=Image-bestand heeft niet een ondersteund formaat
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat
 ErrorWrongDate=Datum is niet correct!
 ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Gebruiker met gebruikersnaam <b>%s</b> kon niet worden g
 ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
 ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde
 ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Fout, er sommige leveringen gekoppeld met deze verzending. Schrapping geweigerd.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 2e424ae3638..3e29b8dd217 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Laat
 SubscriptionNotReceivedShort=Nooit ontvangen
 ListOfSubscriptions=Abonnementenlijst
 SendCardByMail=Stuur kaart per e-mail
-AddMember=Lid toevoegen
+AddMember=Create member
 NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes
 NewMemberType=Nieuw lidtype
 WelcomeEMail=Welkomst e-mail
@@ -125,7 +125,7 @@ Date=Datum
 DateAndTime=Datum en tijd
 PublicMemberCard=Publieke lidmaatschapskaart
 MemberNotOrNoMoreExpectedToSubscribe=Lid niet geabonneerd of niet langer verwacht te abonneren
-AddSubscription=Abonnement toevoegen
+AddSubscription=Create subscription
 ShowSubscription=Toon abonnement
 MemberModifiedInDolibarr=Lid gewijzigd in Dolibarr
 SendAnEMailToMember=Stuur een informatieve e-mail naar lid
@@ -203,3 +203,4 @@ MembersByNature=Leden volgens aard
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
 NoVatOnSubscription=Geen BTW bij inschrijving
 MEMBER_PAYONLINE_SENDEMAIL=E-mail om te verwittigen dat Dolibarr een bericht ontvangen heeft voor een bevestigde betaling van een inschrijving
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 56a94002352..a1af668f2a6 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Afnemersopdrachtenoverzicht
-SuppliersOrdersArea=Leveranciersopdrachtenoverzicht
+OrdersArea=Klantenorders overzicht
+SuppliersOrdersArea=Leverancierorders overzicht
 OrderCard=Opdrachtenkaart
 OrderId=Ordernr
-Order=Opdracht
-Orders=Opdrachten
-OrderLine=Opdrachtregel
+Order=Order
+Orders=Orders
+OrderLine=Orderregel
 OrderFollow=Opvolging
 OrderDate=Opdrachtdatum
 OrderToProcess=Te verwerken opdracht
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 64c7b084a83..0902653a39e 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Aantal prijzen
 MultiPriceLevelsName=Prijscategorieën
-AssociatedProductsAbility=Activeer de onderliggende producten
-AssociatedProducts=Onderliggende producten
-AssociatedProductsNumber=Aantal producten waaruit dit product bestaat
-ParentProductsNumber=Aantal ouder product
-IfZeroItIsNotAVirtualProduct=Bij 0 is dit geen virtueel product
-IfZeroItIsNotUsedByVirtualProduct=Bij 0 is dit product niet in gebruik voor een virtueel product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associatie
 Translation=Vertaling
 KeywordFilter=Trefwoord filter
@@ -132,7 +132,7 @@ AddDel=Toevoegen / verwijderen
 Quantity=Hoeveelheid
 NoMatchFound=Geen resultaten gevonden
 ProductAssociationList=Lijst van gerelateerde producten / diensten: naam van het product / de dienst (hoeveelheid geaffecteerd)
-ProductParentList=Lijst van producten / diensten met dit product als een onderdeel
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
 ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen?
@@ -179,7 +179,7 @@ CloneProduct=Kopieer product of dienst
 ConfirmCloneProduct=Weet u zeker dat u het product of de dienst <b>%s</b> wilt klonen?
 CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst
 ClonePricesProduct=Kloon hoofdinformatie en prijzen
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
 CustomerPrices=Consumentenprijs
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 3f6d56447eb..3485fa3faec 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staa
 Myprojects=Mijn projecten
 ProjectsArea=Projectenoverzicht
 NewProject=Nieuw project
-AddProject=Project toevoegen
+AddProject=Create project
 DeleteAProject=Project verwijderen
 DeleteATask=Taak verwijderen
 ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nieuwe bestede tijd
 MyTimeSpent=Mijn bestede tijd
 MyTasks=Mijn taken
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nieuwe taak
-AddTask=Taak toevoegen
+AddTask=Create task
 AddDuration=Duur toevoegen
 Activity=Activiteit
 Activities=Taken / activiteiten
diff --git a/htdocs/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang
index ead6e558dd8..2f498d486b8 100644
--- a/htdocs/langs/nl_NL/resource.lang
+++ b/htdocs/langs/nl_NL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Bevestig verwijderen van deze resource
 RessourceSuccessfullyDeleted=Resource met succes verwijderd
 DictionaryResourceType=Type resources
 
-DictionaryEMailTemplates=E-mail modellen
-
 SelectResource=Kies resource
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 152e287db16..191a09d27f3 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Crediteer op
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Toon intrekking
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Echter, als factuur is ten minste een terugtrekking betaling nog niet verwerkt, zal het niet worden ingesteld als betaald om tot terugtrekking te beheren voor.
-DoStandingOrdersBeforePayments=Deze tabs kunt u aanvraag voor een permanente opdracht. Zodra het zal worden afgewerkt, kunt u de betaling aan de factuur te sluiten.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betaling van periodieke overboeking %s door de bank
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 359ed174113..9dd96d2668b 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcje filtrów wyszukiwania
 NumberOfKeyToSearch=NBR znaków do uruchomienia wyszukiwania: %s
 ViewFullDateActions=Pokaż pełny terminy działań w trzecim arkusza
@@ -208,6 +210,7 @@ ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych
 ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ...
 ModulesMarketPlaces=Więcej modułów ...
 DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=dostawców sieci Web można szukać, aby znaleźć więcej modułów ...
 URL=Łącze
 BoxesAvailable=Pola dostępne
@@ -444,7 +447,7 @@ Module55Desc=Kody kreskowe zarządzania
 Module56Name=Telefonia
 Module56Desc=Telefonia integracji
 Module57Name=Zlecenia stałe
-Module57Desc=Zlecenia stałe i wycofań zarządzania
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integracji
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron
 Module330Name=Zakładki
 Module330Desc=Zakładki zarządzania
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integracji
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategorie
 Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów)
 Module2000Name=FCKeditor
 Module2000Desc=Edytor WYSIWYG
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Porządek obrad
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Zapisz i udostępniania dokumentów
 Module2600Name=WebServices
 Module2600Desc=Włącz serwer usług internetowych Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Użyj Gravatar usług online (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (znaleziono ich e-maile). Konieczność dostępu do Internetu
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox
 Module50100Name=Kasa
@@ -527,7 +534,7 @@ Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredy
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Konfiguracja zapisana
 BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=logo Pokaż na menu po lewej stronie
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=System został zaktualizowany
 CompanyInfo=Firma / fundacja informacji
 CompanyIds=Firma / fundament tożsamości
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 773b9217b95..35b55585299 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Wszystkie moje zdarzenia/zadania
 AllActions= Wszystkie zdarzenia/zadania
 ViewList=Widok listy
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 7d6459d8408..32f6c94a9ef 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 634bdf42361..04e1d26974d 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Ostatnia %s aktywacji usługi
 LastModifiedServices=Ostatnia %s zmodyfikowane usług
 EditServiceLine=Edycja usługa linii
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisanie umowy sprzedaży
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 696634a340e..43efc8be99c 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dostawca kod wymagane
 ErrorSupplierCodeAlreadyUsed=Dostawca kod już używane
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Wrong wartość '%s &quot;dla parametrów nieprawidłowe&quot; %s spacerem
-ErrorBadImageFormat=Plik obrazu ma nie obsługiwanym formacie
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Wartość '%s &quot;ma zły format daty
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Użytkownik z <b>logowania %s</b> nie może zostać znal
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Konto użytkownika <b>%s</b> wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 8573e0e86bf..ec066499c2c 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -8,7 +8,7 @@ Members=Członkowie
 MemberAccount=Member Login
 ShowMember=Pokaż Państwa karty
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=Członkowie Bilety
 FundationMembers=Fundacja użytkowników
 Attributs=Atrybuty
@@ -85,8 +85,7 @@ SubscriptionLateShort=Późno
 SubscriptionNotReceivedShort=Nigdy nie otrzymała
 ListOfSubscriptions=Lista subskrypcji
 SendCardByMail=Wyślij kartę
-AddMember=Dodaj członków
-MemberType=Państwa typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy członek typu
 WelcomeEMail=Zapraszamy e-mail
@@ -126,12 +125,12 @@ Date=Data
 DateAndTime=Data i czas
 PublicMemberCard=Państwa publiczne karty
 MemberNotOrNoMoreExpectedToSubscribe=Państwa nie są lub nie oczekuje, aby subskrybować
-AddSubscription=Dodaj abonament
+AddSubscription=Create subscription
 ShowSubscription=Pokaż subskrypcji
 MemberModifiedInDolibarr=Państwa zmodyfikowany w Dolibarr
 SendAnEMailToMember=Wyślij e-mail informacji na członka
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Temat wiadomości dla członka autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail dotyczące członka autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail temat członkiem walidacji
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation
 DescADHERENT_MAIL_RESIL=EMail dla członka resiliation
 DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format karty stronę
 DescADHERENT_CARD_HEADER_TEXT=Tekst wydrukowany na górę członka karty
 DescADHERENT_CARD_TEXT=Tekst wydrukowany na członka karty
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka
 ThirdPartyDolibarr=Dolibarr trzeciej
 MembersAndSubscriptions= Członkowie i Subscriptions
 MoreActions=Działanie uzupełniające na nagrywanie
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Stworzenie bezpośredniego zapisu na rachunku transakcji
 MoreActionBankViaInvoice=Tworzenie faktury i wpłaty na rachunek
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Ostatnio kwota subskrypcji
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Liczba członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
@@ -196,9 +197,10 @@ Collectivités=Organizacje
 Particuliers=Osobisty
 Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index cba9264669d..a334b7f2828 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwani
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Ilość cen
 MultiPriceLevelsName=Kategorie cenowe
-AssociatedProductsAbility=Aktywuj wirtualne cechy produktów
-AssociatedProducts=Produkt wirtualny
-AssociatedProductsNumber=Liczba produktów tworzących ten produkt wirtualny
-ParentProductsNumber=Ilość nadrzędnych produktów wirtualnych
-IfZeroItIsNotAVirtualProduct=Jeśli 0, produkt nie jest produktem wirtualnym
-IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, to ten produkt nie jest używany przez żaden produkt wirtualny
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Współpracownik
 Translation=Tłumaczenie
 KeywordFilter=Filtr słów kluczowych
@@ -132,7 +132,7 @@ AddDel=Dodaj / Usuń
 Quantity=Ilość
 NoMatchFound=Nie znaleziono odpowiednika
 ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość)
-ProductParentList=Lista wirtualnych produktów / usług z tym produktem jako komponentem
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego
 DeleteProduct=Usuń produkt / usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt / usługę?
@@ -179,7 +179,7 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu <b>lub usługi %s?</b>?
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
 CustomerPrices=Ceny klientów
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 24c44a6fe67..9acde90020b 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użyt
 Myprojects=Moje projekty
 ProjectsArea=Projekty obszaru
 NewProject=Nowy projekt
-AddProject=Dodaj projekt
+AddProject=Create project
 DeleteAProject=Usuń projektu
 DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
 MyTasks=Moje zadania
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nowe zadania
-AddTask=Dodaj zadanie
+AddTask=Create task
 AddDuration=Dodaj czas
 Activity=Aktywność
 Activities=Zadania / działania
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/pl_PL/resource.lang
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 9c6354451a2..f4a7f570e6b 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredyt na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Pokaż Wypłata
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
-DoStandingOrdersBeforePayments=Te karty pozwala z prośbą o zlecenia stałego. Gdy będzie gotowy, możesz wpisać płatność zamknąć faktury.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 11a91816da8..3e195800e80 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Adicionar uma opção de filtro para mostrar / esconder terceiros que estão atualmente em atividade ou deixaram de
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Filtros opções de pesquisa
 NumberOfKeyToSearch=Nr palavras chave para adicionar á pesquisa: %s
 ViewFullDateActions=Ver as datas das acções na totalidade na ficha do terceiro
@@ -208,6 +210,7 @@ ModulesJobDesc=Os módulos oficios permitem uma preconfiguração simplificada d
 ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
 ModulesMarketPlaces=mais módulos...
 DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Prestadores do site, você pode pesquisar para encontrar os módulos mais ...
 URL=Link
 BoxesAvailable=Caixas disponiveis
@@ -444,7 +447,7 @@ Module55Desc=Gestão dos códigos de barras
 Module56Name=Central Telefónica
 Module56Desc=Gestão da Central Telefónica
 Module57Name=Débitos Directos
-Module57Desc=Gestão de débitos directos e créditos bancários
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integração com ClickToDial
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Ligações RSS
 Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
 Module330Name=Favoritos
 Module330Desc=Gestão de Favoritos
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categorías
 Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes)
 Module2000Name=FCKeditor
 Module2000Desc=Editor WYSIWYG
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestão de tarefas agendadas
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Gestão Electrónica de Documentos
 Module2500Desc=Permite administrar uma base de documentos
 Module2600Name=WebServices
 Module2600Desc=O servidor de serviços web ERP/CRM está Disponível
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Usar o serviço online Gravatar (www.gravatar.com) para mostrar as fotos dos utilizadores / membros (que encontrar nos seus e-mails). Necessita de um acesso à Internet
 Module2800Desc=Cliente FTP
@@ -517,7 +524,7 @@ Module6000Desc=Gestão do fluxo de trabalho
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox
 Module50100Name=Caixa
@@ -527,7 +534,7 @@ Module50200Desc=Módulo para oferecer uma página de pagamento online por cartã
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margens
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Métodos de encomenda
 DictionarySource=Origem das propostas/ordens
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Configuração guardada
 BackToModuleList=Voltar à lista de módulos
 BackToDictionaryList=Voltar à lista de dicionários
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo
 DefaultLanguage=Idioma por defeito a utilizar (código idioma)
 EnableMultilangInterface=Activar interface Multi Idioma
 EnableShowLogo=Mostrar o logotipo no menu da esquerda
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=O seu sistema está actualizado
 CompanyInfo=Informação da Empresa/Instituição
 CompanyIds=Identificação regulamentação
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 2b8af93edae..37be1a827f9 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -6,7 +6,7 @@ Agenda=Agenda
 Agendas=Agendas
 Calendar=Calendário
 Calendars=Calendários
-LocalAgenda=Internal calendar
+LocalAgenda=Calendário interno
 ActionsOwnedBy=Event owned by
 AffectedTo=Afecta o
 DoneBy=Realizado por
@@ -23,12 +23,13 @@ MenuToDoActions=Acções a fazer
 MenuDoneActions=Todos os eventos terminados
 MenuToDoMyActions=Os meus eventos incompletos
 MenuDoneMyActions=Os meus eventos terminados
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lista de eventos (Calendário interno)
 ActionsAskedBy=Os meus eventos reportados
 ActionsToDoBy=Eventos atribuídos a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Eventos para utilizadores
 ActionsForUsersGroup=Eventos para todos os utilizadores do grupo
+ActionAssignedTo=Event assigned to
 AllMyActions= Todas as minhas acções
 AllActions= Todas as Acções
 ViewList=Ver Lista
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index c3e51b1883c..e28633c2e24 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 24c9d555928..2c51fe50855 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista de linhas de contractos em serviço
 ListOfRunningServices=Lista de serviços activos
 NotActivatedServices=Serviços não activados (com os contractos validados)
 BoardNotActivatedServices=Serviços a activar com os contractos validados
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Os %s últimos serviços activados
 LastModifiedServices=Os %s últimos sevicios modificados
 EditServiceLine=Edição linha do serviço
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista de Serviços para expirar
 NoteListOfYourExpiredServices=Esta lista contém apenas os serviços de contratos de terceiros aos quais está ligado como representante de vendas.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato
diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
index c13bacf30ff..ea99bec3e23 100644
--- a/htdocs/langs/pt_PT/dict.lang
+++ b/htdocs/langs/pt_PT/dict.lang
@@ -252,8 +252,7 @@ CivilityMME=Sra.
 CivilityMR=Sr.
 CivilityMLE=Dr.
 CivilityMTRE=Eng.
-# CivilityDR=Doctor
-
+CivilityDR=Doutor
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=Dólar UA
@@ -290,10 +289,10 @@ CurrencyXOF=Francos CFA BCEAO
 CurrencySingXOF=Franco CFA BCEAO
 CurrencyXPF=PCP Francos
 CurrencySingXPF=Franco CFP
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=Cêntimos 
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paisa
+CurrencyThousandthSingTND=milésimo
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campanha de mala direta
@@ -302,11 +301,10 @@ DemandReasonTypeSRC_CAMP_PHO=Campanha de telefone
 DemandReasonTypeSRC_CAMP_FAX=Campanha Fax
 DemandReasonTypeSRC_COMM=Contato comercial
 DemandReasonTypeSRC_SHOP=Loja contato
-# DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Palavra de boca
 DemandReasonTypeSRC_PARTNER=Parceiro
 DemandReasonTypeSRC_EMPLOYEE=Empregado
 DemandReasonTypeSRC_SPONSORING=Patrocínio
-
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index ed6a020fa81..625f05a06b8 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Código fornecedor obrigatório
 ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
 ErrorBadParameters=Parâmetros incorrectos
 ErrorBadValueForParameter=&quot;%s&quot; valor incorreto para parâmetro incorreto dos %s dos
-ErrorBadImageFormat=Arquivo de imagem não tem um formato suportado
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Valor tem formato de data errado
 ErrorWrongDate=A data não está correcta!
 ErrorFailedToWriteInDir=Impossivel escrever na pasta %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=a conta de utilizador de <b>%s</b> não foi encontrado.
 ErrorLoginHasNoEmail=Este utilizador não tem e-mail. impossivel continuar.
 ErrorBadValueForCode=Valor incorrecto para o código. volte a \ttentar com um Novo valor...
 ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar <b>%s</b> servidor web não tem permissão para que
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 12ca0b0b0ed..2881be0fc16 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -207,5 +207,5 @@ MigrationActioncommElement=Atualizar os dados sobre as ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Mostrar opções ocultas
+HideNotAvailableOptions=Esconder opções ocultas
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 1b9c268819a..4d6bfc4b519 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -62,8 +62,8 @@ SetDate=Definir data
 SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 BackgroundColorByDefault=Cor de fundo por omissão
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=O ficheiro não foi enviado
+FileUploaded=O ficheiro foi enviado com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler ajuda on-line (é necessário acesso à Internet)
@@ -341,7 +341,7 @@ FullList=Lista completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
-Favorite=Favorite
+Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
 RefSupplier=Ref. fornecedor
@@ -367,7 +367,7 @@ ActionsOnCompany=Acções nesta sociedade
 ActionsOnMember=Eventos sobre este membro
 NActions=%s acções
 NActionsLate=%s em atraso
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos gerados
@@ -648,7 +648,7 @@ OptionalFieldsSetup=Configuração de atributos extra
 URLPhoto=Url da foto / logotipo
 SetLinkToThirdParty=Link para um terceiro
 CreateDraft=Criar Rascunho
-SetToDraft=Back to draft
+SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
 ObjectDeleted=%s objeto removido
 ByCountry=Por país
@@ -682,7 +682,7 @@ ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
-SelectElementAndClickRefresh=Select an element and click Refresh
+SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 224c0921c35..b30a848fa5a 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -26,8 +26,8 @@ MembersCards=Cartões de Membros
 MembersList=Lista de Membros
 MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
-MembersListUpToDate=Lista dos Membros válidos ao día de adesão
-MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
+MembersListUpToDate=Lista dos Membros válidos ao dia de adesão
+MembersListNotUpToDate=Lista dos Membros válidos não ao dia de adesão
 MembersListResiliated=Lista dos Membros dados de baixa
 MembersListQualified=Lista dos Membros qualificados
 MenuMembersToValidate=Membros rascunho
@@ -57,17 +57,17 @@ MemberStatusActive=Validado (em espera de filiação )
 MemberStatusActiveShort=Validado
 MemberStatusActiveLate=Filiação não actualizada
 MemberStatusActiveLateShort=Não actualizada
-MemberStatusPaid=Filiação em día
-MemberStatusPaidShort=Em día
+MemberStatusPaid=Subscrição em dia
+MemberStatusPaidShort=Em dia
 MemberStatusResiliated=Membro dado de baixa
 MemberStatusResiliatedShort=De baixa
 MembersStatusToValid=Membros rascunho
 MembersStatusToValidShort=Membros rascunho
 MembersStatusValidated=Membros validados
-MembersStatusPaid=Filicações em día
-MembersStatusPaidShort=Em día
-MembersStatusNotPaid=Filicações não em día
-MembersStatusNotPaidShort=Não em día
+MembersStatusPaid=Subscrições em dia
+MembersStatusPaidShort=Em dia
+MembersStatusNotPaid=Subscrição não em dia
+MembersStatusNotPaidShort=Não em dia
 MembersStatusResiliated=Membros dados de baixa
 MembersStatusResiliatedShort=Membros dados de baixa
 NewCotisation=Nova filiação
@@ -85,7 +85,7 @@ SubscriptionLateShort=Em atraso
 SubscriptionNotReceivedShort=Não recebida
 ListOfSubscriptions=Lista de Filicações
 SendCardByMail=Enviar ficha
-AddMember=Adicionar membro
+AddMember=Create member
 NoTypeDefinedGoToSetup=Nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 NewMemberType=Novo tipo de membro
 WelcomeEMail=E-mail
@@ -125,7 +125,7 @@ Date=data
 DateAndTime=data e hora
 PublicMemberCard=Ficha pública membro
 MemberNotOrNoMoreExpectedToSubscribe=Não sometida a cotação
-AddSubscription=Adicionar filiação
+AddSubscription=Create subscription
 ShowSubscription=Mostrar filiação
 MemberModifiedInDolibarr=Membro modificado em Dolibarr
 SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: <b>%s</b>)
@@ -203,3 +203,4 @@ MembersByNature=Membros, por categoria
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
 NoVatOnSubscription=Sem TVA para assinaturas
 MEMBER_PAYONLINE_SENDEMAIL=Enviar e-mail para avisar quando Dolibarr receber uma confirmação de pagamento validados por assinatura
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index d2a0cababf2..a8d228293be 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Sim o serviço é de Duração limitada :
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Nº de preços
 MultiPriceLevelsName=Categoría de preços
-AssociatedProductsAbility=Activar produtos associados
-AssociatedProducts=Produtos associados
-AssociatedProductsNumber=Nº de produtos associados
-ParentProductsNumber=Número de produto pai
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associar
 Translation=Tradução
 KeywordFilter=Filtro por Chave
@@ -132,7 +132,7 @@ AddDel=Adicionar/Retirar
 Quantity=Quantidade
 NoMatchFound=Não foram encontrados resultados
 ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/serviço (quantidade afectada)
-ProductParentList=Lista de produtos e serviços com este produto como um componente
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
 DeleteProduct=Eliminar um produto/serviço
 ConfirmDeleteProduct=Está seguro de querer eliminar este produto/serviço?
@@ -179,7 +179,7 @@ CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que pretende copiar produto ou <b>serviço %s?</b>
 CloneContentProduct=Copie todas as principais informações do produto / serviço
 ClonePricesProduct=Copie principais informações e preços
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
 CustomerPrices=preços de Clientes
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Preço por registo de cliente
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index cd2b63fb250..37d32c854d4 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Essa visão apresenta todos os projetos e tarefas (as permissões de u
 Myprojects=Meus Projetos
 ProjectsArea=Área de Projetos
 NewProject=Novo Projeto
-AddProject=Adicionar Projeto
+AddProject=Create project
 DeleteAProject=Eliminar um Projeto
 DeleteATask=Eliminar uma Tarefa
 ConfirmDeleteAProject=Tem a certeza que quer eliminar este projeto?
@@ -36,6 +36,8 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Novo Tempo Dispendido
 MyTimeSpent=Meu Tempo Dispendido
 MyTasks=Minhas Tarefas
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Descrição da tarefa
 NewTask=Nova Tarefa
-AddTask=Adicionar Tarefa
+AddTask=Create task
 AddDuration=Adicionar Duração
 Activity=Atividade
 Activities=Tarefas/Atividades
diff --git a/htdocs/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang
index d64075dfbf5..18177ed2c6a 100644
--- a/htdocs/langs/pt_PT/resource.lang
+++ b/htdocs/langs/pt_PT/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
+MenuResourceIndex=Recursos
+MenuResourceAdd=Novo recurso
 MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+DeleteResource=Apagar recurso
+ConfirmDeleteResourceElement=Confirme apagar o recurso para este elemento
+NoResourceInDatabase=Nenhum recurso na base de dados
+NoResourceLinked=Nenhum recurso interligado
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Lista de recursos
+ResourceSingular=Recurso
+ResourceCard=Cartão de recurso
+AddResource=Crie um recurso
+ResourceFormLabel_ref=Nome do recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descrição do recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos interligados ao elemento
 
 ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+GotoDate=Ir para a data
 
-ResourceElementPage=Element resources
+ResourceElementPage=Recursos do elemento
 ResourceCreatedWithSuccess=Resource successfully created
 RessourceLineSuccessfullyDeleted=Resource line successfully deleted
 RessourceLineSuccessfullyUpdated=Resource line successfully updated
 ResourceLinkedWithSuccess=Resource linked with success
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Cartão de recurso
+ConfirmDeleteResource=Confirme para apagar este recurso
+RessourceSuccessfullyDeleted=Recurso apagado com sucesso
+DictionaryResourceType=Tipo de recursos
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Selecione o recurso
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index ec8d6c3fda5..e227553e4c9 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Crédito em
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostrar levantamento
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar.
-DoStandingOrdersBeforePayments=Estas abas permitem a você pedir uma ordem permanente. Uma vez que ele será terminado, você pode digitar o pagamento para fechar a fatura.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também irá criar pagamentos em facturas e classificá-los para pagar
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Pagamento de %s ordem permanente pelo banco
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index fbabb4f7401..82af6b13bb6 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilizați autocompletarea câmpurilor pentru alegerea
 ActivityStateToSelectCompany= Adaugă o opţiune de filtru pentru a afişa / ascunde thirdparties, care sunt în prezent în activitate sau le-a încetat
 UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 UseSearchToSelectContact=Utilizați un câmp cu autocompletare pentru a selecta un contact (în loc de lista derulantă).
+DelaiedFullListToSelectCompany=Aşteaptă  să tastaţi o tastă înaintea încărcării a listei combo de terţi (Acest lucru poate crește performanța dacă aveți un număr mare de terţi)
+DelaiedFullListToSelectContact=Aşteaptă  să tastaţi o tastă înaintea încărcării a listei combo de contacte (Acest lucru poate crește performanța dacă aveți un număr mare de contacte)
 SearchFilter=Opţiuni filtre de căutare
 NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s
 ViewFullDateActions=Arata complet datele de acţiuni în cea de-a treia foaie
@@ -125,7 +127,7 @@ PHPTZ=Time Zone Server PHP
 PHPServerOffsetWithGreenwich=Offset pentru PHP server de latime Greenwich (secondes)
 ClientOffsetWithGreenwich=Client / Browser offset lăţime Greenwich (secunde)
 DaylingSavingTime=Ora de vară (utilizator)
-CurrentHour=Current oră
+CurrentHour=Timp  PHP (server)
 CompanyTZ=Time Zone companie (principale companiei)
 CompanyHour=Ora companiei (principale companiei)
 CurrentSessionTimeOut=Sesiunea curentă timeout
@@ -163,7 +165,7 @@ RunCommandSummary=Backup poate fi lansat cu următoarea comandă
 RunCommandSummaryToLaunch=Backup poate fi lansat cu următoarea comandă
 WebServerMustHavePermissionForCommand=Serverul de web trebuie să aibă permisiunea de a rula astfel de comenzi
 BackupResult=Backup rezultat
-BackupFileSuccessfullyCreated=Fişier backup  generat cu succes
+BackupFileSuccessfullyCreated=Fişier backup generat 
 YouCanDownloadBackupFile=Fişiere generate pot fi acum descarcate
 NoBackupFileAvailable=Niciun fişier backup disponibil.
 ExportMethod=Metodă Export
@@ -178,8 +180,8 @@ Compression=Compresie
 CommandsToDisableForeignKeysForImport=Comandă pentru a dezactiva cheile străine la import
 CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sql dump -ul dvs  mai târziu
 ExportCompatibility=Compatibilitatea  fişierului de export generat
-MySqlExportParameters=MySQL parametrii export
-PostgreSqlExportParameters= PostgreSQL parametrii export
+MySqlExportParameters=Parametrii export MySQL 
+PostgreSqlExportParameters= Parametrii export PostgreSQL
 UseTransactionnalMode=Utilizaţi mod tranzacţional
 FullPathToMysqldumpCommand=Calea completă la comanda  mysqldump
 FullPathToPostgreSQLdumpCommand=Calea completă la comanda  pg_dump
@@ -208,6 +210,7 @@ ModulesJobDesc=Business furniza module simple predefinite de configurare de Doli
 ModulesMarketPlaceDesc=Puteţi găsi mai multe module pentru descărcare pe site-uri web externe de pe Internet ...
 ModulesMarketPlaces=Module mai multe ...
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
+DoliPartnersDesc=Listă cu unele companii care pot furniza / dezvolta module  la cerere  sau noi  funcţionalităţi (Notă: orice companie Open Source cunoscând limbajul  PHP vă poate oferi dezvoltări specifice)
 WebSiteDesc=Site-ul Web al furnizorilor unde puteţi căuta şi  găsi mai multe module ...
 URL=Link
 BoxesAvailable=Căsuţe disponibile
@@ -229,7 +232,7 @@ InstrucToClearPass=Pentru a avea parola decodificate (clare) în <b>conf.php</b>
 ProtectAndEncryptPdfFiles=Protecţie a generat pdf (nu recommandd, pauzele de masă PDF Generation)
 ProtectAndEncryptPdfFilesDesc=De protecţie a unui document PDF păstrează disponibil pentru a citi şi de a imprima cu orice browser PDF. Cu toate acestea, editarea şi copierea nu este posibil acum. Reţineţi că utilizarea acestei funcţii face construirea unui globale cumulate pdf nu de lucru (cum ar fi facturile unpaid).
 Feature=Funcţionalitate
-DolibarrLicense=Licenta
+DolibarrLicense=Licenţa
 DolibarrProjectLeader=Sef Proiect
 Developpers=Dezvoltatori / colaboratori
 OtherDeveloppers=Altele dezvoltatori / colaboratori
@@ -269,12 +272,12 @@ MAIN_MAIL_SMTPS_ID=SMTP ID-ul de autentificare necesare în cazul în
 MAIN_MAIL_SMTPS_PW=SMTP parola, dacă se cere autentificare
 MAIN_MAIL_EMAIL_TLS= Utilizaţi TLS (SSL) cripta
 MAIN_DISABLE_ALL_SMS=Dezactivaţi toate trimiteri SMS (în scopuri de testare sau demo-uri)
-MAIN_SMS_SENDMODE=Metoda de a utiliza pentru a trimite SMS-uri
-MAIN_MAIL_SMS_FROM=De telefon expeditor numărul implicit pentru trimiterea de SMS
+MAIN_SMS_SENDMODE=Metoda de  utilizare  pentru  trimiterea SMS-urilor
+MAIN_MAIL_SMS_FROM=Numărul de telefon expeditor implicit   pentru trimiterea de SMS
 FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar fi sisteme. Testaţi-vă sendmail program la nivel local.
 SubmitTranslation=Dacă traducere pentru această limbă nu este completă sau găsiţi erori, puteţi corecta acest lucru prin editarea fişierelor în <b>langs</b> directorul <b>/ %s</b> şi prezintă fişiere modificare www.dolibarr.org forum.
-ModuleSetup=Modulul de configurare
-ModulesSetup=Module de configurare
+ModuleSetup=Configurare Modul
+ModulesSetup=Configurare Module
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Clientul Ressource Management (CRM)
 ModuleFamilyProducts=Managementul Produselor
@@ -323,11 +326,11 @@ UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva se
 DisableLinkToHelpCenter=Ascundere link-ul <b>"Aveţi nevoie de ajutor sau sprijin"</b> de la pagina de login
 DisableLinkToHelp=Ascundere link-ul <b>" %s Online Help"</b> de la stânga meniul
 AddCRIfTooLong=Nu exista un ambalaj, aşa că, dacă este linia de documente pe pagină, pentru că prea mult timp, trebuie să adăugaţi-vă revine transportului în textarea.
-ModuleDisabled=Modulul cu handicap
+ModuleDisabled=Modulul dezactivat
 ModuleDisabledSoNoEvent=Modul de persoane atât de eveniment nu a creat
 ConfirmPurge=Sunteţi sigur că doriţi să execute acest purge? <br> Aceasta va şterge definitiv toate fişiere de date cu nici un mod de a le restaura (ECM imagini, fişiere ataşate ...).
 MinLength=Lungimea minimă
-LanguageFilesCachedIntoShmopSharedMemory=Fişiere. Lang încărcate în memorie partajata
+LanguageFilesCachedIntoShmopSharedMemory=Fişierele  .lang încărcate în memorie partajata
 ExamplesWithCurrentSetup=Exemple cu care rulează curent setup
 ListOfDirectories=Lista de directoare OpenDocument template-uri
 ListOfDirectoriesForModelGenODT=Listă de directoare, template-uri care conţin fişiere cu formatul OpenDocument. <br><br> Pune aici plin patetic de directoare. <br> Adauga un retur de car între directorul eah. <br> Pentru a adăuga un director a modulului GED, adăugaţi aici <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Fişierele din aceste directoare trebuie să se termine <b>cu. Odt.</b>
@@ -374,7 +377,7 @@ Boolean=Boolean (Checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Preţ
 ExtrafieldMail = Email
-ExtrafieldSelect = Listă Select
+ExtrafieldSelect = Select Listă 
 ExtrafieldSelectList = Select din tabel
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
@@ -425,7 +428,7 @@ Module30Name=Facturi
 Module30Desc=Facturi şi note de credit "de management pentru clienţi. Facturi de gestionare pentru furnizorii
 Module40Name=Furnizori
 Module40Desc=Managementul Furnizorilor şi aprovizionării  (comenzi si facturi)
-Module42Name=Syslog
+Module42Name=Loguri
 Module42Desc=Jurnalizarea facilităţi (syslog)
 Module49Name=Editori
 Module49Desc=Managementul Editorilor
@@ -437,14 +440,14 @@ Module52Name=Stocuri
 Module52Desc=Managementul Stocurilor (produse)
 Module53Name=Servicii
 Module53Desc=Managementul Serviciilor
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contracte / Abonamente
+Module54Desc=Managementul contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
 Module55Desc=Coduri de bare "de gestionare a
 Module56Name=Telefonie
 Module56Desc=Telefonie integrare
 Module57Name=Ordine de plată
-Module57Desc=Ordine de plată şi retrageri "de gestionare a
+Module57Desc=Managementul Ordinelor de plată şi al retragerilor . De asemenea, include generarea fișierului SEPA pentru țările europene.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrare
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=Feed RSS
 Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini
 Module330Name=Marcaje
 Module330Desc=Marcaje "de gestionare a
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Proiecte / Oportunitati  / Prospecți
+Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comanda, propunere, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
 Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
@@ -495,6 +498,8 @@ Module1780Name=Categorii
 Module1780Desc=Categorii de "management (produse, furnizori şi clienţi)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Preţuri dinamice
+Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Cron
 Module2300Desc=Managementul taskurilor programate
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Salvaţi şi partaja documente
 Module2600Name=Servicii web
 Module2600Desc=Activarea serviciilor Dolibarr serverul web
+Module2650Name=Servicii web  (client)
+Module2650Desc=Activați Servicii web a clientului Dolibarr  (Poate fi folosit pentru a da date / cererile de servere externe. Doar Comenzi Furnizor sunt acceptate  pentru moment)
 Module2700Name=Gravatar
 Module2700Desc=Folosiţi serviciul online Gravatar (www.gravatar.com) pentru a arăta fotografie de utilizatori / membri (găsit cu mesajele de poştă electronică). Aveţi nevoie de un acces la internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Managementul fluxului de lucru
 Module20000Name=Managementul cererilor de concedii
 Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor
 Module39000Name=Lot Produs
-Module39000Desc=Management Număr lot  și data de expirare pentru produse
+Module39000Desc=Management Număr lot  sau număr de serie ,  data de expirare şi vânzare pentru produse
 Module50000Name=Paybox
 Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox
 Module50100Name=Punct de Vanzare
@@ -527,7 +534,7 @@ Module50200Desc=Modul de a oferi o pagina de plata online prin card de credit cu
 Module50400Name=Contabilitate (avansat)
 Module50400Desc=Management Contabilitate (partidă dublă)
 Module54000Name=Print lP IPrinter
-Module54000Desc=Printează  prin serviciul Cups cu ajutorul  imprimantei IPP
+Module54000Desc=Imprimare directă (fără a deschide documentele) folosind interfața CUPS IPP (imprimanta trebuie să fie vizibilă de pe server și CUPS trebuie să fie instalat pe server).
 Module55000Name=Deschide Sondaj
 Module55000Desc=Modul pentru a face sondaje online (ca Doodle, Studs, Rdvz, ...)
 Module59000Name=Marje
@@ -538,8 +545,8 @@ Module150010Name=Număr lot, data de expirare şi data vânzare
 Module150010Desc=Management Număr lot  și data de expirare pentru produse
 Permission11=Citeşte facturi
 Permission12=Creaţi/Modificare facturi
-Permission13=Unvalidate facturi
-Permission14=Validate facturi
+Permission13=Facturi client nevalidate
+Permission14=Facturi client validate
 Permission15=Trimite facturi prin e-mail
 Permission16=Crearea de plăţi pentru facturile
 Permission19=Ştergere facturi
@@ -558,11 +565,11 @@ Permission38=Exportul de produse
 Permission41=Citiţi cu proiecte şi sarcini
 Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte
 Permission44=Ştergere proiecte
-Permission61=Citiţi cu intervenţii
+Permission61=Citeşte intervenţii
 Permission62=Creare / Modificare intervenţii
 Permission64=Ştergere intervenţii
 Permission67=Export intervenţii
-Permission71=Citiţi cu membrii
+Permission71=Citeşte membrii
 Permission72=Creare / Modificare membri
 Permission74=Ştergere membri
 Permission75=Configurare tipuri şi atribute pentru membri
@@ -606,11 +613,11 @@ Permission151=Citiţi cu ordine de plată
 Permission152=Setup ordine de plată
 Permission153=Citiţi cu ordine de plată încasări
 Permission154=De credit / refuza încasări Ordinele de plată
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Citește contracte / abonamente
+Permission162=Creare / modificare contracte / abonamente
+Permission163=Activează un serviciu / abonament al unui contract
+Permission164=Dezactivarea unui serviciu / abonament al unui contract
+Permission165=Ștergeți contracte / abonamente
 Permission171=Citeşte deconturile si cheltuielile( proprii şi ale subordonaţilor)
 Permission172=Creare / Modificare ordin de deplasare şi cheltuieli
 Permission173=Ştergere ordin de deplasare şi cheltuieli
@@ -672,7 +679,7 @@ Permission300=Citiţi cu coduri de bare
 Permission301=Creare / Modificare coduri de bare
 Permission302=Ştergere coduri de bare
 Permission311=Citeşte servicii
-Permission312=Assign service/subscription to contract
+Permission312=Atribuire serviciu / abonament la contract
 Permission331=Citiţi cu marcaje
 Permission332=Creare / Modificare marcaje
 Permission333=Ştergeţi marcaje
@@ -698,12 +705,12 @@ Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
 Permission536=A se vedea / administra serviciile ascunse
 Permission538=Exportul de servicii
-Permission701=Citiţi cu donaţii
+Permission701=Citiţi donaţii
 Permission702=Creare / Modificare donaţii
 Permission703=Ştergere donaţii
 Permission1001=Citeşte stocuri
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Creare / modificare depozite
+Permission1003=Ștergere depozite
 Permission1004=Citeşte stoc deplasările
 Permission1005=Creare / Modificare stoc deplasările
 Permission1101=Citiţi cu livrare comenzi
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode de comandă
 DictionarySource=Originea de propuneri / comenzi
 DictionaryAccountancyplan=Plan de conturi
 DictionaryAccountancysystem=Model pentru plan de conturi
+DictionaryEMailTemplates=Șabloane e-mailuri 
 SetupSaved=Setup salvate
 BackToModuleList=Inapoi la lista de module
 BackToDictionaryList=Inapoi la lista de dicţionare
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent formularul de căutare de pe stânga de meniu
 DefaultLanguage=Implicit de a folosi limba (limba)
 EnableMultilangInterface=Activaţi multilingv interfaţă
 EnableShowLogo=logo-ul Afişare meniu în stânga
+EnableHtml5=Activare HTML5 (Dezvoltare - disponibil doar pe șablonul ELDY)
 SystemSuccessfulyUpdated=Sistemul dumneavoastră a fost actualizat cu succes
 CompanyInfo=Companie / fundaţie informaţii
 CompanyIds=Companie / fundaţie identităţi
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
 UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune
 FreeLegalTextOnProposal=Free text pe comercial propuneri
 WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al propuneri
 ##### Orders #####
 OrdersSetup=Ordinele de gestionare setup
 OrdersNumberingModules=Ordinele de numerotare module
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Modulele de intervenţie de numerotare
 TemplatePDFInterventions=Carte de modele de documente de intervenţie
 WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configurare modul Contracte /  Abonamente 
 ContractsNumberingModules=Contracte de numerotare module
 TemplatePDFContracts=Modele documente contracte
 FreeLegalTextOnContracts=Free text  pe contracte
@@ -1269,7 +1278,7 @@ LDAPFieldFirstName=Prenume
 LDAPFieldFirstNameExample=Exemplu: givenname
 LDAPFieldMail=Adresa de e-mail
 LDAPFieldMailExample=Exemplu: mail
-LDAPFieldPhone=Professional numărul de telefon
+LDAPFieldPhone=Numărul de telefon profesional 
 LDAPFieldPhoneExample=Exemplu: telephonenumber
 LDAPFieldHomePhone=Personale numărul de telefon
 LDAPFieldHomePhoneExample=Exemplu: homephone
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Fișierele de tip %s nu sunt comprimate de serverul HTT
 CacheByServer=Cache pe server
 CacheByClient=Cache pe browser
 CompressionOfResources=Compresie a răspunsului HTTP
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente
 ##### Products #####
 ProductSetup=Produse modul de configurare
 ServiceSetup=Servicii de modul de configurare
@@ -1415,11 +1424,11 @@ OSCommerceTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizator
 OSCommerceTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins.
 OSCommerceTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Configurare modul Depozite  
+UserWarehouse=Folosiţi depozite personale utilizator
+IfYouUsePointOfSaleCheckModule=Dacă utilizați unmodul punct de vânzare  (modulul POS furnizat în mod implicit sau un alt modul extern), acest setup poate fi ignorat de către modul punctul de vânzare . Cele mai multe module de puncte  de vânzări sunt concepute pentru a crea imediat o factură și reduce stocul implicit indiferent de ce optiune  aveţi aici. Deci, dacă aveți nevoie sau nu de a avea o scădere de stoc la înregistrarea unei vinzări din punctul dvs. de vânzare, verificați de asemenea modulul POS configurat.
 ##### Menu #####
-MenuDeleted=Meniu elimină
+MenuDeleted=Meniu eliminat
 TreeMenu=Tree meniuri
 Menus=Meniuri
 TreeMenuPersonalized=Meniuri personalizate
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Acest modul permite să adăugaţi o pictogramă după numărul
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Punctul de vânzare
 CashDeskSetup=Casierie modul de configurare
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Terț generic implicit utilizat pentru vânzări
 CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
 CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec
 CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Dezactivați scădere stoc atunci când o vinzare se face de la Point of Sale
+CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului
+StockDecreaseForPointOfSaleDisabled=Scădere stoc de la Point of Sale dezactivat
+CashDeskYouDidNotDisableStockDecease=Nu ai dezactivați scăderea de stocului atunci când se face o vinzare de la Point Of Sale. Astfel, este necesar un depozit.
 ##### Bookmark #####
 BookmarkSetup=Bookmark modul de configurare
 BookmarkDesc=Acest modul vă permite să gestionaţi marcaje. De asemenea, puteţi adăuga comenzi rapide pentru orice Dolibarr pagini sau site-uri web externale pe partea stanga de meniu.
@@ -1549,7 +1558,7 @@ NbNumMin=Numărul minim al caracterelor minuscule
 NbSpeMin=Numărul minim al caracterelor speciale
 NbIteConsecutive=Numărul maxim al caracterelor care se repetă
 NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue  ("1","l","i","|","0","O") pentru generare automată
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SalariesSetup=Configurare modul salarii
+SortOrder=Ordine sortare
 Format=Format
 TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index dec69f5b654..d73a2321e91 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Evenimente atribuite lui
 ActionsDoneBy=Evenimente efectuate de
 ActionsForUser=Evenimente pentru utilizator
 ActionsForUsersGroup=Evenimente pentru toți utilizatorii din grup
+ActionAssignedTo=Eveniment atribuit la
 AllMyActions= Toate evenimentele / sarcinile mele
 AllActions= Toate  evenimentele / sarcini
 ViewList=Vezi  listă
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe d
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
 PropalValidatedInDolibarr=Propunerea %s validată
 InvoiceValidatedInDolibarr=Factura %s validată
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
 InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată
 InvoiceDeleteDolibarr=Factura %s ştearsă
 OrderValidatedInDolibarr= Comanda %s validată
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 3032165936b..5782f2b37f2 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -155,6 +155,6 @@ BankDashboard=Sinteză  conturi bancare
 DefaultRIB=IBAN Implicit
 AllRIB=Tot BAN
 LabelRIB=Etichetă BAN
-NoBANRecord=Nici o înregistrare BAN
+NoBANRecord=Nicio înregistrare BAN
 DeleteARib=Ștergeți înregistrarea BAN
 ConfirmDeleteRib=Sigur doriţi să ştergeţi  această înregistrare BAN ?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index dcd7b8f56e0..287171e92b8 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -35,7 +35,7 @@ ReplacementInvoice=Înlocuire factură
 ReplacedByInvoice=Înlocuită de factura %s
 ReplacementByInvoice=Înlocuită  de factura
 CorrectInvoice=Corecţie factura %s
-CorrectionInvoice=Rectificarea facturii
+CorrectionInvoice=Factură corecţie
 UsedByInvoice=Aplicată pe factura %s
 ConsumedBy=Consumat de
 NotConsumed=Neconsumat
@@ -217,7 +217,7 @@ NoInvoice=Nici o  factură
 ClassifyBill=Clasează factura
 SupplierBillsToPay=Facturi furnizori de plată
 CustomerBillsUnpaid=Facturi clienţi neîncasate
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Facturile emise prin proceduri mecanographic sunt distribuite prin ordinea alfabetică
 NonPercuRecuperable=Nerecuperabilă
 SetConditions=Setează termenii de plata
 SetMode=Setează modul de plată
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index aadcee9b18d..f40aaeae237 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -1,38 +1,38 @@
 # Language file - Source file is en_US - cashdesk
 CashDeskMenu=Punctul de vânzare
 CashDesk=Punctul de vânzare
-CashDesks=Punctul de vânzare
+CashDesks=Punct de vânzări
 CashDeskBank=Cont bancar
 CashDeskBankCash=Cont bancar (cash)
-CashDeskBankCB=Cont bancar (carte)
-CashDeskBankCheque=Cont bancar (check)
+CashDeskBankCB=Cont bancar (card)
+CashDeskBankCheque=Cont bancar (cec)
 CashDeskWarehouse=Depozit
-CashdeskShowServices=Vânzarea de servicii
+CashdeskShowServices=Servicii disponibile
 CashDeskProducts=Produse
 CashDeskStock=Stoc
 CashDeskOn=pe
-CashDeskThirdParty=A treia parte
+CashDeskThirdParty=Terţ
 CashdeskDashboard=Acces Punct de vânzare
 ShoppingCart=Cosul de cumparaturi
-NewSell=Vindem nou
+NewSell=Vânzare nouă
 BackOffice=Back office
 AddThisArticle=Adauga acest articol
 RestartSelling=Du-te inapoi la vânzare
-SellFinished=Vindem terminat
-PrintTicket=Print bilet
+SellFinished=Vânzare terminată
+PrintTicket=Print bon
 NoProductFound=Nici un articol gasit
-ProductFound=produsul care se găseşte
+ProductFound=produs găsit
 ProductsFound=produse găsite
 NoArticle=Nici un articol
 Identification=Identificare
 Article=Articol
 Difference=Diferenţă
-TotalTicket=Total de bilet
-NoVAT=Nici TVA-ul pentru această vânzare
-Change=Excesul de primit
+TotalTicket=Total bon
+NoVAT=Fără TVA  pentru această vânzare 
+Change=Primit în plus
 CalTip=Click pentru a vizualiza calendarul
 CashDeskSetupStock=Vă rugăm să scadă stoc pe crearea de factură, dar pentru acest depozit este nu a fost definit <br> Schimba modul de configurare stoc, sau alege un depozit
-BankToPay=Taxa de cont
+BankToPay=Comision cont
 ShowCompany=Afişare companie
 ShowStock=Arată depozit
 DeleteArticle=Faceţi clic pentru a elimina acest articol
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 9323b0a493f..5fe76b345ce 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -37,13 +37,13 @@ Withdrawal=Retragere
 Withdrawals=Retrageri
 AmountHTVATRealReceived=TVA colectat
 AmountHTVATRealPaid=TVA platit
-VATToPay=La plata TVA-ului
-VATReceived=TVA-ul a primit
-VATToCollect=TVA-ul pentru a colecta
-VATSummary=TVA Sumar
-LT2SummaryES=Balanţa IRPF
+VATToPay=TVA vânzări
+VATReceived=TVA recuperat
+VATToCollect=TVA colectat
+VATSummary=Sold TVA
+LT2SummaryES=Sold IRPF
 LT1SummaryES=RE Sold
-VATPaid=Plata TVA-ului
+VATPaid=TVA plătit
 SalaryPaid=Plata salariu
 LT2PaidES=IRPF plătit
 LT1PaidES=RE Platit
@@ -82,10 +82,10 @@ DatePayment=Data Plata
 DateStartPeriod=Dată început perioadă
 DateEndPeriod=Dată sfârşit perioadă
 NewVATPayment=Plata nouă TVA
-newLT2PaymentES=Nou IRPF plată
+newLT2PaymentES=Plată nouă IRPF
 newLT1PaymentES=Plată nouă RE
 LT2PaymentES=IRPF de plata
-LT2PaymentsES=IRPF Plăţi
+LT2PaymentsES=Plăţi IRPF 
 LT1PaymentES=RE Plată
 LT1PaymentsES=RE Plăţi
 VATPayment=Plată TVA
@@ -99,10 +99,10 @@ SupplierAccountancyCode=Cont contabil furnizor
 AccountNumberShort=Numărul de cont
 AccountNumber=Numărul de cont
 NewAccount=Cont nou
-SalesTurnover=Vanzari cifra de afaceri
+SalesTurnover=Cifra de afaceri Vanzari
 SalesTurnoverMinimum=Cifra de afaceri  vânzări minimă
 ByThirdParties=Pe terţi
-ByUserAuthorOfInvoice=Prin factura autor
+ByUserAuthorOfInvoice=După autorul facturii
 AccountancyExport=Export Contabilitate
 ErrorWrongAccountancyCodeForCompany=Bad client contabile cod pentru %s
 SuppliersProductsSellSalesTurnover=A cifrei de afaceri generate de vânzările de furnizorii de produse.
@@ -167,7 +167,7 @@ OrderStats=Statistici privind comenzile
 InvoiceStats=Statistici privind facturile
 Dispatch=Dispecerizare
 Dispatched=Expediate
-ToDispatch=Pentru a expedierii
+ToDispatch=De  expediat
 ThirdPartyMustBeEditAsCustomer=A treia parte trebuie să fie definit ca un client
 SellsJournal=Jurnalul de vânzări
 PurchasesJournal=Jurnalul de cumpărări
@@ -176,7 +176,7 @@ DescPurchasesJournal=Jurnalul de cumpărări
 InvoiceRef=Factură ref.
 CodeNotDef=Nedefinit
 AddRemind=Expedierea Suma disponibilă
-RemainToDivide= Ramaneti la expediere:
+RemainToDivide= Ramane da expediere:
 WarningDepositsNotIncluded=Facturile  în avans nu sunt incluse in aceasta versiune cu acest modul de contabilitate.
 DatePaymentTermCantBeLowerThanObjectDate=Termenul de plată nu poate fi mai mic decât data obiectului.
 Pcg_version=Pcg versiune
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe
 TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
 CalculationMode=Mod calcul
 AccountancyJournal=Jurnal cod contabilitate
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile vândute
 ACCOUNTING_VAT_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Colectată
 ACCOUNTING_VAT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Platită
 ACCOUNTING_ACCOUNT_CUSTOMER=Cont Contabilitate Predefinit pentru terţi Clienţi
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index 195c077ba07..c955006df8d 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Zona Contracte
 ListOfContracts=Lista contracte
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Ultimele %s contracte modificare
 AllContracts=Toate contractele
 ContractCard=Fişă Contract
 ContractStatus=Status Contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista liniilor contractului in service
 ListOfRunningServices=Lista servicii active
 NotActivatedServices=Servicii  inactive (printre contracte validate  )
 BoardNotActivatedServices=Servicii de activat în contractele validate
-LastContracts=Last % contracts
+LastContracts=Ultimele  %s contracte
 LastActivatedServices=Ultimele %s servicii  activate
 LastModifiedServices=Ultimele %s servicii modificate
 EditServiceLine=Editează  linie serviciu
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Lista  servicii care expiră
 NoteListOfYourExpiredServices=Această listă conține numai serviciile pentru terții la care sunteţi reprezentant de vânzării.
 StandardContractsTemplate=Model standard Contracte
 ContactNameAndSignature=Pentru %s nume şi semnătura:
+OnlyLinesWithTypeServiceAreUsed=Numai liniile cu tipul "Service" va fi clonat.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Reprezentant vanzari de semnare a contractului
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 26edf119a79..c774dfce023 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentr
 CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare minut
 # Menu
 CronJobs=Joburi programate
-CronListActive=List of active/scheduled jobs
+CronListActive=Lista  activelor/programatelor joburi
 CronListInactive=Lista joburilor dezactivate
 # Page list
 CronDateLastRun=Ultima rulare
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 7f2399e4129..c392d15d66f 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Beneficiar donaţie
 ThankYou=Vă multumim
 IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume
 MinimumAmount=Valoarea minimă este %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Text liber afişat în subsol
+FrenchOptions=Opțiuni pentru Franța
+DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat
+DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat
+DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 21d11c437ac..e83f98969fc 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este 
 ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
 ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost conciliată
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
+ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
+ErrorPriceExpression2=Nu se poate redefini  funcția built-in  '%s'
+ErrorPriceExpression3=Variabila nedefinita '%s'  în definiția funcției
+ErrorPriceExpression4=Caracter ilegal '%s'
+ErrorPriceExpression5=Neașteptat '%s'
+ErrorPriceExpression6=Număr greșit de argumente (%s dat, %s așteptat)
+ErrorPriceExpression8=Operator neașteptat '%s'
+ErrorPriceExpression9=A apărut o eroare neașteptată
+ErrorPriceExpression10=Iperator '%s' lipsă operand
+ErrorPriceExpression11=Asteptam '%s'
+ErrorPriceExpression14=Împărţirea la zero,
+ErrorPriceExpression17=Variabila  '%s' nedefinită
+ErrorPriceExpression19=Expresia nu a fost găsită
+ErrorPriceExpression20=Expresie goală
+ErrorPriceExpression21=Rezultat gol '%s'
+ErrorPriceExpression22=Rezultat negativ '%s'
+ErrorPriceExpressionInternal=Eroare internă '%s'
+ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
index 25f72b0bed9..a66dc1f4189 100644
--- a/htdocs/langs/ro_RO/externalsite.lang
+++ b/htdocs/langs/ro_RO/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
 ExternalSiteURL=URL-ul site-ului extern
 ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Intrare  Meniul meu
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 1e4ceeea37d..7001d1c09c5 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Doar urmaţi instrucţiunile pas cu pas.
-MiscellaneousChecks=Cerinţe preliminare a verifica
+MiscellaneousChecks=Verificare Cerinţe preliminare 
 DolibarrWelcome=Bine ati venit la Dolibarr
 ConfFileExists=<b>%s</b> fişierul de configurare există.
 ConfFileDoesNotExists=<b>%s</b> fişier de configurare nu exista!
 ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> de fişiere de configurare nu există şi nu a putut fi creat!
-ConfFileCouldBeCreated=<b>%s</b> fişier de configurare ar putea fi creat.
+ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
 ConfFileIsNotWritable=<b>%s</b> fişier de configurare nu poate fi scris. Verificaţi permisiunile. Pentru prima de instalare, serverul de web trebuie să fie acordate pentru a putea scrie în acest fişier în timpul procesului de configurare (&quot;chmod 666&quot;, de exemplu, pe un Unix ca OS).
 ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
 ConfFileReload=Reîncarcă toate informaţiile din fişierul de configurare.
 PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
 PHPSupportPOSTGETKo=Este posibil de configurare PHP nu suporta variabile POST şi / sau GET. Verificaţi <b>variables_order</b> de parametru în php.ini.
-PHPSupportGD=Acest sprijin PHP functii grafice HG nr.
-PHPSupportUTF8=Acest sprijin PHP funcţii utf8.
+PHPSupportGD=Acest PHP suportă  functii grafice GD.
+PHPSupportUTF8=Acest PHP suportă  funcţii  UTF8.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi <b>%s.</b> Acest lucru ar trebui să fie prea mic. Modificarea <b>php.ini</b> pentru a seta parametrul <b>memory_limit</b> de bytes <b>%s</b> cel puţin.
 Recheck=Click aici pentru un test mult mai semnificativ
 ErrorPHPDoesNotSupportSessions=Instalarea dvs. PHP nu are suport pentru sesiuni. Această caracteristică este necesar pentru a face Dolibarr de lucru. Verificaţi configurarea PHP.
 ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu are suport pentru funcţia de grafică HG nr. Graficul nu va fi disponibil.
 ErrorPHPDoesNotSupportUTF8=Instalarea dvs. PHP nu are suport pentru funcţii utf8. Dolibarr nu poate funcţiona corect. Rezolva acest lucru înainte de a instala Dolibarr.
-ErrorDirDoesNotExists=%s director nu există.
+ErrorDirDoesNotExists=Directorul  %s  nu există.
 ErrorGoBackAndCorrectParameters=Du-te înapoi şi de a corecta parametrii greşite.
 ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul &quot;%s&quot;.
-ErrorFailedToCreateDatabase=Nu a reuşit să creeze &quot;%s&quot; bază de date.
-ErrorFailedToConnectToDatabase=Nu a reuşit să se conecteze la &quot;%s&quot; bază de date.
+ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'.
+ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'.
 ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) prea veche. Versiunea %s este necesară.
 ErrorPHPVersionTooLow=PHP versiune prea veche. %s versiune este necesar.
 WarningPHPVersionTooLow=PHP versiune prea veche. %s versiune sau mai mult este de aşteptat. Această versiune ar trebui să permită instalarea, dar nu este acceptat.
 ErrorConnectedButDatabaseNotFound=Conectarea la serverul de succes, dar &quot;%s&quot; bază de date nu a fost găsit.
-ErrorDatabaseAlreadyExists=&quot;%s&quot; baza de date există deja.
+ErrorDatabaseAlreadyExists=Baza de date  '%s' există deja.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, du-te înapoi şi a verifica opţiunea &quot;Creare bază de date&quot;.
 IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi &quot;Crearea bazei de date&quot; opţiune.
 WarningBrowserTooOld=Versiune prea veche a browser-ului. Actualizarea browser-ul dvs. la o versiune recentă a Firefox, Chrome sau Opera este foarte recomandată.
@@ -40,19 +40,19 @@ License=Utilizarea de licenţă
 ConfigurationFile=Fişier de configurare
 WebPagesDirectory=Director în cazul în care paginile web sunt stocate
 DocumentsDirectory=Director pentru a stoca documentele încărcate şi a generat
-URLRoot=URL-ul Root
+URLRoot=URL Rădăcină 
 ForceHttps=Forţarea conexiuni securizate (HTTPS)
 CheckToForceHttps=Bifaţi această opţiune pentru a forţa conexiuni securizate (HTTPS). <br> Acest lucru presupune faptul că serverul de web este configurat cu un certificat SSL.
 DolibarrDatabase=Baza de date Dolibarr
-DatabaseChoice=Baza de date alegere
-DatabaseType=Baza de date de tip
-DriverType=Sterownik typu
+DatabaseChoice= Alegere Baza de date
+DatabaseType=Tip Baza de date 
+DriverType=Tip driver
 Server=Server
 ServerAddressDescription=Numele sau adresa IP pentru serverul de baze de date, de obicei &quot;localhost&quot;, atunci când serverul de baze de date este găzduit pe acelaşi server decât serverul de web
 ServerPortDescription=Port-ul serverului de baze de date. Păstraţi gol, dacă necunoscut.
-DatabaseServer=Date de pe server
-DatabaseName=Nazwa bazy danych
-DatabasePrefix=Baza de date prefix de masă
+DatabaseServer=Server  baze de date
+DatabaseName=Nume bază de date
+DatabasePrefix=Prefix Tabel Baza de date
 Login=Login
 AdminLogin=Autentifica-te pentru proprietarul bazei de date Dolibarr.
 Password=Parolă
@@ -71,20 +71,20 @@ ConfigurationSaving=Salvarea fişier de configurare
 ServerConnection=Conexiune server
 DatabaseConnection=Baza de date a conexiunii
 DatabaseCreation=Baza de date crearea de
-UserCreation=Ghid de creaţie
+UserCreation=Creare utilizator
 CreateDatabaseObjects=Baza de date crearea de obiecte
 ReferenceDataLoading=Date de referinta de încărcare
 TablesAndPrimaryKeysCreation=Mese si primar cheile de creare
-CreateTableAndPrimaryKey=Crearea %s de masă
+CreateTableAndPrimaryKey=Creare tabel %s
 CreateOtherKeysForTable=Crearea cheile străine şi indicii pentru %s de masă
 OtherKeysCreation=Cheile străine şi crearea de indici
-FunctionsCreation=Funcţii crearea de
+FunctionsCreation=Creare Funcţii
 AdminAccountCreation=Administrator crearea de autentificare
 PleaseTypePassword=Vă rugăm să introduceţi o parolă, parole goale nu sunt permise!
 PleaseTypeALogin=Vă rugăm să introduceţi un login!
 PasswordsMismatch=Parolele diferă, vă rugăm să încercaţi din nou!
 SetupEnd=Sfârşitul de configurare
-SystemIsInstalled=Această instalaţie este completă.
+SystemIsInstalled=Această instalare este completă.
 SystemIsUpgraded=Dolibarr a fost actualizat cu succes.
 YouNeedToPersonalizeSetup=Trebuie să vă configuraţi Dolibarr pentru a se potrivi nevoilor dumneavoastră (aspect, caracteristici, ...). Pentru a face acest lucru, va rugam sa urmati link-ul de mai jos:
 AdminLoginCreatedSuccessfuly=<b>&quot;%s&quot;</b> Dolibarr administrator de autentificare a creat cu succes.
@@ -107,7 +107,7 @@ DataMigration=Migrarea datelor
 DatabaseMigration=Structura bazei de date a migraţiei
 ProcessMigrateScript=Script de prelucrare
 ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe &quot;Start&quot; ...
-FreshInstall=Proaspete de instalare
+FreshInstall=Instalare proaspătă
 FreshInstallDesc=Utilizaţi acest mod în cazul în care aceasta este prima de instalare. Dacă nu, acest mod se poate repara o instalare incompleta anterior, dar dacă doriţi să faceţi upgrade versiunii dvs., alegeţi &quot;Upgrade&quot; modul.
 Upgrade=Uaktualnij
 UpgradeDesc=Utilizaţi acest mod, dacă aţi înlocuit fişierele vechi Dolibarr cu fişiere dintr-o versiune mai nouă. Acest lucru se va actualiza baza de date şi de date.
@@ -120,7 +120,7 @@ AlreadyDone=Migrat deja
 DatabaseVersion=Versiunea bazei de date
 ServerVersion=Baza de date server de versiune
 YouMustCreateItAndAllowServerToWrite=Trebuie să creaţi acest director şi pentru a permite serverului de web pentru a scrie în ea.
-CharsetChoice=Set de caractere alegere
+CharsetChoice=Alegere Set de caractere 
 CharacterSetClient=Setul de caractere utilizat pentru paginile web generate HTML
 CharacterSetClientComment=Alegeţi setul de caractere pentru afişarea Web. <br/> Set de caractere implicit propusă este una din baza de date.
 DBSortingCollation=Caracter de sortare pentru
@@ -144,14 +144,14 @@ InstallChoiceSuggested=<b>Instalaţi alegere sugerat de instalator.</b>
 MigrateIsDoneStepByStep=Versiunea ţintă (%s) are un deficit de mai multe versiuni, astfel încât instalaţi expertul va reveni pentru a sugera migraţiei viitor, după ce acesta va fi terminat.
 CheckThatDatabasenameIsCorrect=Verificaţi că numele bazei de date <b>&quot;%s&quot;</b> este corectă.
 IfAlreadyExistsCheckOption=În cazul în care acest nume este corectă şi că baza de date nu există încă, trebuie să verificaţi opţiunea &quot;Creare bază de date&quot;.
-OpenBaseDir=PHP openbasedir parametru
+OpenBaseDir= Parametru openbasedir PHP 
 YouAskToCreateDatabaseSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
 YouAskToCreateDatabaseUserSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date proprietar&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
 NextStepMightLastALongTime=Pasul curent poate dura câteva minute. Vă rugăm să aşteptaţi până când este afişat următorul ecran complet înainte de a continua.
 MigrationCustomerOrderShipping=Migrarea de transport maritim pentru depozitare client comenzi
 MigrationShippingDelivery=Upgrade de depozitare de transport maritim
 MigrationShippingDelivery2=Upgrade de depozitare de transport 2
-MigrationFinished=Migraţia terminat
+MigrationFinished=Migraţia terminată
 LastStepDesc=<strong>Ultimul pas:</strong> Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte.
 ActivateModule=Activaţi modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
@@ -167,7 +167,7 @@ MigrationContract=Migrarea datelor pentru contracte
 MigrationSuccessfullUpdate=Upgrade de succes
 MigrationUpdateFailed=Procesul de actualizare a eşuat
 MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s)
-MigrationPaymentsUpdate=De plată de date de corecţie
+MigrationPaymentsUpdate=Corecţie dată de plată 
 MigrationPaymentsNumberToUpdate=De plată %s (e) pentru a actualiza
 MigrationProcessPaymentUpdate=Actualizaţi plată (e) %s
 MigrationPaymentsNothingToUpdate=Nu există mai multe lucruri de făcut
@@ -189,23 +189,23 @@ MigrationContractsIncoherentCreationDateUpdate=Bad contract de crearea de valoar
 MigrationContractsIncoherentCreationDateUpdateSuccess=Bad contract de crearea de valoare data de corecţie făcut cu succes
 MigrationContractsIncoherentCreationDateNothingToUpdate=Nici o valoare rău pentru data de creare contractului pentru a corecta
 MigrationReopeningContracts=Contract de deschis închis de eroare
-MigrationReopenThisContract=Redeschide %s contractuale
-MigrationReopenedContractsNumber=Contracte de %s modificate
+MigrationReopenThisContract=Redeschide  contract %s 
+MigrationReopenedContractsNumber=%s Contracte modificate
 MigrationReopeningContractsNothingToUpdate=Nici un contract închis pentru a deschide
 MigrationBankTransfertsUpdate=Actualizaţi legături între tranzacţie bancară şi un transfer bancar
 MigrationBankTransfertsNothingToUpdate=Toate link-uri sunt de până la zi
 MigrationShipmentOrderMatching=Trimiteri la data primirii de actualizare
 MigrationDeliveryOrderMatching=Livrare la primirea de actualizare
-MigrationDeliveryDetail=Livrare de actualizare
+MigrationDeliveryDetail=Actualizare Livrare 
 MigrationStockDetail=Actualizarea valoarea stocului de produse
 MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice
 MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi
 MigrationProjectTaskActors=Migrare de date pentru tabel llx_projet_task_actors
 MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact
 MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
-MigrationActioncommElement=Actualiza datele privind acţiunile
+MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrare de date pentru modul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Afişează opţiunile nedisponibile
+HideNotAvailableOptions=Acunde opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 1ab3e168ebb..12c12ea721a 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -115,7 +115,7 @@ SentBy=Trimis de
 MailingNeedCommand=Din motive de securitate, trimiterea unui email-uri este mai bine cand este efectuată de la linia de comandă. Dacă aveți unul, întrebați administratorul pentru a lansa următoarea comandă pentru a trimite email-uri la toți destinatarii:
 MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
 ConfirmSendingEmailing=Dacă nu puteţi sau preferaţi să le trimiteţi cu browser-ul web, vă rugăm să confirmați că sunteți sigur că doriți să trimiteți emailurile acum de la browser-ul dvs.?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face de mai multe ori din motive de securitate și pauze, <b>%s</b> beneficiari la un moment dat pentru fiecare sesiune trimitere.
 TargetsReset=Cer senin lista
 ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul
 ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail
 AddNewNotification=Activaţi un nou target  email notificari 
 ListOfActiveNotifications=Lista tuturor targetelor emailurilor de notificare
 ListOfNotificationsDone=Lista toate notificările e-mail trimis
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
+MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
+MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 95203b0641a..a60474b8897 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Întârziate
 SubscriptionNotReceivedShort=Neîncasată
 ListOfSubscriptions=Lista cotizaţii
 SendCardByMail=Trimite fişa pe email
-AddMember=Adaugă membru
-MemberType=Tip Membru
+AddMember=Creare membru
 NoTypeDefinedGoToSetup=Nici un  tip de membru definit.  Du-te la meniull "Tipuri Membri"
 NewMemberType=Tip nou Membru
 WelcomeEMail=Email de bun venit
@@ -126,7 +125,7 @@ Date=Dată
 DateAndTime=Data şi ora
 PublicMemberCard=Fişa Membru public
 MemberNotOrNoMoreExpectedToSubscribe=Membrii care n-au plătit cotizaţia
-AddSubscription=Adaugă cotizaţie
+AddSubscription=Creare adeziune
 ShowSubscription=Afişează adeziune
 MemberModifiedInDolibarr=Membrii modificaţi în Dolibarr
 SendAnEMailToMember=Trimite e-mail de informare membrului
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Valoarea ultimei cotizaţii
 MembersStatisticsByCountries=Statistici Membri după ţară
 MembersStatisticsByState=Statistici Membri  după regiune / judeţ
 MembersStatisticsByTown=Statistici Membri după oraşe
+MembersStatisticsByRegion=Statistici Membri  după regiune
+MemberByRegion=Membrii după regiune
 NbOfMembers=Număr  membri
 NoValidatedMemberYet=Nici un membru validat găsit
 MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde  serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
@@ -202,3 +203,4 @@ MembersByNature=Membri după personalitate juridică
 VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
 NoVatOnSubscription=Fără TVA la adeziuni
 MEMBER_PAYONLINE_SENDEMAIL=Email de avertizare atunci când Dolibarr primeşte o confirmare a unei plăți validate pentru înscriere
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia  abonamentului în factura:  %s
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 579ae622ecc..52e5bd348e1 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=O expediţie există
 DraftOrWaitingApproved=Comenzi Schiţe sau încă  neaprobate
 DraftOrWaitingShipped=Comenzi Schiţe sau  validate încă neexpediate
 MenuOrdersToBill=Comenzi livrate
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Comenzi facturabile
 SearchOrder=Caută Comanda
 SearchACustomerOrder=Caută o comandă client
 ShipProduct=Expediază produs
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index 5e7b247ee58..864c5f70c35 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -35,6 +35,6 @@ MessageKO=Mesaj de pe pagina anulat schimbul de plată
 NewPayboxPaymentReceived=O nouă plată Paybox primită
 NewPayboxPaymentFailed=O plată nouă Paybox încercată dar eşuată
 PAYBOX_PAYONLINE_SENDEMAIL=Email pentru avertizare după o plată (realizată sau nu)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Valoare pentru PBX SITE
+PAYBOX_PBX_RANG=Valoare pentru PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valoare pentru PBX ID
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 94de8dd384d..f2e97e17072 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
 PriceByCustomerLog=Log Preţ pe client
 MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s
 MinimumRecommendedPrice=Preţul minim recomandat este: %s
+PriceExpressionEditor=Editor expresie preț
+PriceExpressionSelected=Expresie preț selectatată
+PriceExpressionEditorHelp="preț = 2 + 2" sau "2 + 2" pentru stabilirea prețului <br> Extra câmpurile sunt variabile, cum ar fi ""#options_myextrafieldkey# * 2"<br> Există variabile speciale, cum ar fi#quantity# and #tva_tx#<br> Folosiți ; pentru a separa expresiile
+PriceMode=Mod  preț
+PriceNumeric=Număr
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 8d89f5a4f9d..e5fb1a57e8c 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
 TaskTimeDate=Data
+TasksOnOpenedProject=Sarcini la proiectele deschise
+WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timp nou consumat
 MyTimeSpent=Timpul meu consumat
 MyTasks=TAskurile mele
diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang
index d64075dfbf5..8a2f531d677 100644
--- a/htdocs/langs/ro_RO/resource.lang
+++ b/htdocs/langs/ro_RO/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resurse
+MenuResourceAdd=Resursă nouă
+MenuResourcePlanning=Planificare resursă
+DeleteResource=Şterge resursa
+ConfirmDeleteResourceElement=Confirmaţi ştergerea resursei pentru acest element
+NoResourceInDatabase=Nici o resursă în baza de date.
+NoResourceLinked=Nici o resursă legată
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Lista resurse
+ResourceSingular=Resursă
+ResourceCard=Fişă resursă
+AddResource=Crează resursă
+ResourceFormLabel_ref=Nume resursă
+ResourceType=Tip resursă
+ResourceFormLabel_description=Descriere resursă
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Resurse legate de elementul
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Arată planificare resursă
+GotoDate=Mergi la data
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Element resurse
+ResourceCreatedWithSuccess=Resursă creată
+RessourceLineSuccessfullyDeleted=Linie resursă ștearsă
+RessourceLineSuccessfullyUpdated=Linie  resursă actualizată
+ResourceLinkedWithSuccess=Resursă legată cu succes
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Fişă resursă
+ConfirmDeleteResource=Confirmaţi ştergerea acestei resurse
+RessourceSuccessfullyDeleted=Resursă ştearsă
+DictionaryResourceType=Tipuri resurse
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Selectează resursa
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 24f32791525..b951fc80a47 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie
 CorrectStock=Corectează stoc
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
-StocksArea=Warehouses area
+StocksArea=Zona Depozite
 Location=Locație
 LocationSummary=Nume scurt locaţie
 NumberOfDifferentProducts=Numărul de produse diferite
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 31d08174920..e6a719a0b0e 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -102,7 +102,7 @@ UserDisabled=User %s cu handicap
 UserEnabled=User %s activat
 UserDeleted=User %s eliminat
 NewGroupCreated=Grupul creat %s
-GroupModified=Group %s modified
+GroupModified=Grup %s modificat
 GroupDeleted=Grupul %s eliminat
 ConfirmCreateContact=Yu Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr de contact?
 ConfirmCreateLogin=Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr membru?
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 38374aafce8..0793f5019ea 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Data respingerii
 RefusedReason=Motivul respingerii
 RefusedInvoicing=Facturare respingerea
 NoInvoiceRefused=Nu încărcaţi respingerea
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factura refuzată (Încărcați  refuzul la client)
 Status=Status
 StatusUnknown=Necunoscut
 StatusWaiting=Aşteptare
@@ -79,10 +79,11 @@ CreditDate=Credit pe
 WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
 ShowWithdraw=Arată Retragere
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere  încă neprelucrată, aceasta nu va fi setată ca plătită permite în  prealabil gestionarea retragerii.
-DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este complet, puteți introduce plata pentru a închide factura.
+DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată.   Odată ce este dat intră în  meniul Bancă> Retragerea de a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul.
 WithdrawalFile=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
 ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor  fi clasificate ca "Plătit"
+StatisticsByLineStatus=Statistici după starea  liniilor
 
 ### Notifications
 InfoCreditSubject=Plata %s comandă în picioare de către bancă
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index fce5cff17a9..d85f4bd7539 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Использовать автодополнение 
 ActivityStateToSelectCompany= Добавить в фильтр опцию показать / скрыть контрагентов, которые в настоящее время бездействуют или отстранились
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Использовать автодополнение для выбора контакта (вместо списка)
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Настройки поискового фильтра
 NumberOfKeyToSearch=Кол-во символов для запуска поиска: %s
 ViewFullDateActions=Показать полный даты действия в третий лист
@@ -208,6 +210,7 @@ ModulesJobDesc=Бизнес модули обеспечивают простую
 ModulesMarketPlaceDesc=Вы сможете найти больше модулей для загрузки на внешних веб-сайтах в Интернете ...
 ModulesMarketPlaces=Еще модули ...
 DoliStoreDesc=DoliStore, официальный рынок для внешних модулей Dolibarr ERP / CRM
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Веб-сайты, где Вы можете найти еще модули ...
 URL=Ссылка
 BoxesAvailable=Доступные боксы
@@ -444,7 +447,7 @@ Module55Desc=Штрих-коды управления
 Module56Name=Телефония
 Module56Desc=Телефония интеграции
 Module57Name=Постоянные заказы
-Module57Desc=Постоянные приказы и снятие управления
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial интеграции
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Подача
 Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
 Module330Name=Закладки
 Module330Desc=Закладки управления
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Категории
 Module1780Desc=Категории управления (продукции, поставщиков и заказчиков)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG редактор
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Управление запланированными заданиями
 Module2400Name=Повестка дня
@@ -503,6 +508,8 @@ Module2500Name=Электронное управление
 Module2500Desc=Сохранение и обмен документами
 Module2600Name=WebServices
 Module2600Desc=Включить сервер услуг Dolibarr Сети
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
 Module50100Name=Кассовое
@@ -527,7 +534,7 @@ Module50200Desc=Модуль предлагает онлайн страницу
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Управление Бизнес-Процессами
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Наценки
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Система была успешно обновлена
 CompanyInfo=Информация о Компании / фонде
 CompanyIds=Компания / фундамент тождествам
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index fbe2fb1cfcf..ff1b49742b4 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=События назначенные
 ActionsDoneBy=Действия, проделанную
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Все мои действия / задачи
 AllActions= Все ле действия / задачи
 ViewList=Посмотреть список
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 9c6f18e7213..ba15732dac1 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 0e2e79dd3c3..16b0b7d4c85 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Список запуска контракта ли
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
 BoardNotActivatedServices=Услуги для активации среди утверждены контракты
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Последнее %s активированных услуг
 LastModifiedServices=Последнее% с измененными услуги
 EditServiceLine=Изменить направление
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Список истекающих услуг
 NoteListOfYourExpiredServices=Этот список содержит только услуги по договорам с Контрагентами, с которыми связаны как торговый представитель
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index a4f06909eab..34a00865c83 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Требуется код Поставщика
 ErrorSupplierCodeAlreadyUsed=Код Поставщика уже используется
 ErrorBadParameters=Неверные параметры
 ErrorBadValueForParameter=Неверное значение %s для параметра неправильной %s
-ErrorBadImageFormat=Файл изображения имеет не поддерживаемый формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat= Значение '%s' имеет неверный формат даты
 ErrorWrongDate=Дата некорректна!
 ErrorFailedToWriteInDir=Не удалось записать в директорию %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Пользователь с <b>логином %s</b> н
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Обязательные параметры не определены
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 9d4f302eb56..b7750075fd8 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Поздно
 SubscriptionNotReceivedShort=Никогда не получил
 ListOfSubscriptions=Список подписчиков
 SendCardByMail=Отправить карту
-AddMember=Добавить члена
+AddMember=Create member
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый член типа
 WelcomeEMail=Приветственное Email-письмо
@@ -125,7 +125,7 @@ Date=Свидание
 DateAndTime=Дата и время
 PublicMemberCard=Член общественного карту
 MemberNotOrNoMoreExpectedToSubscribe=Члены, не больше и не ожидается, подписаться
-AddSubscription=Добавить подписку
+AddSubscription=Create subscription
 ShowSubscription=Показать подписки
 MemberModifiedInDolibarr=Член Изменения в Dolibarr
 SendAnEMailToMember=Отправить по электронной почте информацию члена
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 27b43d63d39..c94b0a8803c 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Если продукт является услугой 
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Кол-во Цена
 MultiPriceLevelsName=Цена категорий
-AssociatedProductsAbility=Включить связанные продукты
-AssociatedProducts=Связанные продукты
-AssociatedProductsNumber=Количество продукции
-ParentProductsNumber=Количество родителей продукт
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Ассоциированные
 Translation=Перевод
 KeywordFilter=Ключевое слово фильтр
@@ -132,7 +132,7 @@ AddDel=Добавить / Удалить
 Quantity=Кол-во
 NoMatchFound=Не найдено соответствия
 ProductAssociationList=Список продуктов / услуг: Наименование товара / услуги (количество пострадавших)
-ProductParentList=Список продуктов / услуг с этим продуктом в качестве компонента
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
 ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу?
@@ -179,7 +179,7 @@ CloneProduct=Клон продукт или услугу
 ConfirmCloneProduct=Вы уверены, что хотите клонировать продукт или <b>услуга %s?</b>
 CloneContentProduct=Клон все основные данные о продукции / услуг
 ClonePricesProduct=Клон основные данные и цены
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 CustomerPrices=Клиенты цены
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 85f329b89b2..ec8ab9c70d4 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Эта точка зрения представляет всех пр
 Myprojects=Мои проекты
 ProjectsArea=Проекты области
 NewProject=Новый проект
-AddProject=Добавить проект
+AddProject=Create project
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект?
@@ -36,6 +36,8 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
 MyTasks=Мои задачи
@@ -45,7 +47,7 @@ TaskDateStart=Дата начала задачи
 TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
-AddTask=Добавить задачу
+AddTask=Create task
 AddDuration=Добавить продолжительность
 Activity=Мероприятие
 Activities=Задачи / мероприятия
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/ru_RU/resource.lang
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 4e8a688b7ce..1e27c270b19 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Показать Вывод
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
-DoStandingOrdersBeforePayments=Это вкладок позволяет запросить за постоянного платежного поручения. Как только она будет закончена, вы можете ввести оплату, чтобы закрыть счета.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Оплата постоянных %s порядке банк
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 06473396026..c726f320ec8 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Pridať možnosť filtra pre zobrazenie / skrytie thirdparties, ktoré sú v súčasnej dobe v činnosti alebo prestal ju
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Hľadať filtre možnosti
 NumberOfKeyToSearch=Predradníka znaky na spustenie hľadania: %s
 ViewFullDateActions=Všetky dáta udalosti v tretí list
@@ -208,6 +210,7 @@ ModulesJobDesc=Obchodné moduly poskytujú jednoduché preddefinované nastaveni
 ModulesMarketPlaceDesc=Môžete si nájsť viac modulov k stiahnutiu na externých webových stránok na internete ...
 ModulesMarketPlaces=Viac moduly ...
 DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Poskytovatelia webových stránok môžete vyhľadávať nájsť viac modulov ...
 URL=Odkaz
 BoxesAvailable=Trezory sú k dispozícii
@@ -444,7 +447,7 @@ Module55Desc=Barcode riadenie
 Module56Name=Telefónia
 Module56Desc=Telefónia integrácia
 Module57Name=Trvalé príkazy
-Module57Desc=Trvalé príkazy a abstinenčné riadenie
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrácia ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr
 Module330Name=Záložky
 Module330Desc=Správa záložiek
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Kategórie
 Module1780Desc=Category management (produkty, dodávatelia a odberatelia)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechajte upraviť niektoré textové pole pomocou pokročilého editora
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plánované správu úloh
 Module2400Name=Program rokovania
@@ -503,6 +508,8 @@ Module2500Name=Elektronický Redakčný
 Module2500Desc=Uložiť a zdieľať dokumenty
 Module2600Name=WebServices
 Module2600Desc=Povoliť Dolibarr webových služieb servera
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Pomocou on-line služby (Gravatar www.gravatar.com) ukázať fotku užívateľov / členov (nájdený s ich e-maily). Potrebujete prístup k internetu
 Module2800Desc=FTP klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox
 Module50100Name=Bod predaja
@@ -527,7 +534,7 @@ Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Payp
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Tlač cez poháre tlačiarne IPP.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavenie uložené
 BackToModuleList=Späť na zoznam modulov
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu
 DefaultLanguage=Predvolený jazyk používať (kód jazyka)
 EnableMultilangInterface=Povoliť viacjazyčné rozhranie
 EnableShowLogo=Zobraziť logo na ľavom menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Systém bol úspešne aktualizovaný
 CompanyInfo=Spoločnosti / Nadácia informácie
 CompanyIds=Spoločnosť / nadácie identity
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index b267c89fb22..6aaa3b7800d 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Akcia priradené
 ActionsDoneBy=Akcie vykonané
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Všetky moje akcie / úlohy
 AllActions= Všetky udalosti / úlohy
 ViewList=Zobrazenie zoznamu
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index a3dd3513e49..05c32f0d35a 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index d69c3405dd9..9ed7ccf7da6 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Zoznam bežiacich zmlúv liniek
 ListOfRunningServices=Zoznam spustených služieb
 NotActivatedServices=Neaktívne služby (u overených zmlúv)
 BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Posledné %s aktiváciu služby
 LastModifiedServices=Posledné %s upravené služby
 EditServiceLine=Upraviť linka
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Zoznam služieb vyprší
 NoteListOfYourExpiredServices=Tento zoznam obsahuje iba služby zmlúv pre tretie strany si sú prepojené ako obchodného zástupcu.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodný zástupca podpise zmluvy
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 06bdb2b3b44..1b9648f54a2 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Dodávateľ povinný kód
 ErrorSupplierCodeAlreadyUsed=Dodávateľ kód už používaný
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Chybná hodnota &quot;%s&quot; pre nastavenie parametrov nesprávnych &quot;%s&quot;
-ErrorBadImageFormat=Obrazový súbor nemá podporovaný formát
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Hodnota &quot;%s&quot; má nesprávny formát dátumu
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Nepodarilo sa zapísať do adresára %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Užívateľ s prihlásením <b>%s</b> nebol nájdený.
 ErrorLoginHasNoEmail=Tento užívateľ nemá žiadnu e-mailovú adresu. Proces prerušená.
 ErrorBadValueForCode=Bad hodnota bezpečnostného kódu. Skúste to znova s ​​novou hodnotou ...
 ErrorBothFieldCantBeNegative=Polia %s a %s nemôžu byť negatívna
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Užívateľský účet <b>%s</b> použiť na spustenie webový server nemá oprávnenie pre ktoré
 ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
 ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 473092c87c0..eec0d8666a4 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Neskoro
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Zoznam predplatné
 SendCardByMail=Poslať kartu e-mailom
-AddMember=Pridať člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu &quot;Členovia typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vitajte e-mail
@@ -126,7 +125,7 @@ Date=Dátum
 DateAndTime=Dátum a čas
 PublicMemberCard=Členské verejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, ktorý alebo nie viac očakáva, že k odberu
-AddSubscription=Pridať predplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobraziť predplatné
 MemberModifiedInDolibarr=Člen upravený v Dolibarr
 SendAnEMailToMember=Poslať e-mail Informácie o členovi
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Posledný úpisu
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členov
 NoValidatedMemberYet=Žiadne overené členmi nájdených
 MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
@@ -202,3 +203,4 @@ MembersByNature=Členovia od prírody
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=Nie TVA za upísané vlastné imanie
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozorniť pri Dolibarr obdržíte potvrdenie o overenú platby za predplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang
index 1b051dae6cb..835e6827f12 100644
--- a/htdocs/langs/sk_SK/printipp.lang
+++ b/htdocs/langs/sk_SK/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: sk_SK
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-11-08 23:25:26
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26).
-// Reference language: en_US -> sk_SK
-PrintIPPSetup=Nastavenie modulu Priama tlač
-PrintIPPDesc=Ce modul Permet d'un ajouter Bouton d'dojem priame des dokumenty vers votre imprimante. Il requiert un systeme Linux Equipe de poháre.
-PRINTIPP_ENABLED=Zobraziť Piktogram &quot;Priama tlač&quot; do zoznamu dokumentov
-PRINTIPP_HOST=Tlačový server
-PRINTIPP_PORT=Prístav
-PRINTIPP_USER=Prihlásenie
-PRINTIPP_PASSWORD=Heslo
-NoPrinterFound=Žiadne tlačiarne nájdené (skontrolujte poháre Nasta)
-// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:48:51).
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 6df1806e58a..c8e4d892a18 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Počet cien
 MultiPriceLevelsName=Cenové kategórie
-AssociatedProductsAbility=Aktivácia virtuálne produkty sa vyznačujú
-AssociatedProducts=Virtuálne produkt
-AssociatedProductsNumber=Počet výrobkov tvoriacich tento virtuálny produkt
-ParentProductsNumber=Počet materskej virtuálneho produktu
-IfZeroItIsNotAVirtualProduct=Ak je 0, tento produkt nie virtuálneho produktu
-IfZeroItIsNotUsedByVirtualProduct=Je-li 0, je tento výrobok nie je používaný žiadnym virtuálneho produktu
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Asociovať
 Translation=Preklad
 KeywordFilter=Kľúčové slovo filter
@@ -132,7 +132,7 @@ AddDel=Pridať / Odstrániť
 Quantity=Množstvo
 NoMatchFound=Nie nájdená zhoda
 ProductAssociationList=Zoznam súvisiacich produktov / služieb: názov produktu / služby (množstvo ovplyvnené)
-ProductParentList=Zoznam virtuálnych produktov / služieb s týmto produktom ako súčasť
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt
 DeleteProduct=Odstránenie produktu / služby
 ConfirmDeleteProduct=Ste si istí, že chcete zmazať tento výrobok / službu?
@@ -179,7 +179,7 @@ CloneProduct=Clone produkt alebo službu
 ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb <b>%s?</b>
 CloneContentProduct=Klon všetky hlavné informácie o produkte / služby
 ClonePricesProduct=Klonovať hlavné informácie a ceny
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
 CustomerPrices=Zákazníci ceny
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 1772c61049f..8639f46b4fa 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľs
 Myprojects=Moje projekty
 ProjectsArea=Projekty oblasť
 NewProject=Nový projekt
-AddProject=Pridať projekt
+AddProject=Create project
 DeleteAProject=Odstránenie projektu
 DeleteATask=Ak chcete úlohu
 ConfirmDeleteAProject=Ste si istí, že chcete zmazať tento projekt?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový čas strávený
 MyTimeSpent=Môj čas strávený
 MyTasks=Moje úlohy
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nová úloha
-AddTask=Pridať úloha
+AddTask=Create task
 AddDuration=Pridať trvania
 Activity=Činnosť
 Activities=Úlohy / aktivity
diff --git a/htdocs/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sk_SK/resource.lang
+++ b/htdocs/langs/sk_SK/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index f7fc78cb9af..4bb8cdd1569 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Zobraziť Natiahnite
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Odstúpenie súbor
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Platba %s trvalého príkazu bankou
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index b72bb07c101..dc018fa38c8 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Za izbiranje partnerjev uporabite polja z avtomatsko iz
 ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti
 UseSearchToSelectContactTooltip=Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza.
 UseSearchToSelectContact=Zaizbiro kontakta uporabite polja z avtomatsko izpolnitvijo (namesto uporabe seznama).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Opcije iskalnega filtra
 NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu
 ViewFullDateActions=Prikaz polnih datumov aktivnosti v tretjem zavihku
@@ -208,6 +210,7 @@ ModulesJobDesc=Poslovni moduli zagotavljajo enostavne prednastavitve aplikacije
 ModulesMarketPlaceDesc=Več modulov si lahko naložite preko zunanjih web strani na internetu...
 ModulesMarketPlaces=Več modulov...
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Ponudniki spletnih strani, na katerih lahko poiščete več modulov...
 URL=Link
 BoxesAvailable=Polja, ki so na voljo
@@ -437,14 +440,14 @@ Module52Name=Zaloge
 Module52Desc=Upravljanje zalog proizvodov
 Module53Name=Storitve
 Module53Desc=Upravljanje storitev
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Pogodbe/naročnine
+Module54Desc=Upravljanje pogodb (storitev ali ponavljajočih naročnin)
 Module55Name=Črtne kode
 Module55Desc=Upravljanje črtnih kod
 Module56Name=Telefonija
 Module56Desc=Integracija telefonije
 Module57Name=Trajniki
-Module57Desc=Upravljanje trajnikov in dvigov
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
 Module59Name=Vaš zaznamek
@@ -475,8 +478,8 @@ Module320Name=Vir RSS
 Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani
 Module330Name=Zaznamki
 Module330Desc=Upravljanje zaznamkov
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projekti/priložnosti/možnosti
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
 Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
@@ -484,7 +487,7 @@ Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki,
 Module510Name=Plače
 Module510Desc=Upravljanje plač in plačil zaposlenim
 Module600Name=Obvestila
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
 Module700Name=Donacije
 Module700Desc=Upravljanje donacij
 Module1200Name=Mantis
@@ -495,6 +498,8 @@ Module1780Name=Kategorije
 Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci)
 Module2000Name=Fck urejevalnik
 Module2000Desc=WYSIWYG urejevalnik
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Periodično opravilo
 Module2300Desc=Načrtovano upravljanje nalog
 Module2400Name=Dnevni red
@@ -503,6 +508,8 @@ Module2500Name=Upravljanje elektronskih vsebin
 Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo
 Module2600Name=Spletne storitve
 Module2600Desc=Omogočanje Dolibarr strežnika za spletne storitve
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Uporaba online Gravatar storitev (www.gravatar.com) za prikaz fotografij uporabnikov/članov (na osnovi njihovih emailov). Potreben je internetni dostop
 Module2800Desc=FTP Client
@@ -514,10 +521,10 @@ Module5000Name=Skupine podjetij
 Module5000Desc=Omogoča upravljaje skupine podjetij
 Module6000Name=Potek dela
 Module6000Desc=Upravljanje poteka dela
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
+Module20000Name=Upravljanje zahtevkov za dopust
+Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox
 Module50100Name=Prodajalne
@@ -527,7 +534,7 @@ Module50200Desc=Modul za omogočanje strani za spletno plačevanje s kreditno ka
 Module50400Name=Računovodstvo (napredno)
 Module50400Desc=Upravljanje računovodstva (dvostavno)
 Module54000Name=Tiskanje IPP
-Module54000Desc=Tiskanje preko Cups IPP tiskalnika
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Odpri anketo
 Module55000Desc=Modul za online ankete (kot Doodle, Studs, Rdvz, ...)
 Module59000Name=Marže
@@ -606,16 +613,16 @@ Permission151=Branje tekočih naročil
 Permission152=Nastavitve tekočih naročil
 Permission153=Prenos prejema tekočih naročil
 Permission154=Odobritev/zavrnitev prejema tekočih naročil
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
+Permission161=Branje pogodb/naročnin
+Permission162=Kreiranje/spreminjanje pogodb/naročnin
+Permission163=Aktiviranje pogodbene storitve/naročnine
+Permission164=Onemogočenje pogodbene storitve/naročnine
+Permission165=Brisanje pogodb/naročnin
+Permission171=Branje potnih nalogov in stroškov (lastnih in podrejenih)
+Permission172=Kreiranje/spreminjanje potnih nalogov in stroškov
+Permission173=Brisanje potnih nalogov in stroškov
 Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission178=Izvoz potnih nalogov in stroškov
 Permission180=Branje dobaviteljev
 Permission181=Branje naročil pri dobaviteljih
 Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih
@@ -672,7 +679,7 @@ Permission300=Branje črtnih kod
 Permission301=Kreiranje/spreminjanje črtnih kod
 Permission302=Brisanje črtnih kod
 Permission311=Branje storitev
-Permission312=Assign service/subscription to contract
+Permission312=Dodelitev storitve/naročnine pogodbi
 Permission331=Branje zaznamkov
 Permission332=Kreiranje/spreminjanje zaznamkov
 Permission333=Brisanje zaznamkov
@@ -702,8 +709,8 @@ Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
 Permission1001=Branje zalog
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Kreiranje/spreminjanje skladišč
+Permission1003=Brisanje skladišč
 Permission1004=Branje gibanja zalog
 Permission1005=Kreiranje/spreminjanje gibanja zalog
 Permission1101=Branje dobavnic
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Metode naročanja
 DictionarySource=Izvor ponudb/naročil
 DictionaryAccountancyplan=Tabela računov
 DictionaryAccountancysystem=Modeli tabel računov
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Nastavitve shranjene
 BackToModuleList=Nazaj na seznam modulov
 BackToDictionaryList=Nazaj na seznam slovarjev
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju
 DefaultLanguage=Privzet jezik uporabe (koda jezika)
 EnableMultilangInterface=Omogočen večjezični vmesnik
 EnableShowLogo=Prikaži logo na levem meniju
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Vaš sistem je bil uspešno posodobljen
 CompanyInfo=Informacije o podjetju/ustanovi
 CompanyIds=Registracijski podatki o podjetju/ustanovi
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 81fa94bf320..db29ff08f42 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Dogoki, ki se nanašajo na
 ActionsDoneBy=Dogodke izvedel
 ActionsForUser=Aktivnosti za uporabnika
 ActionsForUsersGroup=Aktivnosti za vse uporabnike v skupini
+ActionAssignedTo=Event assigned to
 AllMyActions= Vsi moji dogodki/naloge
 AllActions= Vse dogodki/naloge
 ViewList=Glej seznam
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Ta stran omogoča določitev zunanjih virov koledarjev za ogl
 ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku
 PropalValidatedInDolibarr=Potrjena ponudba %s
 InvoiceValidatedInDolibarr=Potrjen račun %s
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS
 InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
 InvoiceDeleteDolibarr=Račun %s izbrisan
 OrderValidatedInDolibarr= Potrjeno naročilo %s
@@ -68,9 +69,9 @@ DateActionStart= Začetni datum
 DateActionEnd= Končni datum
 AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
 AgendaUrlOptions2=<b>login=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti v lasti uporabnika <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika <b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
+AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> za omejitev izhoda na aktivnosti povezane s projektom<b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rojstni dan kontakta
 AgendaHideBirthdayEvents=Skrij rojstni dan kontakta
 Busy=Zaseden
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 7a3cd7e1b25..a2d5facd9e2 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis
 InvoiceAvoirAsk=Dobropis za korekcijo računa
 InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je znesek na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
 invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Ustvari dobropis iz neplačanega preostanka osnovnega računa
+invoiceAvoirLineWithPaymentRestAmount=Dobropis za preostali neplačan znesek
 ReplaceInvoice=Zamenjava računa %s
 ReplacementInvoice=Nadomestni račun
 ReplacedByInvoice=Zamenjan z računom %s
@@ -154,9 +154,9 @@ ConfirmCancelBill=Ali zares želite preklicati račun <b>%s</b> ?
 ConfirmCancelBillQuestion=Zakaj želite označiti ta račun kot 'opuščen' ?
 ConfirmClassifyPaidPartially=Ali zares želite spremeniti račun <b>%s</b> v status 'plačano' ?
 ConfirmClassifyPaidPartiallyQuestion=Ta račun ni bil plačan v celoti. Zakaj želite kljub temu zaključiti ta račun ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV na ta popust bo vrnjen brez dobropisa.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec
 ConfirmClassifyPaidPartiallyReasonProductReturned=Delno vračilo proizvodov
 ConfirmClassifyPaidPartiallyReasonOther=Znesek opuščen zaradi drugih razlogov
@@ -189,9 +189,9 @@ AlreadyPaid=Že plačano
 AlreadyPaidBack=Že vrnjeno plačilo
 AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
 Abandoned=Opuščeno
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPay=Neplačan preostanek
+RemainderToTake=Preostanek vrednosti za odtegljaj
+RemainderToPayBack=Preostanek vrednosti za vrnitev
 Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
@@ -217,18 +217,18 @@ NoInvoice=Ni računa
 ClassifyBill=Klacificiraj račun
 SupplierBillsToPay=Računi dobaviteljev za plačilo
 CustomerBillsUnpaid=Neplačani računi kupcev
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Izpisani računi se pošiljajo po pošti
 NonPercuRecuperable=Nepovratno
 SetConditions=Nastavitev plačilnih pogojev
 SetMode=Nastavitev načina plačila
 Billed=Zaračunano
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Predloga računa
+RepeatableInvoices=Predloga računov
+Repeatable=Predloga
+Repeatables=Predloge
+ChangeIntoRepeatableInvoice=Pretvori v predlogo računa
+CreateRepeatableInvoice=Ustvari predlogo računa
+CreateFromRepeatableInvoice=Ustvari iz predloge računa
 CustomersInvoicesAndInvoiceLines=Računi za kupce in vrstice v računih
 CustomersInvoicesAndPayments=Računi za kupce in plačila
 ExportDataset_invoice_1=Seznam računov za kupce in vrstic v računih
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 31a939fea21..53f17b73fa9 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Nastavitve kategorij
 CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo
 CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
-ShowCategory=Show category
+ShowCategory=Prikaži kategorijo
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index b0cc63b9a96..8d61bb9401a 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 102524da201..1575ee36695 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Področje pogodb
 ListOfContracts=Seznam pogodb
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Zadnjih %s spremenjenih pogodb
 AllContracts=Vse pogodbe
 ContractCard=Kartica pogodbe
 ContractStatus=Status pogodbe
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam aktivnih vrstic pogodbe
 ListOfRunningServices=Seznam aktivnih storitev
 NotActivatedServices=Neaktivne storitve (med potrjenimi pogodbami)
 BoardNotActivatedServices=Storitve, ki jih je potrebno aktivirati (med potrjenimi pogodbami)
-LastContracts=Last % contracts
+LastContracts=Zadnjih %s pogodb
 LastActivatedServices=Zadnjih %s aktiviranih storitev
 LastModifiedServices=Zadnjih %s spremenjenih storitev
 EditServiceLine=Ureditev storitvene vrstice
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Seznam storitev, ki potečejo
 NoteListOfYourExpiredServices=Ta seznam vsebuje samo storitve po pogodbah s partnerji, ki so povezane z referentom.
 StandardContractsTemplate=Predloga standardnih pogodb
 ContactNameAndSignature=Za %s, ime in podpis:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisnik pogodbe
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index d0b1d69bfb5..7f9f857ec3a 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Obvezna koda dobavitelja
 ErrorSupplierCodeAlreadyUsed=Koda dobavitelja je že uporabljena
 ErrorBadParameters=Napačni parametri
 ErrorBadValueForParameter=Napačna vrednost '%s' za nepravilen parameter '%s'
-ErrorBadImageFormat=Format slikovne datoteke ni podprt
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Vrednost '%s &quot;je napačen zapis datuma
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Napaka pri pisanju v mapo %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Uporabnik s prijavo <b>%s</b> ni bilo mogoče najti.
 ErrorLoginHasNoEmail=Ta uporabnik nima e-poštni naslov. Obdelati prekinjena.
 ErrorBadValueForCode=Slaba vrednost za varnostno kodo. Poskusite znova z novo vrednost ...
 ErrorBothFieldCantBeNegative=Polja %s in %s ne more biti tako negativna
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uporabniški račun <b>%s</b> uporablja za izvedbo spletni strežnik nima dovoljenja za to
 ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index c2cdfde4b96..a3ba9144853 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -367,7 +367,7 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem
 ActionsOnMember=Dogodki okoli tega člana
 NActions=%s aktivnosti
 NActionsLate=%s zamujenih
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Zahtevek je bil že zabeležen
 Filter=Filter
 RemoveFilter=Odstrani filter
 ChartGenerated=Grafikon je ustvarjen
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 291108ce99a..a70ea086a12 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -40,7 +40,7 @@ DateAbonment=Datum prijave
 DateSubscription=Datum vpisa
 DateNextSubscription=Datum naslednje članarine
 DateEndSubscription=Datum zadnje članarine
-EndSubscription=Zadnja članarina
+EndSubscription=Veljavnost članarine
 SubscriptionId=ID članarine
 MemberId=ID člana
 NewMember=Nov član
@@ -85,7 +85,7 @@ SubscriptionLateShort=Zamujen
 SubscriptionNotReceivedShort=Nikoli prejeto
 ListOfSubscriptions=Spisek članarin
 SendCardByMail=Pošlji kartico
-AddMember=Dodaj člana
+AddMember=Ustvari člana
 NoTypeDefinedGoToSetup=Tipi članov niso določeni. Pojdite v Nastavitve – ipi članov
 NewMemberType=Nov tip člana
 WelcomeEMail=e-pošta za dobrodošlico
@@ -125,7 +125,7 @@ Date=Datum
 DateAndTime=Datum in ura
 PublicMemberCard=Javna kartica člana
 MemberNotOrNoMoreExpectedToSubscribe=Član nima več naročnine in se tudi ne pričakuje
-AddSubscription=Dodaj naročnino
+AddSubscription=Ustvari naročnino
 ShowSubscription=Prikaži naročnino
 MemberModifiedInDolibarr=Član je spremenjen v Dolibarr
 SendAnEMailToMember=Pošlji članu informativno e-pošto
@@ -203,3 +203,4 @@ MembersByNature=Naravni člani
 VATToUseForSubscriptions=Stopnja DDV za naročnine
 NoVatOnSubscription=Ni davka za naročnine
 MEMBER_PAYONLINE_SENDEMAIL=Opozorilno e-sporočilo, ko Dilibarr prejme potrdilo potrjenega plačila za naročnino
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod uporabljen za naročniško vrstico v računu: %s
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 51ef2f75c91..4aa5b74d03c 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Pošiljka ne obstaja
 DraftOrWaitingApproved=Osnutek ali odobritev, še ne naročen
 DraftOrWaitingShipped=Osnutek ali potrditev, še ne odposlan
 MenuOrdersToBill=Naročila za fakturiranje
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Naročila za fakturiranje
 SearchOrder=Iskanje naročila
 SearchACustomerOrder=Iskanje naročila kupca
 ShipProduct=Pošlji izdelek
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 6a7bf7aa912..1975819eb8e 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -13,10 +13,10 @@ NewProduct=Nov proizvod
 NewService=Nova storitev
 ProductCode=Koda proizvoda
 ServiceCode=Koda storitve
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChange=Masovna sprememba DDV
+ProductVatMassChangeDesc=Na tej strani lahko spremenite stopnjo DDV za proizvode in storitve iz ene na drugo vrednost. Pozor, ta sprememba se izvrši v celotni bazi podatkov.
+MassBarcodeInit=Vzpostavitev masovne črtne kode
+MassBarcodeInitDesc=Na tej strani lahko vzpostavite črtno kodo za objekte, ki črtne kode nimajo določene. Pred tem preverite, da je zaključena nastavitev modula za črtne kode.
 ProductAccountancyBuyCode=Računovodski konto (nakup)
 ProductAccountancySellCode=Računovodski konto (prodaja)
 ProductOrService=Proizvod ali storitev
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistika proizvodov in storitev
 ProductsStatistics=Statistika proizvodov
 ProductsOnSell=Proizvodi, ki so na voljo
 ProductsNotOnSell=Opuščeni proizvodi
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Proizvodi niti za prodajo, niti za nakup
 ServicesOnSell=Storitve, ki so na voljo
 ServicesNotOnSell=Opuščene storitve
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Storitve niti za prodajo, niti za nakup
 InternalRef=Interna referenca
 LastRecorded=Zadnji vneseni proizvodi/storitve za prodajo
 LastRecordedProductsAndServices=Zadnjih %s vnesenih proizvodov/storitev
@@ -72,20 +72,20 @@ PublicPrice=Javna cena
 CurrentPrice=Trenutna cena
 NewPrice=Nova cena
 MinPrice=Minimalna Prodajna cena
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minimalna prodajna cena (brez DDV)
+MinPriceTTC=Minimalna prodajna cena (z DDV)
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
 ContractStatus=Status pogodbe
 ContractStatusClosed=Zaprta
 ContractStatusRunning=V obdelavi
 ContractStatusExpired=Pretečena
 ContractStatusOnHold=V mirovanju
-ContractStatusToRun=To get running
+ContractStatusToRun=Zagnana
 ContractNotRunning=Ta pogodba miruje
 ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja.
 ErrorProductBadRefOrLabel=Napačna vrednost reference ali naziva.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorProductClone=Prišlo je do težave pri poskusu kloniranja proizvoda ali storitve.
+ErrorPriceCantBeLowerThanMinPrice=Napaka, cena ne mora biti nižja od minimalne cene.
 Suppliers=Dobavitelji
 SupplierRef=Referenca dobavitelja
 ShowProduct=Prikaži proizvod
@@ -114,17 +114,17 @@ BarcodeValue=Vrednost črtne kode
 NoteNotVisibleOnBill=Opomba (ni vidna na računih, ponudbah...)
 CreateCopy=Kreiraj kopijo
 ServiceLimitedDuration=Če ima proizvod storitev z omejenim trajanjem:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Več nivojev cen za proizvode/storitve
 MultiPricesNumPrices=Število cen
 MultiPriceLevelsName=Kategorije cen
-AssociatedProductsAbility=Aktiviranje povezanih proizvodov
-AssociatedProducts=Povezani proizvodi
-AssociatedProductsNumber=Število povezanih proizvodov
-ParentProductsNumber=Število izdelkov matične
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Vklopi možnost navidezne sestave izdelka
+AssociatedProducts=Sestavljen izdelek
+AssociatedProductsNumber=Število izdelkov, ki sestavljajo navidezni sestavljeni izdelek
+ParentProductsNumber=Število nadrejenih sestavljenih izdelkov
+IfZeroItIsNotAVirtualProduct=Če je 0, ta izdelek ni navidezno sestavljen
+IfZeroItIsNotUsedByVirtualProduct=Če je 0, ta izdelek ni uporabljen v nobenem navideznem sestavljenem izdelku
 EditAssociate=Poveži
-Translation=Prenos
+Translation=Prevod
 KeywordFilter=Filter ključnih besed
 CategoryFilter=Filter kategorij
 ProductToAddSearch=Iskanje proizvoda za dodajanje
@@ -132,7 +132,7 @@ AddDel=Dodaj/briši
 Quantity=Količina
 NoMatchFound=Ni ujemanja
 ProductAssociationList=Seznam odvisnih proizvodov/storitev: ime proizvoda/storitve (količina, na katero se nanaša)
-ProductParentList=Seznam izdelkov / storitev, pri tem izdelku, kot sestavnega dela
+ProductParentList=Seznam zavitkov izdelkov / storitev, pri tem izdelku, kot sestavnega dela
 ErrorAssociationIsFatherOfThis=Eden od izbranih proizvodov je nadrejen trenutnemu proizvodu
 DeleteProduct=Izbriši proizvod/storitev
 ConfirmDeleteProduct=Ali zares želite izbrisati ta proizvod/storitev?
@@ -151,22 +151,22 @@ NoStockForThisProduct=Tega proizvoda ni na zalogi
 NoStock=Ni zaloge
 Restock=Obnovitev zaloge
 ProductSpecial=Specialni
-QtyMin=Minimum Qty
+QtyMin=Minimalna količina
 PriceQty=Cena za to količino
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+PriceQtyMin=Cena za to min. količino (brez popusta)
+VATRateForSupplierProduct=Stopnja DDV (za tega dobavitelja/proizvod)
+DiscountQtyMin=Privzet popust za količino
 NoPriceDefinedForThisSupplier=Za tega dobavitelja/storitev ni definirana cena/količina
 NoSupplierPriceDefinedForThisProduct=Za ta proizvod ni definirana cena dobavitelja/količina
 RecordedProducts=Proizvod vnesen
-RecordedServices=Services recorded
+RecordedServices=Zabeležena storitev
 RecordedProductsAndServices=Proizvod/storitev vnesen
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Vnaprej določeni proizvodi za prodajo
+PredefinedServicesToSell=Vnaprej določene storitve za prodajo
+PredefinedProductsAndServicesToSell=Vnaprej določeni proizvodi/storitve za prodajo
+PredefinedProductsToPurchase=Vnaprej določen proizvodi za nakup
+PredefinedServicesToPurchase=Vnaprej določene storitve za nakup
+PredefinedProductsAndServicesToPurchase=Vnaprej določeni proizvodi/storitve za nakup
 GenerateThumb=Generiraj sličico
 ProductCanvasAbility=Uporabi posebni "canvas" dodatek
 ServiceNb=Storitev št. %s
@@ -179,66 +179,71 @@ CloneProduct=Kloniraj proizvod ali storitev
 ConfirmCloneProduct=Ali zares želite klonirati ta proizvod ali storitev <b>%s</b> ?
 CloneContentProduct=Klonirajte vse osnovne podatke proizvoda/storitve
 ClonePricesProduct=Klonirajte osnovne podatke in cene
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Kloniraj sestavljen izdelek/storitev
 ProductIsUsed=Ta proizvod je rabljen
 NewRefForClone=Ref. novega proizvoda/storitve
 CustomerPrices=Cene za kupce
 SuppliersPrices=Nabavne cene
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Cene dobaviteljev (proizvodov ali storitev)
 CustomCode=Carinska tarifa
 CountryOrigin=Država porekla
 HiddenIntoCombo=Skrito v izbranem seznamu
 Nature=Narava
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-AddThisProductCard=Create product card
-HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
-AddThisServiceCard=Create service card
-HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist.
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Price by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
-UpdateOriginalProductLabel=Modify original label
-HelpUpdateOriginalProductLabel=Allows to edit the name of the product
+ProductCodeModel=Predloga za referenco proizvoda
+ServiceCodeModel=Predloga za referenco storitve
+AddThisProductCard=Ustvari kartico proizvoda
+HelpAddThisProductCard=Ta opcija omogoča ustvarjanje ali kloniranje proizvoda, če še ne obstaja.
+AddThisServiceCard=Ustvari kartico storitve
+HelpAddThisServiceCard=Ta opcija omogoča ustvarjanje ali kloniranje storitve, če še ne obstaja.
+CurrentProductPrice=Trenutna cena
+AlwaysUseNewPrice=Vedno uporabi trenutno ceno proizvoda/storitve
+AlwaysUseFixedPrice=Uporabi fiksno ceno
+PriceByQuantity=Cena na količino
+PriceByQuantityRange=Območje količin
+ProductsDashboard=Povzetek proizvodov/storitev
+UpdateOriginalProductLabel=Spremeni originalni naziv
+HelpUpdateOriginalProductLabel=Vedno uredi ime proizvoda
 ### composition fabrication
-Building=Production and items dispatchment
-Build=Produce
-BuildIt=Produce & Dispatch
-BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
+Building=Proizvodnja in odprema
+Build=Proizvodnja
+BuildIt=Proizvodnja & odprema
+BuildindListInfo=Količina, ki je na voljo za proizvodnjo po skladišču (postavi na 0, če ni bodočih aktivnosti)
 QtyNeed=Kol.
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
-ProductUsedForBuild=Auto consumed by production
-ProductBuilded=Production completed
-ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Pricing Rules
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+UnitPmp=Neto VWAP na enoto
+CostPmpHT=Neto skupna VWAP
+ProductUsedForBuild=Lastna poraba za proizvodnjo
+ProductBuilded=Zaključena proizvodnja
+ProductsMultiPrice=Večcenovni proizvod
+ProductsOrServiceMultiPrice=Cene za kupce (proizvodov ali storitev, različne cene)
+ProductSellByQuarterHT=Četrtletni prihodek prooizvoda po VWAP 
+ServiceSellByQuarterHT=Četrtletni prihodek storitev po VWAP
+Quarter1=1. četrtletje
+Quarter2=2. četrtletje
+Quarter3=3. četrtletje
+Quarter4=4. četrtletje
+BarCodePrintsheet=Tiskanje črtne kode
+PageToGenerateBarCodeSheets=S tem orodjem lahko natisnete liste z nalepkami črtnih kod. Izberite format lista z nalepkami, tip črtne kode in vrednost črtne kode, nato kliknite gumb <b>%s</b>.
+NumberOfStickers=Število nalepk za tiskanje na stran
+PrintsheetForOneBarCode=Tiskaj več nalepk za eno črtno kodo
+BuildPageToPrint=Generiraj stran za tiskanje
+FillBarCodeTypeAndValueManually=Ročno vnesi tip črtne kode in vrednost.
+FillBarCodeTypeAndValueFromProduct=Vnesi tip črtne kode in vrednost iz črtne kode proizvoda.
+FillBarCodeTypeAndValueFromThirdParty=Vnesi tip črtne kode in vrednost iz črtne kode partnerja.
+DefinitionOfBarCodeForProductNotComplete=Definicija tipa ali vrednosti črtne kode za proizvod %s ni popolna.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ali vrednosti črtne kode za partnerja %s ni popolna.
+BarCodeDataForProduct=Informacija o črtni kodi proizvoda %s :
+BarCodeDataForThirdparty=Informacija o črtni kodi partnerja %s :
+ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem boste tudi resetirali že določene vrednosti črtnih kod na novo vrednost)
+PriceByCustomer=Cena po stranki
+PriceCatalogue=Enolična cena po proizvodu/storitvi
+PricingRule=Cenovna pravila
+AddCustomerPrice=Dodaj ceno po strankah
+ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
+PriceByCustomerLog=Cena po imenu stranke
+MinimumPriceLimit=Minimalna cena ne more biti nižja od %s
+MinimumRecommendedPrice=Minimalna priporočena cena je : %s
+PriceExpressionEditor=Urejevalnik prikaza cene
+PriceExpressionSelected=Izbran prikaz cene
+PriceExpressionEditorHelp="cena = 2 + 2" ali "2 + 2" za nastavitev cene<br>Posebna polja so spremenljivke kot "#opcije_mojaposebnapolja# * 2"<br>Tukaj so uporabljene posebne spremenljivke kot #količina# in #tva_tx#<br> ; za ločitev prikazov
+PriceMode=Način cene
+PriceNumeric=Številka
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index ccad08cebaf..d41603e6827 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Ref. project
-ProjectId=Project Id
+ProjectId=Id projekta
 Project=Projekt
 Projects=Projekti
 SharedProject=Projekti v skupni rabi
@@ -14,7 +14,7 @@ TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovol
 Myprojects=Moji projekti
 ProjectsArea=Področje projektov
 NewProject=Nov projekt
-AddProject=Dodaj projekt
+AddProject=Ustvari projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši nalogo
 ConfirmDeleteAProject=Ali zares želite izbrisati ta projekt ?
@@ -33,19 +33,21 @@ TimesSpent=Porabljen čas
 RefTask=Referenčna naloga
 LabelTask=Naziv naloge
 TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+TaskTimeUser=Uporabnik
+TaskTimeNote=Beležka
+TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nov porabljen čas
 MyTimeSpent=Moj porabljen čas
 MyTasks=Moje naloge
 Tasks=Naloge
 Task=Naloga
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Datum začetka naloge
+TaskDateEnd=Datum konca naloge
+TaskDescription=Opis naloge
 NewTask=Nova naloga
-AddTask=Dodaj nalogo
+AddTask=Ustvari nalogo
 AddDuration=Dodaj trajanje
 Activity=Aktivnost
 Activities=Naloge/aktivnosti
@@ -118,15 +120,15 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Odgovorna oseba
 TypeContact_project_task_external_TASKEXECUTIVE=Odgovorna oseba
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+SelectElement=Izberi element
+AddElement=Povezava do elementa
+UnlinkElement=Nepovezan element
 # Documents models
 DocumentModelBaleine=Model poročila za celoten projekt (logo...)
 PlannedWorkload = Planirana delovna obremenitev
 WorkloadOccupation= Pretvarjanje delovne obremenitve
 ProjectReferers=Referenčni objekti
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+SearchAProject=Iskanje projekta
+ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
+ProjectDraft=Osnutek projekta
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
diff --git a/htdocs/langs/sl_SI/resource.lang b/htdocs/langs/sl_SI/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sl_SI/resource.lang
+++ b/htdocs/langs/sl_SI/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 7a0c4fd1f16..79ebbecc62d 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Obvezen je naziv skladišča
 CorrectStock=Popravi zalogo
 ListOfWarehouses=Spisek skladišč
 ListOfStockMovements=Seznam gibanja zaloge
-StocksArea=Warehouses area
+StocksArea=Področje skladišč
 Location=Lokacija
 LocationSummary=Kratko ime lokacije
 NumberOfDifferentProducts=Število različnih proizvodov
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 778e491156b..1f41a6282af 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Uporabnik %s je onemogočen
 UserEnabled=Uporabnik %s je aktiviran
 UserDeleted=Uporabnik %s je odstranjen
 NewGroupCreated=Skupina %s je kreirana
-GroupModified=Group %s modified
+GroupModified=Skupina %s je spremenjena
 GroupDeleted=Skupina %s je odstranjena
 ConfirmCreateContact=Ali zares želite kreirati Dolibarr dostop za ta kontakt ?
 ConfirmCreateLogin=Ali zares želite kreirati Dolibarr dostop za tega člana ?
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index a8f6547afae..2e32208fc92 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Datum kredita
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Prikaži nakazilo
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo.
-DoStandingOrdersBeforePayments=Ti zavihki omogočajo zahtevo za trajnik. Ko je končano, lahko vnesete plačilo in zaprete račun.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Plačilo odprtega naročila %s s strani banke
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index b2de3a851d4..40bca8e85fb 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -170,6 +170,8 @@ LastSubscriptionAmount=Last subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Number of members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
@@ -201,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/sq_AL/resource.lang
+++ b/htdocs/langs/sq_AL/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 7d53386ea9d..9e3a4d80c03 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Välj en kontoplan
 Validate=Validera
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
-Ventilation=Breakdown
+Ventilation=Fördelning
 ToDispatch=Avsändandet
 Dispatched=Levereras
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Fördelning kunder
+SuppliersVentilation=Fördelning leverantörerna
 TradeMargin=Handelsmarginal
 Reports=Rapporter
 ByCustomerInvoice=Enligt faktura kunder
@@ -45,9 +45,9 @@ WriteBookKeeping=Record konton i huvudboken
 Bookkeeping=Huvudbok
 AccountBalanceByMonth=Saldo per månad
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Uppdelning redovisning
+AccountingVentilationSupplier=Uppdelning redovisnings leverantör
+AccountingVentilationCustomer=Uppdelning redovisnings kund
 Line=Linje
 
 CAHTF=Totala köpesleverantörs HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilerade linjer faktura
 IntoAccount=I bokföringskonto
 
 Ventilate=Ventilera
-VentilationAuto=Automatic breakdown
+VentilationAuto=Automatisk uppdelning
 
 Processing=Bearbetning
 EndProcessing=I slutet av behandlingen
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Inte ventilerad i redovisningskonto
 
 ACCOUNTING_SEPARATORCSV=Separator CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av nedbrytnings sidor "Breakdown" av de senaste element
 
 AccountLength=Längd på redovisningen redovisning i Dolibarr
 AccountLengthDesc=Funktion som gör det möjligt att låtsas en längd av bokföringskonto genom att ersätta mellanslag med noll siffra. Den här funktionen berör endast displayen, det ändrar inte redovisningskonton registrerade i Dolibarr. För export, är nödvändigt denna funktion för att vara kompatibel med viss programvara.
@@ -140,14 +140,14 @@ Active=Uttalande
 
 NewFiscalYear=Nytt räkenskapsår
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+DescVentilCustomer=Rådgör här den årliga fördelningen redovisning av era fakturor kunder
 TotalVente=Total omsättning HT
 TotalMarge=Total försäljning marginal
 DescVentilDoneCustomer=Konsul här listan med linjerna av fakturor kunder och deras bokföringskonto
 DescVentilTodoCustomer=Ventilera dina rader av kundfaktura med en redovisningskonto
 ChangeAccount=Ändra bokföringskonto för linjer som valts ut av kontot:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Rådgör här den årliga fördelningen redovisning av dina fakturor leverantörer
 DescVentilTodoSupplier=Ventilera dina rader av leverantörsfaktura med en redovisningskonto
 DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto
 
@@ -155,4 +155,4 @@ ValidateHistory=Validera Automatiskt
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
 
-FicheVentilation=Breakdown card
+FicheVentilation=Uppdelning kort
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 3043c9406a5..264a54e753c 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -37,14 +37,14 @@ GUISetup=Visa
 SetupArea=Setup område
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
-RemoveLock=Ta bort filen <b>%s</b> om den finns så att uppdatera verktyget.
-RestoreLock=Ersätt en fil <b>%s</b> med läsbehörighet bara på filen för att stänga av någon användning av uppdatering verktyg.
-SecuritySetup=Säkerhet setup
+RemoveLock=Ta bort filen <b>%s</b> om den finns godkänns uppdatering verktyget.
+RestoreLock=Ersätt en fil <b>%s</b> med läsbehörighet bara på filen för att stänga av all användning av uppdaterings verktyg.
+SecuritySetup=Säkerhets inställning
 ErrorModuleRequirePHPVersion=Fel, kräver denna modul PHP version %s eller högre
 ErrorModuleRequireDolibarrVersion=Fel, kräver denna modul Dolibarr version %s eller högre
 ErrorDecimalLargerThanAreForbidden=Fel, en precision högre än <b>%s</b> stöds inte.
 DictionarySetup=Lexikon inställnings
-Dictionary=Ordböcker
+Dictionary=Ordlista
 Chartofaccounts=Kontoplan
 Fiscalyear=Räkenskapsår
 ErrorReservedTypeSystemSystemAuto=Värdena "system" och "systemauto" för typ är reserverade. Du kan använda "user" som värde för att lägga till en egen post.
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Använd automatisk komplettering fält för att välja
 ActivityStateToSelectCompany= Lägg till ett filter alternativ för att visa / dölja thirdparties som för närvarande är i aktivitet eller har upphört att
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectContact=Använd automatisk komplettering fält för att välja kontakt (istället för att använda en listruta).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Sök filter alternativ
 NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
 ViewFullDateActions=Visa fullständig datum åtgärder i tredje blad
@@ -90,7 +92,7 @@ AntiVirusParam= Fler parametrar på kommandoraden
 AntiVirusParamExample= Exempel för ClamWin - databas = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
 ComptaSetup=Redovisning modul setup
 UserSetup=Användarens hantering setup
-MenuSetup=Meny ledning setup
+MenuSetup=Meny hanterings inställningar
 MenuLimits=Gränser och noggrannhet
 MenuIdParent=Överordnade menyn ID
 DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn)
@@ -98,12 +100,12 @@ DetailPosition=Sortera nummer att definiera menyposition
 PersonalizedMenusNotSupported=Personliga menyer stöds inte
 AllMenus=Alla
 NotConfigured=Inte konfigurerad
-Setup=Setup
+Setup=Inställning
 Activation=Aktiveringen
 Active=Aktiv
-SetupShort=Setup
+SetupShort=Inställning
 OtherOptions=Andra alternativ
-OtherSetup=Andra setup
+OtherSetup=Andra inställningar
 CurrentValueSeparatorDecimal=Decimaltecken
 CurrentValueSeparatorThousand=Tusentalsavgränsare
 Destination=Destination
@@ -125,7 +127,7 @@ PHPTZ=Tidszon PHP server
 PHPServerOffsetWithGreenwich=PHP server offset bredd Greenwich (sekunder)
 ClientOffsetWithGreenwich=Klient / Browser offset bredd Greenwich (sekunder)
 DaylingSavingTime=Sommartid (användare)
-CurrentHour=PHP server timme
+CurrentHour=PHP Tid (server)
 CompanyTZ=Tidszon företag (huvudföretag)
 CompanyHour=Hour företag (huvudföretag)
 CurrentSessionTimeOut=Aktuell session timeout
@@ -171,7 +173,7 @@ ImportMethod=Import metoden
 ToBuildBackupFileClickHere=Att bygga en backup fil, klicka <a href="%s">här</a> .
 ImportMySqlDesc=För att importera en backup fil måste du använda mysql kommandot från kommandoraden:
 ImportPostgreSqlDesc=Om du vill importera en backup fil måste du använda pg_restore kommando från kommandoraden:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Filnamn för att generera
 Compression=Komprimering
@@ -195,11 +197,11 @@ DelayedInsert=Fördröjd in
 EncodeBinariesInHexa=Koda binära data i hexadecimal
 IgnoreDuplicateRecords=Ignorera fel dubblettposter (INSERT ignorera)
 Yes=Ja
-No=Nr
+No=Nej
 AutoDetectLang=Autodetektera (webbläsare språk)
 FeatureDisabledInDemo=Funktion avstängd i demo
 Rights=Behörigheter
-BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på &quot;Aktivera&quot; eller genom att klicka på soptunnan till att stänga av den.
+BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på "Aktivera" eller genom att klicka på soptunnan till att stänga av den.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
 ModulesDesc=Dolibarr moduler definiera vilka funktionen är aktiverad i programvaran. Vissa moduler kräver behörigheter som du skall ge till användare efter möjliggör modul.
 ModulesInterfaceDesc=Den Dolibarr moduler gränssnittet kan du lägga till funktioner beroende på yttre programvara, system eller tjänster.
@@ -208,6 +210,7 @@ ModulesJobDesc=Business moduler ge enkla fördefinierade inställningar för Dol
 ModulesMarketPlaceDesc=Du kan hitta fler moduler för att ladda ner på externa webbplatser på Internet ...
 ModulesMarketPlaces=Fler moduler ...
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webbplats leverantörer kan du söka för att hitta fler moduler ...
 URL=Länk
 BoxesAvailable=Rutor
@@ -437,14 +440,14 @@ Module52Name=Lager
 Module52Desc=Lager hantering av produkter
 Module53Name=Tjänster
 Module53Desc=Service ledning
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Avtal / Prenumerationer
+Module54Desc=Förvaltning av kontrakt (tjänster eller reccuring abonnemang)
 Module55Name=Streckkoder
 Module55Desc=Barcode ledning
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående order
-Module57Desc=Stående order och återkallelse ledning
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS-flöde
 Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor
 Module330Name=Bokmärken
 Module330Desc=Bokmärk ledning
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
@@ -495,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Hantera planlagda uppgifter
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
 Module2600Name=WebServices
 Module2600Desc=Aktivera Dolibarr webbtjänster server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Använder online Gravatar tjänst (www.gravatar.com) för att visa foto av användare / medlemmar (hittade med sin e-post). Behöver en internet
 Module2800Desc=FTP-klient
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Lämna Framställningar förvaltning
 Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
 Module39000Name=Produktsats
-Module39000Desc=Batchnummer, äter-by och bäst före-datum hantering av produkter
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Modul för att erbjuda en online-betalning sidan med kreditkort
 Module50400Name=Redovisning (avancerad)
 Module50400Desc=Bokföring och redovisning (dubbla parter)
 Module54000Name=PrintIPP
-Module54000Desc=Skriv ut via Cups IPP-skrivare.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Öppen Poll
 Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...)
 Module59000Name=Marginaler
@@ -606,11 +613,11 @@ Permission151=Läs stående order
 Permission152=Skapa / ändra en stående order begäran
 Permission153=Läs stående order kvitton
 Permission154=Kredit / vägrar stående order kvitton
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Läs kontrakt / abonnemang
+Permission162=Skapa / ändra avtal / abonnemang
+Permission163=Aktivera en tjänst / teckning av ett kontrakt
+Permission164=Inaktivera en tjänst / teckning av ett kontrakt
+Permission165=Radera kontrakt / abonnemang
 Permission171=Läs resor och utgifter (eget och hans underordnade)
 Permission172=Skapa / ändra resor och kostnader
 Permission173=Ta bort resor och kostnader
@@ -672,7 +679,7 @@ Permission300=Läs streckkoder
 Permission301=Skapa / modifiera streckkoder
 Permission302=Ta bort streckkoder
 Permission311=Läs tjänster
-Permission312=Assign service/subscription to contract
+Permission312=Tilldela tjänst / abonnemang att ingå avtal
 Permission331=Läs bokmärken
 Permission332=Skapa / ändra bokmärken
 Permission333=Ta bort bokmärken
@@ -702,8 +709,8 @@ Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
 Permission1001=Läs lager
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Skapa / ändra lager
+Permission1003=Radera lager
 Permission1004=Läs lager rörelser
 Permission1005=Skapa / ändra lager rörelser
 Permission1101=Läs leveransorder
@@ -779,9 +786,10 @@ DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyplan=Kontoplan
 DictionaryAccountancysystem=Modeller för kontoplan
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup sparas
 BackToModuleList=Tillbaka till moduler lista
-BackToDictionaryList=Tillbaka till ordböcker listan
+BackToDictionaryList=Tillbaka till ordlistan
 VATReceivedOnly=Särskilda räntesats inte
 VATManagement=Moms Management
 VATIsUsedDesc=Den momssats som standard när du skapar framtidsutsikter, fakturor, order etc följa aktiva standard regeln: <br> Om säljaren är föremål för mervärdesskatt, då moms som standard = 0. Slut på regeln. <br> Om (den som säljer land = köparlandet), sedan den mervärdesskatt som standard = mervärdesskatt av produkten vid försäljning landet. Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och varor transporttjänster (bil, fartyg, flygplan), standard moms = 0 (Den mervärdesskatt som skall betalas av köparen vid customoffice av sitt land och inte på säljaren). Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och köparen är inte ett företag, sedan den mervärdesskatt som standard = moms på produkt som säljs. Slut på regeln. <br> Om säljaren och köparen i Europeiska gemenskapen och köparen är ett företag, då moms som standard = 0. Slut på regeln. <br> Else föreslagna standard moms = 0. Slut på regeln.
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Att ditt system har uppdaterats
 CompanyInfo=Företag / stiftelse information
 CompanyIds=Företag / stiftelse identiteter
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Lägg förmåga leveranstid
 UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses som ett alternativ
 FreeLegalTextOnProposal=Fri text på affärsförslag
 WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
 ##### Orders #####
 OrdersSetup=Beställ ledning setup
 OrdersNumberingModules=Beställningar numrering moduler
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Intervention numrering moduler
 TemplatePDFInterventions=Intervention kort dokument modeller
 WatermarkOnDraftInterventionCards=Vattenstämpel på åtgärdskort dokument (ingen om tom)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Avtal / Prenumerationer modul installation
 ContractsNumberingModules=Kontrakt numrering moduler
 TemplatePDFContracts=Contract documents modeller
 FreeLegalTextOnContracts=Fritext om avtal
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=Filer av typen %s är inte komprimerade av HTTP-server
 CacheByServer=Cache med server
 CacheByClient=Cache med browser
 CompressionOfResources=Komprimering av HTTP-svar
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare
 ##### Products #####
 ProductSetup=Produkter modul setup
 ServiceSetup=Tjänster modul konfiguration
@@ -1415,9 +1424,9 @@ OSCommerceTestOk=Anslutning till servern &quot;%s&quot; på databas %s &quot;med
 OSCommerceTestKo1=Anslutning till servern &quot;%s&quot; lyckas, men databas %s &quot;kunde inte nås.
 OSCommerceTestKo2=Anslutning till servern &quot;%s&quot; med användare &quot;%s&quot; misslyckades.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Lagermodul inställnings
+UserWarehouse=Använd användar personliga lager
+IfYouUsePointOfSaleCheckModule=Om du använder en Point of Sale-modul (POS modul som standard eller annan extern modul), kan denna inställning ignoreras av din Point Of Sale modul. De flesta point of sales moduler är utformade för att skapa omedelbart en faktura och minska lager som standard oavsett är alternativ här. Så, om du behöver eller inte ha ett bestånd minskar när du registrerar en sälja från din Point of Sale, kolla även din POS-modul inrättas.
 ##### Menu #####
 MenuDeleted=Meny utgår
 TreeMenu=Tree menyer
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Denna modul gör det möjligt att lägga till en ikon efter tele
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Point of sales
 CashDeskSetup=Point of sales modul setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Standard generiska tredje part att använda för Sells
 CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning
 CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check
 CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Inaktivera lager minskning när en sälja görs från Point of Sale
+CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning
+StockDecreaseForPointOfSaleDisabled=Stock minskning från Point of Sale inaktiv
+CashDeskYouDidNotDisableStockDecease=Du har inte inaktivera lager minskning när du gör en sälja från Point of Sale. Så ett lager krävs.
 ##### Bookmark #####
 BookmarkSetup=Bokmärk modul setup
 BookmarkDesc=Den här modulen kan du hantera bokmärken. Du kan också lägga genvägar till alla Dolibarr sidor eller externale webbplatser på din vänstra menyn.
@@ -1543,13 +1552,13 @@ ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhets
 Opened=Öppnad
 Closed=Stängt
 AlwaysEditable=Kan alltid redigeras
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation)
+NbMajMin=Minsta antal versaler
+NbNumMin=Minsta antal numeriska tecken
+NbSpeMin=Minsta antal specialtecken
+NbIteConsecutive=Maximalt antal upprepa samma tecken
+NoAmbiCaracAutoGeneration=Använd inte tvetydiga tecken ("1", "l", "i", "|", "0", "O") för automatisk generering
+SalariesSetup=Inställning av modul löner
+SortOrder=Sorteringsordning
 Format=Format
 TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index d05899c5119..df18edf920f 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
 ActionsForUser=Händelser för användaren
 ActionsForUsersGroup=Händelser för alla användare av grupp
+ActionAssignedTo=Event assigned to
 AllMyActions= Alla mina handlingar och uppgifter
 AllActions= Alla åtgärder / uppgifter
 ViewList=Visa lista
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalend
 ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt
 PropalValidatedInDolibarr=Förslag %s validerade
 InvoiceValidatedInDolibarr=Faktura %s validerade
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
 InvoiceDeleteDolibarr=Faktura %s raderas
 OrderValidatedInDolibarr= Beställ %s validerade
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 34167669685..77a566b712f 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -147,10 +147,10 @@ BackToAccount=Tillbaka till konto
 ShowAllAccounts=Visa för alla konton
 FutureTransaction=Transaktioner i Futur. Inget sätt att blidka.
 SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på &quot;Skapa&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
-EventualyAddCategory=Eventually, specify a category in which to classify the records
+InputReceiptNumber=Välj kontoutdrag samband med förlikningen. Använd en sorterbar numeriskt värde (t.ex., ÅÅÅÅMM)
+EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
 ToConciliate=För att förena?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
+ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
 BankDashboard=Bankkonton sammandrag
 DefaultRIB=Standard BAN
 AllRIB=Alla BAN
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index af80a05d97f..46d04601dc3 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -21,8 +21,8 @@ InvoiceDepositDesc=Denna typ av faktura sker när en insättning har mottagits.
 InvoiceProForma=Proforma faktura
 InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> är en bild av en sann faktura men har ingen bokföring värde.
-InvoiceReplacement=Ersättning faktura
-InvoiceReplacementAsk=Ersättning faktura för faktura
+InvoiceReplacement=Ersättnings faktura
+InvoiceReplacementAsk=Ersättnings faktura för faktura
 InvoiceReplacementDesc=<b> Ersättning faktura </b> används för att avbryta och byta helt en faktura utan betalningar.<br><br>Anmärkning: Endast fakturor utan betalningar kan bytas ut. Om fakturan du ersätter är ännu inte avslutat, kommer den automatiskt att stängas av "övergivna".
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota att korrigera fakturan
@@ -30,12 +30,12 @@ InvoiceAvoirDesc=Den <b>kreditnota</b> är en negativ faktura används för att
 invoiceAvoirWithLines=Skapa kreditnota med innehållet i originalfakturan 
 invoiceAvoirWithPaymentRestAmount=Skapa kreditnota med återstående obetald faktura ursprung
 invoiceAvoirLineWithPaymentRestAmount=Kredit notering för återstående obetalda beloppet
-ReplaceInvoice=Byt faktura %s
+ReplaceInvoice=Ersätt faktura %s
 ReplacementInvoice=Ersättning faktura
 ReplacedByInvoice=Ersatt av faktura %s
 ReplacementByInvoice=Ersatt av faktura
 CorrectInvoice=Korrekt faktura %s
-CorrectionInvoice=Korrigering faktura
+CorrectionInvoice=Korrigerings faktura
 UsedByInvoice=Användas för att betala fakturan %s
 ConsumedBy=Förbrukas av
 NotConsumed=Inte förbrukas
@@ -111,30 +111,30 @@ BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
 BillStatusStarted=Påbörjad
 BillStatusNotPaid=Inte betalas
-BillStatusClosedUnpaid=Stängt (obetalda)
-BillStatusClosedPaidPartially=Betalt (delvis)
-BillShortStatusDraft=Förslag
+BillStatusClosedUnpaid=Stängd (obetald)
+BillStatusClosedPaidPartially=Betald (delvis)
+BillShortStatusDraft=Utkast
 BillShortStatusPaid=Betald
-BillShortStatusPaidBackOrConverted=Bearbetade
-BillShortStatusConverted=Bearbetade
+BillShortStatusPaidBackOrConverted=Bearbetad
+BillShortStatusConverted=Bearbetad
 BillShortStatusCanceled=Övergiven
 BillShortStatusValidated=Validerad
 BillShortStatusStarted=Började
 BillShortStatusNotPaid=Inte betalas
 BillShortStatusClosedUnpaid=Stängt
-BillShortStatusClosedPaidPartially=Betalt (delvis)
+BillShortStatusClosedPaidPartially=Betald (delvis)
 PaymentStatusToValidShort=För att validera
 ErrorVATIntraNotConfigured=Intracommunautary momsregistreringsnummer ännu inte definierat
 ErrorNoPaiementModeConfigured=Ingen utebliven betalning läge definieras. Gå till Faktura-modulen setup att fixa detta.
 ErrorCreateBankAccount=Skapa ett bankkonto, då gå till Setup panel Faktura-modul för att definiera betalningssätten
 ErrorBillNotFound=Faktura %s finns inte
-ErrorInvoiceAlreadyReplaced=Misstag, försök dig för att godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s.
+ErrorInvoiceAlreadyReplaced=Fel, du försöker dig på att  godkänna en faktura för att ersätta faktura %s. Men denna har redan ersatts av faktura %s.
 ErrorDiscountAlreadyUsed=Fel, rabatt som redan används
 ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belopp
 ErrorInvoiceOfThisTypeMustBePositive=Fel, skall denna typ av faktura har ett positivt belopp
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status
 BillFrom=Från
-BillTo=Bill till
+BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
 NewBill=Ny faktura
 LastBills=Senaste %s fakturor
@@ -157,7 +157,7 @@ ConfirmClassifyPaidPartiallyQuestion=Denna faktura inte har betalats helt. Vad f
 ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag godkänner förlust av momsen på denna rabatt.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kund
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter som returneras delvis
 ConfirmClassifyPaidPartiallyReasonOther=Belopp övergivna av annan orsak
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Detta val är möjligt om din faktura har försetts med lämplig kommentar. (Exempel «Endast den skatt som motsvarar det pris som verkligen har betalats ger rätt till avdrag»)
@@ -172,9 +172,9 @@ ConfirmCustomerPayment=Har du bekräfta denna betalning ingång för <b>%s</b> %
 ConfirmSupplierPayment=Bekräftar du denna betalning för <b>%s</b> %s?
 ConfirmValidatePayment=Är du säker på att du vill godkänna denna betalning? Inga ändringar kan göras efter det att betalning är godkänd.
 ValidateBill=Validera faktura
-UnvalidateBill=Unvalidate faktura
-NumberOfBills=Nb av fakturor
-NumberOfBillsByMonth=Nb av fakturor per månad
+UnvalidateBill=Ovaliderade faktura
+NumberOfBills=Antal av fakturor
+NumberOfBillsByMonth=Antal av fakturor per månad
 AmountOfBills=Belopp för fakturor
 AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
 ShowSocialContribution=Visa sociala avgifter
@@ -205,7 +205,7 @@ NoOtherDraftBills=Inga andra förslag fakturor
 NoDraftInvoices=Inget faktura-utkast
 RefBill=Faktura ref
 ToBill=Fakturamottagare
-RemainderToBill=Återstår att räkningen
+RemainderToBill=Återstår att fakturan
 SendBillByMail=Skicka faktura via e-post
 SendReminderBillByMail=Skicka påminnelse via e-post
 RelatedCommercialProposals=Relaterade kommersiella förslag
@@ -217,7 +217,7 @@ NoInvoice=Ingen faktura
 ClassifyBill=Klassificera faktura
 SupplierBillsToPay=Leverantörer fakturor att betala
 CustomerBillsUnpaid=Obetalda kunder fakturor
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=De skriftliga fakturor genom mecanographic förfaranden dispens av ordning i brev
 NonPercuRecuperable=Icke återvinningsbara
 SetConditions=Ställ betalningsvillkor
 SetMode=Ställ betalningssätt
@@ -390,7 +390,7 @@ ExpectedToPay=Förväntad utbetalning
 PayedByThisPayment=Betalas av denna betalning
 ClosePaidInvoicesAutomatically=Klassificera &quot;betalade&quot; alla standard eller fakturor ersättning entirely betalt.
 ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
-AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status &quot;betald&quot;.
+AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 3c949332eb6..a8fadb4e77b 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -24,7 +24,7 @@ BoxSalesTurnover=Omsättningen
 BoxTotalUnpaidCustomerBills=Totalt obetalda kundens fakturor
 BoxTotalUnpaidSuppliersBills=Totalt obetalda leverantörs fakturor
 BoxTitleLastBooks=Senaste %s inspelade böcker
-BoxTitleNbOfCustomers=Nombre de klient
+BoxTitleNbOfCustomers=Antal klienter
 BoxTitleLastRssInfos=Senaste %s nyheter från %s
 BoxTitleLastProducts=Senast %s modifierade produkter / tjänster
 BoxTitleProductsAlertStock=Produkter i lager alert
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 527dcf7d7a4..8d653226bc1 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Kategorier, inställningar
 CategorieRecursiv=Länka automatiskt med förälderkategori
 CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
-ShowCategory=Show category
+ShowCategory=Visa kategori
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 681b9e10d30..d51e041b7e2 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Bokföring
 AccountancyCard=Bokföringskort
 Treasury=Treasury
 MenuFinancial=Finansiella
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Gå till <a href="%s">skatt modul inställning</a> att ändra reglerna för beräkning
+TaxModuleSetupToModifyRulesLT=Gå till <a href="%s">Företag inställning</a> att ändra reglerna för beräkning
 OptionMode=Alternativ för bokföring
 OptionModeTrue=Alternativ Input-Output
 OptionModeVirtual=Alternativ Credits-Utdebitering
@@ -12,15 +12,15 @@ OptionModeTrueDesc=I detta sammanhang skall omsättningen beräknas över utbeta
 OptionModeVirtualDesc=I detta sammanhang skall omsättningen beräknas på fakturor (datum för godkännandet). När dessa fakturor betalas, om de har betalats eller inte, de är förtecknade i omsättning produktionen.
 FeatureIsSupportedInInOutModeOnly=Funktionen bara tillgänglig i PROV-FORDRINGAR bokförings-läge (Se redovisning modul konfiguration)
 VATReportBuildWithOptionDefinedInModule=Belopp som anges här beräknas enligt regler som fastställts av Skatteverket modul setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Belopp som visas här är beräknade med hjälp av regler som fastställts av bolagets inställning.
 Param=Setup
 RemainingAmountPayment=Belopp som skall erläggas resterande:
 AmountToBeCharged=Totalt belopp att betala:
 AccountsGeneral=Konton
 Account=Konto
 Accounts=Konton
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Konto förälder
+Accountsparent=Konto förälder
 BillsForSuppliers=Räkningar för leverantörer
 Income=Inkomst
 Outcome=Expense
@@ -32,7 +32,7 @@ Profit=Resultat
 Balance=Balans
 Debit=Debet
 Credit=Credit
-Piece=Accounting Doc.
+Piece=Redovisning Doc.
 Withdrawal=Återkallande
 Withdrawals=Uttag
 AmountHTVATRealReceived=Net insamlade
@@ -42,25 +42,25 @@ VATReceived=Mervärdesskatt som
 VATToCollect=Moms inköp
 VATSummary=Moms Balance
 LT2SummaryES=IRPF Balans
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Balans
 VATPaid=Mervärdesskatten
-SalaryPaid=Salary paid
+SalaryPaid=Lön
 LT2PaidES=IRPF Betald
 LT1PaidES=RE Paid
 LT2CustomerES=IRPF omsättning
 LT2SupplierES=IRPF inköp
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE försäljning
+LT1SupplierES=RE inköp
 VATCollected=Momsintäkterna
 ToPay=Att betala
 ToGet=För att komma tillbaka
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Område för alla special betalningar
 TaxAndDividendsArea=Skatt, sociala avgifter och utdelningar område
 SocialContribution=Sociala avgifter
 SocialContributions=Sociala avgifter
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Särskilda kostnader
 MenuTaxAndDividends=Skatter och utdelning
-MenuSalaries=Salaries
+MenuSalaries=Löner
 MenuSocialContributions=Sociala avgifter
 MenuNewSocialContribution=Nya bidrag
 NewSocialContribution=Nya sociala bidrag
@@ -73,21 +73,21 @@ PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=Leverantörsfaktura betalning
 PaymentSocialContribution=Sociala avgifter betalas
 PaymentVat=Moms betalning
-PaymentSalary=Salary payment
+PaymentSalary=Lön betalning
 ListPayment=Lista över betalningar
 ListOfPayments=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
 ListOfSupplierPayments=Förteckning över leverantörsbetalningar
 DatePayment=Betalningsdag
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Datum startperiod
+DateEndPeriod=Slutdatum perioden
 NewVATPayment=Ny moms betalning
 newLT2PaymentES=Ny IRPF betalning
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Ny RE betalning
 LT2PaymentES=IRPF Betalning
 LT2PaymentsES=IRPF betalningar
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE Betalning
+LT1PaymentsES=RE Betalningar
 VATPayment=Moms Betalning
 VATPayments=Momsbetalningar
 SocialContributionsPayments=Sociala avgifter betalningar
@@ -108,7 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad kund bokföring kod för %s
 SuppliersProductsSellSalesTurnover=Den omsättning som försäljningen av leverantörens produkter.
 CheckReceipt=Kontrollera insättning
 CheckReceiptShort=Kontrollera insättning
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=Senaste% s check kvitton
 NewCheckReceipt=Ny rabatt
 NewCheckDeposit=Nya kontrollera insättning
 NewCheckDepositOn=Skapa kvitto för insättning på konto: %s
@@ -120,42 +120,42 @@ ConfirmPaySocialContribution=Är du säker på att du vill klassificera denna so
 DeleteSocialContribution=Ta bort en social avgift
 ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala avgifter?
 ExportDataset_tax_1=Sociala avgifter och betalningar
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
+CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
+CalcModeDebt=<b>Läges% sClaims-Skulder% s</b> sa <b>Åtagande redovisning.</b>
+CalcModeEngagement=<b>Läge% sIncomes-Kostnader% s</b> sa <b>kassaredovisning</b>
+CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
+CalcModeLT1Debt=<b>Läge% SRE på kundfakturor% s</b>
+CalcModeLT1Rec= <b>Läge% SRE på leverantörerna fakturerar% s</b>
+CalcModeLT2= <b>Läge% sIRPF på kundfakturor - leverantörer fakturor% s</b>
+CalcModeLT2Debt=<b>Läge% sIRPF på kundfakturor% s</b>
+CalcModeLT2Rec= <b>Läge% sIRPF på leverantörernas fakturor% s</b>
+AnnualSummaryDueDebtMode=Överskott av intäkter och kostnader, årliga sammanfattande
+AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga sammanfattande
 AnnualByCompaniesDueDebtMode=Överskott av intäkter och kostnader, detalj av tredje part, mode <b>%sClaims-Debts%s</b> sa <b>Åtagande redovisning.</b>
 AnnualByCompaniesInputOutputMode=Överskott av intäkter och kostnader, detalj av tredje part, mode <b>%sRevenues-Expenses%s</b> sa <b>redovisning enligt kontantmetoden.</b>
 SeeReportInInputOutputMode=Se rapporten <b>%sIncomes-Expenses%s</b> sa <b>kontanter står</b> för en beräkning på faktiska betalningar
 SeeReportInDueDebtMode=Se rapporten <b>%sClaims-Debts%s</b> sa <b>åtagande står</b> för en beräkning på utfärdade fakturor
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
 RulesResultDue=- Belopp som anges är med alla skatter inkluderade <br> - Det omfattar utestående fakturor, utlägg och mervärdesskatt oavsett om de betalas eller inte. <br> - Den bygger på validering datum för fakturor och moms och på förfallodagen för kostnader.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Den innehåller de verkliga utbetalningarna på fakturor, kostnader och moms. <br> - Den bygger på datum för fakturor, kostnader och moms betalning.
 RulesCADue=- Det omfattar kundens förfallna fakturor oavsett om de betalas eller inte. <br> - Den bygger på valideringen dagen för dessa fakturor. <br>
 RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder. <br> - Den bygger på betalningsdagen för dessa fakturor <br>
 DepositsAreNotIncluded=- Deposit fakturor eller ingår
 DepositsAreIncluded=- Deposit fakturor ingår
 LT2ReportByCustomersInInputOutputModeES=Rapport från tredje part IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByCustomersInInputOutputModeES=Rapport från tredje part RE
+VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas
+VATReportByCustomersInDueDebtMode=Rapport av kunden moms samlas och betalas
+VATReportByQuartersInInputOutputMode=Rapport från graden av mervärdesskatten och en betald
+LT1ReportByQuartersInInputOutputMode=Rapport från RE hastighet
+LT2ReportByQuartersInInputOutputMode=Betänkande av IRPF hastighet
+VATReportByQuartersInDueDebtMode=Rapport från graden av mervärdesskatten och en betald
+LT1ReportByQuartersInDueDebtMode=Rapport från RE hastighet
+LT2ReportByQuartersInDueDebtMode=Betänkande av IRPF hastighet
 SeeVATReportInInputOutputMode=Se rapporten <b>%sVAT encasement%s</b> en vanlig beräkning
 SeeVATReportInDueDebtMode=Se rapporten <b>%sVAT om flow%s</b> för en beräkning med en option på flödet
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- För tjänster innehåller rapporten de momsregler som faktiskt mottagits eller utfärdats på grundval av betalningsdagen.
 RulesVATInProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor på grundval av fakturadatum.
 RulesVATDueServices=- För tjänster inkluderar redovisa moms fakturor på grund, har betalats eller inte, baserat på fakturadatum.
 RulesVATDueProducts=- För materiella tillgångar, innehåller den för mervärdesskatt fakturor, baserat på fakturadatum.
@@ -178,33 +178,29 @@ CodeNotDef=Inte definierad
 AddRemind=Dispatch tillgängliga beloppet
 RemainToDivide= Återstår att sända:
 WarningDepositsNotIncluded=Insättningar fakturor ingår inte i denna version med denna redovisning modul.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
+DatePaymentTermCantBeLowerThanObjectDate=Betalning sikt datum kan inte vara lägre än objektdatum.
 Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+Pcg_type=Pcg typ
+Pcg_subtype=Pcg subtyp
+InvoiceLinesToDispatch=Faktura linjer avsändandet
+InvoiceDispatched=Skickas fakturor
+AccountancyDashboard=Bokförings sammandrag
+ByProductsAndServices=Genom produkter och tjänster
+RefExt=Extern ref
+ToCreateAPredefinedInvoice=För att skapa en fördefinierad faktura, skapa en standard faktura då, utan att validera den, klicka på knappen "Konvertera till fördefinierad faktura".
+LinkedOrder=Länk för att beställa
+ReCalculate=Räkna
+Mode1=Metod 1
+Mode2=Metod 2
+CalculationRuleDesc=För att beräkna den totala mervärdesskatt, finns det två metoder: <br> Metod 1 är avrundning moms på varje rad, sedan summera dem. <br> Metod 2 är summera all moms på varje rad, sedan avrundning resultatet. <br> Slutresultat kan skiljer sig från några cent. Standardläget är <b>läget% s.</b>
+CalculationRuleDescSupplier=enligt leverantör, väljer lämplig metod att tillämpa samma beräkningsregel och få samma resultat som förväntas av din leverantör.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> läge (se inställning av bokföring modul).
+CalculationMode=Beräkning läge
+AccountancyJournal=Bokförings kod tidskrift
+ACCOUNTING_VAT_ACCOUNT=Standard bokföring kod för uppbörden av moms
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard bokföring kod för att betala moms
+ACCOUNTING_ACCOUNT_CUSTOMER=Bokföring kod som standard för kund thirdparties
+ACCOUNTING_ACCOUNT_SUPPLIER=Bokföring kod som standard för leverantörs thirdparties
+CloneTax=Klona en social avgift
+ConfirmCloneTax=Bekräfta klon av en social bidrag
+CloneTaxForNextMonth=Klona det för nästa månad
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index f011f836ba8..0d5b012104f 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Kontrakt område
 ListOfContracts=Förteckning över avtal
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Senaste %s modifierade kontrakt
 AllContracts=Alla kontrakt
 ContractCard=Kontrakt kort
 ContractStatus=Kontrakt status
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Förteckning över löpande kontrakt linjer
 ListOfRunningServices=Förteckning över löpande tjänster
 NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt)
 BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Senaste %s aktiverade tjänster
 LastModifiedServices=Senast %s uppdaterade tjänster
 EditServiceLine=Redigera servicelinjen
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Förteckning över tjänster som löper ut
 NoteListOfYourExpiredServices=Denna förteckning omfattar endast tjänster från avtal med tredje part i förhållande till vilka du är säljare.
 StandardContractsTemplate=Standardkontrakt mall
 ContactNameAndSignature=För %s, namn och underskrift:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Säljare som tecknar avtal
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 75eaafb3990..cf4ed34e6ae 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=På Unix-miljö bör du använda crontab för att köra
 CronExplainHowToRunWin=På Microsoft (tm) Windows environement kan du använda schemalagd aktivitet verktyg för att köra kommandoraden varje minuter
 # Menu
 CronJobs=Schemalagda jobb
-CronListActive=List of active/scheduled jobs
+CronListActive=Lista över aktiva / schemalagda jobb
 CronListInactive=Lista över handikappade jobb
 # Page list
 CronDateLastRun=Senaste körning
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index 2e0f351d082..a66b54ae5af 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Donation mottagaren
 ThankYou=Tack
 IConfirmDonationReception=Mottagaren förklarar mottagning, som en donation, av följande belopp
 MinimumAmount=Minsta belopp är% s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Fri text för att visa i sidfoten
+FrenchOptions=Alternativ för Frankrike
+DONATION_ART200=Visar artikel 200 från CGI om du är orolig
+DONATION_ART238=Visar artikel 238 från CGI om du är orolig
+DONATION_ART885=Visar artikel 885 från CGI om du är orolig
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 230f6f74889..e05970fa6f1 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu koppla
 ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
 ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index e511fc6c590..5cbc416231e 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Importeras dataset
 SelectExportDataSet=Välj uppsättning data du vill exportera ...
 SelectImportDataSet=Välj uppsättning data du vill importera ...
 SelectExportFields=Välj fält du vill exportera, eller välj en fördefinierad export profil
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Välj fil fält du vill importera och deras mål fält i databasen genom att flytta dem upp och ner med ankar %s, eller välj en fördefinierad importprofil:
 NotImportedFields=Fält av källfil importeras inte
 SaveExportModel=Spara den här exportera profilen om du tänker återanvända det senare ...
 SaveImportModel=Spara denna import profil om du planerar att återanvända den senare ...
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Välj filformat som ska användas som importera filfo
 ChooseFileToImport=Ladda upp filer klicka sedan på Picto %s för att välja fil som källa importera filen ...
 SourceFileFormat=Källa filformat
 FieldsInSourceFile=Fält i källfilen
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Target fält i Dolibarr databas (fetstil = obligatorisk)
 Field=Fält
 NoFields=Inga fält
 MoveField=Flytta fält %s kolumn nummer
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Importera inte första raden i källfilen
 NbOfSourceLines=Antal rader i källfilen
 NowClickToTestTheImport=Kontrollera importera parametrar som du har definierat. Om de är korrekta, klicka på knappen <b>&quot;%s&quot;</b> för att starta en simulering av importprocessen (inga data kommer att ändras i databasen, det är bara en simulering för tillfället) ...
 RunSimulateImportFile=Starta import simulering
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Detta fält kräver data från källfilen
 SomeMandatoryFieldHaveNoSource=Vissa obligatoriska fält inte har någon källa från datafil
 InformationOnSourceFile=Information om källfil
 InformationOnTargetTables=Information om mål fält
@@ -102,33 +102,33 @@ NbOfLinesImported=Antal rader importerades: <b>%s.</b>
 DataComeFromNoWhere=Värde att infoga kommer från ingenstans i källfilen.
 DataComeFromFileFieldNb=Värde att infoga kommer från nummer <b>%s</b> fältet i källfilen.
 DataComeFromIdFoundFromRef=Värde som kommer från flera <b>%s</b> på källfil kommer att användas för att hitta ID förälder motsätta sig att använda (Så objet <b>%s</b> som har ref. Från källfilen måste finns i Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Kod som kommer från <b>fältnummer %s</b> av källfilen kommer att användas för att hitta id ordnade objekt för att använda (Så koden från källfilen måste existerar i <b>ordlistan %s).</b> Observera att om du vet id, kan du även använda den till källfilen istället för kod. Importera bör arbeta i båda fallen.
 DataIsInsertedInto=Uppgifter från källfilen kommer att införas i följande område:
 DataIDSourceIsInsertedInto=ID på överordnat objekt hittas med hjälp av data i källfilen kommer att införas i följande område:
 DataCodeIDSourceIsInsertedInto=Id av förälder linje hittades från kod, kommer att införas i följande fält:
 SourceRequired=Data värde är obligatoriskt
 SourceExample=Exempel på möjliga datavärde
 ExampleAnyRefFoundIntoElement=Varje ref för element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Varje kod (eller id) fann i <b>ordlistan% s</b>
 CSVFormatDesc=<b>Semikolonavgränsade</b> filformat (. Csv). <br> Detta är en text filformat där separeras fält av separator [%s]. Om separator finns inuti ett fält innehållet är området rundad med rund karaktär [%s]. Escape karaktär att fly rund karaktär är [%s].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
+Excel95FormatDesc=<b>Excel-format</b> (.xls) <br> Detta är Excel 95-format (BIFF5).
+Excel2007FormatDesc=<b>Excel-format</b> (.xlsx) <br> Detta är Excel 2007-format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separerad Värde</b> filformat (.tsv) <br> Detta är en textfil format där fälten skiljs åt av en tabulator [flik].
+ExportFieldAutomaticallyAdded=<b>Fält %s</b> lades automatiskt. Den kommer att undvika dig att ha liknande linjer som ska behandlas som dubbla poster (med det här fältet till, kommer alla linjer äga sin egen id och kan skilja).
 CsvOptions=Csv alternativ
 Separator=Avdelare
-Enclosure=Enclosure
+Enclosure=Inneslutning
 SuppliersProducts=Levedrantörsprodukter
 BankCode=Bankkod
 DeskCode=Reception kod
 BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nyckel
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+SpecialCode=Specialkod
+ExportStringFilter=%% Tillåter ersätta ett eller flera tecken i texten
+ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD: filter efter ett år / månad / dag <br> ÅÅÅÅ + ÅÅÅÅ, ÅÅÅÅMM + ÅÅÅÅMM, ÅÅÅÅMMDD + ÅÅÅÅMMDD: filter över en rad år / månader / dagar <br> > ÅÅÅÅ,> ÅÅÅÅMM,> ÅÅÅÅMMDD: filter på alla följande år / månader / dagar <br> <ÅÅÅÅ, <ÅÅÅÅMM, <ÅÅÅÅMMDD: filter på alla tidigare år / månader / dagar
+ExportNumericFilter='NNNNN "filter med en värde <br> 'NNNNN + NNNNN' filter över ett intervall av värden <br> "> NNNNN" filter med lägre värden <br> "> NNNNN" filter med högre värden
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=Om du vill filtrera på vissa värderingar, fyll i ingångsvärden här.
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Filtrerad fält
+FilteredFieldsValues=Värde för filter
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
index c912ae72dd0..e8162ce8502 100644
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ b/htdocs/langs/sv_SE/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Setup länk till extern webbplats
 ExternalSiteURL=Extern webbplats URL
 ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Min meny posten
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index b97e7592c6a..425f3245245 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
 Interventions=Insatser
 InterventionCard=Intervention kort
 NewIntervention=Nya insatser
-AddIntervention=Create intervention
+AddIntervention=Skapa ingripande
 ListOfInterventions=Förteckning över åtgärder
 EditIntervention=Redigera ingripande
 ActionsOnFicheInter=Åtgärder för ingripande
@@ -23,22 +23,22 @@ ConfirmDeleteInterventionLine=Är du säker på att du vill ta bort detta ingrip
 NameAndSignatureOfInternalContact=Namn och underskrift ingripa:
 NameAndSignatureOfExternalContact=Namn och underskrift av kund:
 DocumentModelStandard=Standarddokument modell för insatser
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionCardsAndInterventionLines=Ingrepp och linjer av interventioner
+InterventionClassifyBilled=Klassificera "Fakturerad"
+InterventionClassifyUnBilled=Classify "ofakturerade"
 StatusInterInvoiced=Fakturerade
 RelatedInterventions=Insatserna
 ShowIntervention=Visar ingripande
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+SendInterventionRef=Inlämning av ingrepp %s
+SendInterventionByMail=Skicka ingripa Email
+InterventionCreatedInDolibarr=Ingrepp %s skapad
+InterventionValidatedInDolibarr=Ingrepp %s validerade
+InterventionModifiedInDolibarr=Ingrepp %s modifierade
+InterventionClassifiedBilledInDolibarr=Ingrepp %s uppsättning som faktureras
+InterventionClassifiedUnbilledInDolibarr=Ingrepp %s uppsättning som ofakturerade
+InterventionSentByEMail=Ingrepp %s skickas via e-post
+InterventionDeletedInDolibarr=Ingrepp %s raderad
+SearchAnIntervention=Sök en intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Representanten uppföljning ingripande
 TypeContact_fichinter_internal_INTERVENING=Ingripa
@@ -49,5 +49,5 @@ ArcticNumRefModelDesc1=Generic nummer modell
 ArcticNumRefModelError=Misslyckades med att aktivera
 PacificNumRefModelDesc1=Återgå numero med format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan avbrott och ingen återgång till 0
 PacificNumRefModelError=En intervention kort börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul.
-PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Trycksaker på interventionskort
+PrintProductsOnFichinterDetails=forinterventions genereras från order
diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
index caea335f633..fe63de5bc39 100644
--- a/htdocs/langs/sv_SE/ldap.lang
+++ b/htdocs/langs/sv_SE/ldap.lang
@@ -25,5 +25,5 @@ UserSynchronized=Användare synkroniseras
 GroupSynchronized=Grupp synkroniseras
 MemberSynchronized=Medlem synkroniseras
 ContactSynchronized=Kontakta synkroniseras
-ForceSynchronize=Force synkronisera Dolibarr -> LDAP
+ForceSynchronize=Tvinga synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Misslyckades med att läsa LDAP-databas. Kontrollera LDAP-modul setup och databas tillgänglighet.
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 5837916e0aa..73f612bb83f 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -15,10 +15,10 @@ MailReply=Svara
 MailTo=Mottagare (s)
 MailCC=Kopiera till
 MailCCC=Cachad kopia till
-MailTopic=EMail ämne
+MailTopic=E-post ämne
 MailText=Meddelande
 MailFile=Bifogade filer
-MailMessage=EMail kropp
+MailMessage=E-post huvuddel
 ShowEMailing=Visa e-post
 ListOfEMailings=Lista över emailings
 NewMailing=Ny e-post
@@ -43,20 +43,20 @@ MailingStatusSentCompletely=Skickade helt
 MailingStatusError=Fel
 MailingStatusNotSent=Skickas inte
 MailSuccessfulySent=E-post skickad (från %s till %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
+MailingSuccessfullyValidated=E-post validerades
+MailUnsubcribe=Avanmälan
+Unsuscribe=Avanmälan
+MailingStatusNotContact=Kontakta inte längre
 ErrorMailRecipientIsEmpty=E-postmottagare är tom
 WarningNoEMailsAdded=Inga nya E-posta lägga till mottagarens lista.
 ConfirmValidMailing=Är du säker på att du vill godkänna denna e-post?
-ConfirmResetMailing=Varning, genom reinitializing skicka e-post <b>%s,</b> kan du göra en massa utskick av detta e-postmeddelande annan gång. Är du säker på att du detta är vad du vill göra?
+ConfirmResetMailing=Varning, genom att återinitialisera e-post <b>%s,</b> kan du göra en massa utskick av detta e-postmeddelande en annan gång. Är du säker på att detta är vad du vill göra?
 ConfirmDeleteMailing=Är du säker på att du vill ta bort denna emailling?
 NbOfRecipients=Antal mottagare
-NbOfUniqueEMails=Nb av unika e-post
-NbOfEMails=Nb av e-post
+NbOfUniqueEMails=Antal av unika e-post
+NbOfEMails=Antal e-post
 TotalNbOfDistinctRecipients=Antal skilda mottagare
-NoTargetYet=Inga stödmottagare ännu (Gå på fliken &quot;mottagare&quot;)
+NoTargetYet=Inga stödmottagare ännu (Gå på fliken "mottagare" )
 AddRecipients=Lägg till mottagare
 RemoveRecipient=Ta bort mottagare
 CommonSubstitutions=Vanliga substitutioner
@@ -67,37 +67,37 @@ NoAttachedFiles=Inga bifogade filer
 BadEMail=Dåligt värde för e-post
 CloneEMailing=Klon Email
 ConfirmCloneEMailing=Är du säker på att du vill klona denna e-post?
-CloneContent=Klon meddelande
+CloneContent=Klona meddelande
 CloneReceivers=Cloner mottagare
 DateLastSend=Datum för senaste sändning
 DateSending=Datum skicka
 SentTo=Skickat till <b>%s</b>
 MailingStatusRead=Läsa
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
-MailtoEMail=Hyper link to email
-ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
-XTargetsAdded=<b>%s</b> recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+CheckRead=Läs Kvitto
+YourMailUnsubcribeOK=<b>E-post %s</b> är korrekt avbeställt från sändlistan
+MailtoEMail=Hyper länk till e-post
+ActivateCheckRead=Låt använd länken "Unsubcribe"
+ActivateCheckReadKey=Key bruk för att kryptera URL användning för "Läs Kvitto" och "Unsubcribe" -funktionen
+EMailSentToNRecipients=EMail skickas till% s mottagare.
+XTargetsAdded=<b>% s</b> mottagare läggs in i målet listan
+EachInvoiceWillBeAttachedToEmail=Ett dokument med standardfakturadokumentmall kommer att skapas och bifogas varje e-postmeddelande.
+MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura% s (% s)
+SendRemind=Skicka påminnelse av e-post
+RemindSent=% S påminnelse (er) skickas
+AllRecipientSelectedForRemind=Alla thirdparties väljs och om ett e-post sätts (observera att en post per faktura skickas)
+NoRemindSent=Ingen EMail påminnelse
+ResultOfMassSending=Resultat av massa e påminnelser skicka
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=Kontakter av alla tredje parter (kund, prospekt, leverantör, ...)
 MailingModuleDescDolibarrUsers=Alla Dolibarr användare med e-post
 MailingModuleDescFundationMembers=Stiftelsen medlemmar med e-post
 MailingModuleDescEmailsFromFile=E-post från en textfil (email, namn, efternamn, kommentarer)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
+MailingModuleDescEmailsFromUser=E-post från användarens input (email, efternamn, förnamn, andra)
 MailingModuleDescContactsCategories=Tredje part med e-post (per kategori)
 MailingModuleDescDolibarrContractsLinesExpired=Tredje part med utgångna avtalets linjer
 MailingModuleDescContactsByCompanyCategory=Kontakter med tredje part (av tredje part kategori)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
+MailingModuleDescContactsByCategory=Kontakter / adresser från tredje part efter kategori
 MailingModuleDescMembersCategories=Foundation medlemmar (per kategori)
 MailingModuleDescContactsByFunction=Kontakter från tredje part (i position / funktion)
 LineInFile=Line %s i filen
@@ -112,30 +112,30 @@ SearchAMailing=Sök utskick
 SendMailing=Skicka e-post
 SendMail=Skicka e-post
 SentBy=Skickat av
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Av säkerhetsskäl, skicka ett email är bättre när de utförs från kommandoraden. Om du har en, be din serveradministratör för att lansera följande kommando för att skicka e-post till alla mottagare:
 MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+ConfirmSendingEmailing=Om du inte kan eller föredrar att skicka dem med din webbläsare, bekräfta att du är säker på att du vill skicka e-post nu från din webbläsare?
+LimitSendingEmailing=Obs: Sänder av email från webbgränssnitt sker i flera gånger för säkerhets- och timeout <b>skäl,% s</b> mottagare i taget för varje sändning session.
 TargetsReset=Rensa lista
 ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post
 ToAddRecipientsChooseHere=Lägg till mottagare genom att välja från listorna
 NbOfEMailingsReceived=Massa emailings fått
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Massemail skickas
 IdRecord=ID rekord
 DeliveryReceipt=Leveranskvitto
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan använda <b>kommateckenavgränsare</b> att ange flera mottagare.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+TagCheckMail=Spår post öppning
+TagUnsubscribe=Avanmälan länk
+TagSignature=Signatur sändande användarens
+TagMailtoEmail=Mottagarens EMail
 # Module Notifications
 Notifications=Anmälningar
 NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
 ANotificationsWillBeSent=En anmälan kommer att skickas via e-post
 SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Aktivera ett nytt mål e-postmeddelande
+ListOfActiveNotifications=Lista alla aktiva mål för e-postmeddelanden
 ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
+MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
+MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index a14984c379e..facd4e8651d 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -290,8 +290,8 @@ UnitPrice=Pris per enhet
 UnitPriceHT=Pris per enhet (netto)
 UnitPriceTTC=Pris per enhet
 PriceU=Styckpris
-PriceUHT=Styckpris (netto)
-PriceUTTC=Styckpris
+PriceUHT=St.pris(net)
+PriceUTTC=St.pris
 Amount=Belopp
 AmountInvoice=Fakturabelopp
 AmountPayment=Betalningsbelopp
@@ -367,7 +367,7 @@ ActionsOnCompany=Åtgärder om denna tredje part
 ActionsOnMember=Händelser om denna medlem
 NActions=%s åtgärder
 NActionsLate=%s sent
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Begär redan registrerats
 Filter=Filter
 RemoveFilter=Ta bort filtret
 ChartGenerated=Diagram genererat
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 2579ca249f1..82c57619fd6 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -8,7 +8,7 @@ MarginOnServices=Marginal / Tjänster
 MarginRate=Marginalsats
 MarkRate=Markera sats
 DisplayMarginRates=Visa marginalsatser
-DisplayMarkRates=Display mark rates
+DisplayMarkRates=Display markera hastigheter
 InputPrice=Inpris
 margin=Hantering av vinstmarginaler
 margesSetup=Inställningar för vinstmarginalhantering
@@ -23,22 +23,22 @@ StartDate=Startdatum
 EndDate=Slutdatum
 Launch=Start
 ForceBuyingPriceIfNull=Tvinga inköpspris om tom
-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=Om "ON", kommer marginalen att vara noll på linjen (köp pris = försäljningspris), annars ("OFF"), marge kommer vara lika med försäljningspris (köp pris = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Marginalmetod för globala rabatter
 UseDiscountAsProduct=Som produkt
 UseDiscountAsService=Som tjänst
 UseDiscountOnTotal=På delsumma
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definierar om en global rabatt behandlas som en produkt, en tjänst, eller bara på delsumman för beräkning marginal.
 MARGIN_TYPE=Typ av marginal
 MargeBrute=Bruttomarginal
 MargeNette=Nettomarginal
 MARGIN_TYPE_DETAILS=Bruttomarginal: Säljpris - Inköpspris<br/>Nettomarginal: Säljpris - Kostnadspris
 CostPrice=Kostnadspris
 BuyingCost=Kostnadspris
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+UnitCharges=Enhetsladdningar
+Charges=Avgifter
+AgentContactType=Handelsagent kontakttyp
+AgentContactTypeDetails=Definiera vad kontakttyp (länkad på fakturor) kommer att användas för marginalrapport per försäljning representant
+rateMustBeNumeric=Betyg måste vara ett numeriskt värde
+markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
+ShowMarginInfos=Visa marginal information
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 6110d5aa422..1fcf12f9f2b 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Medlemmar på sort
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang
index c5403b5cff7..97ea739efce 100644
--- a/htdocs/langs/sv_SE/opensurvey.lang
+++ b/htdocs/langs/sv_SE/opensurvey.lang
@@ -5,27 +5,27 @@ OrganizeYourMeetingEasily=Organisera dina möten och enkäter lätt. Först väl
 NewSurvey=Ny enkät
 NoSurveysInDatabase=%s enkät (er) i databasen.
 OpenSurveyArea=Enkät område
-AddACommentForPoll=You can add a comment into poll...
+AddACommentForPoll=Du kan lägga till en kommentar till enkät ...
 AddComment=Lägg till kommentar
 CreatePoll=Skapa enkät
 PollTitle=Enkät titel
-ToReceiveEMailForEachVote=Receive an email for each vote
+ToReceiveEMailForEachVote=Få ett mail för varje omröstning
 TypeDate=Typ Datum
 TypeClassic=Typ standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Välj datum amoung de fria dagarna (grå). De utvalda dagar är gröna. Du kan avmarkera en dag tidigare valts genom att klicka igen på det
 RemoveAllDays=Ta bort alla dagar
 CopyHoursOfFirstDay=Kopiera timmar av första dagen
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
+RemoveAllHours=Ta bort alla timmar
+SelectedDays=Valda dagar
+TheBestChoice=Det bästa valet för närvarande är
+TheBestChoices=De bästa valen för närvarande
 with=med
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+OpenSurveyHowTo=Om du går med på att rösta i den här omröstningen, måste du ge ditt namn väljer de värden som passar bäst för dig och bekräfta med plusknappen i slutet av raden.
+CommentsOfVoters=Kommentarer väljare
+ConfirmRemovalOfPoll=Är du säker på att du vill ta bort den här omröstningen (och alla röster)
 RemovePoll=Radera enkäten
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+UrlForSurvey=URL för att kommunicera för att få direkt tillgång till poll
+PollOnChoice=Du skapar en omröstning för att göra en multi-val för en omröstning. Först in alla möjliga val för din enkät:
 CreateSurveyDate=Skapa en datum enkät
 CreateSurveyStandard=Skapa en vanlig enkät
 CheckBox=Enkel checkbox
@@ -33,34 +33,34 @@ YesNoList=List (tom/ja/nej)
 PourContreList=Lista (tom/för/emot)
 AddNewColumn=Lägg till ny kolumn
 TitleChoice=Val av etikett
-ExportSpreadsheet=Export result spreadsheet
+ExportSpreadsheet=Export resultat kalkylblad
 ExpireDate=Begränsa datum
 NbOfSurveys=Antal enkäter
 NbOfVoters=Antal av väljarna
 SurveyResults=Resultat
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Abstention=Abstention
+PollAdminDesc=Det är tillåtet att ändra alla tycker linjer här omröstningen med knappen "Edit". Du kan, liksom, ta bort en kolumn eller en rad med% s. Du kan också lägga till en ny kolumn med% s.
+5MoreChoices=5 fler alternativ
+Abstention=Avhållsamhet
 Against=Mot
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
+YouAreInivitedToVote=Du är inbjuden att rösta på den här omröstningen
+VoteNameAlreadyExists=Detta namn används redan för den här omröstningen
+ErrorPollDoesNotExists=Fel, inte <strong>enkät% s</strong> inte existerar.
 OpenSurveyNothingToSetup=Det finns ingen specifik inställning att göra.
-PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
+PollWillExpire=Din enkät förfaller <strong>automatiskt% s</strong> dagar efter den sista dagen för din enkät.
 AddADate=Lägg till ett datum
 AddStartHour=Lägg till start tid
 AddEndHour=Lägg till slut tid
 votes=röst (er)
-NoCommentYet=No comments have been posted for this poll yet
-CanEditVotes=Can change vote of others
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+NoCommentYet=Inga kommentarer har lagts till den här omröstningen ännu
+CanEditVotes=Kan ändra röst andras
+CanComment=Väljarna kan kommentera i omröstningen
+CanSeeOthersVote=Väljarna kan se andra människors röst
+SelectDayDesc=För varje vald dag kan du välja, eller inte, mötes timmar i följande format: <br> - Tom, <br> - "8h", "8H" eller "08:00" för att ge ett möte start timme, <br> - "8-11", "8h-11h", "8H-11H" eller "8: 00-11: 00" för att ge en mötets början och slut timme, <br> - "8h15-11h15", "8H15-11H15" eller "8: 15-11: 15" för samma sak men med några minuter.
+BackToCurrentMonth=Tillbaka till aktuella månaden
+ErrorOpenSurveyFillFirstSection=Du har inte fyllt den första sektionen av röstningen skapande
 ErrorOpenSurveyOneChoice=Ange minst ett val
 ErrorOpenSurveyDateFormat=Datum måste ha formatet ÅÅÅÅ-MM-DD
 ErrorInsertingComment=Det uppstod ett fel när du skapa din kommentar
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The voting time of this poll has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+MoreChoices=Ange fler alternativ för väljarna
+SurveyExpiredInfo=Den omröstningen i denna enkät har gått ut.
+EmailSomeoneVoted=% S har fyllt en rad. Du kan hitta din enkät på länken:% s
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 43df2e39b0b..ad1112357ea 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=En sändning föreligger
 DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas
 DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas
 MenuOrdersToBill=Order till faktura
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Fakturerbara order
 SearchOrder=Sök ordning
 SearchACustomerOrder=Sök en kundorder
 ShipProduct=Ship produkt
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index ab030a8c9ac..326d05f3b36 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -5,7 +5,7 @@ Tools=Verktyg
 ToolsDesc=Detta område är avsedd för gruppen diverse verktyg som inte finns i andra menyposter. <br><br> Dessa verktyg kan nås från menyn på sidan.
 Birthday=Födelsedag
 BirthdayDate=Födelsedag
-DateToBirth=Datum för födelse
+DateToBirth=Födelsedatum
 BirthdayAlertOn= födelsedag alert aktiva
 BirthdayAlertOff= födelsedag alert inaktiv
 Notify_FICHINTER_VALIDATE=Intervention validerade
@@ -55,11 +55,11 @@ AttachANewFile=Bifoga en ny fil / dokument
 LinkedObject=Länkat objekt
 Miscellaneous=Diverse
 NbOfActiveNotifications=Antal anmälningar
-PredefinedMailTest=Detta är en test post. \\ NDet två linjerna är åtskilda av en vagnretur.
+PredefinedMailTest=Detta är en test post. \nDet två linjerna är åtskilda av en vagnretur.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Detta är en <b>test</b> post (ordet Provningen skall i fetstil). <br> De två linjerna är åtskilda av en vagnretur.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Här hittar du det kommersiella förslaget __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
@@ -203,26 +203,26 @@ ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta ma
 
 ##### Calendar common #####
 AddCalendarEntry=Lägg till post i kalendern %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Företag %s tillsatt
+ContractValidatedInDolibarr=Kontrakt %s validerade
+ContractCanceledInDolibarr=Kontrakt %s annulleras
+ContractClosedInDolibarr=Kontrakt %s stängd
+PropalClosedSignedInDolibarr=Förslag %s undertecknade
+PropalClosedRefusedInDolibarr=Förslag %s vägrade
+PropalValidatedInDolibarr=Förslag %s validerade
+PropalClassifiedBilledInDolibarr=Förslag %s klassificerad faktureras
+InvoiceValidatedInDolibarr=Faktura %s validerade
+InvoicePaidInDolibarr=Faktura %s ändrades till betald
+InvoiceCanceledInDolibarr=Faktura %s annulleras
+PaymentDoneInDolibarr=Betalning %s klar
+CustomerPaymentDoneInDolibarr=Kundbetalning %s klar
+SupplierPaymentDoneInDolibarr=Leverantör betalning %s klar
+MemberValidatedInDolibarr=Medlem %s validerade
+MemberResiliatedInDolibarr=Medlem %s resiliated
+MemberDeletedInDolibarr=Medlem %s raderad
+MemberSubscriptionAddedInDolibarr=Teckning av medlem %s tillades
+ShipmentValidatedInDolibarr=Frakten %s validerad
+ShipmentDeletedInDolibarr=Frakten %s raderad
 ##### Export #####
 Export=Exportera
 ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
index af4eacf9828..bbef3fa717e 100644
--- a/htdocs/langs/sv_SE/paybox.lang
+++ b/htdocs/langs/sv_SE/paybox.lang
@@ -32,9 +32,9 @@ VendorName=Namn på leverantör
 CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort
 MessageOK=Meddelande på validerade betalning återvänder sida
 MessageKO=Meddelande om avbokning betalning återvänder sida
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+NewPayboxPaymentReceived=Ny Paybox betalning mottagen
+NewPayboxPaymentFailed=Ny Paybox betalnings försök men misslyckats
+PAYBOX_PAYONLINE_SENDEMAIL=EMail varnar efter en betalning (lyckade eller misslyckade)
+PAYBOX_PBX_SITE=Värde för PBX SITE
+PAYBOX_PBX_RANG=Värde för PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Värde för PBX-ID
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index d0d98e3e1f9..d9456de8b17 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Produkter och tjänster statistik
 ProductsStatistics=Produkter statistik
 ProductsOnSell=Tillgängliga produkter
 ProductsNotOnSell=Föråldrade produkter
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Produkter inte till salu eller köp
 ServicesOnSell=Tillgängliga tjänster
 ServicesNotOnSell=Föråldrade tjänster
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Tjänster som inte till salu eller köp
 InternalRef=Intern hänvisning
 LastRecorded=Senaste produkter / tjänster att sälja in
 LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster
@@ -72,20 +72,20 @@ PublicPrice=Offentliga pris
 CurrentPrice=Nuvarande pris
 NewPrice=Nytt pris
 MinPrice=Halvnot. försäljningspris
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minim. försäljningspris (netto efter skatt)
+MinPriceTTC=Minim. försäljningspris (inkl. moms)
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatus=Kontrakt status
 ContractStatusClosed=Stängt
 ContractStatusRunning=Running
 ContractStatusExpired=löpt ut
 ContractStatusOnHold=Inte kör
-ContractStatusToRun=To get running
+ContractStatusToRun=För att få igång
 ContractNotRunning=Detta kontrakt är inte igång
 ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan.
 ErrorProductBadRefOrLabel=Felaktigt värde för referens eller etikett.
 ErrorProductClone=Ett problem uppstod vid kloning av produkten eller tjänsten.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Fel Pris Kan inte vara lägre än Lägsta pris.
 Suppliers=Leverantörer
 SupplierRef=Leverantör ref.
 ShowProduct=Visa produkt
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet:
 MultiPricesAbility=Flera prisnivåer per produkt eller tjänst
 MultiPricesNumPrices=Antal pris
 MultiPriceLevelsName=Pris kategorier
-AssociatedProductsAbility=Aktivera biprodukter
-AssociatedProducts=Biprodukter
-AssociatedProductsNumber=Antal produkter komponera denna produkt
-ParentProductsNumber=Antal förälder produkt
-IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte en virtuell produkt
-IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte använd i någon virtuell produkt
+AssociatedProductsAbility=Aktivera virtuellt paket funktionen
+AssociatedProducts=Paket produkt
+AssociatedProductsNumber=Antal produkter komponera denna virtuellt paket produkt
+ParentProductsNumber=Antal förälder förpackningsartikel
+IfZeroItIsNotAVirtualProduct=Om 0 är denna produkt inte ett virtuellt paket produkt
+IfZeroItIsNotUsedByVirtualProduct=Om 0 är denna produkt inte används av någon virtuellt paket produkt
 EditAssociate=Associate
 Translation=Översättning
 KeywordFilter=Nyckelord filter
@@ -132,7 +132,7 @@ AddDel=Lägg till / Ta bort
 Quantity=Kvantitet
 NoMatchFound=Ingen matchning hittades
 ProductAssociationList=Lista över relaterade produkter / tjänster: namn på produkten / tjänsten (kvantitet påverkas)
-ProductParentList=Förteckning över produkter och tjänster med denna produkt som en komponent
+ProductParentList=Lista över paket produkter / tjänster med denna produkt som en komponent
 ErrorAssociationIsFatherOfThis=Ett av valda produkten är förälder med nuvarande produkt
 DeleteProduct=Ta bort en produkt / tjänst
 ConfirmDeleteProduct=Är du säker på att du vill ta bort denna produkt / tjänst?
@@ -179,12 +179,12 @@ CloneProduct=Klon produkt eller tjänst
 ConfirmCloneProduct=Är du säker på att du vill klona produkt eller tjänst <b>%s?</b>
 CloneContentProduct=Klona alla viktiga informationer av produkt / tjänst
 ClonePricesProduct=Klona viktigaste informationer och priser
-CloneCompositionProduct=Klona virtuell produkt / tjänst
+CloneCompositionProduct=Klon förpackad produkt / tjänster
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
 CustomerPrices=Kunder priser
 SuppliersPrices=Leverantörer priser
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Leverantörer priser (av produkter eller tjänster)
 CustomCode=Tullkodex
 CountryOrigin=Ursprungsland
 HiddenIntoCombo=Dold i vissa utvalda listor
@@ -209,14 +209,14 @@ Build=Tillverka
 BuildIt=Tillverka och sänd
 BuildindListInfo=Tillgänglig mängd för tillverkning per lager (ställ till 0 för ingen åtgärd)
 QtyNeed=Antal
-UnitPmp=Net unit VWAP
-CostPmpHT=Net total VWAP
+UnitPmp=Netto enhet VWAP
+CostPmpHT=Totalt netto VWAP
 ProductUsedForBuild=Automatiskt förbrukad för tillverkning
 ProductBuilded=Tillverkning klar
 ProductsMultiPrice=Produkt multi-priser
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly VWAP
-ServiceSellByQuarterHT=Services turnover quarterly VWAP
+ProductsOrServiceMultiPrice=Kunder priser (av produkter eller tjänster, multi-priser)
+ProductSellByQuarterHT=Produkter omsättning kvartalsvis VWAP
+ServiceSellByQuarterHT=Tjänster omsättning kvartalsvis VWAP
 Quarter1=1:a kvartalet
 Quarter2=2:a kvartalet
 Quarter3=3:e kvartalet
@@ -240,5 +240,10 @@ PricingRule=Prisregler
 AddCustomerPrice=Lägg till pris per kund
 ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
 PriceByCustomerLog=Pris per kundlogg
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Minimipris kan inte vara lägre än %s
+MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index d5d0379b62f..b771cfecc0b 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. projekt
+ProjectId=Projekt Id
 Project=Projekt
 Projects=Projekt
 SharedProject=Alla
@@ -14,7 +14,7 @@ TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din använda
 Myprojects=Mina projekt
 ProjectsArea=Projekt område
 NewProject=Nytt projekt
-AddProject=Lägg till projektet
+AddProject=Skapa projekt
 DeleteAProject=Ta bort ett projekt
 DeleteATask=Ta bort en uppgift
 ConfirmDeleteAProject=Är du säker på att du vill ta bort detta projekt?
@@ -32,20 +32,22 @@ TimeSpent=Tid som tillbringas
 TimesSpent=Tid
 RefTask=Ref. uppgift
 LabelTask=Label uppgift
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+TaskTimeSpent=Tid som ägnas åt uppgifter
+TaskTimeUser=Användare
+TaskTimeNote=Anmärkning
+TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mina uppgifter
 Tasks=Uppgifter
 Task=Uppgift
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Uppgift startdatum
+TaskDateEnd=Uppgift slutdatum
+TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
-AddTask=Lägg till uppgift
+AddTask=Skapa uppgift
 AddDuration=Lägg varaktighet
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
@@ -54,8 +56,8 @@ MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 DurationEffective=Effektiv längd
 Progress=Framsteg
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Förklarades framsteg
+ProgressCalculated=Beräknat framsteg
 Time=Tid
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet
@@ -85,48 +87,48 @@ ActionsOnProject=Åtgärder för projektet
 YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt
 DeleteATimeSpent=Ta bort tid
 ConfirmDeleteATimeSpent=Är du säker på att du vill ta bort denna tid?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
+ShowMyTasksOnly=Visa bara aktiviteter för mig
 TaskRessourceLinks=Resurser
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Uppgift inte tilldelats dig
 ErrorTimeSpentIsEmpty=Tid är tom
 ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt <b>(%s</b> uppgifter på för tillfället) och alla ingångar för nedlagd tid.
 IfNeedToUseOhterObjectKeepEmpty=Om vissa objekt (faktura, order, ...), som tillhör en annan tredje part, måste kopplas till projektet för att skapa, hålla denna tomt för att få projektet att flera tredje part.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+CloneProject=Klon projekt
+CloneTasks=Klon uppgifter
+CloneContacts=Klon kontakter
+CloneNotes=Klon anteckningar
+CloneProjectFiles=Klon projekt fogade filer
+CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad)
+ConfirmCloneProject=Är du säker på att klona detta projekt?
+ProjectReportDate=Ändra uppgift datum enligt projektets startdatum
+ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
+ProjectsAndTasksLines=Projekt och uppdrag
+ProjectCreatedInDolibarr=Projekt %s skapad
+TaskCreatedInDolibarr=Uppgift %s skapad
+TaskModifiedInDolibarr=Uppgift %s modifierade
+TaskDeletedInDolibarr=Uppgift %s raderad
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektledare
 TypeContact_project_external_PROJECTLEADER=Projektledare
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Bidragsgivare
+TypeContact_project_external_PROJECTCONTRIBUTOR=Bidragsgivare
 TypeContact_project_task_internal_TASKEXECUTIVE=Uppgift verkställande
 TypeContact_project_task_external_TASKEXECUTIVE=Uppgift verkställande
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsgivare
+TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare
+SelectElement=Välj elementet
+AddElement=Länk till inslag
+UnlinkElement=Ta bort länk elementet
 # Documents models
 DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+PlannedWorkload = Planerad arbetsbelastning
+WorkloadOccupation= Arbetsbelastning affektation
+ProjectReferers=Med hänvisning objekt
+SearchAProject=Sök ett projekt
+ProjectMustBeValidatedFirst=Projekt måste valideras först
+ProjectDraft=Utkast projekt
+FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid
diff --git a/htdocs/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang
index d64075dfbf5..38588c87528 100644
--- a/htdocs/langs/sv_SE/resource.lang
+++ b/htdocs/langs/sv_SE/resource.lang
@@ -1,36 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resurser
+MenuResourceAdd=Ny resurs
+MenuResourcePlanning=Resursplanering
+DeleteResource=Radera resurs
+ConfirmDeleteResourceElement=Bekräfta radera resurs för detta element
+NoResourceInDatabase=Ingen resurs i databasen.
+NoResourceLinked=Ingen resurs kopplad
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Listan över resurser
+ResourceSingular=Resurs
+ResourceCard=Resurs kort
+AddResource=Skapa en resurs
+ResourceFormLabel_ref=Resursnamn
+ResourceType=Resurs typ
+ResourceFormLabel_description=Resursbeskrivning
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Resurser kopplade till elementet
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Visa resursplanering
+GotoDate=Gå till datum
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Element resurser
+ResourceCreatedWithSuccess=Resursen har skapats
+RessourceLineSuccessfullyDeleted=Resurslinje har tagits bort
+RessourceLineSuccessfullyUpdated=Resurs linje har uppdaterats
+ResourceLinkedWithSuccess=Resurs kopplat med framgång
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Resurs kort
+ConfirmDeleteResource=Bekräfta radera denna resurs
+RessourceSuccessfullyDeleted=Resurs tagits bort
+DictionaryResourceType=Typ av resurser
 
-DictionaryEMailTemplates=Modèles d'Emails
-
-SelectResource=Select resource
+SelectResource=Välj resurs
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 79bd2f814a7..5c4e735ad88 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans
 RelatedShippings=Relaterade sändningar
 ShipmentLine=Transport linje
 CarrierList=Lista över transportörer
-SendingRunning=Product from customer order already sent
-SuppliersReceiptRunning=Product from supplier order already received
+SendingRunning=Produkten från kundorder redan skickad
+SuppliersReceiptRunning=Produkten från leverantörs beställning redan mottaget
 
 # Sending methods
 SendingMethodCATCH=Fångst av kunden
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 33a5ae1a790..947f99a1ccd 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lagrets etikett krävs
 CorrectStock=Rätt lager
 ListOfWarehouses=Lista över lager
 ListOfStockMovements=Lista över lagerförändringar
-StocksArea=Warehouses area
+StocksArea=Lager område
 Location=Plats
 LocationSummary=Kortnamn plats
 NumberOfDifferentProducts=Antal olika produkter
@@ -94,13 +94,13 @@ DesiredStock=Önskat lager
 StockToBuy=Att beställa
 Replenishment=Påfyllning
 ReplenishmentOrders=Påfyllningsbeställningar
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=Enligt öka / minska aktieoptioner, fysiska lagret och virtuella lager (fysiska + aktuella beställningar) kan skilja
+UseVirtualStockByDefault=Använd virtuellt lager som standard, i stället för fysiska lager, för påfyllning funktion
 UseVirtualStock=Använd virtuellt lager
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
+UsePhysicalStock=Använd fysiskt lager
+CurentSelectionMode=Curent urvalsläget
 CurentlyUsingVirtualStock=Virtuell lager
-CurentlyUsingPhysicalStock=Physical stock
+CurentlyUsingPhysicalStock=Fysiskt lager
 RuleForStockReplenishment=Regel för påfyllning av lager
 SelectProductWithNotNullQty=Välj minst en produkt med antal skilt från noll samt leverantör
 AlertOnly= Endast larm
@@ -113,13 +113,13 @@ Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
 NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
 MassMovement=Massrörelse
-MassStockMovement=Mass stock movement
+MassStockMovement=Mass lager rörelse
 SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s".
 RecordMovement=Spela in överföring
 ReceivingForSameOrder=Godsmottagning för denna order
 StockMovementRecorded=Sparade lageröverföringar
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+RuleForStockAvailability=Regler om krav på lagerhållning
+StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura
+StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning
+StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten
 
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 1d0aac29844..712bdc678b6 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Leverantörer
 Supplier=Leverantör
-AddSupplier=Lägg till en leverantör
+AddSupplier=Skapa en leverantör
 SupplierRemoved=Leverantör bort
 SuppliersInvoice=Leverantörer faktura
 NewSupplier=Ny leverantör
@@ -12,8 +12,8 @@ OrderDate=Beställ datum
 BuyingPrice=BETALKURS
 BuyingPriceMin=Lägsta köpkurs
 BuyingPriceMinShort=Min köpkurs
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Totalt subprodukter köper priserna
+SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat
 AddSupplierPrice=Lägg leverantör pris
 ChangeSupplierPrice=Byta leverantör pris
 ErrorQtyTooLowForThisSupplier=Kvantitet för låg för denna leverantör eller något pris som anges på denna produkt för denna leverantör
@@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverantör
 Availability=Tillgänglighet
 ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer
 ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Leverantörs order och orderrader
 ApproveThisOrder=Godkänna denna ordning
 ConfirmApproveThisOrder=Är du säker på att du vill godkänna att <b>%s?</b>
 DenyingThisOrder=Att förneka denna beställning
@@ -39,6 +39,6 @@ AddSupplierOrder=Skapa leverantör för
 AddSupplierInvoice=Skapa leverantörsfaktura
 ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör <b>%s</b>
 NoneOrBatchFileNeverRan=Ingen eller parti <b>%s</b> sprang inte nyligen
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+SentToSuppliers=Skickas till leverantörer
+ListOfSupplierOrders=Lista över leverantörsorder
+MenuOrdersSupplierToBill=Leverantörs order att fakturera
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 638626eeab7..888f20ddd2d 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -4,7 +4,7 @@ Trips=Resor
 TripsAndExpenses=Resor och kostnader
 TripsAndExpensesStatistics=Resor och kostnader statistik
 TripCard=Trip-kort
-AddTrip=Lägg resa
+AddTrip=Skapa resa
 ListOfTrips=Förteckning över resor
 ListOfFees=Prislista för
 NewTrip=Ny resa
@@ -19,4 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=Förteckning över resor och kostnader
 ExpensesArea=Resor och kostnader område
 SearchATripAndExpense=Sök en resa och kostnader
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Klassificerad 'Återbetalas'
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 0220079b20d..34a10699b5c 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Användare %s funktionshindrade
 UserEnabled=Användare %s aktiverad
 UserDeleted=Användare %s bort
 NewGroupCreated=Grupp %s skapade
-GroupModified=Group %s modified
+GroupModified=Grupp% s modifierade
 GroupDeleted=Grupp %s bort
 ConfirmCreateContact=Är du säker på att du vill skapa en Dolibarr konto för denna kontakt?
 ConfirmCreateLogin=Är du säker på att du vill skapa en Dolibarr konto för denna medlem?
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 29af1f4babb..49cab6a2f77 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -14,13 +14,13 @@ WithdrawalReceiptShort=Kvitto
 LastWithdrawalReceipts=Senaste %s tillbakadragande kvitton
 WithdrawedBills=Indragna fakturor
 WithdrawalsLines=Återkallelse linjer
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+RequestStandingOrderToTreat=Begäran om stående order att bearbeta
+RequestStandingOrderTreated=Begäran om stående order bearbetas
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ännu inte möjligt. Uttag status måste vara inställd på "kredit" innan den förklarar förkastar på specifika linjer.
 CustomersStandingOrders=Kunden stående order
 CustomerStandingOrder=Kunden stående order
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdraw=St. av faktura med återkallnings begäran
+NbOfInvoiceToWithdrawWithInfo=St. av faktura med återkallande begäran för kunder som har definierat bankkontouppgifter
 InvoiceWaitingWithdraw=Faktura väntar på återkalla
 AmountToWithdraw=Belopp att dra tillbaka
 WithdrawsRefused=Återkallar vägrade
@@ -47,7 +47,7 @@ RefusedData=Datum för avslag
 RefusedReason=Orsak till avslag
 RefusedInvoicing=Fakturering avslaget
 NoInvoiceRefused=Ladda inte avslaget
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Faktura vägrade (Ladda avslag till kunden)
 Status=Status
 StatusUnknown=Okänd
 StatusWaiting=Väntar
@@ -76,13 +76,14 @@ WithBankUsingRIB=För bankkonton med hjälp av RIB
 WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Bankkonto för att ta emot drar
 CreditDate=Krediter på
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
 ShowWithdraw=Visa Dra
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
-DoStandingOrdersBeforePayments=Detta flikar gör att du kan begära en stående order. När det kommer att vara färdig, kan du skriva betalningen för att stänga fakturan.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Utträde fil
+SetToStatusSent=Ställ in på status "File Skickat"
+ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betalning av %s stående order av banken
@@ -92,5 +93,5 @@ InfoTransMessage=Den stående beställning %s har transmited till bank med %s %s
 InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
 InfoFoot=Detta är ett automatiskt meddelande skickas av Dolibarr
 InfoRejectSubject=Stående order vägrade
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectMessage=Hej, <br><br> den stående beställning av faktura %s relaterad till bolagets %s, med en mängd %s har avslagits av banken. <br><br>--<br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index d56158cf973..dc3223565db 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -6,6 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kom
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter ett avtal validerad
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kundorder är stängd
-# descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-# descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-# descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad förslag källa att faktureras när kundorder är inställd på betald
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura är inställd på betald
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura valideras
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 36d25ed38ed..df4ca8e96de 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/th_TH/resource.lang
+++ b/htdocs/langs/th_TH/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 90cb9765785..f1710cd2aad 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -12,7 +12,7 @@ SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
 SessionSavePath=Oturum kayıt konumu
 PurgeSessions=Oturum Temizleme
-ConfirmPurgeSessions=Gerçekten tüm oturumları temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
+ConfirmPurgeSessions=Tüm oturumları gerçekten temizlemek istiyor musunuz? Bu (kendiniz hariç), tüm kullanıcıların bağlantılarını kesecektir.
 NoSessionListWithThisHandler=PHP nizde yapılandırılmış olan oturum kayıt işlemcisi çalışmakta olan tüm oturumların listelenmesine izin vermiyor.
 LockNewSessions=Yeni bağlantıları kilitle
 ConfirmLockNewSessions=Herhangi bir yeni Dolibarr bağlantısını yalnız kendinizle kısıtlamak istediğinizden emin misiniz? Bundan sonra yalnızca <b>%s</b> kullanıcısı bağlanabilecektir.
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak y
 ActivityStateToSelectCompany= Halen faaliyette olan olan ya da durdurulmuş olan üçüncü partilerin görünmesi/gizlenmesi için bir süzgeç seçeneği ekleyin
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Arama süzgeçi seçenekleri
 NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
 ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster
@@ -82,7 +84,7 @@ NextValueForReplacements=Sonraki değer (yenileme)
 MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %s ile sınırlandırır
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için ençok boyut (herhangi bir yüklemeye izin vermemek için 0 a ayarlayın)
-UseCaptchaCode=Giriş sayfasında grafiksel kod (CAPTCHA) kullan
+UseCaptchaCode=Kullanıcı girişi sayfasında grafiksel kod (CAPTCHA) kullan
 UseAvToScanUploadedFiles=Yüklenen dosyaların taranması için anti-virüs kullan
 AntiVirusCommand= Antivirüs komutu tam yolu
 AntiVirusCommandExample= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv için örnek: /usr/bin/clamscan
@@ -208,6 +210,7 @@ ModulesJobDesc=İş modülleri belirli bir iş için önceden tanımlanmış bas
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesMarketPlaces=Daha çok modül...
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları...
 URL=Bağlantı
 BoxesAvailable=Kutular mevcut
@@ -320,7 +323,7 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Tüm oyuncular ve kuruluşlarının tam listesi için wiki sayfalarına bir göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-DisableLinkToHelpCenter=Giriş sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelpCenter=Kullanıcı girişi sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Sol menüde "<b>%s Çevrimiçi yardım</b>" bağlantısını gizle
 AddCRIfTooLong=Otomatik kaydırma yoktur, yani belge üzerinde çok uzun olmasından dolayı satır sayfa sınırı dışına çıkmışsa metin alanında kendiniz satırbaşı yapmalısınız.
 ModuleDisabled=Modül devre dışı
@@ -444,7 +447,7 @@ Module55Desc=Barkod yönetimi
 Module56Name=Telefon
 Module56Desc=Telefon entegrasyonu
 Module57Name=Ödeme talimatları
-Module57Desc=Ödeme talimatları ve para çekme yönetimi
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -465,7 +468,7 @@ Module200Name=LDAP
 Module200Desc=LDAP dizin senkronizasyonu
 Module210Name=PostNuke
 Module210Desc=PostNuke entegrasyonu
-Module240Name=Veri verme
+Module240Name=Veri dışaaktarma
 Module240Desc=Dolibarr verilerini dışaaktarma aracı (yardımlı)
 Module250Name=Veri içeaktarımı
 Module250Desc=Dolibarr verilerini içeaktarma aracı (yardımlı)
@@ -475,8 +478,8 @@ Module320Name=RSS Besleme
 Module320Desc=Dolibarr ekran sayfaları içine RSS ekle
 Module330Name=Yerimleri
 Module330Desc=Yerimi yönetimi
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projeler/Fırsatlar/Adaylar
+Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz.
 Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
 Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
@@ -495,6 +498,8 @@ Module1780Name=Kategoriler
 Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler)
 Module2000Name=FCKdüzenleyici (FCKeditor)
 Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar
+Module2200Name=Dinamik Fiyatlar
+Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
 Module2300Desc=Planlı görev yönetimi
 Module2400Name=Gündem
@@ -503,6 +508,8 @@ Module2500Name=Elektronik İçerik Yönetimi
 Module2500Desc=Belgeleri saklayın ve yönetin
 Module2600Name=Web Hizmetleri
 Module2600Desc=Dolibarr web hizmetleri sunucusunu etkinleştirin
+Module2650Name=WebHizmetleri (istemci)
+Module2650Desc=Dolibarr web hizmetleri istemcisini etkinleştir (Dış sunuculara veri/istek iteklemek için kullanılabilir. Tedarikçi siparişleri yalnızca anında desteklenir
 Module2700Name=Gravatar
 Module2700Desc=Kullanıcıların/Üyelerin resimlerini (epostalarında bulunan) göstermek için çevrimiçi Gravatar hizmetini kullanın (www.gravatar.com). İnternet erişimi gerektirir.
 Module2800Desc=FTP İstemcisi
@@ -517,7 +524,7 @@ Module6000Desc=İş akışı yönetimi
 Module20000Name=İzin İstekleri yönetimi
 Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin
 Module39000Name=Ürün kümesi
-Module39000Desc=Parti numarası, ürünlerin yenme ve satış tarihi yönetiminde
+Module39000Desc=Parti ya da seri numarası, ürünlerin son yenme tarihi ve son satma tarihi yönetimi
 Module50000Name=PayBox
 Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için
 Module50100Name=Satış Noktaları
@@ -527,15 +534,15 @@ Module50200Desc=Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödem
 Module50400Name=Muhasebe (gelişmiş)
 Module50400Desc=Muhasebe yönetimi (çift taraf)
 Module54000Name=IPP Yazdır
-Module54000Desc=Cup'a IPP Yazıcıyla yazdır.
+Module54000Desc=Cups IPP aryüzü kullanılarak doğrudan yazdırma (belgeler açılmadan)  (Yazıcı sunucudan görülmeli ve sunucuda CUPS kurulu olmalı)
 Module55000Name=Anket aç
 Module55000Desc=Çevrimiçi anketler yapmak için modül (Doodle, Studs, Rdvz gibi)
 Module59000Name=Oranlar
 Module59000Desc=Oran yönetimi modülü
 Module60000Name=Komisyonlar
 Module60000Desc=Komisyon yönetimi modülü
-Module150010Name=Parti no, son yeme tarihi ve son kullanma tarihi
-Module150010Desc=toplu numaralandırma, ürün için kullanma tarihi ve satma tarihi yönetimi
+Module150010Name=Parti numarası, son yenme tarihi ve son satış tarihi
+Module150010Desc=ürünün parti numarası, son yenme tarihi ve son satış tarihi yönetimi
 Permission11=Müşteri faturalarını oku
 Permission12=Müşteri faturaları oluştur/düzenle
 Permission13=Müşteri faturalarının doğrulamasını kaldır
@@ -606,11 +613,11 @@ Permission151=Ödeme talimatlarını oku
 Permission152=Ödeme talimatı isteği oluştur/değiştir
 Permission153=Ödeme talimatı fişleri aktarımı
 Permission154=Ödeme talimatı fişleri alacaklandır/reddet
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Sözleşme/abonelik oku
+Permission162=Sözleşme/abonelik oluştur/değiştir
+Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir
+Permission164=Bir sözleşmeye ait bir hizmet/abonelik engelle
+Permission165=Sözleşme/abonelik sil
 Permission171=Seyahat ve giderleri okuyun (kendi ve astlarının)
 Permission172=Gezi ve gider oluştur/değiştir
 Permission173=Gezi ve gider sil
@@ -672,7 +679,7 @@ Permission300=Bar kod oku
 Permission301=Bar kod oluştur/değiştir
 Permission302=Bar kod sil
 Permission311=Hizmet oku
-Permission312=Assign service/subscription to contract
+Permission312=Sözleşmeye hizmet/abonelik ata
 Permission331=Yerimi oku
 Permission332=Yerimi oluştur/değiştir
 Permission333=Yerimi sil
@@ -702,8 +709,8 @@ Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
 Permission1001=Stok oku
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Depo oluştur/değiştir
+Permission1003=Depo sil
 Permission1004=Stok hareketlerini oku
 Permission1005=Stok hareketleri oluştur/değiştir
 Permission1101=Teslimat emirlerini oku
@@ -718,7 +725,7 @@ Permission1185=Tedarikçi siparişi onayla
 Permission1186=Tedarikçi siparişi ver
 Permission1187=Tedarikçi siparişi alındı fişi
 Permission1188=Tedarikçi siparişi kapat
-Permission1201=Bir verme sonucu al
+Permission1201=Bir dışaaktarma sonucu al
 Permission1202=Dışaaktarma oluştur/değiştir
 Permission1231=Tedarikçi faturalarını oku
 Permission1232=Tedarikçi faturaları oluştur/değiştir
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Sipariş yöntemleri
 DictionarySource=Teklifin/siparişin kökeni
 DictionaryAccountancyplan=Hesap planı
 DictionaryAccountancysystem=Hesap planı modelleri
+DictionaryEMailTemplates=Eposta şablonları
 SetupSaved=Kurulum kaydedildi
 BackToModuleList=Modül listesine geri git
 BackToDictionaryList=Sözlük listesine dön
@@ -883,11 +891,12 @@ DefaultSkin=Varsayılan dış görünüm teması
 MaxSizeList=Listenin ençok uzunluğu
 DefaultMaxSizeList=Liste için varsayılan ençok uzunluk
 MessageOfDay=Günün mesajı
-MessageLogin=Giriş sayfası mesajı
+MessageLogin=Kullanıcı girişi sayfası mesajı
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi
 CompanyInfo=Firma/dernek bilgileri
 CompanyIds=Firma/dernek kimlikleri
@@ -985,13 +994,13 @@ BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
 BackupPHPWarning=Bu yöntemle yedekleme garanti edilmez. Öncekini yeğleyin
 RestoreDesc=Bir Dolibarr yedeklemesini geri yüklemek için şunları yapmalısınız:
 RestoreDesc2=Yeni Dolibarr kurulum dizini belgeleri dosyaların ağaç ayıklamak için veya bu belgeleri geçerli dizinle içine <b>(% s)</b> listesi arşiv dosyası belgeleri (örneğin zip dosyası) Restore. * Belge dizini arşiv dosyalarını yeni Dolibarr kurulumundaki ya da bu geçerli belge dizinindeki dizine ayıklamak için geri yükleyin(<b>%s</b>).
-RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir giriş / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
+RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir Kullanıcı girişi / parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz.
 RestoreMySQL=MySQL içeaktar
 ForcedToByAModule= Bu kural bir aktif modül tarafından <b>s</b> ye zorlanır
 PreviousDumpFiles=Mevcut veritabanı yedekleme dosyaları dökümü
 WeekStartOnDay=Haftanın ilk günü
 RunningUpdateProcessMayBeRequired=Yükseltme işlemini çalıştırmak gerekli gibi görünüyor (Program sürümü %s veritabanı sürümü %s ten farklı)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa (to a shell) giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
+YouMustRunCommandFromCommandLineAfterLoginToUser=Bu komutu <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> elde etmek için komut satırının sonuna –W seçeneğini ekleyebilirsiniz.
 YourPHPDoesNotHaveSSLSupport=SSL fonksiyonları PHP nizde mevcut değildir
 DownloadMoreSkins=Daha fazla kaplama indirin
 SimpleNumRefModelDesc=Referans sayısını %syymm-nnnn biçimi ile girin; yy yıl mm ay ve nnnn deliksiz ve sıfırlanamayan bir dizidir
@@ -1001,7 +1010,7 @@ TranslationUncomplete=Kısmi çeviri
 SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilmiş ya da hatalar içeriyor olabilir. Bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Dikey menüyü gizlenebilir yap (javascript seçeneği devre dışı olmamalıdır)
 MAIN_DISABLE_METEO=Meteo görünümünü engelle
-TestLoginToAPI=API giriş testi
+TestLoginToAPI=API  kullanıcı girişi denemesi
 ProxyDesc=Dolibarr’ın bazı özelliklerinin çalışması için internet erişimi olması gerekir. Bunun için burada parametreleri tanımlayın. Dolibarr sunucusu bir proxy sunucu arkasında ise, bu parametreler üzerinden Internet erişiminin nasıl olacağını Dolibarr’a söyler.
 ExternalAccess=Dış erişim
 MAIN_PROXY_USE=Bir proxy sunucusu kullan (aksi takdirde internete doğrudan erişin)
@@ -1063,7 +1072,7 @@ GeneratePassword=Oluşturulmuş bir şifre önerin
 RuleForGeneratedPasswords=Önerilen parola oluşturmak ya da parola doğrulamak için kural
 DoNotSuggest=Herhangi bir parola önermeyin
 EncryptedPasswordInDatabase=Veritabanındaki parolanın şifrelendirilmesine izin vermek için
-DisableForgetPasswordLinkOnLogonPage=Giriş sayfasında “Parolayı unut” bağlantısını gösterme
+DisableForgetPasswordLinkOnLogonPage=Kullanıcı girişi sayfasında “Parola unutuldu” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta
 ##### Company setup #####
@@ -1138,7 +1147,7 @@ AddDeliveryAddressAbility=Teslim tarihi özelliği ekle
 UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir seçenek olarak kabul et
 FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
 ##### Orders #####
 OrdersSetup=Sipariş yönetimi kurulumu
 OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1160,7 +1169,7 @@ FicheinterNumberingModules=Müdahale numaralandırma modülü
 TemplatePDFInterventions=Müdahale kartı belgesi modelleri
 WatermarkOnDraftInterventionCards=Taslak müdahale kartı belgelerinde filigran (boşsa yoktur)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Sözleşme/Abonelik modül ayarları
 ContractsNumberingModules=Sözleşme numaralandırma modülleri
 TemplatePDFContracts=Sözleşme belge modelleri
 FreeLegalTextOnContracts=Sözleşmeler üzerinde serbest metin
@@ -1169,7 +1178,7 @@ WatermarkOnDraftContractCards=Taslak sözleşmeler üzerinde filigran (boşsa yo
 MembersSetup=Üye modülü kurulumu
 MemberMainOptions=Ana seçenekler
 AddSubscriptionIntoAccount=Yeni bir ödentili abonelik eklerken, banka modülünde varsayılan olarak bir banka işlemi öner
-AdherentLoginRequired= Her üye için bir Giriş yönetin
+AdherentLoginRequired= Her üye için bir Kullanıcı girişi yönetin
 AdherentMailRequired=Yeni üye oluşturmak için E-posta gereklidir
 MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır
 ##### LDAP setup #####
@@ -1249,11 +1258,11 @@ LDAPSetupForVersion3=LDAP sunucusu sürüm 3 için yapılandırılmış
 LDAPSetupForVersion2=LDAP sunucusu sürüm 2 için yapılandırılmış
 LDAPDolibarrMapping=Dolibarr Eşleme
 LDAPLdapMapping=LDAP Eşleme
-LDAPFieldLoginUnix=Giriş (Unix)
+LDAPFieldLoginUnix=Kullanıcı girişi (Unix)
 LDAPFieldLoginExample=Örnek: uid
 LDAPFilterConnection=Arama süzgeçi
 LDAPFilterConnectionExample=Örnek: &(objectClass = InetOrgPerson)
-LDAPFieldLoginSamba=Giriş (samba, activedirectory)
+LDAPFieldLoginSamba=Kullanıcı girişi (samba, activedirectory)
 LDAPFieldLoginSambaExample=Örnek: sAMAccountName
 LDAPFieldFullname=İlk Adı
 LDAPFieldFullnameExample=Örnek: cn
@@ -1324,7 +1333,7 @@ FilesOfTypeNotCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sık
 CacheByServer=Sunucu önbelleği
 CacheByClient=Tarayıcı önbelleği
 CompressionOfResources=HTTP yanıtlarının sıkıştırılması
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
 ##### Products #####
 ProductSetup=Ürünler modülü kurulumu
 ServiceSetup=Hizmetler modülü kurulumu
@@ -1415,9 +1424,9 @@ OSCommerceTestOk='%s' Sunucusuna '%s' veritabanında kullanıcı '% s' ile bağl
 OSCommerceTestKo1='%s' Sunucusuna bağlantı başarılı ancak veritabanı '% s' e ulaşılamadı.
 OSCommerceTestKo2=’%s’ Sunucusuna ‘%s’ kullanıcısı ile bağlantı başarısız oldu.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Depo modülü ayarları
+UserWarehouse=Kullanıcı kişisel deposunu kullan
+IfYouUsePointOfSaleCheckModule=Eğer bir Satış Noktası modülü kullanıyorsanız (varsayılan olarak sağlanan ya da başka bir dış POS modülü), bu ayarlar Satış Noktası modülünüz tarafından gözardı edilebilir. Buradaki seçenekler ne olursa olsun çoğu satış notası modülü ön tanımlı olarak anında fatura oluşturacak ve stok eksiltecek şeklide tasarlanmıştır. Yani, Satış Noktanızdan bir satış kaydederken stok eksiltme gereksiniminiz varsa da yoksa da, aynı zamanda POS modülünüzün ayarlarını da denetleyin.
 ##### Menu #####
 MenuDeleted=Menü silindi
 TreeMenu=Ağaç menüler
@@ -1471,7 +1480,7 @@ AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
 ##### Agenda #####
 AgendaSetup=Etkinlik ve gündem modülü kurulumu
-PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı
+PasswordTogetVCalExport=Dışaaktarma bağlantısı yetki anahtarı
 PastDelayVCalExport=Bundan daha büyük etkinliği dışaaktarma
 AGENDA_USE_EVENT_TYPE=Etkinlik türlerini kullan (Ayarlar -> Sözlük -> Gündem etkinlik türleri) menüsünden yönetilir
 AGENDA_DEFAULT_FILTER_TYPE=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu etkinlik türünü ayarlar
@@ -1482,14 +1491,14 @@ ClickToDialDesc=Bu modül, telefon numaraları ardına bir simge eklemenizi sağ
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Satış Noktası
 CashDeskSetup=Satış Noktası kurulum modülü
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üçüncü parti
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok eksiltilmesini engelle
+CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
+StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli
+CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir.
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
 BookmarkDesc=Bu modül yerimlerini yönetmenize olanak sağlar. Ayrıca, soldaki menüden herhangi Dolibarr sayfaları veya dış web siteleri için kısayollar ekleyebilirsiniz.
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 18a36d5b8d3..4dc82ae066f 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Etkinlikten etkilenen
 ActionsDoneBy=Etkinliği yapan
 ActionsForUser=Kullanıcı etkinlikleri
 ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
+ActionAssignedTo=Event assigned to
 AllMyActions= Tüm etkinliklerim/görevlerim
 AllActions= Tüm etkinlikler/görevler
 ViewList=Liste görünümü
@@ -44,7 +45,7 @@ AgendaExtSitesDesc=Bu sayfa takvimlerin dış kaynaklarında Dolibarr gündemind
 ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler
 PropalValidatedInDolibarr=%s Teklifi doğrulandı
 InvoiceValidatedInDolibarr=%s Faturası doğrulandı
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s
 InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür
 InvoiceDeleteDolibarr=%s faturası silindi
 OrderValidatedInDolibarr= %s Siparişi doğrulandı
@@ -67,8 +68,8 @@ DateActionDoneEnd= Gerçek bitiş tarihi
 DateActionStart= Başlama tarihi
 DateActionEnd= Bitiş tarihi
 AgendaUrlOptions1=Süzgeç çıktısına ayrıca aşağıdaki parametreleri ekleyebilirsiniz:
-AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>login=%s</b> sınırlayacak kullanıcı <b>%s</b>.
-AgendaUrlOptions3=<b>kullanıcı=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
+AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>kullanıcı girişi=%s</b> sınırlayacak kullanıcı <b>%s</b>.
+AgendaUrlOptions3=<b>kullanıcı girişi=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
 AgendaUrlOptions4=Çıktıyı kullanıcı <b>%s</b> tarafından etkilenen etkinliklerle sınırlamak için<b>logint=%s</b>.
 AgendaUrlOptionsProject=<b>proje=PROJECT_ID</b>, bu <b>PROJECT_ID</b> projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir.
 AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
@@ -78,7 +79,7 @@ ExportDataset_event1=Gündem etkinlikleri listesi
 DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6)
 DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18)
 # External Sites ical
-ExportCal=Takvim ver
+ExportCal=Takvim dışaaktar
 ExtSites=Dış takvimleri içeaktar
 ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez.
 ExtSitesNbOfAgenda=Takvimlerin sayısı
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index d855c5c73e3..643815b8abe 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -217,7 +217,7 @@ NoInvoice=Fatura yok
 ClassifyBill=Fatura sınıflandır
 SupplierBillsToPay=Ödenecek tedarikçi faturaları
 CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Mekanografik işlemlerle yazılmış faturalar harf sırasına göre dağıtılırlar
 NonPercuRecuperable=Kurtarılamaz
 SetConditions=Ödeme koşullarını ayarla
 SetMode=Ödeme biçimini ayarla
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 7fffe687d62..94e1b382509 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -277,8 +277,8 @@ CustomerCode=Müşteri kodu
 SupplierCode=Tedarikçi kodu
 CustomerAccount=Müşteri hesabı
 SupplierAccount=Tedarikçi hesabı
-CustomerCodeDesc=Tüm müşteriler için müşteri kodu eşsiz olmalı
-SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu eşsiz olmalı
+CustomerCodeDesc=Tüm müşteriler için müşteri kodu benzersiz olmalı
+SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu benzersiz olmalı
 RequiredIfCustomer=Eğer üçüncü parti bir müşteri ya da aday ise gereklidir
 RequiredIfSupplier=Eğer üçüncü bir tedarikçi ise gereklidir
 ValidityControledByModule=Doğrulama modülü tarafından denetlenir
@@ -365,7 +365,7 @@ NoParentCompany=Hiçbiri
 ExportImport=İçeaktar-Dışaaktar
 ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
-DolibarrLogin=Dolibarr girişi
+DolibarrLogin=Dolibarr kullanıcı girişi
 NoDolibarrAccess=Dolibarr erişimi yok
 ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
 ExportDataset_company_2=Kişiler ve özellikleri
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index a97057a7824..20a21a9f512 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla
 TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
 CalculationMode=Hesaplama modu
 AccountancyJournal=Muhasebe kodu günlüğü
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Ürün alımı için varsayılan muhasebe kodu
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Ürün satışı için varsayılan muhasebe kodu
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Hizmet alımı için varsayılan muhasebe kodu
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Hizmet satışı için varsayılan muhasebe kodu
 ACCOUNTING_VAT_ACCOUNT=Alınan KDV için varsayılan muhasebe kodu
 ACCOUNTING_VAT_BUY_ACCOUNT=Ödenen KDV için varsayılan muhasebe kodu
 ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partiler için varsayılan muhasebe kodu
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 7a4c4151b2f..d5b9448378c 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Sözleşmeler alanı
 ListOfContracts=Sözleşme Listesi
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Değiştirilen son %s sözleşme
 AllContracts=Bütün sözleşmeler
 ContractCard=Sözleşme kartı
 ContractStatus=Sözleşme durumu
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Yürürlükte olan hizmet kalemleri
 ListOfRunningServices=Yürürlükteki hizmetler listesi
 NotActivatedServices=Etkin olmayan hizmetler (doğrulanmış sözleşmeler arasından)
 BoardNotActivatedServices=Doğrulanmış sözleşmelerden etkinleştirilecek hizmetler
-LastContracts=Last % contracts
+LastContracts=Son %s sözleşme
 LastActivatedServices=Etkinleştirilen son %s hizmet
 LastModifiedServices=Değiştirilen son %s hizmet
 EditServiceLine=Hizmet kalemi düzenle
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Süresi dolacak Hizmetler Listesi
 NoteListOfYourExpiredServices=Bu listede yalnızca satış temsilcisi olarak atandığınız üçüncü partilere ait hizmet sözleşmeleri bulunur.
 StandardContractsTemplate=Standart sözleşme kalıbı
 ContactNameAndSignature=%s için, ad ve imza
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sözleşmeyi imzalalayacak satış temsilcisi
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index f2fe6338f23..2e5755e83e9 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Unix ortamında her dakika Komut satırını çalıştı
 CronExplainHowToRunWin=Microsoft (tm) Windows ortamında her dakika Komut satırı çalıştırmak için Planlı görev araçlarını kullanabilirsiniz
 # Menu
 CronJobs=Planlı işler
-CronListActive=List of active/scheduled jobs
+CronListActive=Etkin/programlı işler listesi
 CronListInactive=Etkin olmayan işler listesi
 # Page list
 CronDateLastRun=Son çalıştırma
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 0111fb8633e..df96ebb71d0 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -8,7 +8,7 @@ Errors=Hatalar
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
 ErrorBadEMail=%s EPostası yanlış
 ErrorBadUrl=URL %s yanlış
-ErrorLoginAlreadyExists=%s girişi zaten var.
+ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
 ErrorFailToCopyFile='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üç
 ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi.
 ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez
 ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez
+ErrorPriceExpression1='%s' Değişkenine atama yapılamıyor
+ErrorPriceExpression2='%s' Dahili işlevi yeniden tanımlanamıyor
+ErrorPriceExpression3=İşlev tanımındaki '%s' değişkeni tanımlanmamış
+ErrorPriceExpression4=Geçersi karakter '%s'
+ErrorPriceExpression5=Beklenmeyen '%s'
+ErrorPriceExpression6=Hatalı argüman sayısı (verilen %s, beklenen %s)
+ErrorPriceExpression8=Beklenmeyen işlemci '%s'
+ErrorPriceExpression9=Beklenmeyen bir hata oldu
+ErrorPriceExpression10='%s' İşlemcisinin işleneni yok
+ErrorPriceExpression11=Beklenen '%s'
+ErrorPriceExpression14=Sıfıra bölünme
+ErrorPriceExpression17=Beklenmeyen değişken '%s'
+ErrorPriceExpression19=İfade bulunamadı
+ErrorPriceExpression20=Boş ifade
+ErrorPriceExpression21=Boş sonuç '%s'
+ErrorPriceExpression22=Eksi sonuç '%s'
+ErrorPriceExpressionInternal=İç hata '%s'
+ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index c4baa85d1b9..f08d37906d7 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -14,10 +14,10 @@ SaveExportModel=Yeniden kullanmak için bu dışaaktarma profilini kaydedebilirs
 SaveImportModel=Yeniden kullanmak için bu içeaktarma profilini kaydedebilirsiniz...
 ExportModelName=Dışaaktarma profili adı
 ExportModelSaved=İçeaktarma profili <b>%s</b> adıyla kaydedildi.
-ExportableFields=Verilebilir alanlar
-ExportedFields=Verilen alanlar
-ImportModelName=Alma profili adı
-ImportModelSaved=Alma profili <b>%s</b> adıyla kaydedildi.
+ExportableFields=Dışaaktarılabilir alanlar
+ExportedFields=Dışaaktarılan alanlar
+ImportModelName=İçeaktarma profili adı
+ImportModelSaved=İçeaktarma profili <b>%s</b> adıyla kaydedildi.
 ImportableFields=İçeaktarılabilir alanlar
 ImportedFields=İçeaktarılan alanlar
 DatasetToExport=Dışaaktarılacak veri kümesi
@@ -56,7 +56,7 @@ LineTotalHT=Satırın vergi hariç tutarı
 LineTotalTTC=Satırın vergi dahil tutarı
 LineTotalVAT=Satırın KDV tutarı
 TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet)
-FileWithDataToImport=Alınacak verileri içeren dosya
+FileWithDataToImport=İçeaktarılacak verileri içeren dosya
 FileToImport=İçeaktarılacak kaynak dosya
 FileMustHaveOneOfFollowingFormat=İçeaktarılacak dosya aşağıdaki biçimlerden birinde olmalıdır
 DownloadEmptyExample=Örnek boş kaynak dosyasını indirin
@@ -68,7 +68,7 @@ FieldsInTargetDatabase=Dolibarr veritabanındaki hedef alanlar (koyu=zorunlu)
 Field=Alan
 NoFields=Alan sayısı
 MoveField=%s numaralı alan sütununu taşıyın
-ExampleOfImportFile=İçeaktarılacak_dosya_örneği
+ExampleOfImportFile=İçeaktarma_dosya_örneği
 SaveImportProfile=Bu içeaktarma profilini kaydedin
 ErrorImportDuplicateProfil=Bu içeaktarma profili bu ad ile kaydedilemedi. Aynı adlı bir profil zaten var.
 ImportSummary=İçeaktarma ayarlarının özeti
@@ -85,20 +85,20 @@ FieldNeedSource=Bu alanlar kaynak dosyadan bir veri gerektirir
 SomeMandatoryFieldHaveNoSource=Veri dosyasında, bazı zorunlu alanların kaynağı yok
 InformationOnSourceFile=Kaynak dosya bilgileri
 InformationOnTargetTables=Hedef alan bilgileri
-SelectAtLeastOneField=En az bir kaynak alanı verilecek alanlar bölümüne koyun
-SelectFormat=Bu alma dosya biçimini seçin
-RunImportFile=Dosya almayı başlatın
-NowClickToRunTheImport=Alma provasının sonucunu denetleyin. Herşey yolundaysa, kesin almayı başlatın.
-DataLoadedWithId=Tüm veriler şu alma kodu ile yüklenecek: <b>%s</b>
+SelectAtLeastOneField=En az bir kaynak alanı dışaaktarılacak alanlar bölümüne koyun
+SelectFormat=Bu içeaktarma dosya biçimini seçin
+RunImportFile=Dosya içeaktarmayı başlatın
+NowClickToRunTheImport=İçeaktarma denemesi sonucunu denetleyin. Herşey yolundaysa, kesin içeaktarmayı başlatın.
+DataLoadedWithId=Tüm veriler şu içeaktarma kodu ile yüklenecek: <b>%s</b>
 ErrorMissingMandatoryValue=Kaynak dosyada alan için zorunlu veri boş <b>%s</b>.
 TooMuchErrors=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> hatalı satır daha var.
 TooMuchWarnings=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> uyarı içeren satır daha var.
 EmptyLine=Boş satır (atlanacak)
 CorrectErrorBeforeRunningImport=Kesin alma işleminden önce tüm hataları düzeltmelisiniz.
 FileWasImported=Dosya <b>%s</b> sayısı ile alındı.
-YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ölçütü ile süzerseniz alınmış tüm kayıtları görebilirsiniz.
+YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ölçütü ile süzerseniz içeaktarılmış tüm kayıtları görebilirsiniz.
 NbOfLinesOK=Hatasız ve uyarı içermeyen satır sayısı:<b>%s</b>.
-NbOfLinesImported=Sorunsuz alınan satır sayısı:<b>%s</b>.
+NbOfLinesImported=Sorunsuz içeaktarılan satır sayısı:<b>%s</b>.
 DataComeFromNoWhere=Eklenecek değer kaynak dosyada hiç bir yerden gelmiyor.
 DataComeFromFileFieldNb=Eklenecek değer kaynak dosyada <b>%s</b> numaralı alandan geliyor.
 DataComeFromIdFoundFromRef=Kaynak dosyanın <b>%s</b> numaralı alanından gelen değer, üst nesne kodunun bulunması için kullanılacak (yani kaynak dosyadaki ilgili <b>%s</b> nesnesi önceden Dolibarr içinde bulunmalıdır).
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 9210e6a384d..128034c94d7 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Gönderen
 MailingNeedCommand=Güvenlik nedeni ile, Eposta gönderiminin komut satırından yapılması daha iyidir. Bütün posta alıcılarına eposta göndermek için sunucu yönetcisinden aşağıdaki komutu başlatmasını isteyin:
 MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
 ConfirmSendingEmailing=Eğer www tarayıcınız ile gönderemiyor ya da yeğlemiyorsanız, lütfen kendi tarayıcınızdan eposta göndermek istediğinizden emin olduğunuzu onaylayın.
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Not: Web arayüzünden eposta gönderimi güvenlik ve süre aşımı yüzünden birçok kez yapılmıştır, her gönderme oturumu başına <b>%s<b> alıcıya
 TargetsReset=Listeyi temizle
 ToClearAllRecipientsClickHere=Bu e-posta Alıcı listesini temizlemek için burayı tıkla
 ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=Epostayala %s bildirim gönderilecektir
 AddNewNotification=Yeni bir eposta bildirim hedefi etkinleştir
 ListOfActiveNotifications=Bütün etkin eposta bildirim hedeflerini listele
 ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Yapılandırma e postası '%s' için ayarlandı. Bu mod toplu epostalama için kullanılamaz.
+MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - Epostalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu eposta özelliğini kullanabilirsiniz.
+MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index c475724245b..d5e3a2636d5 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -131,7 +131,7 @@ AddActionDone=Bitmiş etkinlik ekle
 Close=Kapat
 Close2=Kapat
 Confirm=Onayla
-ConfirmSendCardByMail=Gerçekten bu kartı posta ile buna <b>%s</b> göndermek istiyor musunuz?
+ConfirmSendCardByMail=Bu kartın içeriğini posta ile gerçekten  buna <b>%s</b> göndermek istiyor musunuz?
 Delete=Sil
 Remove=Kaldır
 Resiliate=Sonlandır
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 098079e7015..44e74af7fa6 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Gecikmiş
 SubscriptionNotReceivedShort=Hiç alınmadı
 ListOfSubscriptions=Abonelikler listesi
 SendCardByMail=Kartı Eposta ile gönder
-AddMember=Üye ekle
+AddMember=Üye oluştur
 NoTypeDefinedGoToSetup=Hiçbir üyelik türü tanımlanmamıştır. Kurulum  - Üye türlerine git
 NewMemberType=Yeni üye türü
 WelcomeEMail=Hoşgeldiniz e-postası
@@ -125,7 +125,7 @@ Date=Tarih
 DateAndTime=Tarih ve saat
 PublicMemberCard=Genel üyelik kartı
 MemberNotOrNoMoreExpectedToSubscribe=Artık üyelik ya da abonelike beklenmiyor
-AddSubscription=Abonelik ekle
+AddSubscription=Abonelik oluştur
 ShowSubscription=Abonelik göster
 MemberModifiedInDolibarr=Üyelik Dolibarr'da değiştirilmiş
 SendAnEMailToMember=Üyelere bilgi e-postası gönder
@@ -203,3 +203,4 @@ MembersByNature=Doğal üyeler
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
 NoVatOnSubscription=Abonelikler için KDV yok
 MEMBER_PAYONLINE_SENDEMAIL=Dolibarr'ın bir doğrulanmış abonelik ödeme onayını almasıyla gönderilecek uyarı epostası
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 26268de14f1..140d9f1f08e 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Bir sevkiyat var
 DraftOrWaitingApproved=Taslak veya onaylanmış henüz sipariş verilmemiş
 DraftOrWaitingShipped=Taslak veya onaylanmış henüz sevkedilmemiş
 MenuOrdersToBill=Teslim edilen siparişler
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Faturalanabilir siparişler
 SearchOrder=Sipariş ara
 SearchACustomerOrder=Müşteri siparişi ara
 ShipProduct=Ürünü sevket
diff --git a/htdocs/langs/tr_TR/printipp.lang b/htdocs/langs/tr_TR/printipp.lang
index af623b6b2ad..82d85eaae0c 100644
--- a/htdocs/langs/tr_TR/printipp.lang
+++ b/htdocs/langs/tr_TR/printipp.lang
@@ -1,9 +1,14 @@
-# Dolibarr language file - tr_TR - printipp
-PrintIPPSetup=Doğrudan Yazdırma modülü kurulumu
-PrintIPPDesc=Bu modül, yazıcıya doğrudan belge yazdırma düğmesi ekler. Bu bir Cups içeren bir Linux sistemi gerektirir.
-PRINTIPP_ENABLED=Belge listesinde "Doğrudan yazdır" resim ikonunu göster
-PRINTIPP_HOST=Yazdırma sunucusu
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Doğrudan Yazdırma modülü ayarı
+PrintIPPDesc=Bu modül belgeleri doğrudan yazıcıya gönderecek bir Yazdır düğmesi ekler. CUPS kurulmuş bir Linux sistemi gerektirir.
+PRINTIPP_ENABLED=Belge listelerinde "Doğrudan yazdır" simgesini göster
+PRINTIPP_HOST=Yazıcı sunucusu
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Giriş
+PRINTIPP_USER=Kullanıcı girişi
 PRINTIPP_PASSWORD=Parola
-NoPrinterFound=Yazıcı bulnamadı (Cups ayarını denetleyin)
+NoPrinterFound=Hiç yazıcı bulunamadı (CUPS ayarlarınızı denetleyin)
+FileWasSentToPrinter=%s Dosyası yazıcıya gönderildi
+NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok
+DefaultPrinter=Varsayılan yazıcı
+Printer=Yazıcı
+CupsServer=CUPS Sunucusu
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 23c2de284d3..9ec2f349d3b 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -27,15 +27,15 @@ ProductsAndServicesNotOnSell=Eski Ürünler ve Hizmetler
 ProductsAndServicesStatistics=Ürün ve Hizme istatistikleri
 ProductsStatistics=Ürün istatistikleri
 ProductsOnSell=Varolan ürünler
-ProductsNotOnSell=Eskimiş ürünler
-ProductsOnSellAndOnBuy=Ürünler satılamaz ve satın alınamaz
+ProductsNotOnSell=Kullanılmayan ürünler
+ProductsOnSellAndOnBuy=Satılmaz ve satınalınmaz ürünler
 ServicesOnSell=Varolan hizmetler
-ServicesNotOnSell=Eskimiş hizmetler
-ServicesOnSellAndOnBuy=Hizmetler satılamaz ve satın alınamaz
+ServicesNotOnSell=Kullanılmayan hizmetler
+ServicesOnSellAndOnBuy=Satılmaz ve satınalınmaz hizmetler
 InternalRef=İç referans
 LastRecorded=Satışta kaydedilen son ürünler/hizmetler
-LastRecordedProductsAndServices=Son kaydedilen %s ürünler/hizmetler
-LastModifiedProductsAndServices=Son değiştirilen %s ürünler/hizmetler
+LastRecordedProductsAndServices=Son kaydedilen %s ürün/hizmet
+LastModifiedProductsAndServices=Son değiştirilen %s ürün/hizmet
 LastRecordedProducts=Son %s ürün kaydedildi
 LastRecordedServices=Son %s hizmet kaydedildi
 LastProducts=Son ürünler
@@ -171,7 +171,7 @@ GenerateThumb=Kararlama (thumb) oluştur
 ProductCanvasAbility=Özel “kanvas” eklentileri kullan
 ServiceNb=Hizmet sayısı #%s
 ListProductServiceByPopularity=Popülerliğine göre ürün/hizmet listesi
-ListProductByPopularity=Popülerliğine göre ürünler/hizmetler Listesi
+ListProductByPopularity=Popülerliğine göre ürün listesi
 ListServiceByPopularity=Popülerliğine göre hizmetler listesi
 Finished=Üretilen ürünler
 RowMaterial=İlk malzeme
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
 PriceByCustomerLog=Müşteri fiyat günlüğü
 MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
 MinimumRecommendedPrice=Önerilen enaz fiyat: %s
+PriceExpressionEditor=Fiyat ifadesi düzenleyici
+PriceExpressionSelected=Seçili fiyat ifadesi
+PriceExpressionEditorHelp=Fiyatı ayarlamak için "fiyat = 2 + 2" ya da "2 + 2"<br>EkAlanlar "#options_myextrafieldkey# * 2" benzeri değişkenlerdir<br>#quantity# and #tva_tx# benzeri özel değişkenler vardır<br>İfadeleri ayırmak için ; kullanın
+PriceMode=Fiyat biçimi
+PriceNumeric=Sayı
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 09343d28968..3fc2b0041c6 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -36,6 +36,8 @@ TaskTimeSpent=Göreve harcanan süre
 TaskTimeUser=Kullanıcı
 TaskTimeNote=Not
 TaskTimeDate=Tarih
+TasksOnOpenedProject=Açık projelerdeki görevler
+WorkloadNotDefined=İşyükü tanımlanmamış
 NewTimeSpent=Yeni harcanan süre
 MyTimeSpent=Harcadığım sürelerim
 MyTasks=Grevlerim
@@ -66,7 +68,7 @@ ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarını
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListTripAssociatedProject=Proje ile ilgili geziler ve giderlerin listesi
-ListActionsAssociatedProject=Proje ile ilgili eylemlerin listesi
+ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
 ActivityOnProjectThisMonth=Projede bu ayki etkinlik
 ActivityOnProjectThisYear=Projede bu yılki etkinlik
diff --git a/htdocs/langs/tr_TR/resource.lang b/htdocs/langs/tr_TR/resource.lang
index e8adc0a0e76..f593c7e0fe4 100644
--- a/htdocs/langs/tr_TR/resource.lang
+++ b/htdocs/langs/tr_TR/resource.lang
@@ -22,8 +22,8 @@ GotoDate=Tarihe git
 
 ResourceElementPage=Öğe kaynağı
 ResourceCreatedWithSuccess=Kaynak oluşturma başarılı
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
+RessourceLineSuccessfullyDeleted=Kaynak satır silinmesi başarılı
+RessourceLineSuccessfullyUpdated=Kaynak satır güncellemesi başarılı
 ResourceLinkedWithSuccess=Kaynak bağlantılama başarılı
 
 TitleResourceCard=Kaynak kartı
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Bu kaynağı silmeyi onayla
 RessourceSuccessfullyDeleted=Kaynak silme başarılı
 DictionaryResourceType=Kaynak türleri
 
-DictionaryEMailTemplates=E-posta modelleri
-
 SelectResource=Kaynak seç
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index edbf7dc5df3..b160e4cc1c7 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -102,7 +102,7 @@ UserDisabled=Kullanıcı %s engellendi
 UserEnabled=Kullanıcı %s etkinleştirildi
 UserDeleted=Kullanıcı %s kaldırıldı
 NewGroupCreated=Grup %s oluşturuldu
-GroupModified=Group %s modified
+GroupModified=Değiştirilen grup %s
 GroupDeleted=Grubu %s kaldırıldı
 ConfirmCreateContact=Bu kişi için bir Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
 ConfirmCreateLogin=Bu üye için Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index d62f8661f0c..ed188e7fdb8 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ret Tarihi
 RefusedReason=Ret nedeni
 RefusedInvoicing=Rettin faturalandırılması
 NoInvoiceRefused=Reddi borç yazmayın
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz)
 Status=Durum
 StatusUnknown=Bilinmeyen
 StatusWaiting=Bekliyor
@@ -79,10 +79,11 @@ CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
 ShowWithdraw=Para çekme göster
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz.
-DoStandingOrdersBeforePayments=Bu sekmeler ödeme talimatı istemenizi sağlar. Bitirildiğinde, faturayı kapatmak için ödemeyi yazabilirsiniz.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 37e41038659..d68844d9f62 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 43252eb188c..13d9dea3c7e 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/uk_UA/resource.lang
+++ b/htdocs/langs/uk_UA/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index b5d84a0aca7..f12efa61626 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
@@ -208,6 +210,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -444,7 +447,7 @@ Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Bookmarks
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=Categories
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=Agenda
@@ -503,6 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Point of sales
@@ -527,7 +534,7 @@ Module50200Desc=Module to offer an online payment page by credit card with Paypa
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup saved
 BackToModuleList=Back to modules list
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language to use (language code)
 EnableMultilangInterface=Enable multilingual interface
 EnableShowLogo=Show logo on left menu
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Your system has been updated successfully
 CompanyInfo=Company/foundation information
 CompanyIds=Company/foundation identities
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 1ed4e637d14..a24c678a2e5 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
 ViewList=List view
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 9fe5eff520d..878eb49b3c9 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 511516dc755..57ba3bb15d8 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Last %s activated services
 LastModifiedServices=Last %s modified services
 EditServiceLine=Edit service line
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index a2c8ec77de2..53f8d168a55 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Supplier code required
 ErrorSupplierCodeAlreadyUsed=Supplier code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
-ErrorBadImageFormat=Image file has not a supported format
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Value '%s' has wrong date format
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
 ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index eb2063c629c..40bca8e85fb 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Late
 SubscriptionNotReceivedShort=Never received
 ListOfSubscriptions=List of subscriptions
 SendCardByMail=Send card by Email
-AddMember=Add member
+AddMember=Create member
 NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
 NewMemberType=New member type
 WelcomeEMail=Welcome e-mail
@@ -125,7 +125,7 @@ Date=Date
 DateAndTime=Date and time
 PublicMemberCard=Member public card
 MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
-AddSubscription=Add subscription
+AddSubscription=Create subscription
 ShowSubscription=Show subscription
 MemberModifiedInDolibarr=Member modified in Dolibarr
 SendAnEMailToMember=Send information email to member
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
 VATToUseForSubscriptions=VAT rate to use for subscriptions
 NoVatOnSubscription=No TVA for subscriptions
 MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index cb88461602d..81d217ddb54 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature
-AssociatedProducts=Virtual product
-AssociatedProductsNumber=Number of products composing this virtual product
-ParentProductsNumber=Number of parent virtual product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -132,7 +132,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of virtual products/services with this product as a component
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -179,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Customers prices
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 4affd1fdc5a..c48e27fd204 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=This view presents all projects and tasks (your user permissions grant
 Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
-AddProject=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
 MyTasks=My tasks
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
-AddTask=Add task
+AddTask=Create task
 AddDuration=Add duration
 Activity=Activity
 Activities=Tasks/activities
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index e4337309084..ea32511fefb 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 01fe161a7d1..52535054170 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để l
 ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa
 UseSearchToSelectContactTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập CONTACT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi.
 UseSearchToSelectContact=Sử dụng các trường để lựa chọn năng tự động gõ liên lạc (thay vì sử dụng một hộp danh sách).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Tùy chọn bộ lọc tìm kiếm
 NumberOfKeyToSearch=Ký tự nbr để tìm: %s
 ViewFullDateActions=Hiển thị ngày tháng đầy đủ của sự kiện ở bảng tính thứ ba
@@ -208,6 +210,7 @@ ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định
 ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ...
 ModulesMarketPlaces=Nhiều mô-đun ...
 DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ...
 URL=Liên kết
 BoxesAvailable=Hộp có sẵn
@@ -444,7 +447,7 @@ Module55Desc=Quản lý mã vạch
 Module56Name=Điện thoại
 Module56Desc=Tích hợp điện thoại
 Module57Name=Chỉ thị thanh toán định kỳ
-Module57Desc=Quảng lý rút tiền và chỉ thị thanh toán định kỳ
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr
 Module330Name=Đánh dấu
 Module330Desc=Quản lý Bookmark
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar tích hợp
 Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
@@ -495,6 +498,8 @@ Module1780Name=Loại
 Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng)
 Module2000Name=Trình soạn thảo WYSIWYG
 Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Quản lý công việc theo lịch trình
 Module2400Name=Chương trình nghị sự
@@ -503,6 +508,8 @@ Module2500Name=Quản lý nội dung điện tử
 Module2500Desc=Lưu và chia sẻ tài liệu
 Module2600Name=WebServices
 Module2600Desc=Cho phép các máy chủ dịch vụ web Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Quản lý công việc
 Module20000Name=Để lại yêu cầu quản lý
 Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép
 Module39000Name=Hàng loạt sản phẩm
-Module39000Desc=Số lô, ăn theo và bán theo quản lý ngày sản phẩm
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Nơi trả tiền
 Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền
 Module50100Name=Điểm bán hàng
@@ -527,7 +534,7 @@ Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến b
 Module50400Name=Kế toán (nâng cao)
 Module50400Desc=Kế toán quản trị (đôi bên)
 Module54000Name=PrintIPP
-Module54000Desc=In qua Cup IPP in.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Mở Poll
 Module55000Desc=Mô-đun để thực hiện các cuộc thăm dò trực tuyến (như Doodle, Studs, Rdvz, ...)
 Module59000Name=Lợi nhuận
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Phương pháp đặt hàng
 DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng
 DictionaryAccountancyplan=Biểu đồ tài khoản
 DictionaryAccountancysystem=Mô hình biểu đồ của tài khoản
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Thiết lập lưu
 BackToModuleList=Trở lại danh sách các mô-đun
 BackToDictionaryList=Trở lại danh sách từ điển
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bê
 DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
 EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
 EnableShowLogo=Hiển thị biểu tượng trên menu bên trái
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công
 CompanyInfo=Thông tin Công ty / cơ sở
 CompanyIds=Xác định Công ty/ Cơ sở
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 3f6a2a0afa0..d382aef3a06 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=Sự kiện được giao
 ActionsDoneBy=Sự kiện được thực hiện bởi
 ActionsForUser=Sự kiện cho người sử dụng
 ActionsForUsersGroup=Sự kiện cho tất cả người dùng của nhóm
+ActionAssignedTo=Event assigned to
 AllMyActions= Tất cả các sự kiện của tôi / nhiệm vụ
 AllActions= Tất cả các sự kiện / nhiệm vụ
 ViewList=Danh sách xem
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 6894f90a149..c169fe2afbc 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp th
 TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Đang kế toán tạp chí
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Mã kế toán mặc định để mua sản phẩm
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Mã kế toán mặc định để bán sản phẩm
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Mã kế toán mặc định để mua dịch vụ
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Mã kế toán mặc định để bán các dịch vụ
 ACCOUNTING_VAT_ACCOUNT=Kế toán mã mặc định cho thu thuế GTGT
 ACCOUNTING_VAT_BUY_ACCOUNT=Kế toán mã mặc định để nộp thuế GTGT
 ACCOUNTING_ACCOUNT_CUSTOMER=Kế toán mã bằng cách mặc định cho khách hàng thirdparties
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index 2cafa5e8b81..e5d7db9f1bb 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng
 ListOfRunningServices=Danh sách các dịch vụ đang chạy
 NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận)
 BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=Dịch vụ kích hoạt cuối% s
 LastModifiedServices=Dịch vụ biến đổi cuối cùng% s
 EditServiceLine=Dòng Chỉnh sửa dịch vụ
@@ -91,6 +91,7 @@ ListOfServicesToExpire=Danh sách Dịch vụ hết hạn
 NoteListOfYourExpiredServices=Danh sách này chỉ bao gồm các dịch vụ hợp đồng cho các bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng.
 StandardContractsTemplate=Hợp đồng tiêu chuẩn mẫu
 ContactNameAndSignature=Đối với% s, tên, chữ ký:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Bán hàng ký kết hợp đồng đại diện
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 8f3f349ff81..b8c8e2d59a3 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -24,7 +24,7 @@ ECMCreationDate=Ngày tạo
 ECMNbOfFilesInDir=Số lượng hồ sơ trong thư mục
 ECMNbOfSubDir=Số thư mục con
 ECMNbOfFilesInSubDir=Số ảnh trong thư mục con
-ECMCreationUser=Đấng Tạo Hóa
+ECMCreationUser=Người tạo
 ECMArea=Khu vực EDM
 ECMAreaDesc=Các (quản lý tài liệu điện tử) khu vực EDM cho phép bạn lưu, chia sẻ và tìm kiếm một cách nhanh chóng tất cả các loại tài liệu trong Dolibarr.
 ECMAreaDesc2=* Thư mục tự động được điền tự động khi thêm tài liệu từ thẻ của một phần tử. <br> * Hướng dẫn sử dụng các thư mục có thể được sử dụng để lưu các tài liệu không liên quan đến một yếu tố cụ thể.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 2d435e1bd08..a949fb6453e 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Mã nhà cung cấp yêu cầu
 ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng
 ErrorBadParameters=Thông số xấu
 ErrorBadValueForParameter=Sai giá trị '% s' cho tham số không chính xác '% s'
-ErrorBadImageFormat=Tập tin hình ảnh đã không phải là một định dạng được hỗ trợ
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Giá trị '% s' có định dạng sai ngày
 ErrorWrongDate=Ngày là không đúng!
 ErrorFailedToWriteInDir=Không thể viết trong thư mục% s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Người sử dụng có đăng <b>nhập% s</b> không
 ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ.
 ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ...
 ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Tài khoản người <b>dùng% s</b> được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
 ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
 ErrUnzipFails=Không thể giải nén% s với ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa
 ErrorThereIsSomeDeliveries=Lỗi, có một số việc giao hàng có liên quan đến lô hàng này. Xóa từ chối.
 ErrorCantDeletePaymentReconciliated=Không thể xóa một khoản thanh toán đã tạo ra một giao dịch ngân hàng đã được hoà giải
 ErrorCantDeletePaymentSharedWithPayedInvoice=Không thể xóa một khoản thanh toán được chia sẻ bởi ít nhất một hóa đơn với tình trạng payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 7f11e9e529b..eb2687751c6 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -26,8 +26,8 @@ MembersCards=Thành viên danh thiếp
 MembersList=Danh sách thành viên
 MembersListToValid=Danh sách thành viên dự thảo (được xác nhận)
 MembersListValid=Danh sách thành viên hợp lệ
-MembersListUpToDate=Danh sách thành viên hợp lệ lên đến thuê bao ngày
-MembersListNotUpToDate=Danh sách thành viên hợp lệ với các thuê bao trong ngày
+MembersListUpToDate=Danh sách thành viên hợp lệ lên đến mô tả ngày
+MembersListNotUpToDate=Danh sách thành viên hợp lệ với các mô tả trong ngày
 MembersListResiliated=Danh sách thành viên resiliated
 MembersListQualified=Danh sách các thành viên đủ điều kiện
 MenuMembersToValidate=Dự thảo các thành viên
@@ -38,7 +38,7 @@ MenuMembersResiliated=Thành viên Resiliated
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được
 DateAbonment=Ngày đăng ký
 DateSubscription=Ngày đăng ký
-DateNextSubscription=Thuê bao tiếp theo
+DateNextSubscription=Mô tả tiếp theo
 DateEndSubscription=Ngày kết thúc đăng ký
 EndSubscription=Kết thúc đăng ký
 SubscriptionId=Id đăng ký
@@ -55,7 +55,7 @@ MemberStatusDraft=Dự thảo (cần phải được xác nhận)
 MemberStatusDraftShort=Dự thảo
 MemberStatusActive=Xác nhận (đăng ký chờ đợi)
 MemberStatusActiveShort=Xác nhận
-MemberStatusActiveLate=thuê bao hết hạn
+MemberStatusActiveLate=mô tả hết hạn
 MemberStatusActiveLateShort=Hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cho đến nay
@@ -75,17 +75,17 @@ PaymentSubscription=Thanh toán khoản đóng góp mới
 EditMember=Chỉnh sửa thành viên
 SubscriptionEndDate=Ngày kết thúc đăng ký của
 MembersTypeSetup=Loại thành viên thiết lập
-NewSubscription=Thuê bao mới
-NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các thuê bao của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn thuê bao của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s.
+NewSubscription=Mô tả mới
+NewSubscriptionDesc=Hình thức này cho phép bạn ghi lại các mô tả của bạn như là một thành viên mới của nền tảng. Nếu bạn muốn gia hạn mô tả của bạn (nếu đã là thành viên), xin liên lạc với hội đồng quản trị nền tảng thay vì qua email% s.
 Subscription=Đăng ký
 Subscriptions=Đăng ký
 SubscriptionLate=Cuối
-SubscriptionNotReceived=Thuê bao không bao giờ nhận được
+SubscriptionNotReceived=Mô tả không bao giờ nhận được
 SubscriptionLateShort=Cuối
 SubscriptionNotReceivedShort=Không bao giờ nhận được
 ListOfSubscriptions=Danh sách đăng ký
 SendCardByMail=Gửi thẻ qua Email
-AddMember=Thêm thành viên
+AddMember=Tạo thành viên
 NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại"
 NewMemberType=Loại thành viên mới
 WelcomeEMail=Chào mừng e-mail
@@ -100,8 +100,8 @@ Reenable=Bật lại
 ResiliateMember=Resiliate thành viên
 ConfirmResiliateMember=Bạn Bạn có chắc chắn muốn resiliate thành viên này?
 DeleteMember=Xóa thành viên
-ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các thuê bao của mình)?
-DeleteSubscription=Xóa một thuê bao
+ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả các mô tả của mình)?
+DeleteSubscription=Xóa một mô tả
 ConfirmDeleteSubscription=Bạn Bạn có chắc chắn muốn xóa đăng ký này?
 Filehtpasswd=tập tin htpasswd
 ValidateMember=Xác nhận thành viên
@@ -125,8 +125,8 @@ Date=Ngày
 DateAndTime=Ngày và thời gian
 PublicMemberCard=Thẻ thành viên công cộng
 MemberNotOrNoMoreExpectedToSubscribe=Thành viên không hoặc không mong đợi để đăng ký
-AddSubscription=Thêm thuê bao
-ShowSubscription=Hiện thuê bao
+AddSubscription=Tạo mô tả
+ShowSubscription=Hiện mô tả
 MemberModifiedInDolibarr=Thành viên sửa đổi trong Dolibarr
 SendAnEMailToMember=Gửi email thông tin cho các thành viên
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của e-mail nhận được trong trường hợp tự động ghi của khách
@@ -135,8 +135,8 @@ DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành
 DescADHERENT_AUTOREGISTER_MAIL=Thư điện tử của thành viên autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=Tiêu đề thư điện tử để xác nhận thành viên
 DescADHERENT_MAIL_VALID=Thư điện tử để xác nhận thành viên
-DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho thuê bao
-DescADHERENT_MAIL_COTIS=Thư điện tử cho thuê bao
+DescADHERENT_MAIL_COTIS_SUBJECT=Tiêu đề thư điện tử cho mô tả
+DescADHERENT_MAIL_COTIS=Thư điện tử cho mô tả
 DescADHERENT_MAIL_RESIL_SUBJECT=Tiêu đề thư điện tử cho thành viên resiliation
 DescADHERENT_MAIL_RESIL=Thư điện tử của thành viên resiliation
 DescADHERENT_MAIL_FROM=Tên người gửi thư điện tử cho email tự động
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Không có bên thứ ba liên quan đến thành
 ThirdPartyDolibarr=Bên thứ ba Dolibarr
 MembersAndSubscriptions= Thành viên và theo dõi
 MoreActions=Hành động bổ sung vào thu
-MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một thuê bao
+MoreActionsOnSubscription=Hành động bổ sung, đề nghị theo mặc định khi ghi âm một mô tả
 MoreActionBankDirect=Tạo một bản ghi giao dịch trực tiếp trên tài khoản
 MoreActionBankViaInvoice=Tạo hóa đơn và thanh toán trên tài khoản
 MoreActionInvoiceOnly=Tạo hóa đơn không có thanh toán
@@ -164,7 +164,7 @@ LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo ra các tập tin
 DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên
 DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt
 DocForLabels=Tạo tờ địa chỉ
-SubscriptionPayment=Thanh toán thuê bao
+SubscriptionPayment=Thanh toán mô tả
 LastSubscriptionDate=Cuối ngày đăng ký
 LastSubscriptionAmount=Số lượng đăng ký cuối cùng
 MembersStatisticsByCountries=Thành viên thống kê của đất nước
@@ -180,17 +180,17 @@ MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê
 MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
 LastMemberDate=Ngày thành viên cuối cùng
-Nature=Thiên nhiên
+Nature=Tự nhiên
 Public=Thông tin được công khai
 Exports=Xuất khẩu
 NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
-SubscriptionsStatistics=Thống kê về thuê bao
+SubscriptionsStatistics=Thống kê về mô tả
 NbOfSubscriptions=Số đăng ký
-AmountOfSubscriptions=Số tiền thuê bao
+AmountOfSubscriptions=Số tiền mô tả
 TurnoverOrBudget=Doanh thu (cho một công ty) hay Ngân sách nhà nước (đối với một nền tảng)
-DefaultAmount=Số lượng mặc định của thuê bao
-CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng thuê bao của mình
+DefaultAmount=Số lượng mặc định của mô tả
+CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng mô tả của mình
 MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang tích hợp thanh toán trực tuyến
 Associations=Cơ sở
 Collectivités=Tổ chức
@@ -199,7 +199,8 @@ Entreprises=Các công ty
 DOLIBARRFOUNDATION_PAYMENT_FORM=Để thực hiện thanh toán đăng ký của bạn bằng cách sử dụng chuyển khoản ngân hàng, xem trang <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Để thanh toán bằng cách sử dụng thẻ tín dụng hoặc Paypal, bấm vào nút ở dưới cùng của trang này. <br>
 ByProperties=Bởi đặc điểm
 MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm
-MembersByNature=Thành viên của thiên nhiên
-VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho thuê bao
-NoVatOnSubscription=Không TVA cho thuê bao
-MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho thuê bao
+MembersByNature=Thành viên của tự nhiên
+VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả
+NoVatOnSubscription=Không TVA cho mô tả
+MEMBER_PAYONLINE_SENDEMAIL=Gửi email cảnh báo khi Dolibarr nhận được xác nhận của một xác nhận thanh toán cho mô tả
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 38a20e0037d..6229c7c4a90 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -17,8 +17,8 @@ ProductVatMassChange=Thay đổi thuế GTGT hàng loạt
 ProductVatMassChangeDesc=Trang này có thể được sử dụng để sửa đổi một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
 MassBarcodeInit=Khối lượng mã vạch init
 MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra trước đó thiết lập các mô-đun mã vạch hoàn tất.
-ProductAccountancyBuyCode=Đang Toán (mua)
-ProductAccountancySellCode=Đang kế toán (bán)
+ProductAccountancyBuyCode=Mã kế toán (mua)
+ProductAccountancySellCode=Mã kế toán (bán)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
@@ -46,10 +46,10 @@ Warehouse=Kho
 Warehouses=Các kho hàng
 WarehouseOpened=Kho mở
 WarehouseClosed=Kho đóng
-Stock=Cổ
-Stocks=Cổ phiếu
-Movement=Phong trào
-Movements=Biến động
+Stock=tồn kho
+Stocks=tồn kho phiếu
+Movement=Chuyển kho
+Movements=Danh sách chuyển kho
 Sell=Bán hàng
 Buy=Mua
 OnSell=Bán
@@ -117,12 +117,12 @@ ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gia
 MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ
 MultiPricesNumPrices=Số giá
 MultiPriceLevelsName=Loại giá
-AssociatedProductsAbility=Kích hoạt tính năng sản phẩm ảo
-AssociatedProducts=Sản phẩm ảo
-AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này
-ParentProductsNumber=Số phụ huynh sản phẩm ảo
-IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo
-IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo
+AssociatedProductsAbility=Kích hoạt tính năng gói ảo
+AssociatedProducts=Sản phẩm trọn gói
+AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm này gói ảo
+ParentProductsNumber=Số sản phẩm bao bì mẹ
+IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm trọn gói ảo
+IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm gói ảo
 EditAssociate=Phó
 Translation=Dịch
 KeywordFilter=Bộ lọc từ khóa
@@ -132,7 +132,7 @@ AddDel=Thêm / Xóa
 Quantity=Số lượng
 NoMatchFound=Không có trận đấu được tìm thấy
 ProductAssociationList=Danh sách sản phẩm / dịch vụ liên quan: tên của sản phẩm / dịch vụ (số lượng bị ảnh hưởng)
-ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần
+ProductParentList=Danh sách sản phẩm / dịch vụ trọn gói với sản phẩm này như là một thành phần
 ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm / dịch vụ
 ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ?
@@ -147,13 +147,13 @@ DeleteProductLine=Xóa dòng sản phẩm
 ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này?
 NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn
 MatchingProducts=Phù hợp với sản phẩm / dịch vụ
-NoStockForThisProduct=Không có cổ phiếu nào cho sản phẩm này
-NoStock=Không Cổ
-Restock=Trồng cây
+NoStockForThisProduct=Không có tồn kho nào cho sản phẩm này
+NoStock=Không tồn kho
+Restock=Restock
 ProductSpecial=Đặc biệt
 QtyMin=Số lượng tối thiểu
 PriceQty=Giá cho số lượng này
-PriceQtyMin=Giá cho min này. SL (w / o giảm giá)
+PriceQtyMin=Giá cho tối thiểu này. SL (w / o giảm giá)
 VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm)
 DiscountQtyMin=Mặc định giảm giá cho SL
 NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm
@@ -175,11 +175,11 @@ ListProductByPopularity=Danh sách sản phẩm nổi tiếng
 ListServiceByPopularity=Danh sách các dịch vụ nổi tiếng
 Finished=Sản phẩm sản xuất
 RowMaterial=Nguyên liệu
-CloneProduct=Sản phẩm hoặc dịch vụ Clone
+CloneProduct=Sản phẩm hoặc dịch vụ sao chép
 ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch <b>vụ% s?</b>
 CloneContentProduct=Sao lưu tất cả thông tin chính của sản phẩm / dịch vụ
-ClonePricesProduct=Thông tin chính Clone và giá cả
-CloneCompositionProduct=Ảo sản phẩm / dịch vụ Clone
+ClonePricesProduct=Thông tin chính sao chép và giá cả
+CloneCompositionProduct=sao chép đóng gói sản phẩm / dịch vụ
 ProductIsUsed=Sản phẩm này được sử dụng
 NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ
 CustomerPrices=Giá khách hàng
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách
 PriceByCustomerLog=Giá bán của khách hàng đăng nhập
 MinimumPriceLimit=Giá tối thiểu không thấp hơn% s
 MinimumRecommendedPrice=Giá đề nghị tối thiểu là:% s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 53fbbdafe60..a6ccfac4cf2 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (q
 Myprojects=Dự án của tôi
 ProjectsArea=Khu vực dự án
 NewProject=Dự án mới
-AddProject=Thêm dự án
+AddProject=Tạo dự án
 DeleteAProject=Xóa một dự án
 DeleteATask=Xóa một tác vụ
 ConfirmDeleteAProject=Bạn có chắc muốn xóa dự án này?
@@ -36,6 +36,8 @@ TaskTimeSpent=Thời gian dành cho công việc
 TaskTimeUser=Người sử dụng
 TaskTimeNote=Lưu ý
 TaskTimeDate=Ngày
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Thời gian đã qua mới
 MyTimeSpent=Thời gian đã qua của tôi
 MyTasks=Tác vụ của tôi
@@ -45,7 +47,7 @@ TaskDateStart=Nhiệm vụ ngày bắt đầu
 TaskDateEnd=Nhiệm vụ ngày kết thúc
 TaskDescription=Mô tả công việc
 NewTask=Tác vụ mới
-AddTask=Thêm tác vụ
+AddTask=Tạo công việc
 AddDuration=Thêm độ dài thời gian
 Activity=Hoạt động
 Activities=Tác vụ/hoạt động
@@ -85,13 +87,13 @@ ActionsOnProject=Các sự kiện liên quan đến dự án
 YouAreNotContactOfProject=Bạn không thuộc phần liên lạc đối với chủ đề thuộc phạm vi riêng tư này
 DeleteATimeSpent=Xóa thời gian đã bỏ ra
 ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã bỏ ra?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Xem thêm nhiệm vụ không được gán cho tôi
+ShowMyTasksOnly=Xem chỉ nhiệm vụ được giao với tôi
 TaskRessourceLinks=Các nguồn tài nguyên
 ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này
 NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Nhiệm vụ không được giao cho bạn
 ErrorTimeSpentIsEmpty=Thời gian đã qua hiện đang rỗng
 ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (<b>%s</b> các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua.
 IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (đơn hàng, đơn đặt hàng, ...), thuộc về một bên thứ ba khác, phải có đường liên kết đến dự án để tạo, duy trì phần này rỗng để dự án có thể có sự tham gia của nhiều bên thứ ba khác
@@ -120,7 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Đóng góp
 TypeContact_project_task_external_TASKCONTRIBUTOR=Đóng góp
 SelectElement=Chọn phần
 AddElement=Liên kết đến yếu tố
-UnlinkElement=Unlink element
+UnlinkElement=Yếu tố Bỏ liên kết
 # Documents models
 DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...)
 PlannedWorkload = Tải tiến trình công việc đã dự định
@@ -129,4 +131,4 @@ ProjectReferers=Các đối tượng tham chiếu
 SearchAProject=Tìm kiếm một dự án
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên
 ProjectDraft=Dự thảo dự án
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index bb544bbfc61..6e9b8aef50b 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -16,7 +16,7 @@ Prospect=Triển vọng
 ProspectList=Danh sách khách hàng tiềm năng
 DeleteProp=Xóa đề nghị thương mại
 ValidateProp=Xác nhận đề nghị thương mại
-AddProp=Thêm đề nghị
+AddProp=Tạo đề xuất
 ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này?
 ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới <b>tên% s?</b>
 LastPropals=Cuối% s đề xuất
@@ -55,8 +55,6 @@ NoOpenedPropals=Không có đề xuất thương mại mở
 NoOtherOpenedPropals=Không có đề xuất thương mại mở khác
 RefProposal=Đề nghị ref thương mại
 SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện
-FileNotUploaded=Các tập tin không được tải lên
-FileUploaded=Các tập tin được tải lên thành công
 AssociatedDocuments=Các tài liệu liên quan đến đề nghị:
 ErrorCantOpenDir=Không thể mở thư mục
 DatePropal=Ngày đề nghị
@@ -76,7 +74,7 @@ CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề ng
 CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ
 DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày)
 UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận
-ClonePropal=Đề nghị thương mại Clone
+ClonePropal=Đề nghị thương mại sao chép
 ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương <b>mại% s?</b>
 ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương <b>mại% s?</b>
 ProposalsAndProposalsLines=Đề nghị thương mại và dòng
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/vi_VN/resource.lang
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index a8c8d228906..39ad630c510 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Nhà cung cấp
 Supplier=Nhà cung cấp
-AddSupplier=Thêm một nhà cung cấp
+AddSupplier=Tạo một nhà cung cấp
 SupplierRemoved=Nhà cung cấp loại bỏ
 SuppliersInvoice=Nhà cung cấp hóa đơn
 NewSupplier=Nhà cung cấp mới
@@ -11,7 +11,7 @@ ShowSupplier=Hiện nhà cung cấp
 OrderDate=Ngày đặt hàng
 BuyingPrice=Giá mua
 BuyingPriceMin=Giá mua tối thiểu
-BuyingPriceMinShort=Min giá mua
+BuyingPriceMinShort=Tối thiểu giá mua
 TotalBuyingPriceMin=Tổng số subproducts giá mua
 SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định
 AddSupplierPrice=Thêm giá nhà cung cấp
@@ -40,5 +40,5 @@ AddSupplierInvoice=Tạo nhà cung cấp hóa đơn
 ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung <b>cấp% s</b>
 NoneOrBatchFileNeverRan=Không có hoặc hàng <b>loạt% s</b> không chạy gần đây
 SentToSuppliers=Gửi đến nhà cung cấp
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp
+MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 9a2f990f6b0..846f80ab12d 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=Về tín dụng
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Hiện Rút
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
-DoStandingOrdersBeforePayments=Thẻ này cho phép bạn yêu cầu để đứng. Sau khi hoàn tất, bạn có thể gõ thanh toán để đóng hóa đơn.
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Thu hồi tập tin
 SetToStatusSent=Thiết lập để tình trạng "File gửi"
 ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 7cc1e718e38..aa7361675a0 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=使用自动填充字段来选择第三方(而不是使
 ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=使用自动填充字段来选择联系人（而不是使用一个列表框）。
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=搜索过滤选项
 NumberOfKeyToSearch=触发搜索的字符数量：%s
 ViewFullDateActions=在第三表中显示全天事件
@@ -208,6 +210,7 @@ ModulesJobDesc=业务模块为特定业务提供简单的 Dolibarr 预制设置
 ModulesMarketPlaceDesc=您可以在一些外部网站上找到更多的模块(安全性未知)...
 ModulesMarketPlaces=更多模块...
 DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=网站提供者可以搜索找到更多模块...
 URL=链接
 BoxesAvailable=资讯框可用
@@ -444,7 +447,7 @@ Module55Desc=条码的管理
 Module56Name=电话
 Module56Desc=电话整合
 Module57Name=长期订单
-Module57Desc=长期订单和提款管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=单击拨号
 Module58Desc=单击拨号系统集成(Asterisk ...)
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS 源
 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面
 Module330Name=书签
 Module330Desc=书签的管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=特别费用（税，社会公益，股息）
@@ -495,6 +498,8 @@ Module1780Name=分类
 Module1780Desc=分类的管理(产品、供应商和客户)
 Module2000Name=所见即所得编辑器
 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=任务排程管理
 Module2400Name=日程
@@ -503,6 +508,8 @@ Module2500Name=电子内容管理
 Module2500Desc=保存和共享文件
 Module2600Name=SOAP WebServices
 Module2600Desc=启用 Dolibarr Web 服务的服务器
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=使用网上的 Gravatar 服务(www.gravatar.com)，显示 用户/成员的头像(通过电邮搜索)。需要互联网连接。
 Module2800Desc=FTP 客户端
@@ -517,7 +524,7 @@ Module6000Desc=工作流管理
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=产品批号
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=出纳
 Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面
 Module50100Name=POS
@@ -527,7 +534,7 @@ Module50200Desc=模块提供信用卡与Paypal网上支付页面
 Module50400Name=财会(高级)
 Module50400Desc=会计管理(双方)
 Module54000Name=IPP打印
-Module54000Desc=通过CUPS IPP 打印机打印 . 注：CUPS IPP:支持Internet协议的Unix打印系统
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=利润空间
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=设定值已储存
 BackToModuleList=返回模块列表
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=默认语言使用(语言代码)
 EnableMultilangInterface=启用多语言界面
 EnableShowLogo=左侧菜单中显示公司标志
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系统已成功更新
 CompanyInfo=公司资讯
 CompanyIds=公司/协会的编号
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index f0baa362ff1..50054428dab 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=受影响的行动
 ActionsDoneBy=做的动作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的事件/任务
 AllActions= 所有/任务行动
 ViewList=查看列表
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index cc7916bbd7d..1386b63e55c 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=购货缺省会计代码
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖货缺省会计代码
-ACCOUNTING_SERVICE_BUY_ACCOUNT=购买服务缺省会计编码
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=出售服务缺省会计代码
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index d24baa68199..b5ccca60cad 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名单合同线运行
 ListOfRunningServices=运行服务的列表
 NotActivatedServices=不活跃的服务（除验证合同）
 BoardNotActivatedServices=服务激活验证合同之间
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=上次%s的激活服务
 LastModifiedServices=最后%S修饰服务
 EditServiceLine=编辑服务项目
@@ -91,6 +91,7 @@ ListOfServicesToExpire=服务到期列表
 NoteListOfYourExpiredServices=此列表只包含你作为一个销售代表与第三方的服务合同 。
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=销售代表签订合同
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index abbf725b3f9..1a9cf940bfd 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -27,7 +27,7 @@ ErrorProdIdIsMandatory=%s 是强制性的
 ErrorBadCustomerCodeSyntax=坏客户代码的语法
 ErrorBadBarCodeSyntax=Bad syntax for bar code
 ErrorCustomerCodeRequired=客户代码需要
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=需要条形码
 ErrorCustomerCodeAlreadyUsed=客户代码已被使用
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=前缀要求
@@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=要求供应商代码
 ErrorSupplierCodeAlreadyUsed=供应商代码已被使用
 ErrorBadParameters=错误的参数
 ErrorBadValueForParameter=错误值“参数不正确”%s %s'“
-ErrorBadImageFormat=图像文件有不支持的格式
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=值“%s”有错误的日期格式
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=日期不正确！
 ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的
 ErrorUserCannotBeDelete=用户不能被删除。也许它是相关联的Dolibarr实体。
@@ -74,7 +74,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=无法储存与行动“规约未启动
 ErrorRefAlreadyExists=号的创作已经存在。
 ErrorPleaseTypeBankTransactionReportName=请输入银行收据的名字在交易报告（格式YYYYMM或采用YYYYMMDD）
 ErrorRecordHasChildren=删除记录失败，因为它有一些儿童。
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=不能删除记录。它已被使用或者包含在其他对象中。
 ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作。要启用/禁用JavaScript，进入菜单首页->安装->“显示。
 ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配
 ErrorContactEMail=一个技术性错误发生。请联系管理员，以下连接提供错误代码<b>%s</b>在您的邮件，甚至更好，加入了这个页面的屏幕拷贝的电子邮件<b>%s。</b>
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>如何正确</b>使用手机与登录<b>%</b>找不
 ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。
 ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
 ErrorBothFieldCantBeNegative=领域的%s及%s可以不消极
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户帐户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
@@ -132,11 +133,29 @@ ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setu
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
+ErrorBadFormat=格式错误！
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 77941da84a9..c1f903270ce 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=晚
 SubscriptionNotReceivedShort=从未收到
 ListOfSubscriptions=订阅名单
 SendCardByMail=发送卡
-AddMember=加入会员
+AddMember=Create member
 NoTypeDefinedGoToSetup=任何成员类型定义。前往设置 - 会员类型
 NewMemberType=新会员类型
 WelcomeEMail=欢迎电子邮件
@@ -125,7 +125,7 @@ Date=日期
 DateAndTime=日期和时间
 PublicMemberCard=市民卡会员
 MemberNotOrNoMoreExpectedToSubscribe=会员没有或没有更多的预期订阅
-AddSubscription=添加订阅
+AddSubscription=Create subscription
 ShowSubscription=显示订阅
 MemberModifiedInDolibarr=会员修改Dolibarr
 SendAnEMailToMember=向会员发送信息的电子邮件
@@ -170,6 +170,8 @@ LastSubscriptionAmount=最后认购金额
 MembersStatisticsByCountries=成员由国家统计
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=成员由镇统计
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=成员数
 NoValidatedMemberYet=没有验证的成员发现
 MembersByCountryDesc=该屏幕显示您成员国的统计数字。然而，图形取决于谷歌在线图服务，可只有一个互联网连接工作。
@@ -201,3 +203,4 @@ MembersByNature=会员按性质
 VATToUseForSubscriptions=增值税率，用于订阅
 NoVatOnSubscription=没有增值税订阅
 MEMBER_PAYONLINE_SENDEMAIL=通过电子邮件发送警告Dolibarr时收到一个确认的验证支付认购
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index cdd5034bf78..d308f2dbaa5 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果产品是有限期的服务：
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=价格个数
 MultiPriceLevelsName=价格分类
-AssociatedProductsAbility=启用虚拟产品功能
-AssociatedProducts=虚拟产品
-AssociatedProductsNumber=组成此虚拟产品的产品数量
-ParentProductsNumber=父虚拟产品的数量
-IfZeroItIsNotAVirtualProduct=0 表示非虚拟产品
-IfZeroItIsNotUsedByVirtualProduct=0 表示此产品未被任何虚拟产品引用。
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=关联
 Translation=翻译
 KeywordFilter=关键词筛选
@@ -132,7 +132,7 @@ AddDel=添加/删除
 Quantity=数量
 NoMatchFound=未发现匹配项目
 ProductAssociationList=相关产品/服务列表: 产品/服务名称 (按数量)
-ProductParentList=由此产品组成的虚拟产品或服务
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗？
@@ -179,7 +179,7 @@ CloneProduct=复制产品/服务
 ConfirmCloneProduct=您确定要复制产品或服务 <b>%s</b> 吗?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 CustomerPrices=销售价格
@@ -217,11 +217,11 @@ ProductsMultiPrice=产品多重价格
 ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
+Quarter1=第1季度
+Quarter2=第2季度
+Quarter3=第3季度
+Quarter4=第4季度
+BarCodePrintsheet=打印条形码
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index e9fd2afcaeb..cb9cecbc481 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准
 Myprojects=我的项目
 ProjectsArea=项目领域
 NewProject=新项目
-AddProject=新增项目
+AddProject=Create project
 DeleteAProject=删除一个项目
 DeleteATask=删除任务
 ConfirmDeleteAProject=你确定要删除此项目吗？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的时间
 MyTimeSpent=我的时间花
 MyTasks=我的任务
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任务
-AddTask=新增任务
+AddTask=Create task
 AddDuration=添加时间
 Activity=活动
 Activities=任务/活动
diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/zh_CN/resource.lang
+++ b/htdocs/langs/zh_CN/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 0c7d34a38f5..fa4949d1971 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=信贷
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=显示撤柜
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果发票已至少有一个撤出支付尚未处理的，它不会被设置为支付最高允许管理撤出之前。
-DoStandingOrdersBeforePayments=这个标签允许你为一个固定的订单要求。一旦完成，你可以键入付款，收发票。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=撤回文件
 SetToStatusSent=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=这也将创造在付款发票上，将它们归类支付
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=由银行支付的长期订单%s
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 001aa613e7e..55ae292a37f 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Use autocompletion fields to choose third parties inste
 ActivityStateToSelectCompany= 添加一個篩選器的選項，以顯示/隱藏thirdparties，這是在目前的活動或已停止
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=搜尋過濾選項
 NumberOfKeyToSearch=需要 %s 個字元來觸發搜尋
 ViewFullDateActions=充分顯示行動的日期，第三表
@@ -208,6 +210,7 @@ ModulesJobDesc=業務模組提供特定業務簡單的Dolibarr預定義設置。
 ModulesMarketPlaceDesc=你可以找到更多的模組，以在互聯網上下載的外部網站的...
 ModulesMarketPlaces=更多的模組...
 DoliStoreDesc=DoliStore，為Dolibarr的ERP / CRM的外部模組官方市場
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=網站提供者可以搜尋找到更多的模組...
 URL=連結
 BoxesAvailable=資訊框可用
@@ -444,7 +447,7 @@ Module55Desc=條碼的管理
 Module56Name=電話
 Module56Desc=電話整合
 Module57Name=長期訂購
-Module57Desc=長期訂購和提款管理
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial一體化
 Module59Name=Bookmark4u
@@ -475,8 +478,8 @@ Module320Name=RSS饋送
 Module320Desc=添加RSS飼料內Dolibarr屏幕頁面
 Module330Name=書籤
 Module330Desc=書籤的管理
-Module400Name=Projects/Opportunity
-Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module400Name=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar一體化
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -495,6 +498,8 @@ Module1780Name=分類
 Module1780Desc=分類的管理（產品，供應商和客戶）
 Module2000Name=fckeditor的
 Module2000Desc=所見即所得的編輯器
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled task management
 Module2400Name=議程
@@ -503,6 +508,8 @@ Module2500Name=電子內容管理
 Module2500Desc=保存和共享文件
 Module2600Name=的WebServices
 Module2600Desc=啟用Web服務的服務器Dolibarr
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=的Gravatar
 Module2700Desc=使用網上的Gravatar服務（www.gravatar.com），以顯示/成員（與他們的電子郵件用戶發現照片）。需要一個互聯網接入
 Module2800Desc=FTP Client
@@ -517,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=出納
 Module50000Desc=模組提供信用卡網上支付頁面與出納
 Module50100Name=銷售點
@@ -527,7 +534,7 @@ Module50200Desc=模組提供信用卡與Paypal網上支付頁面
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -779,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=設定值已儲存
 BackToModuleList=返回模組列表
 BackToDictionaryList=Back to dictionaries list
@@ -888,6 +896,7 @@ PermanentLeftSearchForm=常駐左搜尋列表菜單
 DefaultLanguage=預設語言使用（語言代碼）
 EnableMultilangInterface=啟用多語言界面
 EnableShowLogo=在菜單上顯示的標誌
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系統已成功更新
 CompanyInfo=公司/基本資訊
 CompanyIds=公司/基本ID
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index eaa4f1ff00d..65870ed6994 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -29,6 +29,7 @@ ActionsToDoBy=受影響的行動
 ActionsDoneBy=做的動作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的行動/任務
 AllActions= 所有/任務行動
 ViewList=查看列表
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 0550676f5a9..90a7651497b 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -197,10 +197,6 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
 ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index 65b0b67e7fa..d513a4f4b35 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名單合同線運行
 ListOfRunningServices=運行服務的列表
 NotActivatedServices=不活躍的服務（除驗證合同）
 BoardNotActivatedServices=服務激活驗證合同之間
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
 LastActivatedServices=上次%s的激活服務
 LastModifiedServices=最後%S修飾服務
 EditServiceLine=編輯服務項目
@@ -91,6 +91,7 @@ ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
 StandardContractsTemplate=Standard contracts template
 ContactNameAndSignature=For %s, name and signature:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=銷售代表簽訂合同
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 8562dccaf35..4fab2ab4b90 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=錯誤!需要提供供應商代號
 ErrorSupplierCodeAlreadyUsed=錯誤!供應商代號已被使用
 ErrorBadParameters=錯誤的參數
 ErrorBadValueForParameter=錯誤值“參數不正確”%s %s'“
-ErrorBadImageFormat=圖像文件有不支持的格式
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=值“%s”有錯誤的日期格式
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=無法寫在目錄%s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>如何正確</b>使用手機與登錄<b>%</b>找不
 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。進程中止。
 ErrorBadValueForCode=代碼有錯誤的值類型。再次嘗試以新的價值...
 ErrorBothFieldCantBeNegative=領域的%s及%s可以不消極
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用來執行Web服務器用戶帳戶沒有該權限
 ErrorNoActivatedBarcode=沒有激活的條碼類型
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -137,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index ea9fd8a62b4..5caf80e18e8 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -8,7 +8,7 @@ Members=成員
 MemberAccount=會員登錄
 ShowMember=出示會員卡
 UserNotLinkedToMember=用戶成員沒有聯系
-# ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Third-party not linked to a member
 MembersTickets=成員的機票
 FundationMembers=基金會成員
 Attributs=屬性
@@ -85,8 +85,7 @@ SubscriptionLateShort=晚
 SubscriptionNotReceivedShort=從未收到
 ListOfSubscriptions=訂閱名單
 SendCardByMail=發送卡
-AddMember=加入會員
-MemberType=會員類型
+AddMember=Create member
 NoTypeDefinedGoToSetup=任何成員類型定義。前往設置 - 會員類型
 NewMemberType=新會員類型
 WelcomeEMail=歡迎電子郵件
@@ -126,12 +125,12 @@ Date=日期
 DateAndTime=日期和時間
 PublicMemberCard=市民卡會員
 MemberNotOrNoMoreExpectedToSubscribe=會員沒有或沒有更多的預期訂閱
-AddSubscription=添加訂閱
+AddSubscription=Create subscription
 ShowSubscription=顯示訂閱
 MemberModifiedInDolibarr=會員修改Dolibarr
 SendAnEMailToMember=向會員發送信息的電子郵件
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-# DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=電郵題目會員autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=電子郵箱會員autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=電郵題目會員驗證
@@ -142,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=電郵題目會員resiliation
 DescADHERENT_MAIL_RESIL=電子郵箱會員resiliation
 DescADHERENT_MAIL_FROM=發件人的電子郵件自動電子郵件
 DescADHERENT_ETIQUETTE_TYPE=標簽的格式頁
-# DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=卡的格式頁
 DescADHERENT_CARD_HEADER_TEXT=文字印在會員卡頂部
 DescADHERENT_CARD_TEXT=文字印在（會員卡，左對齊）
@@ -156,7 +155,7 @@ NoThirdPartyAssociatedToMember=無關聯的第三方該會員
 ThirdPartyDolibarr=Dolibarr第三者
 MembersAndSubscriptions= 議員和Subscriptions
 MoreActions=補充行動記錄
-# MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=創建一個直接交易記錄的帳戶
 MoreActionBankViaInvoice=建立發票和付款帳戶
 MoreActionInvoiceOnly=創建一個沒有付款發票
@@ -171,6 +170,8 @@ LastSubscriptionAmount=最後認購金額
 MembersStatisticsByCountries=成員由國家統計
 MembersStatisticsByState=成員由州/省的統計信息
 MembersStatisticsByTown=成員由鎮統計
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=成員數
 NoValidatedMemberYet=沒有驗證的成員發現
 MembersByCountryDesc=該屏幕顯示您成員國的統計數字。然而，圖形取決於谷歌在線圖服務，可只有一個互聯網連接工作。
@@ -196,9 +197,10 @@ Collectivités=組織
 Particuliers=個人
 Entreprises=公司
 DOLIBARRFOUNDATION_PAYMENT_FORM=為了使您的訂閱使用銀行轉帳支付，請參閱頁<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> 。 <br>使用信用卡或PayPal支付，點擊此頁底部的按鈕。 <br>
-# ByProperties=By characteristics
-# MembersStatisticsByProperties=Members statistics by characteristics
-# MembersByNature=Members by nature
-# VATToUseForSubscriptions=VAT rate to use for subscriptions
-# NoVatOnSubscription=No TVA for subscriptions
-# MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ByProperties=By characteristics
+MembersStatisticsByProperties=Members statistics by characteristics
+MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
+MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index d6b4c7fc7d0..e7406e70399 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -117,12 +117,12 @@ ServiceLimitedDuration=如果產品是一種有期限的服務，請指定服務
 MultiPricesAbility=Several level of prices per product/service
 MultiPricesNumPrices=多種價格的數量
 MultiPriceLevelsName=價格分類
-AssociatedProductsAbility=啟用子階產品功能
-AssociatedProducts=相關聯的產品
-AssociatedProductsNumber=此產品需要其他子產品(下階)的數量
-ParentProductsNumber=影響上階(母)產品的數量
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Activate the virtual package feature
+AssociatedProducts=Package product
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=編輯關聯性
 Translation=產品描述翻譯
 KeywordFilter=關鍵字過濾
@@ -132,7 +132,7 @@ AddDel=新增或刪除
 Quantity=數量
 NoMatchFound=沒有找到匹配
 ProductAssociationList=以下為下階子產品(服務)清單，及所需下階數量和庫存數量
-ProductParentList=此產品(服務)是用來組成以下產品(服務)的
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選定的產品之一，是家長與當前的產品
 DeleteProduct=刪除一個產品/服務
 ConfirmDeleteProduct=你確定要刪除這個產品/服務？
@@ -179,7 +179,7 @@ CloneProduct=複製產品/服務
 ConfirmCloneProduct=你確定要複製一份 <b>%s</b> 產品/服務單嗎 ？
 CloneContentProduct=複製此產品/服務的所有資訊內容
 ClonePricesProduct=複製此產品/服務的價格資訊
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務編號
 CustomerPrices=銷售價格
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Price by customer log
 MinimumPriceLimit=Minimum price can't be lower that %s
 MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 3f4b27b3793..3fa7e273657 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準
 Myprojects=我的項目
 ProjectsArea=項目領域
 NewProject=新項目
-AddProject=新增項目
+AddProject=Create project
 DeleteAProject=刪除一個項目
 DeleteATask=刪除任務
 ConfirmDeleteAProject=你確定要刪除此項目嗎？
@@ -36,6 +36,8 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的時間
 MyTimeSpent=我的時間花
 MyTasks=我的任務
@@ -45,7 +47,7 @@ TaskDateStart=Task start date
 TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任務
-AddTask=新增任務
+AddTask=Create task
 AddDuration=添加時間
 Activity=活動
 Activities=任務/活動
diff --git a/htdocs/langs/zh_TW/resource.lang b/htdocs/langs/zh_TW/resource.lang
index d64075dfbf5..32bdd92f884 100644
--- a/htdocs/langs/zh_TW/resource.lang
+++ b/htdocs/langs/zh_TW/resource.lang
@@ -31,6 +31,4 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
-DictionaryEMailTemplates=Modèles d'Emails
-
 SelectResource=Select resource
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 40e93a15a5a..06d3f9d694c 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -79,10 +79,11 @@ CreditDate=信貸
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=顯示撤櫃
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果發票已至少有一個撤出支付尚未處理的，它不會被設置為支付最高允許管理撤出之前。
-DoStandingOrdersBeforePayments=這個標簽允許你為一個固定的訂單要求。一旦完成，你可以鍵入付款，收發票。
+DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=由銀行支付的長期訂單%s
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 99d5495ef58..35460af92e3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,12 +100,12 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
 $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
-$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
-$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
-$colorbacklinepair1='255,255,255';    // line pair
-$colorbacklinepair2='255,255,255';    // line pair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbacklineimpair1='255,255,255';    // line pair
+$colorbacklineimpair2='255,255,255';    // line pair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
+$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
 $colorbackbody='#f9f9f9';
 $colortext='40,40,40';
 $fontsize='12';
@@ -125,12 +125,12 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
     $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
-    $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
-    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
-    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
+    $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
+    $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
+    $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_TEXT='50,50,130';
     $conf->global->THEME_ELDY_FONT_SIZE1='12';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';

From bdf8189d20d3c797c79f3b317d307565af1c2e18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Dec 2014 10:40:39 +0100
Subject: [PATCH 122/345] Fixed: CSS

---
 htdocs/theme/eldy/style.css.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 35460af92e3..143b76b00ed 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,12 +100,12 @@ $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
 $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
 $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacklineimpair1='255,255,255';    // line pair
-$colorbacklineimpair2='255,255,255';    // line pair
-$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
-$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
-$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
+$colorbacklineimpair1='255,255,255';    // line impair
+$colorbacklineimpair2='255,255,255';    // line impair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));	// line impair
+$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line pair
+$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line pair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line pair
 $colorbackbody='#f9f9f9';
 $colortext='40,40,40';
 $fontsize='12';
@@ -1840,7 +1840,7 @@ table.liste td {
 }
 */
 
-.impair:hover {
+.impair:hover, td.nohover {
 <?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
 	background: rgb(<?php echo $colorbacklineimpairhover; ?>);
 <?php } else { ?>
@@ -1866,7 +1866,7 @@ table.liste td {
 	min-height: 18px; /* seems to not be used */
 }
 
-td.nohover, .pair:hover {
+.pair:hover {
 <?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
 	background: rgb(<?php echo $colorbacklinepairhover; ?>);
 <?php } else { ?>

From fedd05cbcc3b30cbdd6e7c4bd1179a539742d224 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 15 Dec 2014 11:05:47 +0100
Subject: [PATCH 123/345] button should be within form

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

diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index a5f54d5c431..d35e6e8ddf6 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -156,9 +156,9 @@ foreach ( $list as $key ) {
 }
 
 print "</table>\n";
-print '</form>';
 
 print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+print '</form>';
 
 llxFooter();
 $db->close();
\ No newline at end of file

From 3d510ef3464038da4635d8c7cdc1b6e952fd939a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 15 Dec 2014 11:19:14 +0100
Subject: [PATCH 124/345] closing tag twice

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

diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
index d97af918f90..bec3fee45e9 100644
--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@@ -163,7 +163,6 @@ $db->free($resql);
 
 print "</table>\n";
 
-print '</table>';
 print '</div>';
 
 print '<br>';

From 574502994246f9664931bfddb6d0b2ffaaec6bf7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 15 Dec 2014 11:33:09 +0100
Subject: [PATCH 125/345] Change credential test data in WS demo

---
 htdocs/webservices/demo_wsclient_actioncomm.php-NORUN | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
index 32df64218d3..1e14c07a5bf 100755
--- a/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
@@ -53,8 +53,8 @@ if ($soapclient)
 $authentication=array(
     'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
     'sourceapplication'=>'DEMO',
-    'login'=>'admin_dolibarDev',
-    'password'=>'homedread',
+    'login'=>'admin',
+    'password'=>'changeme',
     'entity'=>'1');
 
 

From a4a1a991b85b88e418740837bcf4b0f5e0a846a1 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Mon, 15 Dec 2014 14:13:57 +0100
Subject: [PATCH 126/345] FIX: avoid milestones in margin calculation

---
 htdocs/margin/agentMargins.php    | 1 +
 htdocs/margin/customerMargins.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 51166bc472b..30adf727318 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -119,6 +119,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND sc.fk_soc = f.fk_soc";
+$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (! empty($conf->global->AGENT_CONTACT_TYPE))
 	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
 else
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 6675753d4d6..38691d4f43b 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -173,6 +173,7 @@ $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND s.entity = ".$conf->entity;
 $sql.= " AND d.fk_facture = f.rowid";
+$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if ($client)
   $sql.= " AND f.fk_soc = ".$socid;
 if (!empty($startdate))

From 71c5f81bdf2f9bb8a0b1bc1045d37357313130d7 Mon Sep 17 00:00:00 2001
From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
Date: Tue, 16 Dec 2014 00:48:35 +0800
Subject: [PATCH 127/345] Handle updates for Taiwan VAT.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
---
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 3 +++
 1 file changed, 3 insertions(+)

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 a190f102023..755195c2a61 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
@@ -27,3 +27,6 @@ create table llx_c_price_expression
 )ENGINE=innodb;
 
 ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAULT NULL;
+
+-- Taiwan VAT Rates
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1);

From 27c0e6b4d3cd5cb03398570af23d49a39e412c6b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 15 Dec 2014 19:15:26 +0100
Subject: [PATCH 128/345] balise form should close after table

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b70e212d2d2..b88a39c76af 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -263,8 +263,7 @@ if ($resql)
 	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
 
-	print "</tr>\n";
-	print '</form>';
+	print "</tr>\n";	
 
 	$var=True;
 	while ($i < $num && $i < $conf->liste_limit)
@@ -366,6 +365,7 @@ if ($resql)
 	}
 
 	print "</table>\n";
+	print '</form>';
 
 	if ($num > $conf->liste_limit)
 	{

From 1850ebe33a6db0f788d78754894a5cdc149b7590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Dec 2014 01:41:49 +0100
Subject: [PATCH 129/345] VAT setup for canada was rong

---
 htdocs/langs/en_CA/admin.lang     |  5 +++++
 htdocs/langs/en_CA/companies.lang |  5 +++++
 htdocs/langs/en_CA/main.lang      | 28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 htdocs/langs/en_CA/admin.lang
 create mode 100644 htdocs/langs/en_CA/companies.lang
 create mode 100644 htdocs/langs/en_CA/main.lang

diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
new file mode 100644
index 00000000000..cee56c0f791
--- /dev/null
+++ b/htdocs/langs/en_CA/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+VATManagement=GST Management
+LocalTax1IsUsedDesc=Use a second tax (PST)
+LocalTax1IsNotUsedDesc=Do not use second tax (PST)
+LocalTax1Management=PST Management
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
new file mode 100644
index 00000000000..985f125d7de
--- /dev/null
+++ b/htdocs/langs/en_CA/companies.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - companies
+VATIsUsed=GST is used
+VATIsNotUsed=GST is not use
+LocalTax1IsUsedES=PST is used
+LocalTax1IsNotUsedES=GST is not used
diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
new file mode 100644
index 00000000000..fca2906cd12
--- /dev/null
+++ b/htdocs/langs/en_CA/main.lang
@@ -0,0 +1,28 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=,
+SeparatorThousand=None
+FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
+FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate defined for country '%s'.
+AmountVAT=Amount GST
+AmountLT1=Amount PST
+TotalVAT=Total GST
+TotalLT1=Total PST
+IncludedVAT=Including GST
+VAT=GST
+VATRate=GST rate

From 174428ad3145991d8e2afb51af784d826da55c1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 16 Dec 2014 01:55:03 +0100
Subject: [PATCH 130/345] Data init for canada vat

---
 htdocs/install/mysql/data/llx_c_tva.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 01d2894bca6..a2e1cb6bbb3 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -66,7 +66,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 -- CANADA (id country=14)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '7','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','TPS and TVQ rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1);
 
 
 -- CAMEROUN (id country=24)

From dd6d6bc054e731ba285dfca759b22d4cde9853e0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Dec 2014 14:43:28 +0100
Subject: [PATCH 131/345] open form was at the wrong place missing close form

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

diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index de1f7662373..32e4750009c 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2009 		Laurent Destailleur            <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2013  Juanjo Menent			       <jmenent@2byte.es>
- * Copyright (C) 2013       Philippe Grand                 <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2014  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
@@ -88,7 +88,9 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
 print '<br>';
 
-
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_BANK_CHEQUERECEIPT_FREE_TEXT">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>';
@@ -98,9 +100,7 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_BANK_CHEQUERECEIPT_FREE_TEXT">';
+
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="BANK_CHEQUERECEIPT_FREE_TEXT" class="flat" cols="120">'.$conf->global->BANK_CHEQUERECEIPT_FREE_TEXT.'</textarea>';
@@ -183,7 +183,7 @@ while ($i < $nbofbank)
 }
 
 print '</table>'."\n";
-
+print '</form>';
 $db->close();
 
 llxFooter();

From e40ef3f9cee675987b7dc8c6f9967ccf46e44a23 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Dec 2014 14:49:07 +0100
Subject: [PATCH 132/345] form closed at the wrong place

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

diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 11341f632a2..00a84fc5cbc 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -318,7 +318,6 @@ if (! isset($_SERVER['WINDIR']))
 	print '</td>';
 	print '<td width="60" align="center"><input type="submit" class="button" name="submit_GENBARCODE_LOCATION" value="'.$langs->trans("Modify").'"></td>';
 	print '</tr>';
-	print '</form>';
 }
 
 // Module products
@@ -350,6 +349,7 @@ if (! empty($conf->societe->enabled))
 }
 
 print "</table>\n";
+print '</form>';
 
 print '<br>';
 

From 69c1de3fe12e6134e511febcd7617755cd9f00fb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Dec 2014 15:07:23 +0100
Subject: [PATCH 133/345] one close form too much, an other at the wrong place

---
 htdocs/admin/compta.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index b5aed0c683e..7b041fa3991 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -135,7 +135,6 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 print "</td></tr>\n";
 print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
-print '</form>';
 
 print "</table>\n";
 
@@ -163,11 +162,10 @@ foreach ($list as $key)
 	print '</td></tr>';
 }
 
-print '</form>';
 print "</table>\n";
 
 print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
-
+print '</form>';
 $db->close();
 
 llxFooter();

From cf196c77fb17a1cc34701ffbd0f3c9d99436ce15 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Dec 2014 15:15:03 +0100
Subject: [PATCH 134/345] one close form too much

---
 htdocs/admin/contract.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 6905156990b..817ac84d768 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2011-2013      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2014      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
@@ -509,7 +509,6 @@ print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
 print '</td></tr>'."\n";
-print '</form>';
 
 //Use draft Watermark
 $var=!$var;

From 8878ef601f5acd1f1a90a2f4029e706fe3eb34e5 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 16 Dec 2014 15:34:56 +0100
Subject: [PATCH 135/345] form should open before table

---
 htdocs/admin/dons.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index ac0fe715c99..dcac1079422 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -186,6 +186,9 @@ print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
  */
 print_titre($langs->trans("Options"));
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -194,9 +197,7 @@ print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
+
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("FreeTextOnDonations").'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="120">'.$conf->global->DONATION_MESSAGE.'</textarea>';

From c9f69279c7ca0eca48e436e48f0e5570c4738305 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Tue, 16 Dec 2014 16:21:31 +0100
Subject: [PATCH 136/345] FIX: pagebreak on fichinter like in other documents

---
 .../fichinter/doc/pdf_soleil.modules.php      | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 6a0feda2e9d..ad5516f2bf6 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -255,19 +255,44 @@ class pdf_soleil extends ModelePDFFicheinter
 						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).'</strong>';
 						$desc=dol_htmlentitiesbr($objectligne->desc,1);
 
-						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0);
-
+						$pdf->startTransaction();
+						$pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'<br>'.$desc, LR, 1, 0);
+						$pageposafter=$pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pageposafter=$pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+							$pdf->writeHTMLCell(0, 0, $curX, $curY, $txt.'<br>'.$desc, LR, 1, 0);
+							$pageposafter=$pdf->getPage();
+							$posyafter=$pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines-1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('','',true);
+									$pdf->setPage($pageposafter+1);
+								}
+							}
+						}
+						else	// No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+	
 						$nexY = $pdf->GetY();
 						$pageposafter=$pdf->getPage();
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
+	
 						// We suppose that a too long description is moved completely on next page
 						if ($pageposafter > $pageposbefore) {
 							$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 						}
-
+						
 						$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 
 						// Detect if some page were added automatically and output _tableau for past pages

From 849628f02051070a35f368ee35a570af08fe2c6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 Dec 2014 01:56:36 +0100
Subject: [PATCH 137/345] Fix: Typo and translation

---
 htdocs/expedition/card.php                    |   2 +-
 htdocs/langs/ar_SA/printipp.lang              |  14 ++++++++++++
 htdocs/langs/ar_SA/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/bg_BG/printipp.lang              |  14 ++++++++++++
 htdocs/langs/bg_BG/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/bs_BA/printipp.lang              |  14 ++++++++++++
 htdocs/langs/bs_BA/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/ca_ES/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/cs_CZ/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/da_DK/printipp.lang              |  14 ++++++++++++
 htdocs/langs/da_DK/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/de_DE/printipp.lang              |  14 ++++++++++++
 htdocs/langs/de_DE/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/el_GR/printipp.lang              |  14 ++++++++++++
 htdocs/langs/el_GR/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/et_EE/printipp.lang              |  14 ++++++++++++
 htdocs/langs/et_EE/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/eu_ES/printipp.lang              |  14 ++++++++++++
 htdocs/langs/eu_ES/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/fa_IR/printipp.lang              |  14 ++++++++++++
 htdocs/langs/fa_IR/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/fi_FI/printipp.lang              |  14 ++++++++++++
 htdocs/langs/fi_FI/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/he_IL/printipp.lang              |  14 ++++++++++++
 htdocs/langs/he_IL/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/hr_HR/printipp.lang              |  14 ++++++++++++
 htdocs/langs/hr_HR/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/hu_HU/printipp.lang              |  14 ++++++++++++
 htdocs/langs/hu_HU/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/id_ID/printipp.lang              |  14 ++++++++++++
 htdocs/langs/id_ID/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/is_IS/printipp.lang              |  14 ++++++++++++
 htdocs/langs/is_IS/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/it_IT/printipp.lang              |  14 ++++++++++++
 htdocs/langs/it_IT/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/ja_JP/printipp.lang              |  14 ++++++++++++
 htdocs/langs/ja_JP/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/ko_KR/printipp.lang              |  14 ++++++++++++
 htdocs/langs/ko_KR/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/lt_LT/printipp.lang              |  14 ++++++++++++
 htdocs/langs/lt_LT/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/lv_LV/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/mk_MK/printipp.lang              |  14 ++++++++++++
 htdocs/langs/mk_MK/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/nb_NO/printipp.lang              |  14 ++++++++++++
 htdocs/langs/nb_NO/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/nl_NL/printipp.lang              |  14 ++++++++++++
 htdocs/langs/nl_NL/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/pl_PL/printipp.lang              |  14 ++++++++++++
 htdocs/langs/pl_PL/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/pt_PT/printipp.lang              |  14 ++++++++++++
 htdocs/langs/pt_PT/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/ro_RO/printipp.lang              |  14 ++++++++++++
 htdocs/langs/ro_RO/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/ru_RU/printipp.lang              |  14 ++++++++++++
 htdocs/langs/ru_RU/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/sk_SK/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/sl_SI/printipp.lang              |  14 ++++++++++++
 htdocs/langs/sl_SI/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/sq_AL/printipp.lang              |  14 ++++++++++++
 htdocs/langs/sq_AL/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/sv_SE/printipp.lang              |  14 ++++++++++++
 htdocs/langs/sv_SE/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/th_TH/printipp.lang              |  14 ++++++++++++
 htdocs/langs/th_TH/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/tr_TR/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/uk_UA/printipp.lang              |  14 ++++++++++++
 htdocs/langs/uk_UA/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/vi_VN/printipp.lang              |  14 ++++++++++++
 htdocs/langs/vi_VN/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/zh_CN/printipp.lang              |  14 ++++++++++++
 htdocs/langs/zh_CN/productbatch.lang          |  20 ++++++++++++++++++
 htdocs/langs/zh_TW/printipp.lang              |  14 ++++++++++++
 htdocs/langs/zh_TW/productbatch.lang          |  20 ++++++++++++++++++
 .../theme/dolibarr_preferred_partner_int.png  | Bin 0 -> 9804 bytes
 75 files changed, 1257 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/langs/ar_SA/printipp.lang
 create mode 100644 htdocs/langs/ar_SA/productbatch.lang
 create mode 100644 htdocs/langs/bg_BG/printipp.lang
 create mode 100644 htdocs/langs/bg_BG/productbatch.lang
 create mode 100644 htdocs/langs/bs_BA/printipp.lang
 create mode 100644 htdocs/langs/bs_BA/productbatch.lang
 create mode 100644 htdocs/langs/ca_ES/productbatch.lang
 create mode 100644 htdocs/langs/cs_CZ/productbatch.lang
 create mode 100644 htdocs/langs/da_DK/printipp.lang
 create mode 100644 htdocs/langs/da_DK/productbatch.lang
 create mode 100644 htdocs/langs/de_DE/printipp.lang
 create mode 100644 htdocs/langs/de_DE/productbatch.lang
 create mode 100644 htdocs/langs/el_GR/printipp.lang
 create mode 100644 htdocs/langs/el_GR/productbatch.lang
 create mode 100644 htdocs/langs/et_EE/printipp.lang
 create mode 100644 htdocs/langs/et_EE/productbatch.lang
 create mode 100644 htdocs/langs/eu_ES/printipp.lang
 create mode 100644 htdocs/langs/eu_ES/productbatch.lang
 create mode 100644 htdocs/langs/fa_IR/printipp.lang
 create mode 100644 htdocs/langs/fa_IR/productbatch.lang
 create mode 100644 htdocs/langs/fi_FI/printipp.lang
 create mode 100644 htdocs/langs/fi_FI/productbatch.lang
 create mode 100644 htdocs/langs/he_IL/printipp.lang
 create mode 100644 htdocs/langs/he_IL/productbatch.lang
 create mode 100644 htdocs/langs/hr_HR/printipp.lang
 create mode 100644 htdocs/langs/hr_HR/productbatch.lang
 create mode 100644 htdocs/langs/hu_HU/printipp.lang
 create mode 100644 htdocs/langs/hu_HU/productbatch.lang
 create mode 100644 htdocs/langs/id_ID/printipp.lang
 create mode 100644 htdocs/langs/id_ID/productbatch.lang
 create mode 100644 htdocs/langs/is_IS/printipp.lang
 create mode 100644 htdocs/langs/is_IS/productbatch.lang
 create mode 100644 htdocs/langs/it_IT/printipp.lang
 create mode 100644 htdocs/langs/it_IT/productbatch.lang
 create mode 100644 htdocs/langs/ja_JP/printipp.lang
 create mode 100644 htdocs/langs/ja_JP/productbatch.lang
 create mode 100644 htdocs/langs/ko_KR/printipp.lang
 create mode 100644 htdocs/langs/ko_KR/productbatch.lang
 create mode 100644 htdocs/langs/lt_LT/printipp.lang
 create mode 100644 htdocs/langs/lt_LT/productbatch.lang
 create mode 100644 htdocs/langs/lv_LV/productbatch.lang
 create mode 100644 htdocs/langs/mk_MK/printipp.lang
 create mode 100644 htdocs/langs/mk_MK/productbatch.lang
 create mode 100644 htdocs/langs/nb_NO/printipp.lang
 create mode 100644 htdocs/langs/nb_NO/productbatch.lang
 create mode 100644 htdocs/langs/nl_NL/printipp.lang
 create mode 100644 htdocs/langs/nl_NL/productbatch.lang
 create mode 100644 htdocs/langs/pl_PL/printipp.lang
 create mode 100644 htdocs/langs/pl_PL/productbatch.lang
 create mode 100644 htdocs/langs/pt_PT/printipp.lang
 create mode 100644 htdocs/langs/pt_PT/productbatch.lang
 create mode 100644 htdocs/langs/ro_RO/printipp.lang
 create mode 100644 htdocs/langs/ro_RO/productbatch.lang
 create mode 100644 htdocs/langs/ru_RU/printipp.lang
 create mode 100644 htdocs/langs/ru_RU/productbatch.lang
 create mode 100644 htdocs/langs/sk_SK/productbatch.lang
 create mode 100644 htdocs/langs/sl_SI/printipp.lang
 create mode 100644 htdocs/langs/sl_SI/productbatch.lang
 create mode 100644 htdocs/langs/sq_AL/printipp.lang
 create mode 100644 htdocs/langs/sq_AL/productbatch.lang
 create mode 100644 htdocs/langs/sv_SE/printipp.lang
 create mode 100644 htdocs/langs/sv_SE/productbatch.lang
 create mode 100644 htdocs/langs/th_TH/printipp.lang
 create mode 100644 htdocs/langs/th_TH/productbatch.lang
 create mode 100644 htdocs/langs/tr_TR/productbatch.lang
 create mode 100644 htdocs/langs/uk_UA/printipp.lang
 create mode 100644 htdocs/langs/uk_UA/productbatch.lang
 create mode 100644 htdocs/langs/vi_VN/printipp.lang
 create mode 100644 htdocs/langs/vi_VN/productbatch.lang
 create mode 100644 htdocs/langs/zh_CN/printipp.lang
 create mode 100644 htdocs/langs/zh_CN/productbatch.lang
 create mode 100644 htdocs/langs/zh_TW/printipp.lang
 create mode 100644 htdocs/langs/zh_TW/productbatch.lang
 create mode 100755 htdocs/theme/dolibarr_preferred_partner_int.png

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 979ed0491a1..4e795005abb 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -95,7 +95,7 @@ if (! empty($conf->productbatch->enabled))
 	if (! (GETPOST('entrepot_id','int') > 0))
 	{
 		$langs->load("errors");
-		setEventMessage($langs->trans("WarhouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
+		setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
 		header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
 		exit;
 	}
diff --git a/htdocs/langs/ar_SA/printipp.lang b/htdocs/langs/ar_SA/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/ar_SA/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/bg_BG/printipp.lang b/htdocs/langs/bg_BG/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/bg_BG/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/bs_BA/printipp.lang b/htdocs/langs/bs_BA/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/bs_BA/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/da_DK/printipp.lang b/htdocs/langs/da_DK/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/da_DK/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/de_DE/printipp.lang b/htdocs/langs/de_DE/printipp.lang
new file mode 100644
index 00000000000..c4ce34ef962
--- /dev/null
+++ b/htdocs/langs/de_DE/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Einstellungen des DirektDruck-Moduls
+PrintIPPDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS.
+PRINTIPP_ENABLED="Direktdruck"-Symbol in Dokumentlisten anzeigen
+PRINTIPP_HOST=Druckserver
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Passwort
+NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen)
+FileWasSentToPrinter=Datei %s zum Drucker gesandt
+NoDefaultPrinterDefined=Kein Standarddrucker defininert
+DefaultPrinter=Standarddrucker
+Printer=Drucker
+CupsServer=CUPS-Server
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
new file mode 100644
index 00000000000..a78b3a8302c
--- /dev/null
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Charge/Seriennr. verwalten
+ProductStatusOnBatch=Verwaltet
+ProductStatusNotOnBatch=Nicht Verwaltet
+ProductStatusOnBatchShort=Verwaltet
+ProductStatusNotOnBatchShort=Nicht verwaltet
+Batch=Charge/Seriennr
+atleast1batchfield=Verzehren-bis-, verkaufen-bis-Datum oder Chargennr
+batch_number=Charge/Seriennr
+l_eatby=Verzehren-bis-Datum
+l_sellby=Verkaufen-bis-Datum
+DetailBatchNumber=Chargen-/Seriennummern-Details
+DetailBatchFormat=Charge/Seriennr: %s - E: %s - S: %s (Menge: %d)
+printBatch=Charge: %s
+printEatby=Verzehren bis: %s
+printSellby=Verkaufen bis: %s
+printQty=Menge: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Nicht definiert
+WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden.
diff --git a/htdocs/langs/el_GR/printipp.lang b/htdocs/langs/el_GR/printipp.lang
new file mode 100644
index 00000000000..04a8bfda5b9
--- /dev/null
+++ b/htdocs/langs/el_GR/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Ρύθμιση του module Άμεση Εκτύπωση
+PrintIPPDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή. Απαιτεί ένα σύστημα Linux με εγκατεστημένο CUPS.
+PRINTIPP_ENABLED=Εμφάνιση εικονιδίου "Απευθείας εκτύπωση" στις λίστες εγγράφων
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Σύνδεση
+PRINTIPP_PASSWORD=Κωδικός
+NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (ελέγξτε τη ρύθμιση του CUPS)
+FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή
+NoDefaultPrinterDefined=Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής
+DefaultPrinter=Προεπιλογμένος εκτυπωτής
+Printer=Εκτυπωτής
+CupsServer=CUPS Server
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/et_EE/printipp.lang b/htdocs/langs/et_EE/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/et_EE/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/eu_ES/printipp.lang b/htdocs/langs/eu_ES/printipp.lang
new file mode 100644
index 00000000000..f9c36810b91
--- /dev/null
+++ b/htdocs/langs/eu_ES/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Direct Print modulua konfiguratu
+PrintIPPDesc=Modulu honek "Inprimatu" botoia gehitzen du dokumentuak zuzenean inprimagailu batera bidaltzeko. CUPS instalatuta duen Linux sistema behar du.
+PRINTIPP_ENABLED=Dokumentuen zerrendetan "Direct Print" ikonoa erakutsi
+PRINTIPP_HOST=Inprimatzeko zerbitzaria
+PRINTIPP_PORT=Ataka
+PRINTIPP_USER=Hasi saioa honela
+PRINTIPP_PASSWORD=Pasahitza
+NoPrinterFound=Ez da inprimagailurik aurkitu (CUPS konfigurazioa egiaztatu)
+FileWasSentToPrinter=%s fitxategia inprimagailura bidali da
+NoDefaultPrinterDefined=Ez da lehenetsitako inprimagailurik ezarri
+DefaultPrinter=Lehenetsitako inprimagailua
+Printer=Inprimagailua
+CupsServer=CUPS zerbitzaria
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/fa_IR/printipp.lang b/htdocs/langs/fa_IR/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/fa_IR/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/fi_FI/printipp.lang b/htdocs/langs/fi_FI/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/fi_FI/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/he_IL/printipp.lang b/htdocs/langs/he_IL/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/he_IL/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/hr_HR/printipp.lang b/htdocs/langs/hr_HR/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/hr_HR/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/hu_HU/printipp.lang b/htdocs/langs/hu_HU/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/hu_HU/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/id_ID/printipp.lang b/htdocs/langs/id_ID/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/id_ID/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/is_IS/printipp.lang b/htdocs/langs/is_IS/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/is_IS/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/it_IT/printipp.lang b/htdocs/langs/it_IT/printipp.lang
new file mode 100644
index 00000000000..7c597de10e1
--- /dev/null
+++ b/htdocs/langs/it_IT/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Server di stampa
+PRINTIPP_PORT=Porta
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
new file mode 100644
index 00000000000..39171461732
--- /dev/null
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Gestito
+ProductStatusNotOnBatch=Non gestito
+ProductStatusOnBatchShort=Gestito
+ProductStatusNotOnBatchShort=Non gestito
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Quantità: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Non definito
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/ja_JP/printipp.lang b/htdocs/langs/ja_JP/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/ja_JP/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/ko_KR/printipp.lang b/htdocs/langs/ko_KR/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/ko_KR/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/lt_LT/printipp.lang b/htdocs/langs/lt_LT/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/lt_LT/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/mk_MK/printipp.lang b/htdocs/langs/mk_MK/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/mk_MK/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/nb_NO/printipp.lang b/htdocs/langs/nb_NO/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/nb_NO/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/nl_NL/printipp.lang b/htdocs/langs/nl_NL/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/nl_NL/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/pl_PL/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/pt_PT/printipp.lang b/htdocs/langs/pt_PT/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/pt_PT/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/ro_RO/printipp.lang b/htdocs/langs/ro_RO/printipp.lang
new file mode 100644
index 00000000000..a1734576be5
--- /dev/null
+++ b/htdocs/langs/ro_RO/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Configurarea modulului Imprimare directă
+PrintIPPDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă. Este nevoie de un sistem Linux cu CUPS instalat.
+PRINTIPP_ENABLED=Afișare pictogramă "Print Direct" în listele de documente
+PRINTIPP_HOST=Server print
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Parolă
+NoPrinterFound=Nu există imprimante (verificați setarea CUPS)
+FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă
+NoDefaultPrinterDefined=Nicio imprimantă implicită definită
+DefaultPrinter=Imprimantă implicită
+Printer=Imprimanta
+CupsServer=Server CUPS
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
new file mode 100644
index 00000000000..fe1147cc7b1
--- /dev/null
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Gestionează  lot/serie
+ProductStatusOnBatch=Gestionat
+ProductStatusNotOnBatch=Negestionat
+ProductStatusOnBatchShort=Gestionat
+ProductStatusNotOnBatchShort=Negestionat
+Batch=Lot / Serie
+atleast1batchfield=Data expirare sau data de vânzare sau numărul de lot
+batch_number=Lot / Număr de serie
+l_eatby=Data expirare
+l_sellby=Data vânzare
+DetailBatchNumber=Detalii Lot / Serie
+DetailBatchFormat=Lot / Serie:%s - E:%s - S:%s (Cant.: %d)
+printBatch=Lot: %s
+printEatby=Expiră : %s
+printSellby=Vanzare: %s
+printQty=Cant: %d
+AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere
+BatchDefaultNumber=Nedefinit
+WhenProductBatchModuleOnOptionAreForced=Când modulul de lot / serial este pornit, modul de creștere / scădere a stocului este fortat la ultima alegere și nu poate fi editat. Alte opțiuni pot fi definite după cum doriți.
diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/ru_RU/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/sl_SI/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/sq_AL/printipp.lang b/htdocs/langs/sq_AL/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/sq_AL/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/sv_SE/printipp.lang b/htdocs/langs/sv_SE/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/sv_SE/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/th_TH/printipp.lang b/htdocs/langs/th_TH/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/th_TH/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
new file mode 100644
index 00000000000..61b366364b3
--- /dev/null
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Parti/seri yönetimi
+ProductStatusOnBatch=Yapıldı
+ProductStatusNotOnBatch=Yapılmadı
+ProductStatusOnBatchShort=Yapıldı
+ProductStatusNotOnBatchShort=Yapılmadı
+Batch=Parti/Seri
+atleast1batchfield=Son yenme tarihi ya da Son satış tarihi ya da Parti numarası
+batch_number=Parti/Seri numarası
+l_eatby=Son yenme tarihi
+l_sellby=Son satış tarihi
+DetailBatchNumber=Parti/Seri ayrıntıları
+DetailBatchFormat=Parti/Seri: %s - Y: %s - S: %s (Mik : %d)
+printBatch=Parti: %s
+printEatby=Son Yenme: %s
+printSellby=Son satış: %s
+printQty=Mik: %d
+AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
+BatchDefaultNumber=Tanımlanmamış
+WhenProductBatchModuleOnOptionAreForced=Parti/Seri devredeyken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi yapılandırılabilir.
diff --git a/htdocs/langs/uk_UA/printipp.lang b/htdocs/langs/uk_UA/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/uk_UA/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/vi_VN/printipp.lang b/htdocs/langs/vi_VN/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/vi_VN/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/zh_CN/printipp.lang b/htdocs/langs/zh_CN/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/zh_CN/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/zh_TW/printipp.lang b/htdocs/langs/zh_TW/printipp.lang
new file mode 100644
index 00000000000..835e6827f12
--- /dev/null
+++ b/htdocs/langs/zh_TW/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/theme/dolibarr_preferred_partner_int.png b/htdocs/theme/dolibarr_preferred_partner_int.png
new file mode 100755
index 0000000000000000000000000000000000000000..c72d6153ddccee77e666b2ca86a4dea35967f885
GIT binary patch
literal 9804
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

literal 0
HcmV?d00001


From 52b64f34418af6a84f1aa64c1af52bf8a1d5b0f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 17 Dec 2014 13:27:44 +0100
Subject: [PATCH 138/345] CSS

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

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index eabf4c2ad89..18069afc1d3 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -125,7 +125,7 @@ if (! empty($hookmanager->resArray['options'])) {
 	<tr>
 	<td valign="top" class="nowrap none center">
 
-	<table class="login_table_securitycode"><tr>
+	<table class="login_table_securitycode centpercent"><tr>
 	<td>
 	<span class="span-icon-security">
 	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />

From a06c5b251e11454873a78180fa81e35633c591a7 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 17 Dec 2014 15:49:51 +0100
Subject: [PATCH 139/345] Fix: check warehouse on product batch

Only check warehouse when on actions 'create' and 'add'
---
 htdocs/expedition/card.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 4e795005abb..f7c27e129d1 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -90,18 +90,19 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
  */
 
 $warehousecanbeselectedlater=1;
-if (! empty($conf->productbatch->enabled))
+if ($action == 'create' || $action == 'add')
 {
-	if (! (GETPOST('entrepot_id','int') > 0))
+	if (! empty($conf->productbatch->enabled))
 	{
-		$langs->load("errors");
-		setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
-		header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
-		exit;
+		if (! (GETPOST('entrepot_id','int') > 0))
+		{
+			$langs->load("errors");
+			setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
+			header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
+			exit;
+		}
 	}
 }
-
-
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From f7d2d0e81f0bb3836829ed4af24f5c48c52fc1a7 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 17 Dec 2014 15:51:12 +0100
Subject: [PATCH 140/345] Revert "Fix: check warehouse on product batch"

This reverts commit a06c5b251e11454873a78180fa81e35633c591a7.
---
 htdocs/expedition/card.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f7c27e129d1..4e795005abb 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -90,19 +90,18 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
  */
 
 $warehousecanbeselectedlater=1;
-if ($action == 'create' || $action == 'add')
+if (! empty($conf->productbatch->enabled))
 {
-	if (! empty($conf->productbatch->enabled))
+	if (! (GETPOST('entrepot_id','int') > 0))
 	{
-		if (! (GETPOST('entrepot_id','int') > 0))
-		{
-			$langs->load("errors");
-			setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
-			header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
-			exit;
-		}
+		$langs->load("errors");
+		setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
+		header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
+		exit;
 	}
 }
+
+
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From 722fdaa4eb69aab664774b663c23a4cfc19c26cc Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Wed, 17 Dec 2014 15:58:48 +0100
Subject: [PATCH 141/345] Fix: check warehouse on product batch

Only check warehouse on actions 'create' and 'add'
---
 htdocs/expedition/card.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 4e795005abb..6ee45778d18 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -90,18 +90,20 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
  */
 
 $warehousecanbeselectedlater=1;
-if (! empty($conf->productbatch->enabled))
+if (($action == 'create') || ($action == 'add'))
 {
-	if (! (GETPOST('entrepot_id','int') > 0))
+	if (! empty($conf->productbatch->enabled))
 	{
-		$langs->load("errors");
-		setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
-		header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
-		exit;
+		if (! (GETPOST('entrepot_id','int') > 0))
+		{
+			$langs->load("errors");
+			setEventMessage($langs->trans("WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn"),'errors');
+			header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
+			exit;
+		}
 	}
 }
 
-
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

From d9aba405dd84aa085b0497754f161713baf8327c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Dec 2014 10:09:47 +0100
Subject: [PATCH 142/345] Fix: utf must be default value.

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a48b7e3caff..a831767d940 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1029,7 +1029,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 function dol_getdate($timestamp,$fast=false)
 {
 	global $conf;
-	
+
 	$usealternatemethod=false;
 	if ($timestamp <= 0) $usealternatemethod=true;				// <= 1970
 	if ($timestamp >= 2145913200) $usealternatemethod=true;		// >= 2038
@@ -1041,7 +1041,7 @@ function dol_getdate($timestamp,$fast=false)
 	else
 	{
 		$arrayinfo=getdate($timestamp);
-		
+
 		$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
 		if($startday==1)
 		{
@@ -1116,11 +1116,11 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
-		
+
 		if (empty($localtz)) {
 			$localtz = new DateTimeZone('UTC');
 		}
-		
+
 		$dt = new DateTime(null,$localtz);
 		$dt->setDate($year,$month,$day);
 		$dt->setTime((int) $hour, (int) $minute, (int) $second);
@@ -1788,6 +1788,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 {
 	global $conf;
 
+	if (empty($stringencoding)) $stringencoding='UTF-8';
+
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
 
 	// We go always here

From 38ba6ac75b5753b855842318ccb213e91d84b049 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Dec 2014 11:48:30 +0100
Subject: [PATCH 143/345] Fixed: pgsql to make order

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b96e7f01c95..7593dcf9903 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -828,7 +828,7 @@ class CommandeFournisseur extends CommonOrder
         $result = 0;
         if ($user->rights->fournisseur->commande->commander)
         {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.",date_commande=".$this->db->idate("$date");
+            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."'";
             $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(get_class($this)."::commande", LOG_DEBUG);

From c209d168818d489fb6689a6f0cf41b95a2c79f5a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 18 Dec 2014 15:42:28 +0100
Subject: [PATCH 144/345] [ bug #1749 ] Undefined $mailchimp

---
 ChangeLog                 | 1 +
 htdocs/projet/element.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e6c6ecf1c7d..bbede2377ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
+- Fix: [ bug #1749 ] Undefined $mailchimp
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 53559c74333..4a0c70e04af 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -212,7 +212,7 @@ if ($action=="addelement")
 	$elementselectid = GETPOST("elementselect");
 	$result=$project->update_element($tablename, $elementselectid);
 	if ($result<0) {
-		setEventMessage($mailchimp->error,'errors');
+		setEventMessage($project->error,'errors');
 	}
 }
 

From 229e87adc12b3ab74f1850ad1ca381e0d12ad174 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 18 Dec 2014 22:35:59 +0100
Subject: [PATCH 145/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/admin.lang | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index a5e4ab1fdfa..e2c2f124b2e 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilice los campos de autocompletar para elegir  tercer
 ActivityStateToSelectCompany= Agregar un filtro en la búsqueda para mostrar/ocultar los terceros en activo o que hayan dejado de ejercer
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectContact=Utilice los campos de autocompletar para seleccionar contactos (en lugar de utilizar un cuadro de lista).
+DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de los terceros en el combo (Esto puede incrementar el rendimiento si tiene un gran número de terceros) 
+DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de los contactos en el combo (Esto puede incrementar el rendimiento si tiene un gran número de contactos) 
 SearchFilter=Opciones filtros de búsqueda
 NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s
 ViewFullDateActions=Ver las fechas de las acciones en su totalidad en la ficha de tercero
@@ -208,6 +210,7 @@ ModulesJobDesc=Los módulos específicos permiten una preconfiguración simplifi
 ModulesMarketPlaceDesc=Hay disponibles para su descarga en sitios externos otros módulos/extensiones...
 ModulesMarketPlaces=Más módulos...
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
+DoliPartnersDesc=Listado con algunas empresas que pueden proporcionar desarrollar a medida módulos o funcionalidades (Nota: cualquier empresa Open Source con conocimientos de lenguaje PHP puede proporcionarle desarrollo específico)
 WebSiteDesc=Sitios proveedores a consultar para encontrar más módulos
 URL=Enlace
 BoxesAvailable=Paneles disponibles
@@ -444,7 +447,7 @@ Module55Desc=Gestión de los códigos de barras
 Module56Name=Telefonía
 Module56Desc=Gestión de la telefonía
 Module57Name=Domiciliaciones
-Module57Desc=Gestión de domiciliaciones y reintegros bancarios
+Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con ClickToDial
 Module59Name=Bookmark4u
@@ -893,6 +896,7 @@ PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma por defecto a utilizar (código idioma)
 EnableMultilangInterface=Activar interfaz multi-idioma
 EnableShowLogo=Mostrar el logotipo en el menú de la izquierda
+EnableHtml5=Activar Html5 (En desarrollo - Solo disponible en el tema Eldy)
 SystemSuccessfulyUpdated=Su sistema está actualizado
 CompanyInfo=Información de la empresa/institución
 CompanyIds=Identificación reglamentaria

From d16023a6b7d84f3f00f767e8c67561d38e33392d Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 18 Dec 2014 22:59:45 +0100
Subject: [PATCH 146/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/admin.lang       | 6 +++++-
 htdocs/langs/es_ES/agenda.lang      | 2 +-
 htdocs/langs/es_ES/contracts.lang   | 2 +-
 htdocs/langs/es_ES/withdrawals.lang | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index a5e4ab1fdfa..e2c2f124b2e 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -56,6 +56,8 @@ UseSearchToSelectCompany=Utilice los campos de autocompletar para elegir  tercer
 ActivityStateToSelectCompany= Agregar un filtro en la búsqueda para mostrar/ocultar los terceros en activo o que hayan dejado de ejercer
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectContact=Utilice los campos de autocompletar para seleccionar contactos (en lugar de utilizar un cuadro de lista).
+DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de los terceros en el combo (Esto puede incrementar el rendimiento si tiene un gran número de terceros) 
+DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de los contactos en el combo (Esto puede incrementar el rendimiento si tiene un gran número de contactos) 
 SearchFilter=Opciones filtros de búsqueda
 NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s
 ViewFullDateActions=Ver las fechas de las acciones en su totalidad en la ficha de tercero
@@ -208,6 +210,7 @@ ModulesJobDesc=Los módulos específicos permiten una preconfiguración simplifi
 ModulesMarketPlaceDesc=Hay disponibles para su descarga en sitios externos otros módulos/extensiones...
 ModulesMarketPlaces=Más módulos...
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
+DoliPartnersDesc=Listado con algunas empresas que pueden proporcionar desarrollar a medida módulos o funcionalidades (Nota: cualquier empresa Open Source con conocimientos de lenguaje PHP puede proporcionarle desarrollo específico)
 WebSiteDesc=Sitios proveedores a consultar para encontrar más módulos
 URL=Enlace
 BoxesAvailable=Paneles disponibles
@@ -444,7 +447,7 @@ Module55Desc=Gestión de los códigos de barras
 Module56Name=Telefonía
 Module56Desc=Gestión de la telefonía
 Module57Name=Domiciliaciones
-Module57Desc=Gestión de domiciliaciones y reintegros bancarios
+Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con ClickToDial
 Module59Name=Bookmark4u
@@ -893,6 +896,7 @@ PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma por defecto a utilizar (código idioma)
 EnableMultilangInterface=Activar interfaz multi-idioma
 EnableShowLogo=Mostrar el logotipo en el menú de la izquierda
+EnableHtml5=Activar Html5 (En desarrollo - Solo disponible en el tema Eldy)
 SystemSuccessfulyUpdated=Su sistema está actualizado
 CompanyInfo=Información de la empresa/institución
 CompanyIds=Identificación reglamentaria
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index db154055b67..078045f4c14 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Acontecimientos del usuario
 ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Evento asignado a
 AllMyActions= Todos mis eventos/tareas
 AllActions= Todos los eventos/tareas
 ViewList=Vista listado
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index c9e59a17cd6..76dd3e925de 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -91,7 +91,7 @@ ListOfServicesToExpire=Listado de servicios activos a expirar
 NoteListOfYourExpiredServices=Este listado contiene solamente los servicios de contratos de terceros de los que usted es comercial
 StandardContractsTemplate=Modelo de contrato estandar 
 ContactNameAndSignature=Para %s, nombre y firma:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+OnlyLinesWithTypeServiceAreUsed=Solo serán clonadas las líneas del tipo "Servicio"
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 98c4a32016d..de91cb28d0a 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -79,11 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizada, vaya al menú de Bancos->Domiciliaciones para gestionar las domiciliaciones. Cuando una domiciliación se marca como abonada, el pago en la factura se grabará automáticamente, y la factura será cerrada si resto a pagar es cero.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Estadísticas por estados de líneas
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco

From 57918fe4f6f238599079522505ced134820a5176 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 18 Dec 2014 23:02:21 +0100
Subject: [PATCH 147/345] Trad: Update es_ES from transifex

---
 htdocs/langs/es_ES/agenda.lang      | 2 +-
 htdocs/langs/es_ES/contracts.lang   | 2 +-
 htdocs/langs/es_ES/withdrawals.lang | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index db154055b67..078045f4c14 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
 ActionsForUser=Acontecimientos del usuario
 ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Evento asignado a
 AllMyActions= Todos mis eventos/tareas
 AllActions= Todos los eventos/tareas
 ViewList=Vista listado
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index c9e59a17cd6..76dd3e925de 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -91,7 +91,7 @@ ListOfServicesToExpire=Listado de servicios activos a expirar
 NoteListOfYourExpiredServices=Este listado contiene solamente los servicios de contratos de terceros de los que usted es comercial
 StandardContractsTemplate=Modelo de contrato estandar 
 ContactNameAndSignature=Para %s, nombre y firma:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+OnlyLinesWithTypeServiceAreUsed=Solo serán clonadas las líneas del tipo "Servicio"
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 98c4a32016d..de91cb28d0a 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -79,11 +79,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizada, vaya al menú de Bancos->Domiciliaciones para gestionar las domiciliaciones. Cuando una domiciliación se marca como abonada, el pago en la factura se grabará automáticamente, y la factura será cerrada si resto a pagar es cero.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Estadísticas por estados de líneas
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco

From ad515ef5e52a46a12f1eab0e5a76fc08a7826f41 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Dec 2014 23:49:07 +0100
Subject: [PATCH 148/345] Exclude test

---
 dev/codesniffer/ruleset.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index ffbc1bace39..7105e405524 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -24,6 +24,10 @@
 		
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
  
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>

From b1c4d32fbf00dd9a831fae912f1bbc846bf17b90 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Dec 2014 23:53:17 +0100
Subject: [PATCH 149/345] Update phpcs file

---
 dev/codesniffer/ruleset.xml | 64 +++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 38ea1310d22..b2146ce65b5 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -17,6 +17,10 @@
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
  
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
+		<severity>0</severity>
+	</rule>
+
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>
@@ -105,7 +109,7 @@
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="complexity" value="80" />
-            <property name="absoluteComplexity" value="200" />
+            <property name="absoluteComplexity" value="250" />
         </properties>
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
@@ -162,7 +166,41 @@
     <rule ref="PEAR.Commenting.ClassComment.MissingTag">
         <severity>0</severity>
     </rule>
-    
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
+        
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -219,6 +257,24 @@
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
 	    <severity>0</severity>
 	</rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
+        <severity>0</severity>
+    </rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
 	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -236,6 +292,10 @@
 	</rule>
 	
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
+        <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>
 	</rule>

From 3debf56c68500191267bab4cff93fb9d6f62e9bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 Dec 2014 23:54:39 +0100
Subject: [PATCH 150/345] Update phpcs

---
 dev/codesniffer/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index b2146ce65b5..a83f9800ce0 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -20,6 +20,9 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
+		<severity>0</severity>
+	</rule>
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>

From 747b2af06bdc42169d58a78c439bc0b8033d19f5 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 19 Dec 2014 11:57:47 +0100
Subject: [PATCH 151/345] FIX: check for expedition batch lines

check if expedition batch lines are available before foreach
---
 htdocs/expedition/class/expedition.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2cc0667d58a..fd06131d8b4 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -604,9 +604,11 @@ class Expedition extends CommonObject
 
 					if (! empty($conf->productbatch->enabled)) {
 						$details=ExpeditionLigneBatch::FetchAll($this->db,$obj->rowid);
-						foreach ($details as $dbatch) {
-							$result=$mouvS->livraison_batch($dbatch->fk_origin_stock,$dbatch->dluo_qty);
-							if ($result < 0) { $error++; $this->errors[]=$mouvS->$error; break 2; }
+						if (! empty($details)) {
+							foreach ($details as $dbatch) {
+								$result=$mouvS->livraison_batch($dbatch->fk_origin_stock,$dbatch->dluo_qty);
+								if ($result < 0) { $error++; $this->errors[]=$mouvS->$error; break 2; }
+							}
 						}
 					}
 				}

From 578c4ca3835ac327bceb3e2ad0233ec193de4f4b Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Fri, 19 Dec 2014 12:32:43 +0100
Subject: [PATCH 152/345] Update odt2pdf.sh

Fix odt2pdf.sh
---
 scripts/odt2pdf/odt2pdf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index 0599e4291c5..9d9bf18a8c7 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -22,7 +22,7 @@ if [ -f "$1.odt" ]
   nbprocess=$(pgrep -c soffice)
   if [ $nbprocess -ne 1 ]
    then
-    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless&
+    soffice --invisible --accept="socket,host=127.0.0.1,port=8100;urp;" --nofirststartwizard --headless &
     retcode=$?
     if [ $retcode -ne 0 ]
      then

From c163223957b3560c353f8da5fc21a7bc3dbff8df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 12:39:20 +0100
Subject: [PATCH 153/345] Moved vagrant dir into obsolete repo

---
 dev/vagrant/README.md                         |   74 -
 dev/vagrant/dolibarrdev/Vagrantfile           |  240 --
 .../dolibarrdev/puphpet/.gitattributes        |    5 -
 dev/vagrant/dolibarrdev/puphpet/config.yaml   |  217 --
 .../puphpet/files/dot/.bash_aliases           |   52 -
 .../dolibarrdev/puphpet/files/dot/.bash_git   |  491 -----
 .../dolibarrdev/puphpet/files/dot/.gitignore  |    1 -
 .../dolibarrdev/puphpet/files/dot/.vimrc      |  414 ----
 .../files/dot/ssh/insecure_private_key        |   27 -
 .../puphpet/files/exec-always/empty           |    0
 .../dolibarrdev/puphpet/files/exec-once/empty |    0
 .../puphpet/files/startup-always/empty        |    0
 .../puphpet/files/startup-once/empty          |    0
 .../dolibarrdev/puphpet/puppet/Puppetfile     |   25 -
 .../dolibarrdev/puphpet/puppet/hiera.yaml     |    7 -
 .../dolibarrdev/puphpet/puppet/manifest.pp    | 1742 ---------------
 .../puppet/modules/apache/.fixtures.yml       |    6 -
 .../puppet/modules/apache/.nodeset.yml        |   31 -
 .../puppet/modules/apache/.puppet-lint.rc     |    5 -
 .../puphpet/puppet/modules/apache/.travis.yml |   32 -
 .../puppet/modules/apache/CHANGELOG.md        |  246 ---
 .../puppet/modules/apache/CONTRIBUTING.md     |  234 --
 .../puphpet/puppet/modules/apache/Gemfile     |   26 -
 .../puphpet/puppet/modules/apache/LICENSE     |   15 -
 .../puphpet/puppet/modules/apache/Modulefile  |   12 -
 .../puphpet/puppet/modules/apache/README.md   | 1958 -----------------
 .../puppet/modules/apache/README.passenger.md |  278 ---
 .../puphpet/puppet/modules/apache/Rakefile    |   10 -
 .../puphpet/puppet/modules/apache/files/httpd |   24 -
 .../apache/lib/puppet/provider/a2mod.rb       |   34 -
 .../apache/lib/puppet/provider/a2mod/a2mod.rb |   35 -
 .../lib/puppet/provider/a2mod/gentoo.rb       |  116 -
 .../lib/puppet/provider/a2mod/modfix.rb       |   12 -
 .../lib/puppet/provider/a2mod/redhat.rb       |   60 -
 .../modules/apache/lib/puppet/type/a2mod.rb   |   30 -
 .../modules/apache/manifests/balancer.pp      |   83 -
 .../apache/manifests/balancermember.pp        |   53 -
 .../modules/apache/manifests/confd/no_accf.pp |   10 -
 .../apache/manifests/default_confd_files.pp   |   15 -
 .../modules/apache/manifests/default_mods.pp  |  158 --
 .../apache/manifests/default_mods/load.pp     |    8 -
 .../puppet/modules/apache/manifests/dev.pp    |   11 -
 .../puppet/modules/apache/manifests/init.pp   |  340 ---
 .../puppet/modules/apache/manifests/listen.pp |   10 -
 .../puppet/modules/apache/manifests/mod.pp    |  130 --
 .../modules/apache/manifests/mod/actions.pp   |    3 -
 .../modules/apache/manifests/mod/alias.pp     |   19 -
 .../apache/manifests/mod/auth_basic.pp        |    3 -
 .../modules/apache/manifests/mod/auth_kerb.pp |    5 -
 .../apache/manifests/mod/authnz_ldap.pp       |   19 -
 .../modules/apache/manifests/mod/autoindex.pp |   12 -
 .../modules/apache/manifests/mod/cache.pp     |    3 -
 .../modules/apache/manifests/mod/cgi.pp       |    4 -
 .../modules/apache/manifests/mod/cgid.pp      |   23 -
 .../modules/apache/manifests/mod/dav.pp       |    3 -
 .../modules/apache/manifests/mod/dav_fs.pp    |   20 -
 .../modules/apache/manifests/mod/dav_svn.pp   |   14 -
 .../modules/apache/manifests/mod/deflate.pp   |   12 -
 .../modules/apache/manifests/mod/dev.pp       |    5 -
 .../modules/apache/manifests/mod/dir.pp       |   21 -
 .../apache/manifests/mod/disk_cache.pp        |   24 -
 .../modules/apache/manifests/mod/event.pp     |   62 -
 .../modules/apache/manifests/mod/expires.pp   |    3 -
 .../modules/apache/manifests/mod/fastcgi.pp   |   24 -
 .../modules/apache/manifests/mod/fcgid.pp     |   16 -
 .../modules/apache/manifests/mod/headers.pp   |    3 -
 .../modules/apache/manifests/mod/include.pp   |    3 -
 .../modules/apache/manifests/mod/info.pp      |   17 -
 .../modules/apache/manifests/mod/itk.pp       |   53 -
 .../modules/apache/manifests/mod/ldap.pp      |   14 -
 .../modules/apache/manifests/mod/mime.pp      |   21 -
 .../apache/manifests/mod/mime_magic.pp        |   14 -
 .../apache/manifests/mod/negotiation.pp       |   12 -
 .../modules/apache/manifests/mod/nss.pp       |   25 -
 .../modules/apache/manifests/mod/pagespeed.pp |   55 -
 .../modules/apache/manifests/mod/passenger.pp |   86 -
 .../modules/apache/manifests/mod/perl.pp      |    3 -
 .../modules/apache/manifests/mod/peruser.pp   |   73 -
 .../modules/apache/manifests/mod/php.pp       |   55 -
 .../modules/apache/manifests/mod/prefork.pp   |   70 -
 .../modules/apache/manifests/mod/proxy.pp     |   16 -
 .../modules/apache/manifests/mod/proxy_ajp.pp |    4 -
 .../apache/manifests/mod/proxy_balancer.pp    |   10 -
 .../apache/manifests/mod/proxy_html.pp        |   37 -
 .../apache/manifests/mod/proxy_http.pp        |    4 -
 .../modules/apache/manifests/mod/python.pp    |    5 -
 .../apache/manifests/mod/reqtimeout.pp        |   12 -
 .../modules/apache/manifests/mod/rewrite.pp   |    4 -
 .../modules/apache/manifests/mod/rpaf.pp      |   20 -
 .../modules/apache/manifests/mod/setenvif.pp  |   12 -
 .../modules/apache/manifests/mod/speling.pp   |    3 -
 .../modules/apache/manifests/mod/ssl.pp       |   56 -
 .../modules/apache/manifests/mod/status.pp    |   43 -
 .../modules/apache/manifests/mod/suexec.pp    |    3 -
 .../modules/apache/manifests/mod/suphp.pp     |   14 -
 .../modules/apache/manifests/mod/userdir.pp   |   18 -
 .../apache/manifests/mod/vhost_alias.pp       |    3 -
 .../modules/apache/manifests/mod/worker.pp    |   74 -
 .../modules/apache/manifests/mod/wsgi.pp      |   21 -
 .../modules/apache/manifests/mod/xsendfile.pp |    4 -
 .../puppet/modules/apache/manifests/mpm.pp    |   68 -
 .../apache/manifests/namevirtualhost.pp       |   10 -
 .../modules/apache/manifests/package.pp       |   48 -
 .../puppet/modules/apache/manifests/params.pp |  258 ---
 .../apache/manifests/peruser/multiplexer.pp   |   17 -
 .../apache/manifests/peruser/processor.pp     |   17 -
 .../puppet/modules/apache/manifests/php.pp    |   18 -
 .../puppet/modules/apache/manifests/proxy.pp  |   15 -
 .../puppet/modules/apache/manifests/python.pp |   18 -
 .../modules/apache/manifests/service.pp       |   44 -
 .../puppet/modules/apache/manifests/ssl.pp    |   18 -
 .../modules/apache/manifests/version.pp       |   35 -
 .../puppet/modules/apache/manifests/vhost.pp  |  560 -----
 .../puppet/modules/apache/metadata.json       |   65 -
 .../spec/acceptance/apache_parameters_spec.rb |  446 ----
 .../apache/spec/acceptance/apache_ssl_spec.rb |   87 -
 .../apache/spec/acceptance/basic_spec.rb      |   12 -
 .../apache/spec/acceptance/class_spec.rb      |   78 -
 .../spec/acceptance/default_mods_spec.rb      |  120 -
 .../apache/spec/acceptance/itk_spec.rb        |   33 -
 .../spec/acceptance/mod_dav_svn_spec.rb       |   55 -
 .../spec/acceptance/mod_deflate_spec.rb       |   40 -
 .../apache/spec/acceptance/mod_fcgid_spec.rb  |   62 -
 .../apache/spec/acceptance/mod_mime_spec.rb   |   34 -
 .../spec/acceptance/mod_pagespeed_spec.rb     |   85 -
 .../spec/acceptance/mod_passenger_spec.rb     |  294 ---
 .../apache/spec/acceptance/mod_php_spec.rb    |  173 --
 .../spec/acceptance/mod_proxy_html_spec.rb    |   39 -
 .../apache/spec/acceptance/mod_suphp_spec.rb  |   44 -
 .../acceptance/nodesets/centos-59-x64.yml     |   11 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   13 -
 .../acceptance/nodesets/centos-64-x64.yml     |   11 -
 .../acceptance/nodesets/centos-65-x64.yml     |   11 -
 .../acceptance/nodesets/debian-607-x64.yml    |   11 -
 .../acceptance/nodesets/debian-70rc1-x64.yml  |   11 -
 .../acceptance/nodesets/debian-73-i386.yml    |   11 -
 .../acceptance/nodesets/debian-73-x64.yml     |   11 -
 .../spec/acceptance/nodesets/default.yml      |   11 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   11 -
 .../acceptance/nodesets/sles-11sp1-x64.yml    |   11 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   11 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   11 -
 .../nodesets/ubuntu-server-1310-x64.yml       |   11 -
 .../nodesets/ubuntu-server-1404-x64.yml       |   11 -
 .../spec/acceptance/prefork_worker_spec.rb    |   79 -
 .../apache/spec/acceptance/service_spec.rb    |   19 -
 .../spec/acceptance/unsupported_spec.rb       |   13 -
 .../modules/apache/spec/acceptance/version.rb |   57 -
 .../apache/spec/acceptance/vhost_spec.rb      | 1097 ---------
 .../apache/spec/classes/apache_spec.rb        |  563 -----
 .../modules/apache/spec/classes/dev_spec.rb   |   42 -
 .../apache/spec/classes/mod/auth_kerb_spec.rb |   56 -
 .../spec/classes/mod/authnz_ldap_spec.rb      |   76 -
 .../apache/spec/classes/mod/dav_svn_spec.rb   |   56 -
 .../apache/spec/classes/mod/deflate_spec.rb   |   90 -
 .../apache/spec/classes/mod/dev_spec.rb       |   26 -
 .../apache/spec/classes/mod/dir_spec.rb       |  103 -
 .../apache/spec/classes/mod/event_spec.rb     |  103 -
 .../apache/spec/classes/mod/fastcgi_spec.rb   |   43 -
 .../apache/spec/classes/mod/fcgid_spec.rb     |   86 -
 .../apache/spec/classes/mod/info_spec.rb      |  119 -
 .../apache/spec/classes/mod/itk_spec.rb       |   69 -
 .../spec/classes/mod/mime_magic_spec.rb       |  109 -
 .../apache/spec/classes/mod/mime_spec.rb      |   52 -
 .../apache/spec/classes/mod/pagespeed_spec.rb |   43 -
 .../apache/spec/classes/mod/passenger_spec.rb |  230 --
 .../apache/spec/classes/mod/perl_spec.rb      |   56 -
 .../apache/spec/classes/mod/peruser_spec.rb   |   23 -
 .../apache/spec/classes/mod/php_spec.rb       |  224 --
 .../apache/spec/classes/mod/prefork_spec.rb   |  114 -
 .../spec/classes/mod/proxy_html_spec.rb       |   85 -
 .../apache/spec/classes/mod/python_spec.rb    |   56 -
 .../apache/spec/classes/mod/rpaf_spec.rb      |   88 -
 .../apache/spec/classes/mod/speling_spec.rb   |   37 -
 .../apache/spec/classes/mod/ssl_spec.rb       |   72 -
 .../apache/spec/classes/mod/status_spec.rb    |  198 --
 .../apache/spec/classes/mod/suphp_spec.rb     |   38 -
 .../apache/spec/classes/mod/worker_spec.rb    |  161 --
 .../apache/spec/classes/mod/wsgi_spec.rb      |   69 -
 .../apache/spec/classes/params_spec.rb        |   26 -
 .../apache/spec/classes/service_spec.rb       |  127 --
 .../modules/apache/spec/defines/mod_spec.rb   |  118 -
 .../modules/apache/spec/defines/vhost_spec.rb | 1469 -------------
 .../modules/apache/spec/fixtures/files/spec   |    1 -
 .../site_apache/templates/fake.conf.erb       |    1 -
 .../puppet/modules/apache/spec/spec.opts      |    4 -
 .../puppet/modules/apache/spec/spec_helper.rb |   25 -
 .../apache/spec/spec_helper_acceptance.rb     |   45 -
 .../spec/unit/provider/a2mod/gentoo_spec.rb   |  184 --
 .../apache/templates/confd/no-accf.conf.erb   |    4 -
 .../modules/apache/templates/httpd.conf.erb   |  109 -
 .../modules/apache/templates/listen.erb       |    6 -
 .../apache/templates/mod/alias.conf.erb       |   13 -
 .../apache/templates/mod/authnz_ldap.conf.erb |    5 -
 .../apache/templates/mod/autoindex.conf.erb   |   56 -
 .../apache/templates/mod/cgid.conf.erb        |    1 -
 .../apache/templates/mod/dav_fs.conf.erb      |    1 -
 .../apache/templates/mod/deflate.conf.erb     |    8 -
 .../modules/apache/templates/mod/dir.conf.erb |    1 -
 .../apache/templates/mod/disk_cache.conf.erb  |    8 -
 .../apache/templates/mod/event.conf.erb       |    9 -
 .../apache/templates/mod/fastcgi.conf.erb     |    6 -
 .../apache/templates/mod/fcgid.conf.erb       |    5 -
 .../apache/templates/mod/info.conf.erb        |   10 -
 .../modules/apache/templates/mod/itk.conf.erb |    8 -
 .../apache/templates/mod/ldap.conf.erb        |   11 -
 .../modules/apache/templates/mod/load.erb     |    7 -
 .../apache/templates/mod/mime.conf.erb        |   36 -
 .../apache/templates/mod/mime_magic.conf.erb  |    1 -
 .../apache/templates/mod/mpm_event.conf.erb   |    9 -
 .../apache/templates/mod/negotiation.conf.erb |    2 -
 .../modules/apache/templates/mod/nss.conf.erb |  228 --
 .../apache/templates/mod/pagespeed.conf.erb   |   98 -
 .../apache/templates/mod/passenger.conf.erb   |   37 -
 .../apache/templates/mod/peruser.conf.erb     |   12 -
 .../apache/templates/mod/php5.conf.erb        |   30 -
 .../apache/templates/mod/prefork.conf.erb     |    8 -
 .../apache/templates/mod/proxy.conf.erb       |   27 -
 .../apache/templates/mod/proxy_html.conf.erb  |   18 -
 .../apache/templates/mod/reqtimeout.conf.erb  |    2 -
 .../apache/templates/mod/rpaf.conf.erb        |   15 -
 .../apache/templates/mod/setenvif.conf.erb    |   34 -
 .../modules/apache/templates/mod/ssl.conf.erb |   28 -
 .../apache/templates/mod/status.conf.erb      |   16 -
 .../apache/templates/mod/suphp.conf.erb       |   19 -
 .../apache/templates/mod/userdir.conf.erb     |   27 -
 .../apache/templates/mod/worker.conf.erb      |   10 -
 .../apache/templates/mod/wsgi.conf.erb        |   13 -
 .../apache/templates/namevirtualhost.erb      |    8 -
 .../modules/apache/templates/ports_header.erb |    5 -
 .../modules/apache/templates/vhost.conf.erb   |   66 -
 .../apache/templates/vhost/_action.erb        |    4 -
 .../apache/templates/vhost/_aliases.erb       |   12 -
 .../modules/apache/templates/vhost/_block.erb |   14 -
 .../templates/vhost/_custom_fragment.erb      |    5 -
 .../apache/templates/vhost/_directories.erb   |  171 --
 .../templates/vhost/_error_document.erb       |    7 -
 .../apache/templates/vhost/_fastcgi.erb       |   22 -
 .../apache/templates/vhost/_header.erb        |   10 -
 .../modules/apache/templates/vhost/_itk.erb   |   28 -
 .../apache/templates/vhost/_php_admin.erb     |   12 -
 .../modules/apache/templates/vhost/_proxy.erb |   23 -
 .../modules/apache/templates/vhost/_rack.erb  |    7 -
 .../apache/templates/vhost/_redirect.erb      |   24 -
 .../apache/templates/vhost/_requestheader.erb |   10 -
 .../apache/templates/vhost/_rewrite.erb       |   43 -
 .../apache/templates/vhost/_scriptalias.erb   |   24 -
 .../apache/templates/vhost/_serveralias.erb   |    7 -
 .../apache/templates/vhost/_setenv.erb        |   12 -
 .../modules/apache/templates/vhost/_ssl.erb   |   41 -
 .../apache/templates/vhost/_suexec.erb        |    4 -
 .../modules/apache/templates/vhost/_suphp.erb |   11 -
 .../modules/apache/templates/vhost/_wsgi.erb  |   24 -
 .../puppet/modules/apache/tests/apache.pp     |    6 -
 .../puppet/modules/apache/tests/dev.pp        |    1 -
 .../puppet/modules/apache/tests/init.pp       |    1 -
 .../modules/apache/tests/mod_load_params.pp   |   11 -
 .../puppet/modules/apache/tests/mods.pp       |    9 -
 .../modules/apache/tests/mods_custom.pp       |   16 -
 .../puppet/modules/apache/tests/php.pp        |    4 -
 .../puppet/modules/apache/tests/vhost.pp      |  238 --
 .../modules/apache/tests/vhost_directories.pp |   44 -
 .../modules/apache/tests/vhost_ip_based.pp    |   25 -
 .../puppet/modules/apache/tests/vhost_ssl.pp  |   23 -
 .../apache/tests/vhosts_without_listen.pp     |   53 -
 .../puphpet/puppet/modules/apt/.fixtures.yml  |    7 -
 .../puphpet/puppet/modules/apt/.project       |   23 -
 .../puppet/modules/apt/.puppet-lint.rc        |    1 -
 .../puphpet/puppet/modules/apt/.travis.yml    |   41 -
 .../puphpet/puppet/modules/apt/CHANGELOG.md   |  222 --
 .../puphpet/puppet/modules/apt/Gemfile        |   18 -
 .../puphpet/puppet/modules/apt/LICENSE        |   34 -
 .../puphpet/puppet/modules/apt/Modulefile     |   14 -
 .../puphpet/puppet/modules/apt/README.md      |  236 --
 .../puphpet/puppet/modules/apt/Rakefile       |    4 -
 .../puppet/modules/apt/manifests/backports.pp |   48 -
 .../puppet/modules/apt/manifests/builddep.pp  |   16 -
 .../puppet/modules/apt/manifests/conf.pp      |   18 -
 .../modules/apt/manifests/debian/testing.pp   |   21 -
 .../modules/apt/manifests/debian/unstable.pp  |   21 -
 .../puppet/modules/apt/manifests/force.pp     |   42 -
 .../puppet/modules/apt/manifests/init.pp      |  121 -
 .../puppet/modules/apt/manifests/key.pp       |   90 -
 .../puppet/modules/apt/manifests/params.pp    |   42 -
 .../puppet/modules/apt/manifests/pin.pp       |   73 -
 .../puppet/modules/apt/manifests/ppa.pp       |   81 -
 .../puppet/modules/apt/manifests/release.pp   |   17 -
 .../puppet/modules/apt/manifests/source.pp    |   87 -
 .../apt/manifests/unattended_upgrades.pp      |   69 -
 .../puppet/modules/apt/manifests/update.pp    |   10 -
 .../puphpet/puppet/modules/apt/metadata.json  |   30 -
 .../apt/spec/acceptance/apt_builddep_spec.rb  |   36 -
 .../apt/spec/acceptance/apt_key_spec.rb       |  200 --
 .../apt/spec/acceptance/apt_ppa_spec.rb       |   98 -
 .../apt/spec/acceptance/apt_source_spec.rb    |  326 ---
 .../modules/apt/spec/acceptance/apt_spec.rb   |  233 --
 .../apt/spec/acceptance/backports_spec.rb     |   59 -
 .../modules/apt/spec/acceptance/class_spec.rb |   17 -
 .../modules/apt/spec/acceptance/conf_spec.rb  |   66 -
 .../modules/apt/spec/acceptance/force_spec.rb |   76 -
 .../acceptance/nodesets/debian-70rc1-x64.yml  |   10 -
 .../apt/spec/acceptance/nodesets/default.yml  |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   11 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../modules/apt/spec/acceptance/pin_spec.rb   |  266 ---
 .../apt/spec/acceptance/release_spec.rb       |   26 -
 .../acceptance/unattended_upgrade_spec.rb     |  562 -----
 .../apt/spec/acceptance/unsupported_spec.rb   |   10 -
 .../modules/apt/spec/classes/apt_spec.rb      |  134 --
 .../apt/spec/classes/backports_spec.rb        |   71 -
 .../apt/spec/classes/debian_testing_spec.rb   |   15 -
 .../apt/spec/classes/debian_unstable_spec.rb  |   15 -
 .../modules/apt/spec/classes/params_spec.rb   |   14 -
 .../modules/apt/spec/classes/release_spec.rb  |   23 -
 .../spec/classes/unattended_upgrades_spec.rb  |  205 --
 .../modules/apt/spec/defines/builddep_spec.rb |   19 -
 .../modules/apt/spec/defines/conf_spec.rb     |   58 -
 .../modules/apt/spec/defines/force_spec.rb    |   58 -
 .../modules/apt/spec/defines/key_spec.rb      |  124 --
 .../modules/apt/spec/defines/pin_spec.rb      |  102 -
 .../modules/apt/spec/defines/ppa_spec.rb      |  156 --
 .../modules/apt/spec/defines/source_spec.rb   |  167 --
 .../puppet/modules/apt/spec/spec_helper.rb    |    1 -
 .../apt/spec/spec_helper_acceptance.rb        |   33 -
 .../modules/apt/templates/10periodic.erb      |   12 -
 .../apt/templates/50unattended-upgrades.erb   |   53 -
 .../puppet/modules/apt/templates/pin.pref.erb |   22 -
 .../modules/apt/templates/source.list.erb     |    5 -
 .../puppet/modules/apt/tests/builddep.pp      |    2 -
 .../modules/apt/tests/debian/testing.pp       |    2 -
 .../modules/apt/tests/debian/unstable.pp      |    2 -
 .../puphpet/puppet/modules/apt/tests/force.pp |   17 -
 .../puphpet/puppet/modules/apt/tests/init.pp  |    1 -
 .../puphpet/puppet/modules/apt/tests/key.pp   |    6 -
 .../puppet/modules/apt/tests/params.pp        |    1 -
 .../puphpet/puppet/modules/apt/tests/pin.pp   |    5 -
 .../puphpet/puppet/modules/apt/tests/ppa.pp   |    4 -
 .../puppet/modules/apt/tests/release.pp       |    4 -
 .../puppet/modules/apt/tests/source.pp        |   29 -
 .../modules/apt/tests/unattended_upgrades.pp  |    1 -
 .../puppet/modules/beanstalkd/.travis.yml     |   26 -
 .../puphpet/puppet/modules/beanstalkd/Gemfile |   12 -
 .../puppet/modules/beanstalkd/README.md       |   68 -
 .../puppet/modules/beanstalkd/Rakefile        |   10 -
 .../modules/beanstalkd/manifests/init.pp      |  124 --
 .../puppet/modules/beanstalkd/run-tests.sh    |   20 -
 .../beanstalkd/spec/defines/config_spec.rb    |   80 -
 .../spec/fixtures/manifests/site.pp           |    0
 .../modules/beanstalkd/manifests/init.pp      |  124 --
 .../templates/debian/beanstalkd_default.erb   |  123 --
 .../templates/redhat/beanstalkd_sysconfig.erb |   56 -
 .../modules/beanstalkd/spec/spec_helper.rb    |    8 -
 .../templates/debian/beanstalkd_default.erb   |  123 --
 .../templates/redhat/beanstalkd_sysconfig.erb |   56 -
 .../puppet/modules/composer/.fixtures.yml     |    5 -
 .../puppet/modules/composer/.travis.yml       |   13 -
 .../puppet/modules/composer/CHANGELOG.md      |  133 --
 .../puphpet/puppet/modules/composer/Gemfile   |   17 -
 .../puphpet/puppet/modules/composer/LICENSE   |   21 -
 .../puppet/modules/composer/Modulefile        |    8 -
 .../puphpet/puppet/modules/composer/README.md |  155 --
 .../puphpet/puppet/modules/composer/Rakefile  |    2 -
 .../composer/lib/facter/composer_home.rb      |    5 -
 .../puppet/modules/composer/manifests/exec.pp |   55 -
 .../puppet/modules/composer/manifests/init.pp |  156 --
 .../modules/composer/manifests/params.pp      |   53 -
 .../modules/composer/manifests/project.pp     |   96 -
 .../spec/classes/composer_params_spec.rb      |   14 -
 .../composer/spec/classes/composer_spec.rb    |  116 -
 .../spec/defines/composer_exec_spec.rb        |   65 -
 .../spec/defines/composer_project_spec.rb     |   61 -
 .../composer/spec/fixtures/manifests/site.pp  |    8 -
 .../puppet/modules/composer/spec/spec.opts    |    6 -
 .../modules/composer/spec/spec_helper.rb      |    1 -
 .../modules/composer/templates/exec.erb       |   17 -
 .../puppet/modules/composer/tests/init.pp     |   11 -
 .../puppet/modules/composer/tests/project.pp  |   23 -
 .../puppet/modules/concat/.fixtures.yml       |    7 -
 .../puppet/modules/concat/.gitattributes      |    1 -
 .../puphpet/puppet/modules/concat/.travis.yml |   40 -
 .../puphpet/puppet/modules/concat/CHANGELOG   |  127 --
 .../puphpet/puppet/modules/concat/Gemfile     |   20 -
 .../puphpet/puppet/modules/concat/LICENSE     |   14 -
 .../puphpet/puppet/modules/concat/Modulefile  |    9 -
 .../puphpet/puppet/modules/concat/README.md   |  441 ----
 .../puphpet/puppet/modules/concat/Rakefile    |    5 -
 .../modules/concat/files/concatfragments.rb   |  137 --
 .../modules/concat/files/concatfragments.sh   |  140 --
 .../concat/lib/facter/concat_basedir.rb       |   11 -
 .../modules/concat/manifests/fragment.pp      |  121 -
 .../puppet/modules/concat/manifests/init.pp   |  232 --
 .../puppet/modules/concat/manifests/setup.pp  |   58 -
 .../concat/spec/acceptance/backup_spec.rb     |  101 -
 .../concat/spec/acceptance/concat_spec.rb     |  204 --
 .../acceptance/deprecation_warnings_spec.rb   |  230 --
 .../concat/spec/acceptance/empty_spec.rb      |   24 -
 .../spec/acceptance/fragment_source_spec.rb   |  134 --
 .../concat/spec/acceptance/newline_spec.rb    |   57 -
 .../acceptance/nodesets/aix-71-vcloud.yml     |   19 -
 .../acceptance/nodesets/centos-59-x64.yml     |   10 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../acceptance/nodesets/debian-607-x64.yml    |   10 -
 .../acceptance/nodesets/debian-70rc1-x64.yml  |   10 -
 .../acceptance/nodesets/debian-73-x64.yml     |   11 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../spec/acceptance/nodesets/sles-11-x64.yml  |   10 -
 .../acceptance/nodesets/sles-11sp1-x64.yml    |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../nodesets/ubuntu-server-1404-x64.yml       |   11 -
 .../concat/spec/acceptance/order_spec.rb      |  137 --
 .../spec/acceptance/quoted_paths_spec.rb      |   33 -
 .../concat/spec/acceptance/replace_spec.rb    |  241 --
 .../spec/acceptance/symbolic_name_spec.rb     |   32 -
 .../concat/spec/acceptance/warn_spec.rb       |   97 -
 .../puppet/modules/concat/spec/spec_helper.rb |    1 -
 .../concat/spec/spec_helper_acceptance.rb     |   39 -
 .../spec/unit/classes/concat_setup_spec.rb    |   42 -
 .../spec/unit/defines/concat_fragment_spec.rb |  267 ---
 .../concat/spec/unit/defines/concat_spec.rb   |  380 ----
 .../spec/unit/facts/concat_basedir_spec.rb    |   18 -
 .../puppet/modules/concat/tests/fragment.pp   |   19 -
 .../puppet/modules/concat/tests/init.pp       |    7 -
 .../puphpet/puppet/modules/drush/Puppetfile   |    6 -
 .../puphpet/puppet/modules/drush/README       |  226 --
 .../puppet/modules/drush/manifests/apt.pp     |   49 -
 .../puppet/modules/drush/manifests/dis.pp     |   25 -
 .../puppet/modules/drush/manifests/dl.pp      |   48 -
 .../puppet/modules/drush/manifests/en.pp      |   26 -
 .../puppet/modules/drush/manifests/git.pp     |   60 -
 .../modules/drush/manifests/git/drush.pp      |   61 -
 .../puppet/modules/drush/manifests/init.pp    |   33 -
 .../puppet/modules/drush/manifests/make.pp    |   26 -
 .../puppet/modules/drush/manifests/params.pp  |   35 -
 .../puppet/modules/drush/manifests/run.pp     |   57 -
 .../puppet/modules/drush/manifests/status.pp  |   22 -
 .../puppet/modules/drush/tests/.ci/.module    |    1 -
 .../modules/drush/tests/.ci/Vagrantfile       |   11 -
 .../puppet/modules/drush/tests/.ci/test.sh    |   78 -
 .../modules/drush/tests/.ci/vagrant_test.sh   |    5 -
 .../puphpet/puppet/modules/drush/tests/apt.pp |    4 -
 .../puppet/modules/drush/tests/defaults.pp    |    1 -
 .../puphpet/puppet/modules/drush/tests/dis.pp |    3 -
 .../puphpet/puppet/modules/drush/tests/dl.pp  |    2 -
 .../puphpet/puppet/modules/drush/tests/en.pp  |    2 -
 .../puphpet/puppet/modules/drush/tests/git.pp |    4 -
 .../puppet/modules/drush/tests/git/drush.pp   |    1 -
 .../puppet/modules/drush/tests/init.pp        |    1 -
 .../puppet/modules/drush/tests/make.pp        |    4 -
 .../puphpet/puppet/modules/drush/tests/run.pp |    2 -
 .../puppet/modules/drush/tests/status.pp      |    2 -
 .../modules/elasticsearch/.fixtures.yml       |    5 -
 .../puppet/modules/elasticsearch/.travis.yml  |   33 -
 .../puppet/modules/elasticsearch/CHANGELOG    |   91 -
 .../modules/elasticsearch/CONTRIBUTING.md     |   18 -
 .../puppet/modules/elasticsearch/CONTRIBUTORS |   20 -
 .../puppet/modules/elasticsearch/Gemfile      |    7 -
 .../puppet/modules/elasticsearch/LICENSE      |   13 -
 .../puppet/modules/elasticsearch/Modulefile   |    9 -
 .../puppet/modules/elasticsearch/README.md    |  203 --
 .../puppet/modules/elasticsearch/Rakefile     |    7 -
 .../modules/elasticsearch/manifests/config.pp |   90 -
 .../modules/elasticsearch/manifests/init.pp   |  208 --
 .../modules/elasticsearch/manifests/java.pp   |   50 -
 .../elasticsearch/manifests/package.pp        |  145 --
 .../modules/elasticsearch/manifests/params.pp |  122 -
 .../modules/elasticsearch/manifests/plugin.pp |   96 -
 .../modules/elasticsearch/manifests/python.pp |   73 -
 .../modules/elasticsearch/manifests/ruby.pp   |   67 -
 .../elasticsearch/manifests/service.pp        |   43 -
 .../elasticsearch/manifests/service/init.pp   |  132 --
 .../elasticsearch/manifests/template.pp       |  114 -
 .../001_elasticsearch_init_debian_spec.rb     |  219 --
 .../002_elasticsearch_init_redhat_spec.rb     |  219 --
 .../003_elasticsearch_init_unknown_spec.rb    |   18 -
 .../004_elasticsearch_init_config_spec.rb     |  112 -
 .../classes/005_elasticsearch_java_spec.rb    |  120 -
 .../defines/001_elasticsearch_python_spec.rb  |   19 -
 .../defines/002_elasticsearch_ruby_spec.rb    |   19 -
 .../003_elasticsearch_template_spec.rb        |   43 -
 .../defines/004_elasticsearch_plugin_spec.rb  |   29 -
 .../spec/lib/parser_validate_task.rb          |   40 -
 .../spec/lib/template_check_task.rb           |   31 -
 .../modules/elasticsearch/spec/spec_helper.rb |    2 -
 .../etc/elasticsearch/elasticsearch.yml.erb   |   93 -
 .../etc/init.d/elasticsearch.Debian.erb       |  196 --
 .../etc/init.d/elasticsearch.RedHat.erb       |  155 --
 .../templates/etc/sysconfig/defaults.erb      |    5 -
 .../puphpet/puppet/modules/epel/Gemfile       |   15 -
 .../puphpet/puppet/modules/epel/LICENSE       |   13 -
 .../puphpet/puppet/modules/epel/Modulefile    |    8 -
 .../puphpet/puppet/modules/epel/README.md     |   90 -
 .../puphpet/puppet/modules/epel/Rakefile      |   17 -
 .../modules/epel/files/RPM-GPG-KEY-EPEL-5     |   30 -
 .../modules/epel/files/RPM-GPG-KEY-EPEL-6     |   29 -
 .../modules/epel/files/RPM-GPG-KEY-EPEL-7     |   29 -
 .../modules/epel/lib/facter/os_maj_version.rb |   11 -
 .../puppet/modules/epel/manifests/init.pp     |  135 --
 .../puppet/modules/epel/manifests/params.pp   |   45 -
 .../modules/epel/manifests/rpm_gpg_key.pp     |   28 -
 .../puphpet/puppet/modules/epel/metadata.json |   45 -
 .../modules/epel/spec/classes/epel_spec.rb    |   80 -
 .../modules/epel/spec/classes/shared_base.rb  |   36 -
 .../epel/spec/classes/shared_debuginfo.rb     |   36 -
 .../epel/spec/classes/shared_gpgkey.rb        |   37 -
 .../epel/spec/classes/shared_source.rb        |   36 -
 .../epel/spec/classes/shared_testing.rb       |   36 -
 .../spec/classes/shared_testing_debuginfo.rb  |   36 -
 .../spec/classes/shared_testing_source.rb     |   36 -
 .../epel/spec/defines/rpm_gpg_key_spec.rb     |   57 -
 .../puppet/modules/epel/spec/spec_helper.rb   |    8 -
 .../modules/epel/spec/spec_helper_system.rb   |   23 -
 .../modules/epel/spec/system/basic_spec.rb    |   36 -
 .../modules/epel/spec/system/usage_spec.rb    |   60 -
 .../spec/unit/facter/os_maj_version_spec.rb   |   21 -
 .../puphpet/puppet/modules/epel/tests/init.pp |    3 -
 .../puppet/modules/erlang/.fixtures.yml       |    7 -
 .../puppet/modules/erlang/.nodeset.yml        |   35 -
 .../puphpet/puppet/modules/erlang/.rspec      |    1 -
 .../puphpet/puppet/modules/erlang/.travis.yml |   23 -
 .../puphpet/puppet/modules/erlang/Gemfile     |   15 -
 .../puppet/modules/erlang/Gemfile.lock        |   94 -
 .../puphpet/puppet/modules/erlang/LICENSE     |  207 --
 .../puphpet/puppet/modules/erlang/Modulefile  |   10 -
 .../puphpet/puppet/modules/erlang/README.md   |   28 -
 .../puphpet/puppet/modules/erlang/Rakefile    |   35 -
 .../puppet/modules/erlang/manifests/init.pp   |   45 -
 .../puppet/modules/erlang/manifests/params.pp |   29 -
 .../modules/erlang/manifests/repo/apt.pp      |   41 -
 .../modules/erlang/manifests/repo/yum.pp      |   30 -
 .../erlang/spec/classes/erlang_spec.rb        |  138 --
 .../puppet/modules/erlang/spec/spec_helper.rb |    1 -
 .../modules/erlang/spec/spec_helper_system.rb |   17 -
 .../modules/erlang/spec/system/erlang_spec.rb |   25 -
 .../puppet/modules/firewall/.fixtures.yml     |    3 -
 .../puppet/modules/firewall/.nodeset.yml      |   31 -
 .../puppet/modules/firewall/.travis.yml       |   29 -
 .../puppet/modules/firewall/CHANGELOG.md      |  432 ----
 .../puppet/modules/firewall/CONTRIBUTING.md   |   87 -
 .../puphpet/puppet/modules/firewall/Gemfile   |   18 -
 .../puphpet/puppet/modules/firewall/LICENSE   |   25 -
 .../puppet/modules/firewall/Modulefile        |    8 -
 .../puppet/modules/firewall/README.markdown   |  429 ----
 .../puphpet/puppet/modules/firewall/Rakefile  |   14 -
 .../firewall/lib/facter/ip6tables_version.rb  |   11 -
 .../lib/facter/iptables_persistent_version.rb |   15 -
 .../firewall/lib/facter/iptables_version.rb   |   11 -
 .../firewall/lib/puppet/provider/firewall.rb  |   34 -
 .../lib/puppet/provider/firewall/ip6tables.rb |  136 --
 .../lib/puppet/provider/firewall/iptables.rb  |  501 -----
 .../provider/firewallchain/iptables_chain.rb  |  178 --
 .../firewall/lib/puppet/type/firewall.rb      | 1077 ---------
 .../firewall/lib/puppet/type/firewallchain.rb |  222 --
 .../firewall/lib/puppet/util/firewall.rb      |  225 --
 .../firewall/lib/puppet/util/ipcidr.rb        |   42 -
 .../puppet/modules/firewall/manifests/init.pp |   36 -
 .../modules/firewall/manifests/linux.pp       |   51 -
 .../firewall/manifests/linux/archlinux.pp     |   41 -
 .../firewall/manifests/linux/debian.pp        |   44 -
 .../firewall/manifests/linux/redhat.pp        |   40 -
 .../puppet/modules/firewall/metadata.json     |   64 -
 .../spec/acceptance/change_source_spec.rb     |   77 -
 .../firewall/spec/acceptance/class_spec.rb    |   27 -
 .../spec/acceptance/connlimit_spec.rb         |   55 -
 .../firewall/spec/acceptance/connmark_spec.rb |   27 -
 .../firewall/spec/acceptance/firewall_spec.rb | 1618 --------------
 .../spec/acceptance/firewallchain_spec.rb     |  125 --
 .../spec/acceptance/ip6_fragment_spec.rb      |  114 -
 .../spec/acceptance/isfragment_spec.rb        |   92 -
 .../acceptance/nodesets/centos-59-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-59-x64.yml     |   10 -
 .../nodesets/centos-64-x64-fusion.yml         |   10 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../acceptance/nodesets/debian-607-x64.yml    |   10 -
 .../acceptance/nodesets/debian-70rc1-x64.yml  |   10 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../acceptance/nodesets/sles-11sp1-x64.yml    |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../nodesets/ubuntu-server-1404-x64.yml       |    9 -
 .../firewall/spec/acceptance/params_spec.rb   |  154 --
 .../firewall/spec/acceptance/purge_spec.rb    |  124 --
 .../spec/acceptance/resource_cmd_spec.rb      |   93 -
 .../firewall/spec/acceptance/rules_spec.rb    |  252 ---
 .../firewall/spec/acceptance/socket_spec.rb   |   97 -
 .../spec/acceptance/standard_usage_spec.rb    |   55 -
 .../fixtures/ip6tables/conversion_hash.rb     |  107 -
 .../spec/fixtures/iptables/conversion_hash.rb |  934 --------
 .../modules/firewall/spec/spec_helper.rb      |   29 -
 .../firewall/spec/spec_helper_acceptance.rb   |   42 -
 .../classes/firewall_linux_archlinux_spec.rb  |   32 -
 .../classes/firewall_linux_debian_spec.rb     |   19 -
 .../classes/firewall_linux_redhat_spec.rb     |   22 -
 .../spec/unit/classes/firewall_linux_spec.rb  |   30 -
 .../spec/unit/classes/firewall_spec.rb        |   25 -
 .../iptables_persistent_version_spec.rb       |   35 -
 .../spec/unit/facter/iptables_spec.rb         |   23 -
 .../puppet/provider/iptables_chain_spec.rb    |  227 --
 .../unit/puppet/provider/iptables_spec.rb     |  410 ----
 .../spec/unit/puppet/type/firewall_spec.rb    |  650 ------
 .../unit/puppet/type/firewallchain_spec.rb    |  185 --
 .../spec/unit/puppet/util/firewall_spec.rb    |  197 --
 .../spec/unit/puppet/util/ipcidr_spec.rb      |   67 -
 .../puphpet/puppet/modules/git/.fixtures.yml  |    5 -
 .../puphpet/puppet/modules/git/CHANGELOG      |    2 -
 .../puphpet/puppet/modules/git/LICENSE        |  201 --
 .../puphpet/puppet/modules/git/Modulefile     |   10 -
 .../puphpet/puppet/modules/git/README.md      |   71 -
 .../puphpet/puppet/modules/git/Rakefile       |    1 -
 .../git/files/subtree/bash_completion.sh      |   25 -
 .../modules/git/lib/facter/git_exec_path.rb   |    4 -
 .../modules/git/lib/facter/git_version.rb     |    4 -
 .../puppet/modules/git/manifests/gitosis.pp   |   13 -
 .../puppet/modules/git/manifests/init.pp      |   17 -
 .../puppet/modules/git/manifests/subtree.pp   |   43 -
 .../git/spec/classes/git_subtree_spec.rb      |   70 -
 .../puppet/modules/git/spec/spec_helper.rb    |    1 -
 .../puppet/modules/git/tests/gitosis.pp       |    1 -
 .../puphpet/puppet/modules/git/tests/init.pp  |    1 -
 .../puppet/modules/mailcatcher/.fixtures.yml  |    5 -
 .../puppet/modules/mailcatcher/.travis.yml    |   31 -
 .../puppet/modules/mailcatcher/Gemfile        |   12 -
 .../puppet/modules/mailcatcher/Modulefile     |   13 -
 .../puppet/modules/mailcatcher/README.md      |   34 -
 .../puppet/modules/mailcatcher/Rakefile       |    6 -
 .../modules/mailcatcher/manifests/config.pp   |   18 -
 .../modules/mailcatcher/manifests/init.pp     |   64 -
 .../modules/mailcatcher/manifests/package.pp  |   17 -
 .../modules/mailcatcher/manifests/params.pp   |   22 -
 .../spec/classes/mailcatcher_spec.rb          |   41 -
 .../modules/mailcatcher/spec/spec_helper.rb   |    1 -
 .../templates/etc/init/mailcatcher.conf.erb   |   16 -
 .../puppet/modules/mailcatcher/tests/init.pp  |   12 -
 .../puppet/modules/mongodb/.fixtures.yml      |    6 -
 .../puppet/modules/mongodb/.nodeset.yml       |   31 -
 .../puppet/modules/mongodb/.travis.yml        |   33 -
 .../puphpet/puppet/modules/mongodb/CHANGELOG  |   74 -
 .../puphpet/puppet/modules/mongodb/Gemfile    |   19 -
 .../puphpet/puppet/modules/mongodb/LICENSE    |   15 -
 .../puphpet/puppet/modules/mongodb/Modulefile |   12 -
 .../puphpet/puppet/modules/mongodb/README.md  |  515 -----
 .../puphpet/puppet/modules/mongodb/Rakefile   |    1 -
 .../parser/functions/mongodb_password.rb      |   14 -
 .../provider/mongodb_database/mongodb.rb      |   36 -
 .../puppet/provider/mongodb_replset/mongo.rb  |  232 --
 .../puppet/provider/mongodb_user/mongodb.rb   |   48 -
 .../lib/puppet/type/mongodb_database.rb       |   27 -
 .../lib/puppet/type/mongodb_replset.rb        |   35 -
 .../mongodb/lib/puppet/type/mongodb_user.rb   |   63 -
 .../modules/mongodb/manifests/client.pp       |   26 -
 .../mongodb/manifests/client/install.pp       |   26 -
 .../puppet/modules/mongodb/manifests/db.pp    |   43 -
 .../modules/mongodb/manifests/globals.pp      |   27 -
 .../puppet/modules/mongodb/manifests/init.pp  |  136 --
 .../modules/mongodb/manifests/params.pp       |   93 -
 .../modules/mongodb/manifests/replset.pp      |   10 -
 .../puppet/modules/mongodb/manifests/repo.pp  |   31 -
 .../modules/mongodb/manifests/repo/apt.pp     |   25 -
 .../modules/mongodb/manifests/repo/yum.pp     |   20 -
 .../modules/mongodb/manifests/server.pp       |   77 -
 .../mongodb/manifests/server/config.pp        |   92 -
 .../mongodb/manifests/server/install.pp       |   34 -
 .../mongodb/manifests/server/service.pp       |   23 -
 .../acceptance/nodesets/centos-6-vcloud.yml   |   21 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../nodesets/multi-centos-6-vcloud.yml        |   21 -
 .../nodesets/multi-centos-64-x64.yml          |   10 -
 .../spec/acceptance/nodesets/sles-11-x64.yml  |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../mongodb/spec/acceptance/replset_spec.rb   |   69 -
 .../mongodb/spec/acceptance/server_spec.rb    |  122 -
 .../spec/classes/client_install_spec.rb       |   13 -
 .../modules/mongodb/spec/classes/repo_spec.rb |   32 -
 .../spec/classes/server_config_spec.rb        |  116 -
 .../spec/classes/server_install_spec.rb       |   16 -
 .../mongodb/spec/classes/server_spec.rb       |   23 -
 .../modules/mongodb/spec/defines/db_spec.rb   |   43 -
 .../modules/mongodb/spec/spec_helper.rb       |    1 -
 .../mongodb/spec/spec_helper_acceptance.rb    |   39 -
 .../mongodb/spec/spec_helper_system.rb        |   34 -
 .../spec/unit/mongodb_password_spec.rb        |   27 -
 .../provider/mongodb_database/mongodb_spec.rb |   35 -
 .../provider/mongodb_replset/mongodb_spec.rb  |  148 --
 .../provider/mongodb_user/mongodb_spec.rb     |   66 -
 .../unit/puppet/type/mongodb_database_spec.rb |   24 -
 .../unit/puppet/type/mongodb_replset_spec.rb  |   28 -
 .../unit/puppet/type/mongodb_user_spec.rb     |   67 -
 .../mongodb/templates/mongodb.conf.erb        |  172 --
 .../puppet/modules/mongodb/tests/globals.pp   |    3 -
 .../puppet/modules/mongodb/tests/init.pp      |    1 -
 .../modules/mongodb/tests/replicaset.pp       |   16 -
 .../puppet/modules/mongodb/tests/server.pp    |    2 -
 .../puppet/modules/mysql/.fixtures.yml        |    5 -
 .../puphpet/puppet/modules/mysql/.nodeset.yml |   31 -
 .../puphpet/puppet/modules/mysql/.travis.yml  |   34 -
 .../puphpet/puppet/modules/mysql/CHANGELOG.md |  476 ----
 .../puphpet/puppet/modules/mysql/Gemfile      |   25 -
 .../puphpet/puppet/modules/mysql/LICENSE      |  201 --
 .../puphpet/puppet/modules/mysql/Modulefile   |    9 -
 .../puphpet/puppet/modules/mysql/README.md    |  523 -----
 .../puphpet/puppet/modules/mysql/Rakefile     |    2 -
 .../puphpet/puppet/modules/mysql/TODO         |    8 -
 .../puppet/modules/mysql/files/mysqltuner.pl  |  966 --------
 .../parser/functions/mysql_deepmerge.rb       |   58 -
 .../puppet/parser/functions/mysql_password.rb |   15 -
 .../parser/functions/mysql_strip_hash.rb      |   21 -
 .../lib/puppet/provider/database/mysql.rb     |   41 -
 .../puppet/provider/database_grant/mysql.rb   |  199 --
 .../puppet/provider/database_user/mysql.rb    |   65 -
 .../mysql/lib/puppet/provider/mysql.rb        |   70 -
 .../puppet/provider/mysql_database/mysql.rb   |   68 -
 .../lib/puppet/provider/mysql_grant/mysql.rb  |  120 -
 .../lib/puppet/provider/mysql_user/mysql.rb   |  115 -
 .../modules/mysql/lib/puppet/type/database.rb |   21 -
 .../mysql/lib/puppet/type/database_grant.rb   |   79 -
 .../mysql/lib/puppet/type/database_user.rb    |   31 -
 .../mysql/lib/puppet/type/mysql_database.rb   |   22 -
 .../mysql/lib/puppet/type/mysql_grant.rb      |   72 -
 .../mysql/lib/puppet/type/mysql_user.rb       |   45 -
 .../puppet/modules/mysql/manifests/backup.pp  |   31 -
 .../modules/mysql/manifests/bindings.pp       |   33 -
 .../modules/mysql/manifests/bindings/java.pp  |   10 -
 .../modules/mysql/manifests/bindings/perl.pp  |   10 -
 .../modules/mysql/manifests/bindings/php.pp   |   10 -
 .../mysql/manifests/bindings/python.pp        |   10 -
 .../modules/mysql/manifests/bindings/ruby.pp  |   10 -
 .../puppet/modules/mysql/manifests/client.pp  |   27 -
 .../modules/mysql/manifests/client/install.pp |    8 -
 .../puppet/modules/mysql/manifests/db.pp      |   59 -
 .../puppet/modules/mysql/manifests/init.pp    |  100 -
 .../puppet/modules/mysql/manifests/params.pp  |  230 --
 .../puppet/modules/mysql/manifests/server.pp  |   82 -
 .../manifests/server/account_security.pp      |   22 -
 .../modules/mysql/manifests/server/backup.pp  |   61 -
 .../modules/mysql/manifests/server/config.pp  |   30 -
 .../modules/mysql/manifests/server/install.pp |    9 -
 .../modules/mysql/manifests/server/monitor.pp |   24 -
 .../mysql/manifests/server/mysqltuner.pp      |    9 -
 .../mysql/manifests/server/providers.pp       |    8 -
 .../mysql/manifests/server/root_password.pp   |   21 -
 .../modules/mysql/manifests/server/service.pp |   19 -
 .../puppet/modules/mysql/metadata.json        |   76 -
 .../acceptance/mysql_account_delete_spec.rb   |   25 -
 .../spec/acceptance/mysql_backup_spec.rb      |   64 -
 .../spec/acceptance/mysql_bindings_spec.rb    |  117 -
 .../mysql/spec/acceptance/mysql_db_spec.rb    |   49 -
 .../acceptance/mysql_server_config_spec.rb    |   47 -
 .../acceptance/mysql_server_monitor_spec.rb   |   22 -
 .../mysql_server_root_password_spec.rb        |   71 -
 .../spec/acceptance/mysql_server_spec.rb      |  281 ---
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../spec/acceptance/nodesets/sles-11-x64.yml  |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../acceptance/types/mysql_database_spec.rb   |   64 -
 .../spec/acceptance/types/mysql_grant_spec.rb |  308 ---
 .../spec/acceptance/types/mysql_user_spec.rb  |   32 -
 .../mysql/spec/acceptance/unsupported_spec.rb |   10 -
 .../mysql/spec/classes/mysql_bindings_spec.rb |   58 -
 .../mysql/spec/classes/mysql_client_spec.rb   |   16 -
 .../mysql_server_account_security_spec.rb     |   41 -
 .../spec/classes/mysql_server_backup_spec.rb  |  183 --
 .../spec/classes/mysql_server_monitor_spec.rb |   31 -
 .../classes/mysql_server_mysqltuner_spec.rb   |    5 -
 .../mysql/spec/classes/mysql_server_spec.rb   |  193 --
 .../mysql/spec/defines/mysql_db_spec.rb       |   51 -
 .../puppet/modules/mysql/spec/spec.opts       |    6 -
 .../puppet/modules/mysql/spec/spec_helper.rb  |    5 -
 .../mysql/spec/spec_helper_acceptance.rb      |   48 -
 .../modules/mysql/spec/spec_helper_system.rb  |   25 -
 .../spec/system/mysql_account_delete_spec.rb  |   35 -
 .../mysql/spec/system/mysql_backup_spec.rb    |   62 -
 .../mysql/spec/system/mysql_bindings_spec.rb  |   90 -
 .../mysql/spec/system/mysql_db_spec.rb        |   61 -
 .../spec/system/mysql_server_monitor_spec.rb  |   30 -
 .../system/mysql_server_root_password_spec.rb |   71 -
 .../mysql/spec/system/mysql_server_spec.rb    |  106 -
 .../spec/system/types/mysql_grant_spec.rb     |  314 ---
 .../spec/system/types/mysql_user_spec.rb      |   35 -
 .../mysql/spec/unit/mysql_password_spec.rb    |   27 -
 .../puppet/functions/mysql_deepmerge_spec.rb  |   91 -
 .../puppet/provider/database/mysql_spec.rb    |   86 -
 .../provider/database_grant/mysql_spec.rb     |   95 -
 .../provider/database_user/mysql_spec.rb      |  119 -
 .../provider/mysql_database/mysql_spec.rb     |  118 -
 .../puppet/provider/mysql_user/mysql_spec.rb  |  130 --
 .../unit/puppet/type/mysql_database_spec.rb   |   29 -
 .../spec/unit/puppet/type/mysql_grant_spec.rb |   44 -
 .../spec/unit/puppet/type/mysql_user_spec.rb  |   30 -
 .../puppet/modules/mysql/templates/my.cnf.erb |   18 -
 .../modules/mysql/templates/my.cnf.pass.erb   |    7 -
 .../modules/mysql/templates/my.conf.cnf.erb   |   17 -
 .../mysql/templates/mysqlbackup.sh.erb        |   72 -
 .../puppet/modules/mysql/tests/backup.pp      |    8 -
 .../puppet/modules/mysql/tests/bindings.pp    |    3 -
 .../puppet/modules/mysql/tests/init.pp        |    1 -
 .../puppet/modules/mysql/tests/java.pp        |    1 -
 .../modules/mysql/tests/mysql_database.pp     |   12 -
 .../puppet/modules/mysql/tests/mysql_grant.pp |    5 -
 .../puppet/modules/mysql/tests/mysql_user.pp  |   23 -
 .../puppet/modules/mysql/tests/perl.pp        |    1 -
 .../puppet/modules/mysql/tests/python.pp      |    1 -
 .../puppet/modules/mysql/tests/ruby.pp        |    1 -
 .../puppet/modules/mysql/tests/server.pp      |    3 -
 .../mysql/tests/server/account_security.pp    |    4 -
 .../modules/mysql/tests/server/config.pp      |   11 -
 .../puppet/modules/nginx/.fixtures.yml        |    3 -
 .../puphpet/puppet/modules/nginx/.nodeset.yml |   31 -
 .../puphpet/puppet/modules/nginx/.travis.yml  |   24 -
 .../puppet/modules/nginx/.travis/Gemfile      |   14 -
 .../puppet/modules/nginx/.travis/Rakefile     |    8 -
 .../puphpet/puppet/modules/nginx/Gemfile      |   13 -
 .../puphpet/puppet/modules/nginx/LICENSE      |   11 -
 .../puphpet/puppet/modules/nginx/Modulefile   |   12 -
 .../puphpet/puppet/modules/nginx/Puppetfile   |    5 -
 .../puppet/modules/nginx/Puppetfile.lock      |   13 -
 .../puppet/modules/nginx/README.markdown      |  240 --
 .../puphpet/puppet/modules/nginx/Rakefile     |   19 -
 .../puppet/modules/nginx/composer.json        |   14 -
 .../puppet/modules/nginx/manifests/config.pp  |  146 --
 .../puppet/modules/nginx/manifests/init.pp    |  173 --
 .../puppet/modules/nginx/manifests/package.pp |   79 -
 .../modules/nginx/manifests/package/debian.pp |   73 -
 .../modules/nginx/manifests/package/redhat.pp |   71 -
 .../nginx/manifests/package/solaris.pp        |   29 -
 .../modules/nginx/manifests/package/suse.pp   |   30 -
 .../puppet/modules/nginx/manifests/params.pp  |  123 --
 .../nginx/manifests/resource/location.pp      |  299 ---
 .../nginx/manifests/resource/mailhost.pp      |  144 --
 .../nginx/manifests/resource/upstream.pp      |   68 -
 .../modules/nginx/manifests/resource/vhost.pp |  511 -----
 .../puppet/modules/nginx/manifests/service.pp |   40 -
 .../modules/nginx/spec/classes/config_spec.rb |  324 ---
 .../modules/nginx/spec/classes/nginx_spec.rb  |   61 -
 .../nginx/spec/classes/package_spec.rb        |  163 --
 .../modules/nginx/spec/classes/params_spec.rb |   15 -
 .../nginx/spec/classes/service_spec.rb        |   38 -
 .../spec/defines/resource_location_spec.rb    |  621 ------
 .../spec/defines/resource_mailhost_spec.rb    |  401 ----
 .../spec/defines/resource_upstream_spec.rb    |   93 -
 .../nginx/spec/defines/resource_vhost_spec.rb |  647 ------
 .../puppet/modules/nginx/spec/spec_helper.rb  |    8 -
 .../modules/nginx/spec/spec_helper_system.rb  |   64 -
 .../modules/nginx/spec/system/basic_spec.rb   |   33 -
 .../modules/nginx/spec/system/class_spec.rb   |   35 -
 .../nginx/spec/system/nginx_mail_spec.rb      |   42 -
 .../nginx/spec/system/nginx_proxy_spec.rb     |   43 -
 .../nginx/spec/system/nginx_vhost_spec.rb     |  100 -
 .../nginx/templates/conf.d/nginx.conf.erb     |   55 -
 .../nginx/templates/conf.d/proxy.conf.erb     |   11 -
 .../nginx/templates/conf.d/upstream.erb       |   15 -
 .../nginx/templates/mailhost/mailhost.erb     |   23 -
 .../nginx/templates/mailhost/mailhost_ssl.erb |   23 -
 .../nginx/templates/vhost/fastcgi_params.erb  |   27 -
 .../nginx/templates/vhost/vhost_footer.erb    |   25 -
 .../nginx/templates/vhost/vhost_header.erb    |   54 -
 .../templates/vhost/vhost_location_alias.erb  |   47 -
 .../vhost/vhost_location_directory.erb        |   65 -
 .../templates/vhost/vhost_location_empty.erb  |   13 -
 .../vhost/vhost_location_fastcgi.erb          |   66 -
 .../templates/vhost/vhost_location_proxy.erb  |   67 -
 .../vhost/vhost_location_stub_status.erb      |   47 -
 .../templates/vhost/vhost_ssl_footer.erb      |   33 -
 .../templates/vhost/vhost_ssl_header.erb      |   84 -
 .../puppet/modules/nginx/tests/init.pp        |    9 -
 .../modules/nginx/tests/location_alias.pp     |    8 -
 .../puppet/modules/nginx/tests/upstream.pp    |   10 -
 .../puppet/modules/nginx/tests/vhost.pp       |   16 -
 .../puppet/modules/nginx/tests/vhost_ssl.pp   |   17 -
 .../puphpet/puppet/modules/ntp/.fixtures.yml  |    5 -
 .../puphpet/puppet/modules/ntp/.nodeset.yml   |   35 -
 .../puphpet/puppet/modules/ntp/.travis.yml    |   31 -
 .../puphpet/puppet/modules/ntp/CHANGELOG.md   |  152 --
 .../puppet/modules/ntp/CONTRIBUTING.md        |    9 -
 .../puphpet/puppet/modules/ntp/Gemfile        |   19 -
 .../puphpet/puppet/modules/ntp/LICENSE        |  202 --
 .../puphpet/puppet/modules/ntp/Modulefile     |   11 -
 .../puppet/modules/ntp/README.markdown        |  227 --
 .../puphpet/puppet/modules/ntp/Rakefile       |    1 -
 .../puppet/modules/ntp/manifests/config.pp    |   24 -
 .../puppet/modules/ntp/manifests/init.pp      |   56 -
 .../puppet/modules/ntp/manifests/install.pp   |    9 -
 .../puppet/modules/ntp/manifests/params.pp    |  185 --
 .../puppet/modules/ntp/manifests/service.pp   |   18 -
 .../puphpet/puppet/modules/ntp/metadata.json  |   84 -
 .../modules/ntp/spec/acceptance/class_spec.rb |   36 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../acceptance/nodesets/centos-65-x64.yml     |   10 -
 .../ntp/spec/acceptance/nodesets/default.yml  |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../spec/acceptance/nodesets/sles-11-x64.yml  |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../ntp/spec/acceptance/ntp_config_spec.rb    |   36 -
 .../ntp/spec/acceptance/ntp_install_spec.rb   |   31 -
 .../spec/acceptance/ntp_parameters_spec.rb    |  165 --
 .../ntp/spec/acceptance/ntp_service_spec.rb   |   63 -
 .../spec/acceptance/preferred_servers_spec.rb |   24 -
 .../ntp/spec/acceptance/restrict_spec.rb      |   20 -
 .../ntp/spec/acceptance/unsupported_spec.rb   |   10 -
 .../modules/ntp/spec/classes/ntp_spec.rb      |  272 ---
 .../modules/my_ntp/templates/ntp.conf.erb     |    4 -
 .../puphpet/puppet/modules/ntp/spec/spec.opts |    6 -
 .../puppet/modules/ntp/spec/spec_helper.rb    |    1 -
 .../ntp/spec/spec_helper_acceptance.rb        |   34 -
 .../spec/unit/puppet/provider/README.markdown |    4 -
 .../ntp/spec/unit/puppet/type/README.markdown |    4 -
 .../puppet/modules/ntp/templates/ntp.conf.erb |   43 -
 .../puphpet/puppet/modules/ntp/tests/init.pp  |   11 -
 .../puphpet/puppet/modules/php/.fixtures.yml  |   10 -
 .../puphpet/puppet/modules/php/.gemfile       |    6 -
 .../puphpet/puppet/modules/php/.project       |   23 -
 .../puphpet/puppet/modules/php/.travis.yml    |   21 -
 .../puphpet/puppet/modules/php/LICENSE        |   17 -
 .../puphpet/puppet/modules/php/Modulefile     |    9 -
 .../puphpet/puppet/modules/php/README.md      |  157 --
 .../puphpet/puppet/modules/php/Rakefile       |    5 -
 .../php/lib/facter/php_fact_extension_dir.rb  |    5 -
 .../php/lib/facter/php_fact_version.rb        |    5 -
 .../puppet/modules/php/manifests/augeas.pp    |   76 -
 .../puppet/modules/php/manifests/conf.pp      |  112 -
 .../puppet/modules/php/manifests/devel.pp     |   13 -
 .../puppet/modules/php/manifests/ini.pp       |   26 -
 .../puppet/modules/php/manifests/init.pp      |  298 ---
 .../puppet/modules/php/manifests/module.pp    |   85 -
 .../puppet/modules/php/manifests/params.pp    |  108 -
 .../puppet/modules/php/manifests/pear.pp      |   38 -
 .../modules/php/manifests/pear/config.pp      |   19 -
 .../modules/php/manifests/pear/module.pp      |  119 -
 .../modules/php/manifests/pecl/config.pp      |   23 -
 .../modules/php/manifests/pecl/module.pp      |  126 --
 .../puppet/modules/php/manifests/spec.pp      |   22 -
 .../modules/php/spec/classes/php_spec.rb      |   76 -
 .../php/spec/defines/php_module_spec.rb       |   38 -
 .../php/spec/defines/php_pear_module_spec.rb  |   49 -
 .../puppet/modules/php/spec/spec_helper.rb    |    1 -
 .../modules/php/templates/extra-ini.erb       |   11 -
 .../puppet/modules/php/templates/spec.erb     |    8 -
 .../puppet/modules/postgresql/.fixtures.yml   |    8 -
 .../puppet/modules/postgresql/.nodeset.yml    |   31 -
 .../puppet/modules/postgresql/.project        |   23 -
 .../puppet/modules/postgresql/.travis.yml     |   28 -
 .../puppet/modules/postgresql/CHANGELOG.md    |  550 -----
 .../puphpet/puppet/modules/postgresql/Gemfile |   20 -
 .../puphpet/puppet/modules/postgresql/LICENSE |  202 --
 .../puppet/modules/postgresql/Modulefile      |   13 -
 .../puphpet/puppet/modules/postgresql/NOTICE  |   14 -
 .../puppet/modules/postgresql/README.md       |  901 --------
 .../puppet/modules/postgresql/Rakefile        |   11 -
 .../modules/postgresql/files/RPM-GPG-KEY-PGDG |   30 -
 .../files/validate_postgresql_connection.sh   |   31 -
 .../postgresql_acls_to_resources_hash.rb      |   76 -
 .../parser/functions/postgresql_escape.rb     |   25 -
 .../parser/functions/postgresql_password.rb   |   18 -
 .../puppet/provider/postgresql_conf/parsed.rb |   37 -
 .../puppet/provider/postgresql_psql/ruby.rb   |   93 -
 .../lib/puppet/type/postgresql_conf.rb        |   31 -
 .../lib/puppet/type/postgresql_psql.rb        |   89 -
 .../modules/postgresql/manifests/client.pp    |   29 -
 .../modules/postgresql/manifests/globals.pp   |   94 -
 .../modules/postgresql/manifests/lib/devel.pp |   15 -
 .../modules/postgresql/manifests/lib/java.pp  |   15 -
 .../postgresql/manifests/lib/python.pp        |   13 -
 .../modules/postgresql/manifests/params.pp    |  175 --
 .../modules/postgresql/manifests/repo.pp      |   22 -
 .../manifests/repo/apt_postgresql_org.pp      |   30 -
 .../manifests/repo/yum_postgresql_org.pp      |   38 -
 .../modules/postgresql/manifests/server.pp    |   73 -
 .../postgresql/manifests/server/config.pp     |  108 -
 .../manifests/server/config_entry.pp          |   43 -
 .../postgresql/manifests/server/contrib.pp    |   27 -
 .../postgresql/manifests/server/database.pp   |   76 -
 .../manifests/server/database_grant.pp        |   18 -
 .../modules/postgresql/manifests/server/db.pp |   38 -
 .../postgresql/manifests/server/firewall.pp   |   21 -
 .../postgresql/manifests/server/grant.pp      |   85 -
 .../postgresql/manifests/server/initdb.pp     |   76 -
 .../postgresql/manifests/server/install.pp    |   49 -
 .../postgresql/manifests/server/passwd.pp     |   35 -
 .../manifests/server/pg_hba_rule.pp           |   52 -
 .../postgresql/manifests/server/plperl.pp     |   27 -
 .../postgresql/manifests/server/reload.pp     |   15 -
 .../postgresql/manifests/server/role.pp       |   85 -
 .../postgresql/manifests/server/service.pp    |   45 -
 .../manifests/server/table_grant.pp           |   20 -
 .../postgresql/manifests/server/tablespace.pp |   42 -
 .../manifests/validate_db_connection.pp       |   75 -
 .../puppet/modules/postgresql/metadata.json   |   82 -
 .../postgresql/spec/acceptance/client_spec.rb |   18 -
 .../spec/acceptance/common_patterns_spec.rb   |   47 -
 .../spec/acceptance/contrib_spec.rb           |   28 -
 .../spec/acceptance/lib/devel_spec.rb         |   17 -
 .../spec/acceptance/lib/java_spec.rb          |   20 -
 .../spec/acceptance/lib/python_spec.rb        |   19 -
 .../acceptance/nodesets/centos-510-x64.yml    |   10 -
 .../acceptance/nodesets/centos-59-x64.yml     |   10 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../acceptance/nodesets/debian-607-x64.yml    |   10 -
 .../acceptance/nodesets/debian-73-x64.yml     |   10 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../spec/acceptance/postgresql_psql_spec.rb   |   43 -
 .../acceptance/server/config_entry_spec.rb    |   26 -
 .../acceptance/server/database_grant_spec.rb  |   48 -
 .../spec/acceptance/server/database_spec.rb   |   29 -
 .../spec/acceptance/server/db_spec.rb         |  138 --
 .../spec/acceptance/server/grant_spec.rb      |   49 -
 .../acceptance/server/pg_hba_rule_spec.rb     |   72 -
 .../spec/acceptance/server/plperl_spec.rb     |   25 -
 .../spec/acceptance/server/role_spec.rb       |   88 -
 .../acceptance/server/table_grant_spec.rb     |  124 --
 .../spec/acceptance/server/tablespace_spec.rb |   67 -
 .../postgresql/spec/acceptance/server_spec.rb |  188 --
 .../spec/acceptance/unsupported_spec.rb       |   16 -
 .../acceptance/validate_db_connection_spec.rb |   79 -
 .../modules/postgresql/spec/spec_helper.rb    |   30 -
 .../postgresql/spec/spec_helper_acceptance.rb |   75 -
 .../spec/unit/classes/client_spec.rb          |   36 -
 .../spec/unit/classes/globals_spec.rb         |   29 -
 .../spec/unit/classes/lib/devel_spec.rb       |   12 -
 .../spec/unit/classes/lib/java_spec.rb        |   40 -
 .../spec/unit/classes/lib/python_spec.rb      |   31 -
 .../spec/unit/classes/params_spec.rb          |   12 -
 .../postgresql/spec/unit/classes/repo_spec.rb |   18 -
 .../spec/unit/classes/server/contrib_spec.rb  |   42 -
 .../spec/unit/classes/server/initdb_spec.rb   |   29 -
 .../spec/unit/classes/server/plperl_spec.rb   |   45 -
 .../spec/unit/classes/server_spec.rb          |  100 -
 .../unit/defines/server/config_entry_spec.rb  |   23 -
 .../defines/server/database_grant_spec.rb     |   26 -
 .../spec/unit/defines/server/database_spec.rb |   16 -
 .../spec/unit/defines/server/db_spec.rb       |   28 -
 .../spec/unit/defines/server/grant_spec.rb    |   24 -
 .../unit/defines/server/pg_hba_rule_spec.rb   |  161 --
 .../spec/unit/defines/server/role_spec.rb     |   23 -
 .../unit/defines/server/table_grant_spec.rb   |   27 -
 .../unit/defines/server/tablespace_spec.rb    |   23 -
 .../defines/validate_db_connection_spec.rb    |   35 -
 .../postgresql_acls_to_resources_hash_spec.rb |  137 --
 .../unit/functions/postgresql_escape_spec.rb  |   10 -
 .../functions/postgresql_password_spec.rb     |    6 -
 .../provider/postgresql_conf/parsed_spec.rb   |  112 -
 .../provider/postgresql_psql/ruby_spec.rb     |  140 --
 .../unit/puppet/type/postgresql_psql_spec.rb  |   92 -
 .../spec/unit/type/postgresql_conf_spec.rb    |   50 -
 .../postgresql/templates/pg_hba_rule.conf     |    5 -
 .../puphpet/puppet/modules/puphpet/LICENSE    |   22 -
 .../puphpet/puppet/modules/puphpet/README.md  |    3 -
 .../puphpet/files/xdebug_cli_alias.erb        |    2 -
 .../parser/functions/hash_key_equals.rb       |   36 -
 .../puppet/parser/functions/hash_key_true.rb  |   46 -
 .../lib/puppet/parser/functions/value_true.rb |   45 -
 .../modules/puphpet/manifests/adminer.pp      |   23 -
 .../puphpet/manifests/apache/modpagespeed.pp  |   50 -
 .../puphpet/manifests/apache/modspdy.pp       |   86 -
 .../puppet/modules/puphpet/manifests/hhvm.pp  |  151 --
 .../puppet/modules/puphpet/manifests/ini.pp   |  305 ---
 .../puppet/modules/puphpet/manifests/init.pp  |    1 -
 .../modules/puphpet/manifests/mariadb.pp      |   50 -
 .../puppet/modules/puphpet/manifests/nginx.pp |   38 -
 .../modules/puphpet/manifests/params.pp       |   92 -
 .../puphpet/manifests/php/extra_repos.pp      |   16 -
 .../modules/puphpet/manifests/php/module.pp   |   33 -
 .../modules/puphpet/manifests/php/pear.pp     |   49 -
 .../modules/puphpet/manifests/php/pecl.pp     |  120 -
 .../modules/puphpet/manifests/phpmyadmin.pp   |   46 -
 .../modules/puphpet/manifests/python/pip.pp   |   22 -
 .../modules/puphpet/manifests/ssl_cert.pp     |   36 -
 .../modules/puphpet/manifests/supervisord.pp  |   18 -
 .../modules/puphpet/manifests/xdebug.pp       |   32 -
 .../modules/puphpet/manifests/xhprof.pp       |   93 -
 .../templates/apache/custom_fragment.erb      |    1 -
 .../templates/apache/hhvm-httpd.conf.erb      |    6 -
 .../templates/apache/mod/spdy/php-wrapper.erb |    6 -
 .../templates/apache/mod/spdy/spdy_conf.erb   |    8 -
 .../puphpet/templates/nginx/default_conf.erb  |   29 -
 .../puppet/modules/puppi/.fixtures.yml        |    6 -
 .../puphpet/puppet/modules/puppi/.gemfile     |    7 -
 .../puphpet/puppet/modules/puppi/.project     |   23 -
 .../puphpet/puppet/modules/puppi/.travis.yml  |   21 -
 .../puphpet/puppet/modules/puppi/LICENSE      |   17 -
 .../puphpet/puppet/modules/puppi/Modulefile   |    9 -
 .../puphpet/puppet/modules/puppi/README.md    |  257 ---
 .../puppet/modules/puppi/README_check.md      |   67 -
 .../puppet/modules/puppi/README_deploy.md     |  263 ---
 .../puppet/modules/puppi/README_info.md       |   60 -
 .../puppet/modules/puppi/README_log.md        |   44 -
 .../puphpet/puppet/modules/puppi/Rakefile     |    6 -
 .../puppet/modules/puppi/composer.json        |   13 -
 .../modules/puppi/files/info/readme/readme    |    2 -
 .../puppi/files/info/readme/readme-default    |    4 -
 .../puppet/modules/puppi/files/mailpuppicheck |   72 -
 .../modules/puppi/files/mcollective/mc-puppi  |   65 -
 .../modules/puppi/files/mcollective/puppi.ddl |   68 -
 .../modules/puppi/files/mcollective/puppi.rb  |   83 -
 .../puppi/files/mcollective/puppicheck        |   22 -
 .../puppi/files/mcollective/puppideploy       |   22 -
 .../modules/puppi/files/scripts/archive.sh    |  168 --
 .../puppi/files/scripts/check_project.sh      |   45 -
 .../puppi/files/scripts/checkwardir.sh        |   63 -
 .../puppi/files/scripts/clean_filelist.sh     |   35 -
 .../modules/puppi/files/scripts/database.sh   |   96 -
 .../modules/puppi/files/scripts/delete.sh     |   26 -
 .../modules/puppi/files/scripts/deploy.sh     |   59 -
 .../puppi/files/scripts/deploy_files.sh       |   69 -
 .../modules/puppi/files/scripts/execute.sh    |   12 -
 .../modules/puppi/files/scripts/firewall.sh   |   63 -
 .../modules/puppi/files/scripts/functions     |  229 --
 .../modules/puppi/files/scripts/get_file.sh   |  165 --
 .../puppi/files/scripts/get_filesfromlist.sh  |   67 -
 .../puppi/files/scripts/get_maven_files.sh    |   99 -
 .../puppi/files/scripts/get_metadata.sh       |  124 --
 .../puppet/modules/puppi/files/scripts/git.sh |  176 --
 .../puppet/modules/puppi/files/scripts/header |   25 -
 .../modules/puppi/files/scripts/predeploy.sh  |   95 -
 .../puppi/files/scripts/predeploy_tar.sh      |   37 -
 .../puppi/files/scripts/report_mail.sh        |   27 -
 .../puppi/files/scripts/report_mongo.sh       |  112 -
 .../modules/puppi/files/scripts/service.sh    |   42 -
 .../puppet/modules/puppi/files/scripts/svn.sh |  215 --
 .../modules/puppi/files/scripts/wait.sh       |   54 -
 .../modules/puppi/files/scripts/yant.sh       |   38 -
 .../puppet/modules/puppi/files/scripts/yum.sh |   93 -
 .../modules/puppi/lib/facter/last_run.rb      |    7 -
 .../puppi/lib/facter/puppi_projects.rb        |    7 -
 .../lib/facter/windows_common_appdata.rb      |   10 -
 .../lib/puppet/parser/functions/any2bool.rb   |   44 -
 .../puppet/parser/functions/bool2ensure.rb    |   32 -
 .../puppet/parser/functions/get_class_args.rb |   32 -
 .../puppet/parser/functions/get_magicvar.rb   |   23 -
 .../parser/functions/get_module_path.rb       |   17 -
 .../lib/puppet/parser/functions/nslookup.rb   |   44 -
 .../puppet/parser/functions/options_lookup.rb |   56 -
 .../puppet/parser/functions/params_lookup.rb  |   77 -
 .../lib/puppet/parser/functions/url_parse.rb  |   44 -
 .../puppet/modules/puppi/manifests/check.pp   |   50 -
 .../modules/puppi/manifests/configure.pp      |   40 -
 .../modules/puppi/manifests/dependencies.pp   |   38 -
 .../puppet/modules/puppi/manifests/deploy.pp  |   40 -
 .../puppet/modules/puppi/manifests/extras.pp  |  208 --
 .../puppet/modules/puppi/manifests/helper.pp  |   29 -
 .../puppet/modules/puppi/manifests/helpers.pp |   16 -
 .../puppet/modules/puppi/manifests/info.pp    |   46 -
 .../modules/puppi/manifests/info/instance.pp  |   33 -
 .../modules/puppi/manifests/info/module.pp    |   59 -
 .../modules/puppi/manifests/info/readme.pp    |   69 -
 .../puppet/modules/puppi/manifests/init.pp    |   77 -
 .../modules/puppi/manifests/initialize.pp     |   37 -
 .../puppi/manifests/install_packages.pp       |   83 -
 .../puppet/modules/puppi/manifests/log.pp     |   36 -
 .../puppi/manifests/mcollective/client.pp     |   60 -
 .../puppi/manifests/mcollective/server.pp     |   34 -
 .../modules/puppi/manifests/netinstall.pp     |  169 --
 .../puppet/modules/puppi/manifests/one.pp     |   31 -
 .../puppet/modules/puppi/manifests/params.pp  |  104 -
 .../puppet/modules/puppi/manifests/project.pp |  100 -
 .../modules/puppi/manifests/project/README    |   31 -
 .../puppi/manifests/project/archive.pp        |  406 ----
 .../puppi/manifests/project/builder.pp        |  561 -----
 .../modules/puppi/manifests/project/dir.pp    |  450 ----
 .../modules/puppi/manifests/project/files.pp  |  482 ----
 .../modules/puppi/manifests/project/git.pp    |  418 ----
 .../modules/puppi/manifests/project/maven.pp  |  814 -------
 .../modules/puppi/manifests/project/mysql.pp  |  425 ----
 .../puppi/manifests/project/service.pp        |  352 ---
 .../modules/puppi/manifests/project/svn.pp    |  438 ----
 .../modules/puppi/manifests/project/tar.pp    |  479 ----
 .../modules/puppi/manifests/project/war.pp    |  525 -----
 .../puppi/manifests/project/y4maven.pp        |  723 ------
 .../modules/puppi/manifests/project/yum.pp    |  347 ---
 .../puppet/modules/puppi/manifests/report.pp  |   38 -
 .../modules/puppi/manifests/rollback.pp       |   36 -
 .../puppet/modules/puppi/manifests/run.pp     |   31 -
 .../modules/puppi/manifests/runscript.pp      |  154 --
 .../puppet/modules/puppi/manifests/skel.pp    |  184 --
 .../puppet/modules/puppi/manifests/todo.pp    |   57 -
 .../puppet/modules/puppi/manifests/two.pp     |   13 -
 .../puppet/modules/puppi/manifests/ze.pp      |   35 -
 .../modules/puppi/spec/classes/puppi_spec.rb  |   17 -
 .../puppi/spec/defines/puppi_check_spec.rb    |   26 -
 .../puppi/spec/defines/puppi_deploy_spec.rb   |   25 -
 .../puppi/spec/defines/puppi_helper_spec.rb   |   20 -
 .../puppi/spec/defines/puppi_info_spec.rb     |   24 -
 .../spec/defines/puppi_initialize_spec.rb     |   25 -
 .../puppi/spec/defines/puppi_log_spec.rb      |   22 -
 .../puppi/spec/defines/puppi_project_spec.rb  |   25 -
 .../puppi/spec/defines/puppi_report_spec.rb   |   25 -
 .../puppi/spec/defines/puppi_rollback_spec.rb |   25 -
 .../puppi/spec/defines/puppi_run_spec.rb      |   17 -
 .../puppi/spec/defines/puppi_todo_spec.rb     |   24 -
 .../puppi/spec/defines/puppi_ze_spec.rb       |   20 -
 .../puppi/spec/functions/any2bool_spec.rb     |   20 -
 .../puppi/spec/functions/bool2ensure_spec.rb  |   20 -
 .../puppi/spec/functions/url_parse_spec.rb    |   43 -
 .../puppet/modules/puppi/spec/spec_helper.rb  |    1 -
 .../puppi/templates/helpers/standard.yml.erb  |   49 -
 .../puppet/modules/puppi/templates/info.erb   |   11 -
 .../modules/puppi/templates/info/instance.erb |   89 -
 .../modules/puppi/templates/info/module.erb   |   89 -
 .../modules/puppi/templates/info/puppet.erb   |   30 -
 .../modules/puppi/templates/info/readme.erb   |   22 -
 .../puppi/templates/install_packages.erb      |    8 -
 .../puppet/modules/puppi/templates/log.erb    |    2 -
 .../puppi/templates/project/config.erb        |   33 -
 .../modules/puppi/templates/puppi.conf.erb    |   15 -
 .../puppet/modules/puppi/templates/puppi.erb  |  517 -----
 .../modules/puppi/templates/puppi_clean.erb   |   10 -
 .../puppet/modules/puppi/templates/todo.erb   |   42 -
 .../puppet/modules/rabbitmq/.fixtures.yml     |    9 -
 .../puppet/modules/rabbitmq/.nodeset.yml      |   35 -
 .../puppet/modules/rabbitmq/.travis.yml       |   38 -
 .../puphpet/puppet/modules/rabbitmq/CHANGELOG |  115 -
 .../puphpet/puppet/modules/rabbitmq/Gemfile   |   26 -
 .../puphpet/puppet/modules/rabbitmq/LICENSE   |  201 --
 .../puppet/modules/rabbitmq/Modulefile        |   13 -
 .../puphpet/puppet/modules/rabbitmq/README.md |  394 ----
 .../puphpet/puppet/modules/rabbitmq/Rakefile  |   10 -
 .../puphpet/puppet/modules/rabbitmq/TODO      |   10 -
 .../modules/rabbitmq/files/README.markdown    |   22 -
 .../files/plugins/amqp_client-2.3.1.ez        |  Bin 151907 -> 0 bytes
 .../files/plugins/rabbit_stomp-2.3.1.ez       |  Bin 55937 -> 0 bytes
 .../lib/facter/rabbitmq_erlang_cookie.rb      |   16 -
 .../rabbitmq_exchange/rabbitmqadmin.rb        |   89 -
 .../rabbitmq_plugin/rabbitmqplugins.rb        |   47 -
 .../provider/rabbitmq_user/rabbitmqctl.rb     |   98 -
 .../rabbitmq_user_permissions/rabbitmqctl.rb  |  105 -
 .../provider/rabbitmq_vhost/rabbitmqctl.rb    |   35 -
 .../lib/puppet/type/rabbitmq_exchange.rb      |   54 -
 .../lib/puppet/type/rabbitmq_plugin.rb        |   19 -
 .../rabbitmq/lib/puppet/type/rabbitmq_user.rb |   46 -
 .../puppet/type/rabbitmq_user_permissions.rb  |   59 -
 .../lib/puppet/type/rabbitmq_vhost.rb         |   19 -
 .../modules/rabbitmq/manifests/config.pp      |  121 -
 .../puppet/modules/rabbitmq/manifests/init.pp |  176 --
 .../modules/rabbitmq/manifests/install.pp     |   21 -
 .../manifests/install/rabbitmqadmin.pp        |   23 -
 .../modules/rabbitmq/manifests/management.pp  |   19 -
 .../modules/rabbitmq/manifests/params.pp      |   98 -
 .../modules/rabbitmq/manifests/policy.pp      |   15 -
 .../modules/rabbitmq/manifests/repo/apt.pp    |   33 -
 .../modules/rabbitmq/manifests/repo/rhel.pp   |   12 -
 .../modules/rabbitmq/manifests/server.pp      |  100 -
 .../modules/rabbitmq/manifests/service.pp     |   40 -
 .../modules/rabbitmq/spec/README.markdown     |    7 -
 .../rabbitmq/spec/acceptance/class_spec.rb    |   96 -
 .../spec/acceptance/clustering_spec.rb        |   34 -
 .../spec/acceptance/delete_guest_user_spec.rb |   26 -
 .../spec/acceptance/nodesets/default.yml      |   11 -
 .../nodesets/ubuntu-server-1310-x64.yml       |   11 -
 .../nodesets/ubuntu-server-1404-x64.yml       |   11 -
 .../spec/acceptance/rabbitmqadmin_spec.rb     |   46 -
 .../rabbitmq/spec/acceptance/server_spec.rb   |   96 -
 .../rabbitmq/spec/classes/rabbitmq_spec.rb    |  531 -----
 .../puppet/modules/rabbitmq/spec/spec.opts    |    6 -
 .../modules/rabbitmq/spec/spec_helper.rb      |    1 -
 .../rabbitmq/spec/spec_helper_acceptance.rb   |   38 -
 .../unit/facts/rabbitmq_erlang_cookie_spec.rb |   19 -
 .../rabbitmq_exchange/rabbitmqadmin_spec.rb   |   65 -
 .../rabbitmq_user/rabbitmqctl_spec.rb         |  236 --
 .../rabbitmqctl_spec.rb                       |  109 -
 .../rabbitmq_vhost/rabbitmqctl_spec.rb        |   45 -
 .../puppet/type/rabbitmq_exchange_spec.rb     |   54 -
 .../type/rabbitmq_user_permissions_spec.rb    |   55 -
 .../unit/puppet/type/rabbitmq_user_spec.rb    |   42 -
 .../unit/puppet/type/rabbitmq_vhost_spec.rb   |   21 -
 .../rabbitmq/templates/README.markdown        |   23 -
 .../rabbitmq/templates/rabbitmq-env.conf.erb  |    5 -
 .../rabbitmq/templates/rabbitmq.config.erb    |   56 -
 .../modules/rabbitmq/tests/erlang_deps.pp     |    5 -
 .../puppet/modules/rabbitmq/tests/full.pp     |   21 -
 .../modules/rabbitmq/tests/permissions/add.pp |    9 -
 .../puppet/modules/rabbitmq/tests/plugin.pp   |   11 -
 .../puppet/modules/rabbitmq/tests/repo/apt.pp |    2 -
 .../puppet/modules/rabbitmq/tests/server.pp   |    5 -
 .../puppet/modules/rabbitmq/tests/service.pp  |    1 -
 .../puppet/modules/rabbitmq/tests/site.pp     |   16 -
 .../puppet/modules/rabbitmq/tests/user/add.pp |    4 -
 .../modules/rabbitmq/tests/vhosts/add.pp      |    1 -
 .../puphpet/puppet/modules/redis/.travis.yml  |   24 -
 .../puphpet/puppet/modules/redis/CHANGELOG    |   63 -
 .../puphpet/puppet/modules/redis/Gemfile      |    7 -
 .../puphpet/puppet/modules/redis/LICENSE      |   15 -
 .../puphpet/puppet/modules/redis/Modulefile   |   13 -
 .../puphpet/puppet/modules/redis/README.md    |   57 -
 .../puphpet/puppet/modules/redis/Rakefile     |    6 -
 .../puphpet/puppet/modules/redis/Vagrantfile  |   18 -
 .../puppet/modules/redis/manifests/init.pp    |  160 --
 .../puppet/modules/redis/manifests/params.pp  |   39 -
 .../puppet/modules/redis/spec/spec_helper.rb  |   17 -
 .../redis/templates/redis.debian.conf.erb     |  221 --
 .../redis/templates/redis.logrotate.erb       |    9 -
 .../redis/templates/redis.rhel.conf.erb       |  549 -----
 .../puppet/modules/redis/tests/init.pp        |   15 -
 .../puphpet/puppet/modules/sqlite/Modulefile  |   13 -
 .../puphpet/puppet/modules/sqlite/README.md   |   32 -
 .../puppet/modules/sqlite/manifests/db.pp     |   44 -
 .../puppet/modules/sqlite/manifests/init.pp   |   16 -
 .../puppet/modules/sqlite/metadata.json       |   12 -
 .../puppet/modules/sqlite/spec/spec.opts      |    6 -
 .../puppet/modules/sqlite/spec/spec_helper.rb |   18 -
 .../puppet/modules/sqlite/tests/init.pp       |    1 -
 .../puppet/modules/staging/.fixtures.yml      |    5 -
 .../puppet/modules/staging/.travis.yml        |   22 -
 .../puphpet/puppet/modules/staging/Gemfile    |   25 -
 .../puphpet/puppet/modules/staging/LICENSE    |   11 -
 .../puphpet/puppet/modules/staging/Modulefile |   10 -
 .../puphpet/puppet/modules/staging/README.md  |   57 -
 .../puphpet/puppet/modules/staging/Rakefile   |   51 -
 .../puppet/modules/staging/Vagrantfile        |   29 -
 .../puppet/modules/staging/docs/deploy.html   |  113 -
 .../puppet/modules/staging/docs/extract.html  |  176 --
 .../puppet/modules/staging/docs/file.html     |  178 --
 .../puppet/modules/staging/docs/init.html     |   87 -
 .../puppet/modules/staging/files/sample       |    1 -
 .../modules/staging/files/sample.tar.bz2      |  Bin 27984 -> 0 bytes
 .../modules/staging/files/sample.tar.gz       |  Bin 33352 -> 0 bytes
 .../staging/lib/facter/staging_http_get.rb    |   29 -
 .../staging/lib/facter/staging_windir.rb      |   11 -
 .../puppet/parser/functions/scope_defaults.rb |   17 -
 .../puppet/parser/functions/staging_parse.rb  |   36 -
 .../modules/staging/manifests/deploy.pp       |   42 -
 .../modules/staging/manifests/extract.pp      |   95 -
 .../puppet/modules/staging/manifests/file.pp  |  115 -
 .../puppet/modules/staging/manifests/init.pp  |   28 -
 .../modules/staging/manifests/params.pp       |   26 -
 .../spec/defines/staging_deploy_spec.rb       |   26 -
 .../spec/defines/staging_extract_spec.rb      |   58 -
 .../staging/spec/defines/staging_file_spec.rb |  157 --
 .../modules/staging/spec/fixtures/hiera.yaml  |    7 -
 .../modules/staging/spec/spec_helper.rb       |    2 -
 .../parser/functions/scope_defaults_spec.rb   |   45 -
 .../parser/functions/staging_parse_spec.rb    |   51 -
 .../puppet/modules/staging/tests/deploy.pp    |    4 -
 .../puppet/modules/staging/tests/extract.pp   |   25 -
 .../puppet/modules/staging/tests/file.pp      |   17 -
 .../puppet/modules/staging/tests/init.pp      |    1 -
 .../modules/staging/tests/scope_defaults.pp   |    7 -
 .../modules/staging/tests/staging_parse.pp    |   12 -
 .../puppet/modules/stdlib/CHANGELOG.md        |  413 ----
 .../puppet/modules/stdlib/CONTRIBUTING.md     |   65 -
 .../puphpet/puppet/modules/stdlib/Gemfile     |   33 -
 .../puppet/modules/stdlib/Gemfile.lock        |  174 --
 .../puphpet/puppet/modules/stdlib/LICENSE     |   19 -
 .../puphpet/puppet/modules/stdlib/Modulefile  |   11 -
 .../puppet/modules/stdlib/README.markdown     | 1304 -----------
 .../modules/stdlib/README_DEVELOPER.markdown  |   35 -
 .../modules/stdlib/README_SPECS.markdown      |    7 -
 .../modules/stdlib/RELEASE_PROCESS.markdown   |   24 -
 .../puphpet/puppet/modules/stdlib/Rakefile    |   18 -
 .../modules/stdlib/lib/facter/facter_dot_d.rb |  202 --
 .../modules/stdlib/lib/facter/pe_version.rb   |   53 -
 .../stdlib/lib/facter/puppet_vardir.rb        |   26 -
 .../modules/stdlib/lib/facter/root_home.rb    |   32 -
 .../stdlib/lib/facter/util/puppet_settings.rb |   21 -
 .../stdlib/lib/puppet/parser/functions/abs.rb |   36 -
 .../lib/puppet/parser/functions/any2array.rb  |   33 -
 .../lib/puppet/parser/functions/base64.rb     |   37 -
 .../lib/puppet/parser/functions/bool2num.rb   |   49 -
 .../lib/puppet/parser/functions/capitalize.rb |   34 -
 .../lib/puppet/parser/functions/chomp.rb      |   35 -
 .../lib/puppet/parser/functions/chop.rb       |   37 -
 .../lib/puppet/parser/functions/concat.rb     |   41 -
 .../lib/puppet/parser/functions/count.rb      |   22 -
 .../lib/puppet/parser/functions/deep_merge.rb |   44 -
 .../parser/functions/defined_with_params.rb   |   35 -
 .../lib/puppet/parser/functions/delete.rb     |   46 -
 .../lib/puppet/parser/functions/delete_at.rb  |   49 -
 .../parser/functions/delete_undef_values.rb   |   34 -
 .../puppet/parser/functions/delete_values.rb  |   26 -
 .../lib/puppet/parser/functions/difference.rb |   36 -
 .../lib/puppet/parser/functions/dirname.rb    |   15 -
 .../lib/puppet/parser/functions/downcase.rb   |   33 -
 .../lib/puppet/parser/functions/empty.rb      |   28 -
 .../parser/functions/ensure_packages.rb       |   35 -
 .../parser/functions/ensure_resource.rb       |   45 -
 .../lib/puppet/parser/functions/flatten.rb    |   33 -
 .../lib/puppet/parser/functions/floor.rb      |   25 -
 .../puppet/parser/functions/fqdn_rotate.rb    |   46 -
 .../parser/functions/get_module_path.rb       |   17 -
 .../lib/puppet/parser/functions/getparam.rb   |   35 -
 .../lib/puppet/parser/functions/getvar.rb     |   26 -
 .../lib/puppet/parser/functions/grep.rb       |   33 -
 .../parser/functions/has_interface_with.rb    |   52 -
 .../puppet/parser/functions/has_ip_address.rb |   25 -
 .../puppet/parser/functions/has_ip_network.rb |   25 -
 .../lib/puppet/parser/functions/has_key.rb    |   28 -
 .../lib/puppet/parser/functions/hash.rb       |   41 -
 .../puppet/parser/functions/intersection.rb   |   34 -
 .../lib/puppet/parser/functions/is_array.rb   |   22 -
 .../lib/puppet/parser/functions/is_bool.rb    |   22 -
 .../puppet/parser/functions/is_domain_name.rb |   50 -
 .../lib/puppet/parser/functions/is_float.rb   |   30 -
 .../parser/functions/is_function_available.rb |   26 -
 .../lib/puppet/parser/functions/is_hash.rb    |   22 -
 .../lib/puppet/parser/functions/is_integer.rb |   45 -
 .../puppet/parser/functions/is_ip_address.rb  |   32 -
 .../puppet/parser/functions/is_mac_address.rb |   27 -
 .../lib/puppet/parser/functions/is_numeric.rb |   75 -
 .../lib/puppet/parser/functions/is_string.rb  |   26 -
 .../lib/puppet/parser/functions/join.rb       |   41 -
 .../parser/functions/join_keys_to_values.rb   |   47 -
 .../lib/puppet/parser/functions/keys.rb       |   26 -
 .../lib/puppet/parser/functions/loadyaml.rb   |   20 -
 .../lib/puppet/parser/functions/lstrip.rb     |   33 -
 .../stdlib/lib/puppet/parser/functions/max.rb |   21 -
 .../lib/puppet/parser/functions/member.rb     |   44 -
 .../lib/puppet/parser/functions/merge.rb      |   34 -
 .../stdlib/lib/puppet/parser/functions/min.rb |   21 -
 .../lib/puppet/parser/functions/num2bool.rb   |   43 -
 .../lib/puppet/parser/functions/parsejson.rb  |   24 -
 .../lib/puppet/parser/functions/parseyaml.rb  |   24 -
 .../lib/puppet/parser/functions/pick.rb       |   29 -
 .../puppet/parser/functions/pick_default.rb   |   35 -
 .../lib/puppet/parser/functions/prefix.rb     |   45 -
 .../lib/puppet/parser/functions/range.rb      |   88 -
 .../lib/puppet/parser/functions/reject.rb     |   31 -
 .../lib/puppet/parser/functions/reverse.rb    |   28 -
 .../lib/puppet/parser/functions/rstrip.rb     |   32 -
 .../lib/puppet/parser/functions/shuffle.rb    |   46 -
 .../lib/puppet/parser/functions/size.rb       |   48 -
 .../lib/puppet/parser/functions/sort.rb       |   27 -
 .../lib/puppet/parser/functions/squeeze.rb    |   36 -
 .../lib/puppet/parser/functions/str2bool.rb   |   46 -
 .../parser/functions/str2saltedsha512.rb      |   32 -
 .../lib/puppet/parser/functions/strftime.rb   |  107 -
 .../lib/puppet/parser/functions/strip.rb      |   39 -
 .../lib/puppet/parser/functions/suffix.rb     |   45 -
 .../lib/puppet/parser/functions/swapcase.rb   |   39 -
 .../lib/puppet/parser/functions/time.rb       |   49 -
 .../lib/puppet/parser/functions/to_bytes.rb   |   28 -
 .../lib/puppet/parser/functions/type.rb       |   50 -
 .../lib/puppet/parser/functions/union.rb      |   34 -
 .../lib/puppet/parser/functions/unique.rb     |   51 -
 .../lib/puppet/parser/functions/upcase.rb     |   41 -
 .../lib/puppet/parser/functions/uriescape.rb  |   35 -
 .../functions/validate_absolute_path.rb       |   56 -
 .../puppet/parser/functions/validate_array.rb |   33 -
 .../parser/functions/validate_augeas.rb       |   81 -
 .../puppet/parser/functions/validate_bool.rb  |   34 -
 .../puppet/parser/functions/validate_cmd.rb   |   48 -
 .../puppet/parser/functions/validate_hash.rb  |   33 -
 .../parser/functions/validate_ipv4_address.rb |   48 -
 .../parser/functions/validate_ipv6_address.rb |   49 -
 .../puppet/parser/functions/validate_re.rb    |   40 -
 .../parser/functions/validate_slength.rb      |   71 -
 .../parser/functions/validate_string.rb       |   33 -
 .../lib/puppet/parser/functions/values.rb     |   39 -
 .../lib/puppet/parser/functions/values_at.rb  |   98 -
 .../stdlib/lib/puppet/parser/functions/zip.rb |   65 -
 .../lib/puppet/provider/file_line/ruby.rb     |   83 -
 .../modules/stdlib/lib/puppet/type/anchor.rb  |   46 -
 .../stdlib/lib/puppet/type/file_line.rb       |   79 -
 .../puppet/modules/stdlib/manifests/init.pp   |   20 -
 .../puppet/modules/stdlib/manifests/stages.pp |   43 -
 .../puppet/modules/stdlib/metadata.json       |  509 -----
 .../stdlib/spec/acceptance/abs_spec.rb        |   30 -
 .../stdlib/spec/acceptance/any2array_spec.rb  |   49 -
 .../stdlib/spec/acceptance/base64_spec.rb     |   18 -
 .../stdlib/spec/acceptance/bool2num_spec.rb   |   34 -
 .../stdlib/spec/acceptance/build_csv.rb       |   83 -
 .../stdlib/spec/acceptance/capitalize_spec.rb |   33 -
 .../stdlib/spec/acceptance/chomp_spec.rb      |   21 -
 .../stdlib/spec/acceptance/chop_spec.rb       |   45 -
 .../stdlib/spec/acceptance/concat_spec.rb     |   18 -
 .../stdlib/spec/acceptance/count_spec.rb      |   30 -
 .../stdlib/spec/acceptance/deep_merge_spec.rb |   20 -
 .../acceptance/defined_with_params_spec.rb    |   22 -
 .../stdlib/spec/acceptance/delete_at_spec.rb  |   19 -
 .../stdlib/spec/acceptance/delete_spec.rb     |   19 -
 .../acceptance/delete_undef_values_spec.rb    |   19 -
 .../spec/acceptance/delete_values_spec.rb     |   25 -
 .../stdlib/spec/acceptance/difference_spec.rb |   26 -
 .../stdlib/spec/acceptance/dirname_spec.rb    |   42 -
 .../stdlib/spec/acceptance/downcase_spec.rb   |   39 -
 .../stdlib/spec/acceptance/empty_spec.rb      |   39 -
 .../spec/acceptance/ensure_packages_spec.rb   |   24 -
 .../spec/acceptance/ensure_resource_spec.rb   |   24 -
 .../stdlib/spec/acceptance/flatten_spec.rb    |   39 -
 .../stdlib/spec/acceptance/floor_spec.rb      |   39 -
 .../spec/acceptance/fqdn_rotate_spec.rb       |   33 -
 .../spec/acceptance/get_module_path_spec.rb   |   41 -
 .../stdlib/spec/acceptance/getparam_spec.rb   |   25 -
 .../stdlib/spec/acceptance/getvar_spec.rb     |   26 -
 .../stdlib/spec/acceptance/grep_spec.rb       |   26 -
 .../acceptance/has_interface_with_spec.rb     |   44 -
 .../spec/acceptance/has_ip_address_spec.rb    |   33 -
 .../spec/acceptance/has_ip_network_spec.rb    |   33 -
 .../stdlib/spec/acceptance/has_key_spec.rb    |   41 -
 .../stdlib/spec/acceptance/hash_spec.rb       |   26 -
 .../spec/acceptance/intersection_spec.rb      |   27 -
 .../stdlib/spec/acceptance/is_array_spec.rb   |   67 -
 .../stdlib/spec/acceptance/is_bool_spec.rb    |   81 -
 .../spec/acceptance/is_domain_name_spec.rb    |   83 -
 .../stdlib/spec/acceptance/is_float_spec.rb   |   86 -
 .../acceptance/is_function_available_spec.rb  |   58 -
 .../stdlib/spec/acceptance/is_hash_spec.rb    |   63 -
 .../stdlib/spec/acceptance/is_integer_spec.rb |   95 -
 .../spec/acceptance/is_ip_address_spec.rb     |   80 -
 .../spec/acceptance/is_mac_address_spec.rb    |   38 -
 .../stdlib/spec/acceptance/is_numeric_spec.rb |   95 -
 .../stdlib/spec/acceptance/is_string_spec.rb  |  102 -
 .../acceptance/join_keys_to_values_spec.rb    |   24 -
 .../stdlib/spec/acceptance/join_spec.rb       |   26 -
 .../stdlib/spec/acceptance/keys_spec.rb       |   23 -
 .../stdlib/spec/acceptance/loadyaml_spec.rb   |   31 -
 .../stdlib/spec/acceptance/lstrip_spec.rb     |   34 -
 .../stdlib/spec/acceptance/max_spec.rb        |   20 -
 .../stdlib/spec/acceptance/member_spec.rb     |   26 -
 .../stdlib/spec/acceptance/merge_spec.rb      |   23 -
 .../stdlib/spec/acceptance/min_spec.rb        |   20 -
 .../acceptance/nodesets/centos-6-vcloud.yml   |   15 -
 .../acceptance/nodesets/centos-64-x64-pe.yml  |   12 -
 .../acceptance/nodesets/centos-64-x64.yml     |   10 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../acceptance/nodesets/fedora-18-x64.yml     |   10 -
 .../spec/acceptance/nodesets/sles-11-x64.yml  |   10 -
 .../nodesets/ubuntu-server-10044-x64.yml      |   10 -
 .../nodesets/ubuntu-server-12042-x64.yml      |   10 -
 .../stdlib/spec/acceptance/num2bool_spec.rb   |   76 -
 .../stdlib/spec/acceptance/parsejson_spec.rb  |   34 -
 .../stdlib/spec/acceptance/parseyaml_spec.rb  |   35 -
 .../spec/acceptance/pick_default_spec.rb      |   54 -
 .../stdlib/spec/acceptance/pick_spec.rb       |   44 -
 .../stdlib/spec/acceptance/prefix_spec.rb     |   42 -
 .../stdlib/spec/acceptance/range_spec.rb      |   36 -
 .../stdlib/spec/acceptance/reject_spec.rb     |   42 -
 .../stdlib/spec/acceptance/reverse_spec.rb    |   23 -
 .../stdlib/spec/acceptance/rstrip_spec.rb     |   34 -
 .../stdlib/spec/acceptance/shuffle_spec.rb    |   34 -
 .../stdlib/spec/acceptance/size_spec.rb       |   55 -
 .../stdlib/spec/acceptance/sort_spec.rb       |   34 -
 .../stdlib/spec/acceptance/squeeze_spec.rb    |   47 -
 .../stdlib/spec/acceptance/str2bool_spec.rb   |   31 -
 .../spec/acceptance/str2saltedsha512_spec.rb  |   22 -
 .../stdlib/spec/acceptance/strftime_spec.rb   |   22 -
 .../stdlib/spec/acceptance/strip_spec.rb      |   34 -
 .../stdlib/spec/acceptance/suffix_spec.rb     |   42 -
 .../stdlib/spec/acceptance/swapcase_spec.rb   |   22 -
 .../stdlib/spec/acceptance/time_spec.rb       |   36 -
 .../stdlib/spec/acceptance/to_bytes_spec.rb   |   27 -
 .../stdlib/spec/acceptance/type_spec.rb       |   37 -
 .../stdlib/spec/acceptance/union_spec.rb      |   24 -
 .../stdlib/spec/acceptance/unique_spec.rb     |   33 -
 .../spec/acceptance/unsupported_spec.rb       |   11 -
 .../stdlib/spec/acceptance/upcase_spec.rb     |   33 -
 .../stdlib/spec/acceptance/uriescape_spec.rb  |   23 -
 .../acceptance/validate_absolute_path_spec.rb |   31 -
 .../spec/acceptance/validate_array_spec.rb    |   37 -
 .../spec/acceptance/validate_augeas_spec.rb   |   63 -
 .../spec/acceptance/validate_bool_spec.rb     |   37 -
 .../spec/acceptance/validate_cmd_spec.rb      |   50 -
 .../spec/acceptance/validate_hash_spec.rb     |   37 -
 .../acceptance/validate_ipv4_address_spec.rb  |   31 -
 .../acceptance/validate_ipv6_address_spec.rb  |   31 -
 .../spec/acceptance/validate_re_spec.rb       |   47 -
 .../spec/acceptance/validate_slength_spec.rb  |   72 -
 .../spec/acceptance/validate_string_spec.rb   |   36 -
 .../stdlib/spec/acceptance/values_at_spec.rb  |   73 -
 .../stdlib/spec/acceptance/values_spec.rb     |   31 -
 .../stdlib/spec/acceptance/zip_spec.rb        |   74 -
 .../stdlib/spec/classes/anchor_spec.rb        |   30 -
 .../stdlib/spec/fixtures/dscacheutil/root     |    8 -
 .../modules/stdlib/spec/functions/abs_spec.rb |   25 -
 .../stdlib/spec/functions/any2array_spec.rb   |   55 -
 .../stdlib/spec/functions/base64_spec.rb      |   34 -
 .../stdlib/spec/functions/bool2num_spec.rb    |   24 -
 .../stdlib/spec/functions/capitalize_spec.rb  |   19 -
 .../stdlib/spec/functions/chomp_spec.rb       |   19 -
 .../stdlib/spec/functions/chop_spec.rb        |   19 -
 .../stdlib/spec/functions/concat_spec.rb      |   30 -
 .../stdlib/spec/functions/count_spec.rb       |   31 -
 .../stdlib/spec/functions/deep_merge_spec.rb  |  105 -
 .../functions/defined_with_params_spec.rb     |   37 -
 .../stdlib/spec/functions/delete_at_spec.rb   |   25 -
 .../stdlib/spec/functions/delete_spec.rb      |   56 -
 .../functions/delete_undef_values_spec.rb     |   41 -
 .../spec/functions/delete_values_spec.rb      |   36 -
 .../stdlib/spec/functions/difference_spec.rb  |   19 -
 .../stdlib/spec/functions/dirname_spec.rb     |   24 -
 .../stdlib/spec/functions/downcase_spec.rb    |   24 -
 .../stdlib/spec/functions/empty_spec.rb       |   23 -
 .../spec/functions/ensure_packages_spec.rb    |   81 -
 .../spec/functions/ensure_resource_spec.rb    |  113 -
 .../stdlib/spec/functions/flatten_spec.rb     |   27 -
 .../stdlib/spec/functions/floor_spec.rb       |   39 -
 .../stdlib/spec/functions/fqdn_rotate_spec.rb |   33 -
 .../spec/functions/get_module_path_spec.rb    |   46 -
 .../stdlib/spec/functions/getparam_spec.rb    |   76 -
 .../stdlib/spec/functions/getvar_spec.rb      |   37 -
 .../stdlib/spec/functions/grep_spec.rb        |   19 -
 .../spec/functions/has_interface_with_spec.rb |   64 -
 .../spec/functions/has_ip_address_spec.rb     |   39 -
 .../spec/functions/has_ip_network_spec.rb     |   36 -
 .../stdlib/spec/functions/has_key_spec.rb     |   42 -
 .../stdlib/spec/functions/hash_spec.rb        |   19 -
 .../spec/functions/intersection_spec.rb       |   19 -
 .../stdlib/spec/functions/is_array_spec.rb    |   29 -
 .../stdlib/spec/functions/is_bool_spec.rb     |   44 -
 .../spec/functions/is_domain_name_spec.rb     |   64 -
 .../stdlib/spec/functions/is_float_spec.rb    |   33 -
 .../spec/functions/is_function_available.rb   |   31 -
 .../stdlib/spec/functions/is_hash_spec.rb     |   29 -
 .../stdlib/spec/functions/is_integer_spec.rb  |   69 -
 .../spec/functions/is_ip_address_spec.rb      |   39 -
 .../spec/functions/is_mac_address_spec.rb     |   29 -
 .../stdlib/spec/functions/is_numeric_spec.rb  |  119 -
 .../stdlib/spec/functions/is_string_spec.rb   |   34 -
 .../functions/join_keys_to_values_spec.rb     |   40 -
 .../stdlib/spec/functions/join_spec.rb        |   19 -
 .../stdlib/spec/functions/keys_spec.rb        |   21 -
 .../stdlib/spec/functions/loadyaml_spec.rb    |   25 -
 .../stdlib/spec/functions/lstrip_spec.rb      |   19 -
 .../modules/stdlib/spec/functions/max_spec.rb |   27 -
 .../stdlib/spec/functions/member_spec.rb      |   24 -
 .../stdlib/spec/functions/merge_spec.rb       |   52 -
 .../modules/stdlib/spec/functions/min_spec.rb |   27 -
 .../stdlib/spec/functions/num2bool_spec.rb    |   67 -
 .../stdlib/spec/functions/parsejson_spec.rb   |   22 -
 .../stdlib/spec/functions/parseyaml_spec.rb   |   24 -
 .../spec/functions/pick_default_spec.rb       |   58 -
 .../stdlib/spec/functions/pick_spec.rb        |   34 -
 .../stdlib/spec/functions/prefix_spec.rb      |   28 -
 .../stdlib/spec/functions/range_spec.rb       |   70 -
 .../stdlib/spec/functions/reject_spec.rb      |   20 -
 .../stdlib/spec/functions/reverse_spec.rb     |   19 -
 .../stdlib/spec/functions/rstrip_spec.rb      |   24 -
 .../stdlib/spec/functions/shuffle_spec.rb     |   24 -
 .../stdlib/spec/functions/size_spec.rb        |   24 -
 .../stdlib/spec/functions/sort_spec.rb        |   24 -
 .../stdlib/spec/functions/squeeze_spec.rb     |   24 -
 .../stdlib/spec/functions/str2bool_spec.rb    |   31 -
 .../spec/functions/str2saltedsha512_spec.rb   |   45 -
 .../stdlib/spec/functions/strftime_spec.rb    |   29 -
 .../stdlib/spec/functions/strip_spec.rb       |   18 -
 .../stdlib/spec/functions/suffix_spec.rb      |   27 -
 .../stdlib/spec/functions/swapcase_spec.rb    |   19 -
 .../stdlib/spec/functions/time_spec.rb        |   29 -
 .../stdlib/spec/functions/to_bytes_spec.rb    |   58 -
 .../stdlib/spec/functions/type_spec.rb        |   43 -
 .../stdlib/spec/functions/union_spec.rb       |   19 -
 .../stdlib/spec/functions/unique_spec.rb      |   24 -
 .../stdlib/spec/functions/upcase_spec.rb      |   24 -
 .../stdlib/spec/functions/uriescape_spec.rb   |   24 -
 .../functions/validate_absolute_path_spec.rb  |   84 -
 .../spec/functions/validate_array_spec.rb     |   38 -
 .../spec/functions/validate_augeas_spec.rb    |  103 -
 .../spec/functions/validate_bool_spec.rb      |   51 -
 .../spec/functions/validate_cmd_spec.rb       |   48 -
 .../spec/functions/validate_hash_spec.rb      |   43 -
 .../functions/validate_ipv4_address_spec.rb   |   64 -
 .../functions/validate_ipv6_address_spec.rb   |   67 -
 .../stdlib/spec/functions/validate_re_spec.rb |   77 -
 .../spec/functions/validate_slength_spec.rb   |   67 -
 .../spec/functions/validate_string_spec.rb    |   60 -
 .../stdlib/spec/functions/values_at_spec.rb   |   38 -
 .../stdlib/spec/functions/values_spec.rb      |   31 -
 .../modules/stdlib/spec/functions/zip_spec.rb |   15 -
 .../stdlib/spec/lib/puppet_spec/compiler.rb   |   47 -
 .../stdlib/spec/lib/puppet_spec/database.rb   |   30 -
 .../stdlib/spec/lib/puppet_spec/files.rb      |   61 -
 .../stdlib/spec/lib/puppet_spec/fixtures.rb   |   29 -
 .../stdlib/spec/lib/puppet_spec/matchers.rb   |  121 -
 .../stdlib/spec/lib/puppet_spec/modules.rb    |   27 -
 .../stdlib/spec/lib/puppet_spec/pops.rb       |   17 -
 .../stdlib/spec/lib/puppet_spec/scope.rb      |   15 -
 .../stdlib/spec/lib/puppet_spec/settings.rb   |   16 -
 .../stdlib/spec/lib/puppet_spec/verbose.rb    |   10 -
 .../monkey_patches/alias_should_to_must.rb    |    9 -
 .../spec/monkey_patches/publicize_methods.rb  |   11 -
 .../puppet/modules/stdlib/spec/spec.opts      |    6 -
 .../puppet/modules/stdlib/spec/spec_helper.rb |   39 -
 .../stdlib/spec/spec_helper_acceptance.rb     |   31 -
 .../spec/unit/facter/coverage/.last_run.json  |    5 -
 .../spec/unit/facter/coverage/.resultset.json |    7 -
 .../coverage/assets/0.8.0/application.css     |  799 -------
 .../coverage/assets/0.8.0/application.js      | 1559 -------------
 .../coverage/assets/0.8.0/colorbox/border.png |  Bin 162 -> 0 bytes
 .../assets/0.8.0/colorbox/controls.png        |  Bin 2032 -> 0 bytes
 .../assets/0.8.0/colorbox/loading.gif         |  Bin 9427 -> 0 bytes
 .../0.8.0/colorbox/loading_background.png     |  Bin 165 -> 0 bytes
 .../coverage/assets/0.8.0/favicon_green.png   |  Bin 1008 -> 0 bytes
 .../coverage/assets/0.8.0/favicon_red.png     |  Bin 1008 -> 0 bytes
 .../coverage/assets/0.8.0/favicon_yellow.png  |  Bin 1008 -> 0 bytes
 .../facter/coverage/assets/0.8.0/loading.gif  |  Bin 7247 -> 0 bytes
 .../facter/coverage/assets/0.8.0/magnify.png  |  Bin 1300 -> 0 bytes
 .../images/ui-bg_flat_0_aaaaaa_40x100.png     |  Bin 179 -> 0 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png    |  Bin 177 -> 0 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    |  Bin 119 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 104 -> 0 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png    |  Bin 110 -> 0 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    |  Bin 109 -> 0 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png    |  Bin 118 -> 0 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  |  Bin 100 -> 0 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 4367 -> 0 bytes
 .../images/ui-icons_2e83ff_256x240.png        |  Bin 4367 -> 0 bytes
 .../images/ui-icons_454545_256x240.png        |  Bin 4367 -> 0 bytes
 .../images/ui-icons_888888_256x240.png        |  Bin 4367 -> 0 bytes
 .../images/ui-icons_cd0a0a_256x240.png        |  Bin 4367 -> 0 bytes
 .../spec/unit/facter/coverage/index.html      |   72 -
 .../spec/unit/facter/facter_dot_d_spec.rb     |   32 -
 .../spec/unit/facter/pe_version_spec.rb       |   76 -
 .../stdlib/spec/unit/facter/root_home_spec.rb |   52 -
 .../unit/facter/util/puppet_settings_spec.rb  |   36 -
 .../puppet/provider/file_line/ruby_spec.rb    |  225 --
 .../spec/unit/puppet/type/anchor_spec.rb      |   11 -
 .../spec/unit/puppet/type/file_line_spec.rb   |   70 -
 .../puppet/modules/stdlib/tests/file_line.pp  |    9 -
 .../stdlib/tests/has_interface_with.pp        |   10 -
 .../modules/stdlib/tests/has_ip_address.pp    |    3 -
 .../modules/stdlib/tests/has_ip_network.pp    |    4 -
 .../puppet/modules/stdlib/tests/init.pp       |    1 -
 .../puppet/modules/supervisord/.fixtures.yml  |   10 -
 .../puppet/modules/supervisord/.nodeset.yml   |   27 -
 .../puppet/modules/supervisord/.travis.yml    |   31 -
 .../puppet/modules/supervisord/Changelog      |  119 -
 .../puppet/modules/supervisord/Gemfile        |   26 -
 .../puppet/modules/supervisord/Modulefile     |   11 -
 .../puppet/modules/supervisord/README.md      |  127 --
 .../puppet/modules/supervisord/Rakefile       |   28 -
 .../lib/puppet/parser/functions/array2csv.rb  |   36 -
 .../lib/puppet/parser/functions/hash2csv.rb   |   40 -
 .../modules/supervisord/manifests/config.pp   |   72 -
 .../supervisord/manifests/eventlistener.pp    |  118 -
 .../supervisord/manifests/fcgi_program.pp     |  117 -
 .../modules/supervisord/manifests/group.pp    |   30 -
 .../modules/supervisord/manifests/init.pp     |  130 --
 .../modules/supervisord/manifests/install.pp  |   10 -
 .../modules/supervisord/manifests/params.pp   |   60 -
 .../modules/supervisord/manifests/pip.pp      |   30 -
 .../modules/supervisord/manifests/program.pp  |  113 -
 .../modules/supervisord/manifests/reload.pp   |   19 -
 .../modules/supervisord/manifests/service.pp  |   12 -
 .../supervisord/manifests/supervisorctl.pp    |   27 -
 .../acceptance/nodesets/centos-65-i386.yml    |   10 -
 .../acceptance/nodesets/centos-65-x64.yml     |   10 -
 .../acceptance/nodesets/debian-73-i386.yml    |   10 -
 .../acceptance/nodesets/debian-73-x64.yml     |   10 -
 .../spec/acceptance/nodesets/default.yml      |   10 -
 .../spec/acceptance/supervisord_spec.rb       |  114 -
 .../spec/classes/supervisord_spec.rb          |  299 ---
 .../spec/defines/eventlistener_spec.rb        |   86 -
 .../spec/defines/fcgi_program_spec.rb         |   88 -
 .../supervisord/spec/defines/group_spec.rb    |   22 -
 .../supervisord/spec/defines/program_spec.rb  |   86 -
 .../supervisord/spec/defines/supervisorctl.rb |   13 -
 .../spec/functions/array2csv_spec.rb          |    8 -
 .../spec/functions/hash2csv_spec.rb           |    8 -
 .../modules/supervisord/spec/spec_helper.rb   |   10 -
 .../spec/spec_helper_acceptance.rb            |   24 -
 .../templates/conf/eventlistener.erb          |   88 -
 .../templates/conf/fcgi_program.erb           |   96 -
 .../supervisord/templates/conf/group.erb      |    5 -
 .../supervisord/templates/conf/program.erb    |   89 -
 .../templates/init/Debian/defaults.erb        |   10 -
 .../templates/init/Debian/init.erb            |  137 --
 .../templates/init/RedHat/defaults.erb        |    8 -
 .../templates/init/RedHat/init.erb            |  120 -
 .../templates/supervisord_inet.erb            |   13 -
 .../templates/supervisord_main.erb            |   34 -
 .../templates/supervisord_unix.erb            |   15 -
 .../puppet/modules/supervisord/tests/group.pp |    4 -
 .../puppet/modules/supervisord/tests/init.pp  |    5 -
 .../modules/supervisord/tests/program.pp      |   35 -
 .../puphpet/puppet/modules/sysctl/ChangeLog   |   29 -
 .../puphpet/puppet/modules/sysctl/Gemfile     |    8 -
 .../puphpet/puppet/modules/sysctl/LICENSE     |   14 -
 .../puphpet/puppet/modules/sysctl/Modulefile  |    8 -
 .../puphpet/puppet/modules/sysctl/README.md   |   58 -
 .../puphpet/puppet/modules/sysctl/Rakefile    |    7 -
 .../puppet/modules/sysctl/manifests/base.pp   |   26 -
 .../puppet/modules/sysctl/manifests/init.pp   |   66 -
 .../puppet/modules/sysctl/metadata.json       |   32 -
 .../sysctl/spec/classes/sysctl_base_spec.rb   |    9 -
 .../sysctl/spec/defines/sysctl_init_spec.rb   |   25 -
 .../puppet/modules/sysctl/spec/spec_helper.rb |    2 -
 .../sysctl/templates/sysctl.d-file.erb        |    6 -
 .../puppet/modules/sysctl/tests/base.pp       |    1 -
 .../puppet/modules/sysctl/tests/init.pp       |    3 -
 .../puppet/modules/vcsrepo/.travis.yml        |   31 -
 .../puphpet/puppet/modules/vcsrepo/CHANGELOG  |   41 -
 .../puphpet/puppet/modules/vcsrepo/Gemfile    |   22 -
 .../puphpet/puppet/modules/vcsrepo/LICENSE    |   17 -
 .../puphpet/puppet/modules/vcsrepo/Modulefile |    4 -
 .../modules/vcsrepo/README.BZR.markdown       |   47 -
 .../modules/vcsrepo/README.CVS.markdown       |   66 -
 .../modules/vcsrepo/README.GIT.markdown       |   95 -
 .../puppet/modules/vcsrepo/README.HG.markdown |   73 -
 .../modules/vcsrepo/README.SVN.markdown       |   62 -
 .../puppet/modules/vcsrepo/README.markdown    |   32 -
 .../puphpet/puppet/modules/vcsrepo/Rakefile   |    1 -
 .../modules/vcsrepo/examples/bzr/branch.pp    |    6 -
 .../modules/vcsrepo/examples/bzr/init_repo.pp |    4 -
 .../modules/vcsrepo/examples/cvs/local.pp     |   11 -
 .../modules/vcsrepo/examples/cvs/remote.pp    |    5 -
 .../modules/vcsrepo/examples/git/bare_init.pp |    4 -
 .../modules/vcsrepo/examples/git/clone.pp     |    5 -
 .../vcsrepo/examples/git/working_copy_init.pp |    4 -
 .../modules/vcsrepo/examples/hg/clone.pp      |    6 -
 .../modules/vcsrepo/examples/hg/init_repo.pp  |    4 -
 .../modules/vcsrepo/examples/svn/checkout.pp  |    5 -
 .../modules/vcsrepo/examples/svn/server.pp    |    4 -
 .../vcsrepo/lib/puppet/provider/vcsrepo.rb    |   42 -
 .../lib/puppet/provider/vcsrepo/bzr.rb        |   85 -
 .../lib/puppet/provider/vcsrepo/cvs.rb        |  137 --
 .../lib/puppet/provider/vcsrepo/dummy.rb      |   12 -
 .../lib/puppet/provider/vcsrepo/git.rb        |  323 ---
 .../vcsrepo/lib/puppet/provider/vcsrepo/hg.rb |  115 -
 .../lib/puppet/provider/vcsrepo/svn.rb        |  124 --
 .../vcsrepo/lib/puppet/type/vcsrepo.rb        |  198 --
 .../spec/fixtures/bzr_version_info.txt        |    5 -
 .../vcsrepo/spec/fixtures/git_branch_a.txt    |   14 -
 .../spec/fixtures/git_branch_feature_bar.txt  |   14 -
 .../vcsrepo/spec/fixtures/git_branch_none.txt |   15 -
 .../vcsrepo/spec/fixtures/hg_parents.txt      |    6 -
 .../modules/vcsrepo/spec/fixtures/hg_tags.txt |   18 -
 .../vcsrepo/spec/fixtures/svn_info.txt        |   10 -
 .../puppet/modules/vcsrepo/spec/spec.opts     |    6 -
 .../modules/vcsrepo/spec/spec_helper.rb       |   13 -
 .../spec/support/filesystem_helpers.rb        |   18 -
 .../vcsrepo/spec/support/fixture_helpers.rb   |    7 -
 .../unit/puppet/provider/vcsrepo/bzr_spec.rb  |  109 -
 .../unit/puppet/provider/vcsrepo/cvs_spec.rb  |  115 -
 .../unit/puppet/provider/vcsrepo/git_spec.rb  |  369 ----
 .../unit/puppet/provider/vcsrepo/hg_spec.rb   |  122 -
 .../unit/puppet/provider/vcsrepo/svn_spec.rb  |  105 -
 .../spec/unit/puppet/type/README.markdown     |    4 -
 .../puphpet/puppet/modules/yum/.fixtures.yml  |   10 -
 .../puphpet/puppet/modules/yum/.gemfile       |    7 -
 .../puphpet/puppet/modules/yum/.project       |   23 -
 .../puphpet/puppet/modules/yum/.travis.yml    |   21 -
 .../puphpet/puppet/modules/yum/LICENSE        |   17 -
 .../puphpet/puppet/modules/yum/Modulefile     |    9 -
 .../puphpet/puppet/modules/yum/README.md      |  132 --
 .../puphpet/puppet/modules/yum/Rakefile       |    5 -
 .../Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6     |   30 -
 .../files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL   |   29 -
 .../files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL   |   36 -
 .../files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta   |   28 -
 .../Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh      |   25 -
 .../files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi   |   24 -
 .../Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag |   32 -
 .../rpm-gpg/RPM-GPG-KEY-webtatic-andy         |   30 -
 .../files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms |   20 -
 .../files/Amazon.3/rpm-gpg/RubyWorks.GPG.key  |   30 -
 .../files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL   |   30 -
 .../CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5     |   28 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL   |   30 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL   |   36 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta   |   28 -
 .../CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh      |   25 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi   |   24 -
 .../CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag |   32 -
 .../rpm-gpg/RPM-GPG-KEY-webtatic-andy         |   30 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art    |   24 -
 .../files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms |   20 -
 .../files/CentOS.5/rpm-gpg/RubyWorks.GPG.key  |   30 -
 .../CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6     |   30 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL   |   29 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG   |   31 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL   |   36 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta   |   28 -
 .../CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh      |   25 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi   |   24 -
 .../CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag |   32 -
 .../rpm-gpg/RPM-GPG-KEY-webtatic-andy         |   30 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art    |   24 -
 .../files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms |   20 -
 .../files/CentOS.6/rpm-gpg/RubyWorks.GPG.key  |   30 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 |   28 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL     |   29 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL     |   36 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-beta     |   28 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson   |   25 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-beta           |   61 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-former  |   37 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-release |   24 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx     |   17 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-release        |   62 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-remi     |   24 -
 .../rpm-gpg/RPM-GPG-KEY-rpmforge-dag          |   32 -
 .../files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl |   32 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3      |   34 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4      |   34 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5      |   34 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6      |   34 -
 .../Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms   |   20 -
 .../Scientific.6/rpm-gpg/RubyWorks.GPG.key    |   30 -
 .../modules/yum/files/empty/.placeholder      |    1 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5    |   28 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6    |   30 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-EPEL        |   30 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4      |   30 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5      |   30 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6      |   29 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-PGDG        |   31 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-RBEL        |   36 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-beta        |   28 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org  |   30 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh     |   25 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta |   61 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-former  |   37 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-release |   24 -
 .../rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx     |   17 -
 .../files/rpm-gpg/RPM-GPG-KEY-redhat-release  |   62 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY-remi        |   24 -
 .../files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag    |   32 -
 .../modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl  |   32 -
 .../files/rpm-gpg/RPM-GPG-KEY-webtatic-andy   |   30 -
 .../modules/yum/files/rpm-gpg/RPM-GPG-KEY.art |   24 -
 .../yum/files/rpm-gpg/RPM-GPG-KEY.atrpms      |   20 -
 .../yum/files/rpm-gpg/RubyWorks.GPG.key       |   30 -
 .../modules/yum/files/yum-updatesd.conf       |   20 -
 .../puppet/modules/yum/manifests/cron.pp      |   47 -
 .../puppet/modules/yum/manifests/defaults.pp  |   49 -
 .../puppet/modules/yum/manifests/init.pp      |  329 ---
 .../modules/yum/manifests/managed_yumrepo.pp  |   77 -
 .../puppet/modules/yum/manifests/params.pp    |   62 -
 .../puppet/modules/yum/manifests/plugin.pp    |   54 -
 .../modules/yum/manifests/prerequisites.pp    |   21 -
 .../modules/yum/manifests/repo/10gen.pp       |   12 -
 .../modules/yum/manifests/repo/atomic.pp      |   16 -
 .../modules/yum/manifests/repo/atrpms.pp      |   17 -
 .../modules/yum/manifests/repo/centalt.pp     |   21 -
 .../modules/yum/manifests/repo/centos4.pp     |   61 -
 .../modules/yum/manifests/repo/centos5.pp     |  124 --
 .../modules/yum/manifests/repo/centos6.pp     |  108 -
 .../yum/manifests/repo/centos_testing.pp      |   23 -
 .../puppet/modules/yum/manifests/repo/ceph.pp |   20 -
 .../yum/manifests/repo/elasticsearch10.pp     |   15 -
 .../yum/manifests/repo/elasticsearch90.pp     |   15 -
 .../modules/yum/manifests/repo/elrepo.pp      |  105 -
 .../puppet/modules/yum/manifests/repo/epel.pp |  132 --
 .../modules/yum/manifests/repo/foreman.pp     |   18 -
 .../yum/manifests/repo/integ_ganeti.pp        |   69 -
 .../modules/yum/manifests/repo/jpackage5.pp   |   49 -
 .../modules/yum/manifests/repo/jpackage6.pp   |   17 -
 .../modules/yum/manifests/repo/karan.pp       |   44 -
 .../modules/yum/manifests/repo/logstash13.pp  |   15 -
 .../modules/yum/manifests/repo/mongodb.pp     |   15 -
 .../yum/manifests/repo/monitoringsucks.pp     |   16 -
 .../modules/yum/manifests/repo/newrelic.pp    |   15 -
 .../modules/yum/manifests/repo/nginx.pp       |   16 -
 .../yum/manifests/repo/openstack_grizzly.pp   |   15 -
 .../modules/yum/manifests/repo/passenger.pp   |   20 -
 .../modules/yum/manifests/repo/pgdg91.pp      |   18 -
 .../modules/yum/manifests/repo/pgdg92.pp      |   18 -
 .../modules/yum/manifests/repo/pgdg93.pp      |   18 -
 .../modules/yum/manifests/repo/puppetdevel.pp |   27 -
 .../modules/yum/manifests/repo/puppetlabs.pp  |   36 -
 .../puppet/modules/yum/manifests/repo/rbel.pp |   20 -
 .../puppet/modules/yum/manifests/repo/remi.pp |   25 -
 .../modules/yum/manifests/repo/remi_php55.pp  |   15 -
 .../modules/yum/manifests/repo/repoforge.pp   |   18 -
 .../yum/manifests/repo/repoforgeextras.pp     |   17 -
 .../modules/yum/manifests/repo/rpmforge.pp    |   17 -
 .../puppet/modules/yum/manifests/repo/sl5.pp  |   77 -
 .../puppet/modules/yum/manifests/repo/sl6.pp  |   74 -
 .../puppet/modules/yum/manifests/repo/tmz.pp  |   27 -
 .../modules/yum/manifests/repo/varnish.pp     |   17 -
 .../modules/yum/manifests/repo/vfabric.pp     |   20 -
 .../modules/yum/manifests/repo/virtualbox.pp  |   18 -
 .../modules/yum/manifests/repo/webtatic.pp    |   19 -
 .../puppet/modules/yum/manifests/updatesd.pp  |   50 -
 .../modules/yum/spec/classes/yum_spec.rb      |   23 -
 .../puppet/modules/yum/spec/spec_helper.rb    |    1 -
 .../puppet/modules/yum/templates/yum-cron.erb |   62 -
 .../puphpet/shell/execute-files.sh            |   30 -
 .../puphpet/shell/hostsupdater-notice.txt     |    4 -
 .../puphpet/shell/important-notices.sh        |   11 -
 .../puphpet/shell/important-notices.txt       |   57 -
 .../puphpet/shell/initial-setup.sh            |   67 -
 .../puphpet/shell/install-puppet.sh           |   35 -
 .../dolibarrdev/puphpet/shell/install-ruby.sh |   43 -
 .../dolibarrdev/puphpet/shell/os-detect.sh    |   49 -
 .../puphpet/shell/self-promotion.txt          |    6 -
 .../dolibarrdev/puphpet/shell/ssh-keygen.sh   |   80 -
 1989 files changed, 122672 deletions(-)
 delete mode 100644 dev/vagrant/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/Vagrantfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/.gitattributes
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/config.yaml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/exec-always/empty
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/exec-once/empty
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/startup-always/empty
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/files/startup-once/empty
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_base.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_source.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper_system.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/basic_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/usage_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.rspec
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile.lock
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/yum.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/supervisord.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/policy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/db.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp
 delete mode 100755 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt
 delete mode 100644 dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh

diff --git a/dev/vagrant/README.md b/dev/vagrant/README.md
deleted file mode 100644
index dc0bc4234e2..00000000000
--- a/dev/vagrant/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Vagrant development box for Dolibarr
-====================================
-
-Introduction
-------------
-
-[Vagrant](http://vagrantup.com) is a tool to make development easier using [VirtualBox](http://virtualbox.org) virtual machines.
-
-These machines have been created with [PuPHEt](http://puphpet.com) and combine the power of Vagrant with [Puppet](http://puppetlabs.com) to automate the development machine provisionning.
-
-What you need
--------------
-
-Latest versions of:
-
-- [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-- [Vagrant](http://downloads.vagrantup.com/)
-
-Usage
------
-
-### VM startup
-
-`cd` into the vagrant box directory and simply type `vagrant up`.
-
-That's all you need to do. It will build a brand new VirtualBox machine for you with everything you need to develop on Dolibarr.
-
-### Name resolution
-For easy access to the VM you need to setup name resolution to the machines IP.
-
-Edit the [hosts](https://en.wikipedia.org/wiki/Hosts_(file)) file on the machine you run Vagrant on to map the virtual machine's IP to it's Vhost name.
-
-Example syntax:
-
-    192.168.42.101  dev.dolibarr.org
-
-Once this is done, you will be able to access your VM's service at <http://dev.dolibarr.org>
-
-Available boxes
----------------
-
-### dolibardev
-
-Somewhat bleeding edge vagrant box for develop branch related work.
-
-- IP: 192.168.42.101
-- Vhost: dev.dolibarr.org
-- OS: Debian Wheezy 7.5 x64
-- Webserver: Apache 2.2.22
-- PHP: mod_php 5.5.14-1~dotdeb.1
-  Installed modules:
-    - cli
-    - curl
-    - gd
-    - imagick
-    - intl
-    - mcrypt
-- Database: MySQL 5.5
-    - Root user: root
-    - Root password: root
-    - Database name: dolibarr
-    - Database user: user
-    - Database password: user
-    - Initial data: dev/initdata/mysqldump_dolibarr-3.5.0.sql
-- Database: PostgreSQL 9.3
-- Adminer: lightweight database management. Access through http://192.168.42.101/adminer
-- Debugger: XDebug
-- Profiler: Xhprof. Access through http://192.168.42.101/xhprof/xhprof_html
-
-You can access MailCatcher to read all outgoing emails at http://192.168.42.101:1080
-
-To access the machine you must use the following private keys:
-- User root: located at puphpet/files/dot/ssh/root_rsa
-- User vagrant: located at puphpet/files/dot/ssh/id_rsa
diff --git a/dev/vagrant/dolibarrdev/Vagrantfile b/dev/vagrant/dolibarrdev/Vagrantfile
deleted file mode 100644
index a0bcc88ced6..00000000000
--- a/dev/vagrant/dolibarrdev/Vagrantfile
+++ /dev/null
@@ -1,240 +0,0 @@
-require 'yaml'
-
-dir = File.dirname(File.expand_path(__FILE__))
-
-configValues = YAML.load_file("#{dir}/puphpet/config.yaml")
-data = configValues['vagrantfile-local']
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "#{data['vm']['box']}"
-  config.vm.box_url = "#{data['vm']['box_url']}"
-
-  if data['vm']['hostname'].to_s.strip.length != 0
-    config.vm.hostname = "#{data['vm']['hostname']}"
-  end
-
-  if data['vm']['network']['private_network'].to_s != ''
-    config.vm.network "private_network", ip: "#{data['vm']['network']['private_network']}"
-  end
-
-  data['vm']['network']['forwarded_port'].each do |i, port|
-    if port['guest'] != '' && port['host'] != ''
-      config.vm.network :forwarded_port, guest: port['guest'].to_i, host: port['host'].to_i
-    end
-  end
-
-  if Vagrant.has_plugin?('vagrant-hostsupdater')
-    hosts = Array.new()
-
-    if !configValues['apache']['install'].nil? &&
-        configValues['apache']['install'].to_i == 1 &&
-        configValues['apache']['vhosts'].is_a?(Hash)
-      configValues['apache']['vhosts'].each do |i, vhost|
-        hosts.push(vhost['servername'])
-
-        if vhost['serveraliases'].is_a?(Array)
-          vhost['serveraliases'].each do |vhost_alias|
-            hosts.push(vhost_alias)
-          end
-        end
-      end
-    elsif !configValues['nginx']['install'].nil? &&
-           configValues['nginx']['install'].to_i == 1 &&
-           configValues['nginx']['vhosts'].is_a?(Hash)
-      configValues['nginx']['vhosts'].each do |i, vhost|
-        hosts.push(vhost['server_name'])
-
-        if vhost['server_aliases'].is_a?(Array)
-          vhost['server_aliases'].each do |x, vhost_alias|
-            hosts.push(vhost_alias)
-          end
-        end
-      end
-    end
-
-    if hosts.any?
-      contents = File.open("#{dir}/puphpet/shell/hostsupdater-notice.txt", 'r'){ |file| file.read }
-      puts "\n\033[34m#{contents}\033[0m\n"
-
-      if config.vm.hostname.to_s.strip.length == 0
-        config.vm.hostname = 'puphpet-dev-machine'
-      end
-
-      config.hostsupdater.aliases = hosts
-    end
-  end
-
-  data['vm']['synced_folder'].each do |i, folder|
-    if folder['source'] != '' && folder['target'] != ''
-      if folder['sync_type'] == 'nfs'
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "nfs"
-      elsif folder['sync_type'] == 'smb'
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "smb"
-      elsif folder['sync_type'] == 'rsync'
-        rsync_args = !folder['rsync']['args'].nil? ? folder['rsync']['args'] : ["--verbose", "--archive", "--delete", "-z"]
-        rsync_auto = !folder['rsync']['auto'].nil? ? folder['rsync']['auto'] : true
-        rsync_exclude = !folder['rsync']['exclude'].nil? ? folder['rsync']['exclude'] : [".vagrant/"]
-
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}",
-            rsync__args: rsync_args, rsync__exclude: rsync_exclude, rsync__auto: rsync_auto, type: "rsync"
-      else
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}",
-          group: 'www-data', owner: 'www-data', mount_options: ["dmode=775", "fmode=764"]
-      end
-    end
-  end
-
-  config.vm.usable_port_range = (10200..10500)
-
-  if data['vm']['chosen_provider'].empty? || data['vm']['chosen_provider'] == "virtualbox"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-
-    config.vm.provider :virtualbox do |virtualbox|
-      data['vm']['provider']['virtualbox']['modifyvm'].each do |key, value|
-        if key == "memory"
-          next
-        end
-        if key == "cpus"
-          next
-        end
-
-        if key == "natdnshostresolver1"
-          value = value ? "on" : "off"
-        end
-
-        virtualbox.customize ["modifyvm", :id, "--#{key}", "#{value}"]
-      end
-
-      virtualbox.customize ["modifyvm", :id, "--memory", "#{data['vm']['memory']}"]
-      virtualbox.customize ["modifyvm", :id, "--cpus", "#{data['vm']['cpus']}"]
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        virtualbox.customize ["modifyvm", :id, "--name", config.vm.hostname]
-      end
-    end
-  end
-
-  if data['vm']['chosen_provider'] == "vmware_fusion" || data['vm']['chosen_provider'] == "vmware_workstation"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = (data['vm']['chosen_provider'] == "vmware_fusion") ? "vmware_fusion" : "vmware_workstation"
-
-    config.vm.provider "vmware_fusion" do |v|
-      data['vm']['provider']['vmware'].each do |key, value|
-        if key == "memsize"
-          next
-        end
-        if key == "cpus"
-          next
-        end
-
-        v.vmx["#{key}"] = "#{value}"
-      end
-
-      v.vmx["memsize"] = "#{data['vm']['memory']}"
-      v.vmx["numvcpus"] = "#{data['vm']['cpus']}"
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        v.vmx["displayName"] = config.vm.hostname
-      end
-    end
-  end
-
-  if data['vm']['chosen_provider'] == "parallels"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = "parallels"
-
-    config.vm.provider "parallels" do |v|
-      data['vm']['provider']['parallels'].each do |key, value|
-        if key == "memsize"
-          next
-        end
-        if key == "cpus"
-          next
-        end
-
-        v.customize ["set", :id, "--#{key}", "#{value}"]
-      end
-
-      v.memory = "#{data['vm']['memory']}"
-      v.cpus = "#{data['vm']['cpus']}"
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        v.name = config.vm.hostname
-      end
-    end
-  end
-
-  ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : "vagrant"
-
-  config.vm.provision "shell" do |s|
-    s.path = "puphpet/shell/initial-setup.sh"
-    s.args = "/vagrant/puphpet"
-  end
-  config.vm.provision "shell" do |kg|
-    kg.path = "puphpet/shell/ssh-keygen.sh"
-    kg.args = "#{ssh_username}"
-  end
-  config.vm.provision :shell, :path => "puphpet/shell/install-ruby.sh"
-  config.vm.provision :shell, :path => "puphpet/shell/install-puppet.sh"
-
-  config.vm.provision :puppet do |puppet|
-    puppet.facter = {
-      "ssh_username"     => "#{ssh_username}",
-      "provisioner_type" => ENV['VAGRANT_DEFAULT_PROVIDER'],
-      "vm_target_key"    => 'vagrantfile-local',
-    }
-    puppet.manifests_path = "#{data['vm']['provision']['puppet']['manifests_path']}"
-    puppet.manifest_file = "#{data['vm']['provision']['puppet']['manifest_file']}"
-    puppet.module_path = "#{data['vm']['provision']['puppet']['module_path']}"
-
-    if !data['vm']['provision']['puppet']['options'].empty?
-      puppet.options = data['vm']['provision']['puppet']['options']
-    end
-  end
-
-  config.vm.provision :shell do |s|
-    s.path = "puphpet/shell/execute-files.sh"
-    s.args = ["exec-once", "exec-always"]
-  end
-  config.vm.provision :shell, run: "always" do |s|
-    s.path = "puphpet/shell/execute-files.sh"
-    s.args = ["startup-once", "startup-always"]
-  end
-  config.vm.provision :shell, :path => "puphpet/shell/important-notices.sh"
-
-  if File.file?("#{dir}/puphpet/files/dot/ssh/id_rsa")
-    config.ssh.private_key_path = [
-      "#{dir}/puphpet/files/dot/ssh/id_rsa",
-      "#{dir}/puphpet/files/dot/ssh/insecure_private_key"
-    ]
-  end
-
-  if !data['ssh']['host'].nil?
-    config.ssh.host = "#{data['ssh']['host']}"
-  end
-  if !data['ssh']['port'].nil?
-    config.ssh.port = "#{data['ssh']['port']}"
-  end
-  if !data['ssh']['username'].nil?
-    config.ssh.username = "#{data['ssh']['username']}"
-  end
-  if !data['ssh']['guest_port'].nil?
-    config.ssh.guest_port = data['ssh']['guest_port']
-  end
-  if !data['ssh']['shell'].nil?
-    config.ssh.shell = "#{data['ssh']['shell']}"
-  end
-  if !data['ssh']['keep_alive'].nil?
-    config.ssh.keep_alive = data['ssh']['keep_alive']
-  end
-  if !data['ssh']['forward_agent'].nil?
-    config.ssh.forward_agent = data['ssh']['forward_agent']
-  end
-  if !data['ssh']['forward_x11'].nil?
-    config.ssh.forward_x11 = data['ssh']['forward_x11']
-  end
-  if !data['vagrant']['host'].nil?
-    config.vagrant.host = data['vagrant']['host'].gsub(":", "").intern
-  end
-
-end
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/.gitattributes b/dev/vagrant/dolibarrdev/puphpet/.gitattributes
deleted file mode 100644
index 5bb817f8e45..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/.gitattributes
+++ /dev/null
@@ -1,5 +0,0 @@
-# Autodetect text files
-* text=auto
-
-# Force the following filetypes to have unix eols, so Windows does not break them
-*.* text eol=lf
diff --git a/dev/vagrant/dolibarrdev/puphpet/config.yaml b/dev/vagrant/dolibarrdev/puphpet/config.yaml
deleted file mode 100644
index e88a3e13003..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/config.yaml
+++ /dev/null
@@ -1,217 +0,0 @@
----
-vagrantfile-local:
-    vm:
-        box: puphpet/debian75-x64
-        box_url: puphpet/debian75-x64
-        hostname: null
-        memory: '512'
-        cpus: '1'
-        chosen_provider: virtualbox
-        network:
-            private_network: 192.168.42.101
-            forwarded_port: {  }
-        provider:
-            virtualbox:
-                modifyvm:
-                    natdnshostresolver1: on
-                setextradata:
-                    VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root: 1
-            vmware:
-                numvcpus: 1
-            parallels:
-                cpus: 1
-        provision:
-            puppet:
-                manifests_path: puphpet/puppet
-                manifest_file: manifest.pp
-                module_path: puphpet/puppet/modules
-                options:
-                    - '--verbose'
-                    - '--hiera_config /vagrant/puphpet/puppet/hiera.yaml'
-                    - '--parser future'
-        synced_folder:
-            w6GqzzS2a7lu:
-                source: ../../../
-                target: /var/www/dolibarr
-                sync_type: default
-                rsync:
-                    auto: 'false'
-        usable_port_range: 2200..2250
-    ssh:
-        host: null
-        port: null
-        private_key_path: null
-        username: vagrant
-        guest_port: null
-        keep_alive: true
-        forward_agent: false
-        forward_x11: false
-        shell: 'bash -l'
-    vagrant:
-        host: detect
-server:
-    packages:
-        - nano
-        - ack-grep
-    dot_files:
-        -
-            bash_aliases: null
-    _prevent_empty: ''
-mailcatcher:
-    install: '1'
-    settings:
-        smtp_ip: 0.0.0.0
-        smtp_port: 1025
-        http_ip: 0.0.0.0
-        http_port: '1080'
-        mailcatcher_path: /usr/local/rvm/wrappers/default
-firewall:
-    install: '1'
-    rules: null
-apache:
-    install: '1'
-    settings:
-        user: www-data
-        group: www-data
-        default_vhost: true
-        manage_user: false
-        manage_group: false
-        sendfile: 0
-    modules:
-        - php
-        - rewrite
-    vhosts:
-        syTi8VestVdG:
-            servername: dev.dolibarr.org
-            docroot: /var/www/dolibarr/htdocs
-            port: '80'
-            setenv:
-                - 'APP_ENV dev'
-            override:
-                - All
-            custom_fragment: ''
-            ssl_cert: ''
-            ssl_key: ''
-            ssl_chain: ''
-            ssl_certs_dir: ''
-    mod_pagespeed: 0
-    mod_spdy: 0
-nginx:
-    install: 0
-    settings:
-        default_vhost: 1
-        proxy_buffer_size: 128k
-        proxy_buffers: '4 256k'
-    vhosts:
-        kZiLLcLAIVAF:
-            server_name: awesome.dev
-            server_aliases:
-                - www.awesome.dev
-            www_root: /var/www/awesome.dev
-            listen_port: '80'
-            index_files:
-                - index.html
-                - index.htm
-                - index.php
-            envvars:
-                - 'APP_ENV dev'
-            ssl_cert: ''
-            ssl_key: ''
-php:
-    install: '1'
-    version: '55'
-    composer: '1'
-    composer_home: ''
-    modules:
-        php:
-            - cli
-            - curl
-            - gd
-            - imagick
-            - intl
-            - mcrypt
-        pear: {  }
-        pecl: {  }
-    ini:
-        display_errors: On
-        error_reporting: '-1'
-        session.save_path: /var/lib/php/session
-        sendmail_path: '"/usr/bin/env catchmail"'
-    timezone: UTC
-xdebug:
-    install: '1'
-    settings:
-        xdebug.default_enable: '1'
-        xdebug.remote_autostart: '0'
-        xdebug.remote_connect_back: '1'
-        xdebug.remote_enable: '1'
-        xdebug.remote_handler: dbgp
-        xdebug.remote_port: '9000'
-xhprof:
-    install: '1'
-drush:
-    install: 0
-    settings:
-        drush.tag_branch: 6.x
-mysql:
-    install: '1'
-    root_password: root
-    adminer: 0
-    databases:
-        HHTBm64g1siG:
-            grant:
-                - ALTER
-                - CREATE
-                - DELETE
-                - DROP
-                - INDEX
-                - INSERT
-                - SELECT
-                - UPDATE
-            name: dolibarr
-            host: localhost
-            user: user
-            password: user
-            sql_file: /var/www/dolibarr/dev/initdata/mysqldump_dolibarr_3.5.0.sql
-postgresql:
-    install: '1'
-    settings:
-        root_password: root
-        user_group: postgres
-        encoding: UTF8
-        version: '9.3'
-    databases: {  }
-    adminer: '1'
-mariadb:
-    install: 0
-    root_password: '123'
-    adminer: 0
-    databases: {  }
-    version: '10.0'
-mongodb:
-    install: 0
-    settings:
-        auth: 1
-        port: '27017'
-    databases: {  }
-redis:
-    install: 0
-    settings:
-        conf_port: '6379'
-beanstalkd:
-    install: 0
-    settings:
-        listenaddress: 0.0.0.0
-        listenport: '13000'
-        maxjobsize: '65535'
-        maxconnections: '1024'
-        binlogdir: /var/lib/beanstalkd/binlog
-        binlogfsync: null
-        binlogsize: '10485760'
-    beanstalk_console: 0
-    binlogdir: /var/lib/beanstalkd/binlog
-rabbitmq:
-    install: 0
-    settings:
-        port: '5672'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases b/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases
deleted file mode 100644
index b1ab498e1cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases
+++ /dev/null
@@ -1,52 +0,0 @@
-if [ -f /etc/bash_completion ]; then
-    source /etc/bash_completion
-fi
-
-__has_parent_dir () {
-    # Utility function so we can test for things like .git/.hg without firing up a
-    # separate process
-    test -d "$1" && return 0;
-
-    current="."
-    while [ ! "$current" -ef "$current/.." ]; do
-        if [ -d "$current/$1" ]; then
-            return 0;
-        fi
-        current="$current/..";
-    done
-
-    return 1;
-}
-
-__vcs_name() {
-    if [ -d .svn ]; then
-        echo "-[svn]";
-    elif __has_parent_dir ".git"; then
-        echo "-[$(__git_ps1 'git %s')]";
-    elif __has_parent_dir ".hg"; then
-        echo "-[hg $(hg branch)]"
-    fi
-}
-
-black=$(tput -Txterm setaf 0)
-red=$(tput -Txterm setaf 1)
-green=$(tput -Txterm setaf 2)
-yellow=$(tput -Txterm setaf 3)
-dk_blue=$(tput -Txterm setaf 4)
-pink=$(tput -Txterm setaf 5)
-lt_blue=$(tput -Txterm setaf 6)
-
-bold=$(tput -Txterm bold)
-reset=$(tput -Txterm sgr0)
-
-# Nicely formatted terminal prompt
-export PS1='\n\[$bold\]\[$black\][\[$dk_blue\]\@\[$black\]]-[\[$green\]\u\[$yellow\]@\[$green\]\h\[$black\]]-[\[$pink\]\w\[$black\]]\[\033[0;33m\]$(__vcs_name) \[\033[00m\]\[$reset\]\n\[$reset\]\$ '
-
-alias ls='ls -F --color=always'
-alias dir='dir -F --color=always'
-alias ll='ls -l'
-alias cp='cp -iv'
-alias rm='rm -i'
-alias mv='mv -iv'
-alias grep='grep --color=auto -in'
-alias ..='cd ..'
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git b/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
deleted file mode 100644
index 853425d005c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
+++ /dev/null
@@ -1,491 +0,0 @@
-# bash/zsh git prompt support
-#
-# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
-# Distributed under the GNU General Public License, version 2.0.
-#
-# This script allows you to see repository status in your prompt.
-#
-# To enable:
-#
-#    1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
-#    2) Add the following line to your .bashrc/.zshrc:
-#        source ~/.git-prompt.sh
-#    3a) Change your PS1 to call __git_ps1 as
-#        command-substitution:
-#        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#        ZSH:  setopt PROMPT_SUBST ; PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
-#        the optional argument will be used as format string.
-#    3b) Alternatively, for a slightly faster prompt, __git_ps1 can
-#        be used for PROMPT_COMMAND in Bash or for precmd() in Zsh
-#        with two parameters, <pre> and <post>, which are strings
-#        you would put in $PS1 before and after the status string
-#        generated by the git-prompt machinery.  e.g.
-#        Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
-#          will show username, at-sign, host, colon, cwd, then
-#          various status string, followed by dollar and SP, as
-#          your prompt.
-#        ZSH:  precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
-#          will show username, pipe, then various status string,
-#          followed by colon, cwd, dollar and SP, as your prompt.
-#        Optionally, you can supply a third argument with a printf
-#        format string to finetune the output of the branch status
-#
-# The repository status will be displayed only if you are currently in a
-# git repository. The %s token is the placeholder for the shown status.
-#
-# The prompt status always includes the current branch name.
-#
-# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
-# unstaged (*) and staged (+) changes will be shown next to the branch
-# name.  You can configure this per-repository with the
-# bash.showDirtyState variable, which defaults to true once
-# GIT_PS1_SHOWDIRTYSTATE is enabled.
-#
-# You can also see if currently something is stashed, by setting
-# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
-# then a '$' will be shown next to the branch name.
-#
-# If you would like to see if there're untracked files, then you can set
-# GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
-# files, then a '%' will be shown next to the branch name.  You can
-# configure this per-repository with the bash.showUntrackedFiles
-# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is
-# enabled.
-#
-# If you would like to see the difference between HEAD and its upstream,
-# set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
-# indicates you are ahead, "<>" indicates you have diverged and "="
-# indicates that there is no difference. You can further control
-# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
-# of values:
-#
-#     verbose       show number of commits ahead/behind (+/-) upstream
-#     name          if verbose, then also show the upstream abbrev name
-#     legacy        don't use the '--count' option available in recent
-#                   versions of git-rev-list
-#     git           always compare HEAD to @{upstream}
-#     svn           always compare HEAD to your SVN upstream
-#
-# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
-# find one, or @{upstream} otherwise.  Once you have set
-# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
-# setting the bash.showUpstream config variable.
-#
-# If you would like to see more information about the identity of
-# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
-# to one of these values:
-#
-#     contains      relative to newer annotated tag (v1.6.3.2~35)
-#     branch        relative to newer tag or branch (master~4)
-#     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
-#     default       exactly matching tag
-#
-# If you would like a colored hint about the current dirty state, set
-# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
-# the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
-
-# check whether printf supports -v
-__git_printf_supports_v=
-printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1
-
-# stores the divergence from upstream in $p
-# used by GIT_PS1_SHOWUPSTREAM
-__git_ps1_show_upstream ()
-{
-	local key value
-	local svn_remote svn_url_pattern count n
-	local upstream=git legacy="" verbose="" name=""
-
-	svn_remote=()
-	# get some config options from git-config
-	local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
-	while read -r key value; do
-		case "$key" in
-		bash.showupstream)
-			GIT_PS1_SHOWUPSTREAM="$value"
-			if [[ -z "${GIT_PS1_SHOWUPSTREAM}" ]]; then
-				p=""
-				return
-			fi
-			;;
-		svn-remote.*.url)
-			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
-			svn_url_pattern="$svn_url_pattern\\|$value"
-			upstream=svn+git # default upstream is SVN if available, else git
-			;;
-		esac
-	done <<< "$output"
-
-	# parse configuration values
-	for option in ${GIT_PS1_SHOWUPSTREAM}; do
-		case "$option" in
-		git|svn) upstream="$option" ;;
-		verbose) verbose=1 ;;
-		legacy)  legacy=1  ;;
-		name)    name=1 ;;
-		esac
-	done
-
-	# Find our upstream
-	case "$upstream" in
-	git)    upstream="@{upstream}" ;;
-	svn*)
-		# get the upstream from the "git-svn-id: ..." in a commit message
-		# (git-svn uses essentially the same procedure internally)
-		local -a svn_upstream
-		svn_upstream=($(git log --first-parent -1 \
-					--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
-		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
-			svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
-			svn_upstream=${svn_upstream%@*}
-			local n_stop="${#svn_remote[@]}"
-			for ((n=1; n <= n_stop; n++)); do
-				svn_upstream=${svn_upstream#${svn_remote[$n]}}
-			done
-
-			if [[ -z "$svn_upstream" ]]; then
-				# default branch name for checkouts with no layout:
-				upstream=${GIT_SVN_ID:-git-svn}
-			else
-				upstream=${svn_upstream#/}
-			fi
-		elif [[ "svn+git" = "$upstream" ]]; then
-			upstream="@{upstream}"
-		fi
-		;;
-	esac
-
-	# Find how many commits we are ahead/behind our upstream
-	if [[ -z "$legacy" ]]; then
-		count="$(git rev-list --count --left-right \
-				"$upstream"...HEAD 2>/dev/null)"
-	else
-		# produce equivalent output to --count for older versions of git
-		local commits
-		if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
-		then
-			local commit behind=0 ahead=0
-			for commit in $commits
-			do
-				case "$commit" in
-				"<"*) ((behind++)) ;;
-				*)    ((ahead++))  ;;
-				esac
-			done
-			count="$behind	$ahead"
-		else
-			count=""
-		fi
-	fi
-
-	# calculate the result
-	if [[ -z "$verbose" ]]; then
-		case "$count" in
-		"") # no upstream
-			p="" ;;
-		"0	0") # equal to upstream
-			p="=" ;;
-		"0	"*) # ahead of upstream
-			p=">" ;;
-		*"	0") # behind upstream
-			p="<" ;;
-		*)	    # diverged from upstream
-			p="<>" ;;
-		esac
-	else
-		case "$count" in
-		"") # no upstream
-			p="" ;;
-		"0	0") # equal to upstream
-			p=" u=" ;;
-		"0	"*) # ahead of upstream
-			p=" u+${count#0	}" ;;
-		*"	0") # behind upstream
-			p=" u-${count%	0}" ;;
-		*)	    # diverged from upstream
-			p=" u+${count#*	}-${count%	*}" ;;
-		esac
-		if [[ -n "$count" && -n "$name" ]]; then
-			__git_ps1_upstream_name=$(git rev-parse \
-				--abbrev-ref "$upstream" 2>/dev/null)
-			if [ $pcmode = yes ]; then
-				# see the comments around the
-				# __git_ps1_branch_name variable below
-				p="$p \${__git_ps1_upstream_name}"
-			else
-				p="$p ${__git_ps1_upstream_name}"
-				# not needed anymore; keep user's
-				# environment clean
-				unset __git_ps1_upstream_name
-			fi
-		fi
-	fi
-
-}
-
-# Helper function that is meant to be called from __git_ps1.  It
-# injects color codes into the appropriate gitstring variables used
-# to build a gitstring.
-__git_ps1_colorize_gitstring ()
-{
-	if [[ -n ${ZSH_VERSION-} ]]; then
-		local c_red='%F{red}'
-		local c_green='%F{green}'
-		local c_lblue='%F{blue}'
-		local c_clear='%f'
-	else
-		# Using \[ and \] around colors is necessary to prevent
-		# issues with command line editing/browsing/completion!
-		local c_red='\[\e[31m\]'
-		local c_green='\[\e[32m\]'
-		local c_lblue='\[\e[1;34m\]'
-		local c_clear='\[\e[0m\]'
-	fi
-	local bad_color=$c_red
-	local ok_color=$c_green
-	local flags_color="$c_lblue"
-
-	local branch_color=""
-	if [ $detached = no ]; then
-		branch_color="$ok_color"
-	else
-		branch_color="$bad_color"
-	fi
-	c="$branch_color$c"
-
-	z="$c_clear$z"
-	if [ "$w" = "*" ]; then
-		w="$bad_color$w"
-	fi
-	if [ -n "$i" ]; then
-		i="$ok_color$i"
-	fi
-	if [ -n "$s" ]; then
-		s="$flags_color$s"
-	fi
-	if [ -n "$u" ]; then
-		u="$bad_color$u"
-	fi
-	r="$c_clear$r"
-}
-
-__git_eread ()
-{
-	f="$1"
-	shift
-	test -r "$f" && read "$@" <"$f"
-}
-
-# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
-# when called from PS1 using command substitution
-# in this mode it prints text to add to bash PS1 prompt (includes branch name)
-#
-# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)
-# in that case it _sets_ PS1. The arguments are parts of a PS1 string.
-# when two arguments are given, the first is prepended and the second appended
-# to the state string when assigned to PS1.
-# The optional third parameter will be used as printf format string to further
-# customize the output of the git-status string.
-# In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
-__git_ps1 ()
-{
-	local pcmode=no
-	local detached=no
-	local ps1pc_start='\u@\h:\w '
-	local ps1pc_end='\$ '
-	local printf_format=' (%s)'
-
-	case "$#" in
-		2|3)	pcmode=yes
-			ps1pc_start="$1"
-			ps1pc_end="$2"
-			printf_format="${3:-$printf_format}"
-		;;
-		0|1)	printf_format="${1:-$printf_format}"
-		;;
-		*)	return
-		;;
-	esac
-
-	local repo_info rev_parse_exit_code
-	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
-		--is-bare-repository --is-inside-work-tree \
-		--short HEAD 2>/dev/null)"
-	rev_parse_exit_code="$?"
-
-	if [ -z "$repo_info" ]; then
-		if [ $pcmode = yes ]; then
-			#In PC mode PS1 always needs to be set
-			PS1="$ps1pc_start$ps1pc_end"
-		fi
-		return
-	fi
-
-	local short_sha
-	if [ "$rev_parse_exit_code" = "0" ]; then
-		short_sha="${repo_info##*$'\n'}"
-		repo_info="${repo_info%$'\n'*}"
-	fi
-	local inside_worktree="${repo_info##*$'\n'}"
-	repo_info="${repo_info%$'\n'*}"
-	local bare_repo="${repo_info##*$'\n'}"
-	repo_info="${repo_info%$'\n'*}"
-	local inside_gitdir="${repo_info##*$'\n'}"
-	local g="${repo_info%$'\n'*}"
-
-	local r=""
-	local b=""
-	local step=""
-	local total=""
-	if [ -d "$g/rebase-merge" ]; then
-		__git_eread "$g/rebase-merge/head-name" b
-		__git_eread "$g/rebase-merge/msgnum" step
-		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
-	else
-		if [ -d "$g/rebase-apply" ]; then
-			__git_eread "$g/rebase-apply/next" step
-			__git_eread "$g/rebase-apply/last" total
-			if [ -f "$g/rebase-apply/rebasing" ]; then
-				__git_eread "$g/rebase-apply/head-name" b
-				r="|REBASE"
-			elif [ -f "$g/rebase-apply/applying" ]; then
-				r="|AM"
-			else
-				r="|AM/REBASE"
-			fi
-		elif [ -f "$g/MERGE_HEAD" ]; then
-			r="|MERGING"
-		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-			r="|CHERRY-PICKING"
-		elif [ -f "$g/REVERT_HEAD" ]; then
-			r="|REVERTING"
-		elif [ -f "$g/BISECT_LOG" ]; then
-			r="|BISECTING"
-		fi
-
-		if [ -n "$b" ]; then
-			:
-		elif [ -h "$g/HEAD" ]; then
-			# symlink symbolic ref
-			b="$(git symbolic-ref HEAD 2>/dev/null)"
-		else
-			local head=""
-			if ! __git_eread "$g/HEAD" head; then
-				if [ $pcmode = yes ]; then
-					PS1="$ps1pc_start$ps1pc_end"
-				fi
-				return
-			fi
-			# is it a symbolic ref?
-			b="${head#ref: }"
-			if [ "$head" = "$b" ]; then
-				detached=yes
-				b="$(
-				case "${GIT_PS1_DESCRIBE_STYLE-}" in
-				(contains)
-					git describe --contains HEAD ;;
-				(branch)
-					git describe --contains --all HEAD ;;
-				(describe)
-					git describe HEAD ;;
-				(* | default)
-					git describe --tags --exact-match HEAD ;;
-				esac 2>/dev/null)" ||
-
-				b="$short_sha..."
-				b="($b)"
-			fi
-		fi
-	fi
-
-	if [ -n "$step" ] && [ -n "$total" ]; then
-		r="$r $step/$total"
-	fi
-
-	local w=""
-	local i=""
-	local s=""
-	local u=""
-	local c=""
-	local p=""
-
-	if [ "true" = "$inside_gitdir" ]; then
-		if [ "true" = "$bare_repo" ]; then
-			c="BARE:"
-		else
-			b="GIT_DIR!"
-		fi
-	elif [ "true" = "$inside_worktree" ]; then
-		if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
-		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
-		then
-			git diff --no-ext-diff --quiet --exit-code || w="*"
-			if [ -n "$short_sha" ]; then
-				git diff-index --cached --quiet HEAD -- || i="+"
-			else
-				i="#"
-			fi
-		fi
-		if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
-		   [ -r "$g/refs/stash" ]; then
-			s="$"
-		fi
-
-		if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
-		   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
-		   git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
-		then
-			u="%${ZSH_VERSION+%}"
-		fi
-
-		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
-			__git_ps1_show_upstream
-		fi
-	fi
-
-	local z="${GIT_PS1_STATESEPARATOR-" "}"
-
-	# NO color option unless in PROMPT_COMMAND mode
-	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		__git_ps1_colorize_gitstring
-	fi
-
-	b=${b##refs/heads/}
-	if [ $pcmode = yes ]; then
-		# In pcmode (and only pcmode) the contents of
-		# $gitstring are subject to expansion by the shell.
-		# Avoid putting the raw ref name in the prompt to
-		# protect the user from arbitrary code execution via
-		# specially crafted ref names (e.g., a ref named
-		# '$(IFS=_;cmd=sudo_rm_-rf_/;$cmd)' would execute
-		# 'sudo rm -rf /' when the prompt is drawn).  Instead,
-		# put the ref name in a new global variable (in the
-		# __git_ps1_* namespace to avoid colliding with the
-		# user's environment) and reference that variable from
-		# PS1.
-		__git_ps1_branch_name=$b
-		# note that the $ is escaped -- the variable will be
-		# expanded later (when it's time to draw the prompt)
-		b="\${__git_ps1_branch_name}"
-	fi
-
-	local f="$w$i$s$u"
-	local gitstring="$c$b${f:+$z$f}$r$p"
-
-	if [ $pcmode = yes ]; then
-		if [ "${__git_printf_supports_v-}" != yes ]; then
-			gitstring=$(printf -- "$printf_format" "$gitstring")
-		else
-			printf -v gitstring -- "$printf_format" "$gitstring"
-		fi
-		PS1="$ps1pc_start$gitstring$ps1pc_end"
-	else
-		printf -- "$printf_format" "$gitstring"
-	fi
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore b/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
deleted file mode 100644
index e9b023ea6a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ssh/*
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc b/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc
deleted file mode 100644
index 2ff1aa60801..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc
+++ /dev/null
@@ -1,414 +0,0 @@
-set rtp+=$GOROOT/misc/vim
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Maintainer:
-"       Amir Salihefendic
-"       http://amix.dk - amix@amix.dk
-"
-" Version:
-"       5.0 - 29/05/12 15:43:36
-"
-" Blog_post:
-"       http://amix.dk/blog/post/19691#The-ultimate-Vim-configuration-on-Github
-"
-" Awesome_version:
-"       Get this config, nice color schemes and lots of plugins!
-"
-"       Install the awesome version from:
-"
-"           https://github.com/amix/vimrc
-"
-" Syntax_highlighted:
-"       http://amix.dk/vim/vimrc.html
-"
-" Raw_version:
-"       http://amix.dk/vim/vimrc.txt
-"
-" Sections:
-"    -> General
-"    -> VIM user interface
-"    -> Colors and Fonts
-"    -> Files and backups
-"    -> Text, tab and indent related
-"    -> Visual mode related
-"    -> Moving around, tabs and buffers
-"    -> Status line
-"    -> Editing mappings
-"    -> vimgrep searching and cope displaying
-"    -> Spell checking
-"    -> Misc
-"    -> Helper functions
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => General
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Sets how many lines of history VIM has to remember
-set history=700
-
-" Enable filetype plugins
-filetype plugin on
-filetype indent on
-
-" Set to auto read when a file is changed from the outside
-set autoread
-
-" With a map leader it's possible to do extra key combinations
-" like <leader>w saves the current file
-let mapleader = ","
-let g:mapleader = ","
-
-" Fast saving
-nmap <leader>w :w!<cr>
-
-" :W sudo saves the file
-" (useful for handling the permission-denied error)
-command W w !sudo tee % > /dev/null
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => VIM user interface
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Set 7 lines to the cursor - when moving vertically using j/k
-set so=7
-
-" Turn on the WiLd menu
-set wildmenu
-
-" Ignore compiled files
-set wildignore=*.o,*~,*.pyc
-if has("win16") || has("win32")
-    set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
-else
-    set wildignore+=.git\*,.hg\*,.svn\*
-endif
-
-"Always show current position
-set ruler
-
-" Height of the command bar
-set cmdheight=2
-
-" A buffer becomes hidden when it is abandoned
-set hid
-
-" Configure backspace so it acts as it should act
-set backspace=eol,start,indent
-set whichwrap+=<,>,h,l
-
-" Ignore case when searching
-set ignorecase
-
-" When searching try to be smart about cases
-set smartcase
-
-" Highlight search results
-set hlsearch
-
-" Makes search act like search in modern browsers
-set incsearch
-
-" Don't redraw while executing macros (good performance config)
-set lazyredraw
-
-" For regular expressions turn magic on
-set magic
-
-" Show matching brackets when text indicator is over them
-set showmatch
-" How many tenths of a second to blink when matching brackets
-set mat=2
-
-" No annoying sound on errors
-set noerrorbells
-set novisualbell
-set t_vb=
-set tm=500
-
-" Add a bit extra margin to the left
-set foldcolumn=1
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Colors and Fonts
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Enable syntax highlighting
-syntax enable
-
-try
-    colorscheme desert
-catch
-endtry
-
-set background=dark
-
-" Set extra options when running in GUI mode
-if has("gui_running")
-    set guioptions-=T
-    set guioptions-=e
-    set t_Co=256
-    set guitablabel=%M\ %t
-endif
-
-" Set utf8 as standard encoding and en_US as the standard language
-set encoding=utf8
-
-" Use Unix as the standard file type
-set ffs=unix,dos,mac
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Files, backups and undo
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Turn backup off, since most stuff is in SVN, git et.c anyway...
-set nobackup
-set nowb
-set noswapfile
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Text, tab and indent related
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Use spaces instead of tabs
-set expandtab
-
-" Be smart when using tabs ;)
-set smarttab
-
-" 1 tab == 4 spaces
-set shiftwidth=4
-set tabstop=4
-
-" Linebreak on 500 characters
-set lbr
-set tw=500
-
-set ai "Auto indent
-set si "Smart indent
-set wrap "Wrap lines
-
-
-""""""""""""""""""""""""""""""
-" => Visual mode related
-""""""""""""""""""""""""""""""
-" Visual mode pressing * or # searches for the current selection
-" Super useful! From an idea by Michael Naumann
-vnoremap <silent> * :call VisualSelection('f', '')<CR>
-vnoremap <silent> # :call VisualSelection('b', '')<CR>
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Moving around, tabs, windows and buffers
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Treat long lines as break lines (useful when moving around in them)
-map j gj
-map k gk
-
-" Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
-map <space> /
-map <c-space> ?
-
-" Disable highlight when <leader><cr> is pressed
-map <silent> <leader><cr> :noh<cr>
-
-" Smart way to move between windows
-map <C-j> <C-W>j
-map <C-k> <C-W>k
-map <C-h> <C-W>h
-map <C-l> <C-W>l
-
-" Close the current buffer
-map <leader>bd :Bclose<cr>
-
-" Close all the buffers
-map <leader>ba :1,1000 bd!<cr>
-
-" Useful mappings for managing tabs
-map <leader>tn :tabnew<cr>
-map <leader>to :tabonly<cr>
-map <leader>tc :tabclose<cr>
-map <leader>tm :tabmove
-map <leader>t<leader> :tabnext
-
-" Opens a new tab with the current buffer's path
-" Super useful when editing files in the same directory
-map <leader>te :tabedit <c-r>=expand("%:p:h")<cr>/
-
-" Switch CWD to the directory of the open buffer
-map <leader>cd :cd %:p:h<cr>:pwd<cr>
-
-" Specify the behavior when switching between buffers
-try
-  set switchbuf=useopen,usetab,newtab
-  set stal=2
-catch
-endtry
-
-" Return to last edit position when opening files (You want this!)
-autocmd BufReadPost *
-     \ if line("'\"") > 0 && line("'\"") <= line("$") |
-     \   exe "normal! g`\"" |
-     \ endif
-" Remember info about open buffers on close
-set viminfo^=%
-
-
-""""""""""""""""""""""""""""""
-" => Status line
-""""""""""""""""""""""""""""""
-" Always show the status line
-set laststatus=2
-
-" Format the status line
-set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Editing mappings
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Remap VIM 0 to first non-blank character
-map 0 ^
-
-" Move a line of text using ALT+[jk] or Comamnd+[jk] on mac
-nmap <M-j> mz:m+<cr>`z
-nmap <M-k> mz:m-2<cr>`z
-vmap <M-j> :m'>+<cr>`<my`>mzgv`yo`z
-vmap <M-k> :m'<-2<cr>`>my`<mzgv`yo`z
-
-if has("mac") || has("macunix")
-  nmap <D-j> <M-j>
-  nmap <D-k> <M-k>
-  vmap <D-j> <M-j>
-  vmap <D-k> <M-k>
-endif
-
-" Delete trailing white space on save, useful for Python and CoffeeScript ;)
-func! DeleteTrailingWS()
-  exe "normal mz"
-  %s/\s\+$//ge
-  exe "normal `z"
-endfunc
-autocmd BufWrite *.py :call DeleteTrailingWS()
-autocmd BufWrite *.coffee :call DeleteTrailingWS()
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => vimgrep searching and cope displaying
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" When you press gv you vimgrep after the selected text
-vnoremap <silent> gv :call VisualSelection('gv', '')<CR>
-
-" Open vimgrep and put the cursor in the right position
-map <leader>g :vimgrep // **/*.<left><left><left><left><left><left><left>
-
-" Vimgreps in the current file
-map <leader><space> :vimgrep // <C-R>%<C-A><right><right><right><right><right><right><right><right><right>
-
-" When you press <leader>r you can search and replace the selected text
-vnoremap <silent> <leader>r :call VisualSelection('replace', '')<CR>
-
-" Do :help cope if you are unsure what cope is. It's super useful!
-"
-" When you search with vimgrep, display your results in cope by doing:
-"   <leader>cc
-"
-" To go to the next search result do:
-"   <leader>n
-"
-" To go to the previous search results do:
-"   <leader>p
-"
-map <leader>cc :botright cope<cr>
-map <leader>co ggVGy:tabnew<cr>:set syntax=qf<cr>pgg
-map <leader>n :cn<cr>
-map <leader>p :cp<cr>
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Spell checking
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Pressing ,ss will toggle and untoggle spell checking
-map <leader>ss :setlocal spell!<cr>
-
-" Shortcuts using <leader>
-map <leader>sn ]s
-map <leader>sp [s
-map <leader>sa zg
-map <leader>s? z=
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Misc
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Remove the Windows ^M - when the encodings gets messed up
-noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
-
-" Quickly open a buffer for scripbble
-map <leader>q :e ~/buffer<cr>
-
-" Toggle paste mode on and off
-map <leader>pp :setlocal paste!<cr>
-
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Helper functions
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-function! CmdLine(str)
-    exe "menu Foo.Bar :" . a:str
-    emenu Foo.Bar
-    unmenu Foo
-endfunction
-
-function! VisualSelection(direction, extra_filter) range
-    let l:saved_reg = @"
-    execute "normal! vgvy"
-
-    let l:pattern = escape(@", '\\/.*$^~[]')
-    let l:pattern = substitute(l:pattern, "\n$", "", "")
-
-    if a:direction == 'b'
-        execute "normal ?" . l:pattern . "^M"
-    elseif a:direction == 'gv'
-        call CmdLine("vimgrep " . '/'. l:pattern . '/' . ' **/*.' . a:extra_filter)
-    elseif a:direction == 'replace'
-        call CmdLine("%s" . '/'. l:pattern . '/')
-    elseif a:direction == 'f'
-        execute "normal /" . l:pattern . "^M"
-    endif
-
-    let @/ = l:pattern
-    let @" = l:saved_reg
-endfunction
-
-
-" Returns true if paste mode is enabled
-function! HasPaste()
-    if &paste
-        return 'PASTE MODE  '
-    en
-    return ''
-endfunction
-
-" Don't close window, when deleting a buffer
-command! Bclose call <SID>BufcloseCloseIt()
-function! <SID>BufcloseCloseIt()
-   let l:currentBufNum = bufnr("%")
-   let l:alternateBufNum = bufnr("#")
-
-   if buflisted(l:alternateBufNum)
-     buffer #
-   else
-     bnext
-   endif
-
-   if bufnr("%") == l:currentBufNum
-     new
-   endif
-
-   if buflisted(l:currentBufNum)
-     execute("bdelete! ".l:currentBufNum)
-   endif
-endfunction
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key b/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key
deleted file mode 100644
index 7d6a083909e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/exec-always/empty b/dev/vagrant/dolibarrdev/puphpet/files/exec-always/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/exec-once/empty b/dev/vagrant/dolibarrdev/puphpet/files/exec-once/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/startup-always/empty b/dev/vagrant/dolibarrdev/puphpet/files/startup-always/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/startup-once/empty b/dev/vagrant/dolibarrdev/puphpet/files/startup-once/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
deleted file mode 100644
index ee7a39186bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
+++ /dev/null
@@ -1,25 +0,0 @@
-forge "http://forge.puppetlabs.com"
-mod 'stdlib', :git => 'https://github.com/puphpet/puppetlabs-stdlib.git'
-mod 'concat', :git => 'https://github.com/puphpet/puppetlabs-concat.git'
-mod 'apt', :git => 'https://github.com/puphpet/puppetlabs-apt.git'
-mod 'yum', :git => 'https://github.com/puphpet/puppet-yum.git'
-mod 'vcsrepo', :git => 'https://github.com/puphpet/puppetlabs-vcsrepo.git'
-mod 'ntp', :git => 'https://github.com/puphpet/puppetlabs-ntp.git'
-mod 'firewall', :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
-mod 'git', :git => 'https://github.com/puphpet/puppetlabs-git.git'
-mod 'mailcatcher', :git => 'https://github.com/puphpet/puppet-mailcatcher.git'
-mod 'supervisord', :git => 'https://github.com/puphpet/puppet-supervisord.git'
-mod 'apache', :git => 'https://github.com/puphpet/puppetlabs-apache.git'
-mod 'nginx', :git => 'https://github.com/puphpet/puppet-nginx.git'
-mod 'php', :git => 'https://github.com/puphpet/puppet-php.git'
-mod 'composer', :git => 'https://github.com/puphpet/puppet-composer.git'
-mod 'puphpet', :git => 'https://github.com/puphpet/puppet-puphpet.git'
-mod 'puppi', :git => 'https://github.com/puphpet/puppi.git'
-mod 'drush', :git => 'https://github.com/puphpet/puppet-drush.git'
-mod 'mysql', :git => 'https://github.com/puphpet/puppetlabs-mysql.git'
-mod 'postgresql', :git => 'https://github.com/puphpet/puppetlabs-postgresql.git'
-mod 'mongodb', :git => 'https://github.com/puphpet/puppetlabs-mongodb.git'
-mod 'redis', :git => 'https://github.com/puphpet/puppet-redis.git'
-mod 'beanstalkd', :git => 'https://github.com/puphpet/puppet-beanstalkd.git'
-mod 'rabbitmq', :git => 'https://github.com/puphpet/puppetlabs-rabbitmq.git'
-mod 'staging', :git => 'https://github.com/puphpet/puppet-staging.git'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml b/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml
deleted file mode 100644
index 0cde1f6a6a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-:backends: yaml
-:yaml:
-    :datadir: '/vagrant/puphpet'
-:hierarchy:
-    - config
-:logger: console
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
deleted file mode 100644
index ea27564f8c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
+++ /dev/null
@@ -1,1742 +0,0 @@
-## Begin Server manifest
-
-if $server_values == undef {
-  $server_values = hiera('server', false)
-} if $vm_values == undef {
-  $vm_values = hiera($::vm_target_key, false)
-}
-# Ensure the time is accurate, reducing the possibilities of apt repositories
-# failing for invalid certificates
-class { 'ntp': }
-
-include 'puphpet'
-include 'puphpet::params'
-
-Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ] }
-group { 'puppet':   ensure => present }
-group { 'www-data': ensure => present }
-group { 'www-user': ensure => present }
-
-user { $::ssh_username:
-  shell   => '/bin/bash',
-  home    => "/home/${::ssh_username}",
-  ensure  => present,
-  groups  => ['www-data', 'www-user'],
-  require => [Group['www-data'], Group['www-user']]
-}
-
-user { ['apache', 'nginx', 'httpd', 'www-data']:
-  shell  => '/bin/bash',
-  ensure => present,
-  groups => 'www-data',
-  require => Group['www-data']
-}
-
-file { "/home/${::ssh_username}":
-  ensure => directory,
-  owner  => $::ssh_username,
-}
-
-# copy dot files to ssh user's home directory
-exec { 'dotfiles':
-  cwd     => "/home/${::ssh_username}",
-  command => "cp -r /vagrant/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \
-              && chown -R ${::ssh_username} /home/${::ssh_username}/.[a-zA-Z0-9]* \
-              && cp -r /vagrant/puphpet/files/dot/.[a-zA-Z0-9]* /root/",
-  onlyif  => 'test -d /vagrant/puphpet/files/dot',
-  returns => [0, 1],
-  require => User[$::ssh_username]
-}
-
-case $::osfamily {
-  # debian, ubuntu
-  'debian': {
-    class { 'apt': }
-
-    Class['::apt::update'] -> Package <|
-        title != 'python-software-properties'
-    and title != 'software-properties-common'
-    |>
-
-    if ! defined(Package['augeas-tools']) {
-      package { 'augeas-tools':
-        ensure => present,
-      }
-    }
-  }
-  # redhat, centos
-  'redhat': {
-    class { 'yum': extrarepo => ['epel'] }
-
-    class { 'yum::repo::rpmforge': }
-    class { 'yum::repo::repoforgeextras': }
-
-    Class['::yum'] -> Yum::Managed_yumrepo <| |> -> Package <| |>
-
-    if ! defined(Package['git']) {
-      package { 'git':
-        ensure  => latest,
-        require => Class['yum::repo::repoforgeextras']
-      }
-    }
-
-    file_line { 'link ~/.bash_git':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_git ] ; then source ~/.bash_git; fi',
-      path    => "/home/${::ssh_username}/.bash_profile",
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_git for root':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_git ] ; then source ~/.bash_git; fi',
-      path    => '/root/.bashrc',
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_aliases':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_aliases ] ; then source ~/.bash_aliases; fi',
-      path    => "/home/${::ssh_username}/.bash_profile",
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_aliases for root':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_aliases ] ; then source ~/.bash_aliases; fi',
-      path    => '/root/.bashrc',
-      require => Exec['dotfiles'],
-    }
-
-    ensure_packages( ['augeas'] )
-  }
-}
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-}
-
-case $::operatingsystem {
-  'debian': {
-    include apt::backports
-
-    add_dotdeb { 'packages.dotdeb.org': release => $lsbdistcodename }
-
-   if hash_key_equals($php_values, 'install', 1) {
-      # Debian Squeeze 6.0 can do PHP 5.3 (default) and 5.4
-      if $lsbdistcodename == 'squeeze' and $php_values['version'] == '54' {
-        add_dotdeb { 'packages.dotdeb.org-php54': release => 'squeeze-php54' }
-      }
-      # Debian Wheezy 7.0 can do PHP 5.4 (default) and 5.5
-      elsif $lsbdistcodename == 'wheezy' and $php_values['version'] == '55' {
-        add_dotdeb { 'packages.dotdeb.org-php55': release => 'wheezy-php55' }
-      }
-    }
-
-    $server_lsbdistcodename = downcase($lsbdistcodename)
-
-    apt::force { 'git':
-      release => "${server_lsbdistcodename}-backports",
-      timeout => 60
-    }
-  }
-  'ubuntu': {
-    apt::key { '4F4EA0AAE5267A6C':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-    apt::key { '4CBEDD5A':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-
-    if $lsbdistcodename in ['lucid', 'precise'] {
-      apt::ppa { 'ppa:pdoes/ppa': require => Apt::Key['4CBEDD5A'], options => '' }
-    } else {
-      apt::ppa { 'ppa:pdoes/ppa': require => Apt::Key['4CBEDD5A'] }
-    }
-
-    if hash_key_equals($php_values, 'install', 1) {
-      # Ubuntu Lucid 10.04, Precise 12.04, Quantal 12.10 and Raring 13.04 can do PHP 5.3 (default <= 12.10) and 5.4 (default <= 13.04)
-      if $lsbdistcodename in ['lucid', 'precise', 'quantal', 'raring', 'trusty'] and $php_values['version'] == '54' {
-        if $lsbdistcodename == 'lucid' {
-          apt::ppa { 'ppa:ondrej/php5-oldstable': require => Apt::Key['4F4EA0AAE5267A6C'], options => '' }
-        } else {
-          apt::ppa { 'ppa:ondrej/php5-oldstable': require => Apt::Key['4F4EA0AAE5267A6C'] }
-        }
-      }
-      # Ubuntu 12.04/10, 13.04/10, 14.04 can do PHP 5.5
-      elsif $lsbdistcodename in ['precise', 'quantal', 'raring', 'saucy', 'trusty'] and $php_values['version'] == '55' {
-        apt::ppa { 'ppa:ondrej/php5': require => Apt::Key['4F4EA0AAE5267A6C'] }
-      }
-      elsif $lsbdistcodename in ['lucid'] and $php_values['version'] == '55' {
-        err('You have chosen to install PHP 5.5 on Ubuntu 10.04 Lucid. This will probably not work!')
-      }
-    }
-  }
-  'redhat', 'centos': {
-    if hash_key_equals($php_values, 'install', 1) {
-      if $php_values['version'] == '54' {
-        class { 'yum::repo::remi': }
-      }
-      # remi_php55 requires the remi repo as well
-      elsif $php_values['version'] == '55' {
-        class { 'yum::repo::remi': }
-        class { 'yum::repo::remi_php55': }
-      }
-    }
-  }
-}
-
-if is_array($server_values['packages']) and count($server_values['packages']) > 0 {
-  each( $server_values['packages'] ) |$package| {
-    if ! defined(Package[$package]) {
-      package { $package:
-        ensure => present,
-      }
-    }
-  }
-}
-
-define add_dotdeb ($release){
-   apt::source { "${name}-repo.puphpet":
-    location          => 'http://repo.puphpet.com/dotdeb/',
-    release           => $release,
-    repos             => 'all',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '89DF5277',
-    key_server        => 'keys.gnupg.net',
-    include_src       => true
-  }
-}
-
-# Begin open ports for iptables
-if has_key($vm_values, 'vm')
-  and has_key($vm_values['vm'], 'network')
-  and has_key($vm_values['vm']['network'], 'forwarded_port')
-{
-  create_resources( iptables_port, $vm_values['vm']['network']['forwarded_port'] )
-}
-
-if has_key($vm_values, 'ssh') and has_key($vm_values['ssh'], 'port') {
-  $vm_values_ssh_port = $vm_values['ssh']['port'] ? {
-    ''      => 22,
-    undef   => 22,
-    0       => 22,
-    default => $vm_values['ssh']['port']
-  }
-
-  if ! defined(Firewall["100 tcp/${vm_values_ssh_port}"]) {
-    firewall { "100 tcp/${vm_values_ssh_port}":
-      port   => $vm_values_ssh_port,
-      proto  => tcp,
-      action => 'accept',
-      before => Class['my_fw::post']
-    }
-  }
-}
-
-define iptables_port (
-  $host,
-  $guest,
-) {
-  if ! defined(Firewall["100 tcp/${guest}"]) {
-    firewall { "100 tcp/${guest}":
-      port   => $guest,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
-## Begin MailCatcher manifest
-
-if $mailcatcher_values == undef {
-  $mailcatcher_values = hiera('mailcatcher', false)
-}
-
-if hash_key_equals($mailcatcher_values, 'install', 1) {
-  if ! defined(Package['tilt']) {
-    package { 'tilt':
-      ensure   => '1.3',
-      provider => 'gem',
-      before   => Class['mailcatcher']
-    }
-  }
-
-  if $::operatingsystem == 'ubuntu' and $lsbdistcodename == 'trusty' {
-    package { 'rubygems':
-      ensure => absent,
-    }
-  }
-
-  create_resources('class', { 'mailcatcher' => $mailcatcher_values['settings'] })
-
-  if ! defined(Firewall["100 tcp/${mailcatcher_values['settings']['smtp_port']}, ${mailcatcher_values['settings']['http_port']}"]) {
-    firewall { "100 tcp/${mailcatcher_values['settings']['smtp_port']}, ${mailcatcher_values['settings']['http_port']}":
-      port   => [$mailcatcher_values['settings']['smtp_port'], $mailcatcher_values['settings']['http_port']],
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-
-  if ! defined(Class['supervisord']) {
-    class{ 'puphpet::python::pip': }
-
-    class { 'supervisord':
-      install_pip => false,
-      require     => [
-        Class['my_fw::post'],
-        Class['Puphpet::Python::Pip'],
-      ],
-    }
-  }
-
-  $mailcatcher_path = $mailcatcher_values['settings']['mailcatcher_path']
-
-  $mailcatcher_options = sort(join_keys_to_values({
-    ' --smtp-ip'   => $mailcatcher_values['settings']['smtp_ip'],
-    ' --smtp-port' => $mailcatcher_values['settings']['smtp_port'],
-    ' --http-ip'   => $mailcatcher_values['settings']['http_ip'],
-    ' --http-port' => $mailcatcher_values['settings']['http_port']
-  }, ' '))
-
-  supervisord::program { 'mailcatcher':
-    command     => "${mailcatcher_path}/mailcatcher ${mailcatcher_options} -f",
-    priority    => '100',
-    user        => 'mailcatcher',
-    autostart   => true,
-    autorestart => 'true',
-    environment => {
-      'PATH' => "/bin:/sbin:/usr/bin:/usr/sbin:${mailcatcher_path}"
-    },
-    require => [
-      Class['mailcatcher::config'],
-      File['/var/log/mailcatcher']
-    ],
-  }
-}
-
-## Begin Firewall manifest
-
-if $firewall_values == undef {
-  $firewall_values = hiera('firewall', false)
-}
-
-Firewall {
-  before  => Class['my_fw::post'],
-  require => Class['my_fw::pre'],
-}
-
-class { ['my_fw::pre', 'my_fw::post']: }
-
-class { 'firewall': }
-
-class my_fw::pre {
-  Firewall {
-    require => undef,
-  }
-
-  # Default firewall rules
-  firewall { '000 accept all icmp':
-    proto  => 'icmp',
-    action => 'accept',
-  }->
-  firewall { '001 accept all to lo interface':
-    proto   => 'all',
-    iniface => 'lo',
-    action  => 'accept',
-  }->
-  firewall { '002 accept related established rules':
-    proto  => 'all',
-    state  => ['RELATED', 'ESTABLISHED'],
-    action => 'accept',
-  }
-}
-
-class my_fw::post {
-  firewall { '999 drop all':
-    proto   => 'all',
-    action  => 'drop',
-    before  => undef,
-  }
-}
-
-if is_hash($firewall_values['rules']) and count($firewall_values['rules']) > 0 {
-  each( $firewall_values['rules'] ) |$key, $rule| {
-    if ! defined(Firewall["${rule['priority']} ${rule['proto']}/${rule['port']}"]) {
-      firewall { "${rule['priority']} ${rule['proto']}/${rule['port']}":
-        port   => $rule['port'],
-        proto  => $rule['proto'],
-        action => $rule['action'],
-      }
-    }
-  }
-}
-
-## Begin Apache manifest
-
-if $yaml_values == undef {
-  $yaml_values = loadyaml('/vagrant/puphpet/config.yaml')
-} if $apache_values == undef {
-  $apache_values = $yaml_values['apache']
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  include puphpet::params
-  include apache::params
-
-  $webroot_location      = $puphpet::params::apache_webroot_location
-  $apache_provider_types = ['virtualbox', 'vmware_fusion', 'vmware_desktop', 'parallels']
-
-  exec { "exec mkdir -p ${webroot_location}":
-    command => "mkdir -p ${webroot_location}",
-    creates => $webroot_location,
-  }
-
-  if (downcase($::provisioner_type) in $apache_provider_types) and ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  } elsif ! (downcase($::provisioner_type) in $apache_provider_types) and ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      group   => 'www-data',
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if hash_key_equals($hhvm_values, 'install', 1) {
-    $mpm_module           = 'worker'
-    $disallowed_modules   = ['php']
-    $apache_conf_template = 'puphpet/apache/hhvm-httpd.conf.erb'
-    $apache_php_package   = 'hhvm'
-  } elsif hash_key_equals($php_values, 'install', 1) {
-    $mpm_module           = 'prefork'
-    $disallowed_modules   = []
-    $apache_conf_template = $apache::params::conf_template
-    $apache_php_package   = 'php'
-  } else {
-    $mpm_module           = 'prefork'
-    $disallowed_modules   = []
-    $apache_conf_template = $apache::params::conf_template
-    $apache_php_package   = ''
-  }
-
-  if $::operatingsystem == 'ubuntu'
-    and hash_key_equals($php_values, 'install', 1)
-    and hash_key_equals($php_values, 'version', 55)
-  {
-    $apache_version = '2.4'
-  } else {
-    $apache_version = $apache::version::default
-  }
-
-  $apache_settings = merge($apache_values['settings'], {
-    'default_vhost'  => false,
-    'mpm_module'     => $mpm_module,
-    'conf_template'  => $apache_conf_template,
-    'sendfile'       => $apache_values['settings']['sendfile'] ? { 1 => 'On', default => 'Off' },
-    'apache_version' => $apache_version
-  })
-
-  create_resources('class', { 'apache' => $apache_settings })
-
-  if hash_key_equals($apache_values, 'mod_pagespeed', 1) {
-    class { 'puphpet::apache::modpagespeed': }
-  }
-
-  if hash_key_equals($apache_values, 'mod_spdy', 1) {
-    class { 'puphpet::apache::modspdy':
-      php_package => $apache_php_package
-    }
-  }
-
-  if $apache_values['settings']['default_vhost'] == true {
-    $apache_vhosts = merge($apache_values['vhosts'], {
-      'default_vhost_80'  => {
-        'servername'    => 'default',
-        'docroot'       => '/var/www/default',
-        'port'          => 80,
-        'default_vhost' => true,
-      },
-      'default_vhost_443' => {
-        'servername'    => 'default',
-        'docroot'       => '/var/www/default',
-        'port'          => 443,
-        'default_vhost' => true,
-        'ssl'           => 1,
-      },
-    })
-  } else {
-    $apache_vhosts = $apache_values['vhosts']
-  }
-
-  if count($apache_vhosts) > 0 {
-    each( $apache_vhosts ) |$key, $vhost| {
-      exec { "exec mkdir -p ${vhost['docroot']} @ key ${key}":
-        command => "mkdir -p ${vhost['docroot']}",
-        creates => $vhost['docroot'],
-      }
-
-      if (downcase($::provisioner_type) in $apache_provider_types)
-        and ! defined(File[$vhost['docroot']])
-      {
-        file { $vhost['docroot']:
-          ensure  => directory,
-          mode    => 0765,
-          require => Exec["exec mkdir -p ${vhost['docroot']} @ key ${key}"]
-        }
-      } elsif !(downcase($::provisioner_type) in $apache_provider_types)
-        and ! defined(File[$vhost['docroot']])
-      {
-        file { $vhost['docroot']:
-          ensure  => directory,
-          group   => 'www-user',
-          mode    => 0765,
-          require => [
-            Exec["exec mkdir -p ${vhost['docroot']} @ key ${key}"],
-            Group['www-user']
-          ]
-        }
-      }
-
-      create_resources(apache::vhost, { "${key}" => merge($vhost, {
-          'custom_fragment' => template('puphpet/apache/custom_fragment.erb'),
-          'ssl'             => 'ssl' in $vhost and str2bool($vhost['ssl']) ? { true => true, default => false },
-          'ssl_cert'        => hash_key_true($vhost, 'ssl_cert')      ? { true => $vhost['ssl_cert'],      default => undef },
-          'ssl_key'         => hash_key_true($vhost, 'ssl_key')       ? { true => $vhost['ssl_key'],       default => undef },
-          'ssl_chain'       => hash_key_true($vhost, 'ssl_chain')     ? { true => $vhost['ssl_chain'],     default => undef },
-          'ssl_certs_dir'   => hash_key_true($vhost, 'ssl_certs_dir') ? { true => $vhost['ssl_certs_dir'], default => undef }
-        })
-      })
-
-      if ! defined(Firewall["100 tcp/${vhost['port']}"]) {
-        firewall { "100 tcp/${vhost['port']}":
-          port   => $vhost['port'],
-          proto  => tcp,
-          action => 'accept',
-        }
-      }
-    }
-  }
-
-  if ! defined(Firewall['100 tcp/443']) {
-    firewall { '100 tcp/443':
-      port   => 443,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-
-  if count($apache_values['modules']) > 0 {
-    apache_mod { $apache_values['modules']: }
-  }
-}
-
-define apache_mod {
-  if ! defined(Class["apache::mod::${name}"]) and !($name in $disallowed_modules) {
-    class { "apache::mod::${name}": }
-  }
-}
-
-## Begin Nginx manifest
-
-if $nginx_values == undef {
-   $nginx_values = hiera('nginx', false)
-} if $php_values == undef {
-   $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($nginx_values, 'install', 1) {
-  include nginx::params
-  include puphpet::params
-
-  Class['puphpet::ssl_cert'] -> Nginx::Resource::Vhost <| |>
-
-  class { 'puphpet::ssl_cert': }
-
-  if $lsbdistcodename == 'lucid' and hash_key_equals($php_values, 'version', '53') {
-    apt::key { '67E15F46': key_server => 'hkp://keyserver.ubuntu.com:80' }
-    apt::ppa { 'ppa:l-mierzwa/lucid-php5':
-      options => '',
-      require => Apt::Key['67E15F46']
-    }
-  }
-
-  $webroot_location     = $puphpet::params::nginx_webroot_location
-  $nginx_provider_types = ['virtualbox', 'vmware_fusion', 'vmware_desktop', 'parallels']
-
-  exec { "exec mkdir -p ${webroot_location}":
-    command => "mkdir -p ${webroot_location}",
-    creates => $webroot_location,
-  }
-
-  if (downcase($::provisioner_type) in $nginx_provider_types) and ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      mode    => 0775,
-      require => Exec["exec mkdir -p ${webroot_location}"],
-    }
-  } elsif ! (downcase($::provisioner_type) in $nginx_provider_types) and ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      mode    => 0775,
-      group   => 'www-data',
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if $::osfamily == 'redhat' {
-      file { '/usr/share/nginx':
-        ensure  => directory,
-        mode    => 0775,
-        owner   => 'www-data',
-        group   => 'www-data',
-        require => Group['www-data'],
-        before  => Package['nginx']
-      }
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-
-    $fastcgi_pass = $php_values['version'] ? {
-      '53'    => '127.0.0.1:9000',
-      undef   => null,
-      default => "unix:${php5_fpm_sock}"
-    }
-
-    if $::osfamily == 'redhat' and $fastcgi_pass == "unix:${php5_fpm_sock}" {
-      exec { "create ${php5_fpm_sock} file":
-        command => "touch ${php5_fpm_sock}",
-        onlyif  => ["test ! -f ${php5_fpm_sock}", "test ! -f ${php5_fpm_sock}="],
-        require => Package['nginx'],
-      }
-
-      exec { "'listen = 127.0.0.1:9000' => 'listen = ${php5_fpm_sock}'":
-        command => "perl -p -i -e 's#listen = 127.0.0.1:9000#listen = ${php5_fpm_sock}#gi' /etc/php-fpm.d/www.conf",
-        unless  => "grep -c 'listen = 127.0.0.1:9000' '${php5_fpm_sock}'",
-        notify  => [
-          Class['nginx::service'],
-          Service['php-fpm']
-        ],
-        require => Exec["create ${php5_fpm_sock} file"]
-      }
-
-      set_nginx_php5_fpm_sock_group_and_user { 'php_rhel':
-        require => Exec["create ${php5_fpm_sock} file"],
-      }
-    } else {
-      set_nginx_php5_fpm_sock_group_and_user { 'php':
-        require   => Package['nginx'],
-        subscribe => Service['php5-fpm'],
-      }
-    }
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $fastcgi_pass = '127.0.0.1:9000'
-  } else {
-    $fastcgi_pass = null
-  }
-
-  class { 'nginx': }
-
-  if hash_key_equals($nginx_values['settings'], 'default_vhost', 1) {
-    $nginx_vhosts = merge($nginx_values['vhosts'], {
-      'default' => {
-        'server_name'    => '_',
-        'server_aliases' => [],
-        'www_root'       => '/var/www/html',
-        'listen_port'    => 80,
-        'index_files'    => ['index', 'index.html', 'index.htm', 'index.php'],
-        'envvars'        => [],
-        'ssl'            => '0',
-        'ssl_cert'       => '',
-        'ssl_key'        => '',
-      },
-    })
-
-    if ! defined(File[$puphpet::params::nginx_default_conf_location]) {
-      file { $puphpet::params::nginx_default_conf_location:
-        ensure  => absent,
-        require => Package['nginx'],
-        notify  => Class['nginx::service'],
-      }
-    }
-  } else {
-    $nginx_vhosts = $nginx_values['vhosts']
-  }
-
-  if count($nginx_vhosts) > 0 {
-    each( $nginx_vhosts ) |$key, $vhost| {
-      exec { "exec mkdir -p ${vhost['www_root']} @ key ${key}":
-        command => "mkdir -p ${vhost['www_root']}",
-        creates => $vhost['www_root'],
-      }
-
-      if ! defined(File[$vhost['www_root']]) {
-        file { $vhost['www_root']:
-          ensure  => directory,
-          require => Exec["exec mkdir -p ${vhost['www_root']} @ key ${key}"]
-        }
-      }
-
-      if ! defined(Firewall["100 tcp/${vhost['listen_port']}"]) {
-        firewall { "100 tcp/${vhost['listen_port']}":
-          port   => $vhost['listen_port'],
-          proto  => tcp,
-          action => 'accept',
-        }
-      }
-    }
-
-    create_resources(nginx_vhost, $nginx_vhosts)
-  }
-
-  if ! defined(Firewall['100 tcp/443']) {
-    firewall { '100 tcp/443':
-      port   => 443,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
-define nginx_vhost (
-  $server_name,
-  $server_aliases = [],
-  $www_root,
-  $listen_port,
-  $index_files,
-  $envvars = [],
-  $ssl = false,
-  $ssl_cert = $puphpet::params::ssl_cert_location,
-  $ssl_key = $puphpet::params::ssl_key_location,
-  $ssl_port = '443',
-  $rewrite_to_https = false,
-  $spdy = $nginx::params::nx_spdy,
-){
-  $merged_server_name = concat([$server_name], $server_aliases)
-
-  if is_array($index_files) and count($index_files) > 0 {
-    $try_files = $index_files[count($index_files) - 1]
-  } else {
-    $try_files = 'index.php'
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $fastcgi_param_parts = [
-      'PATH_INFO $fastcgi_path_info',
-      'PATH_TRANSLATED $document_root$fastcgi_path_info',
-      'SCRIPT_FILENAME $document_root$fastcgi_script_name'
-    ]
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $fastcgi_param_parts = [
-      'SCRIPT_FILENAME $document_root$fastcgi_script_name'
-    ]
-  } else {
-    $fastcgi_param_parts = []
-  }
-
-  $ssl_set              = value_true($ssl)              ? { true => true,      default => false, }
-  $ssl_cert_set         = value_true($ssl_cert)         ? { true => $ssl_cert, default => $puphpet::params::ssl_cert_location, }
-  $ssl_key_set          = value_true($ssl_key)          ? { true => $ssl_key,  default => $puphpet::params::ssl_key_location, }
-  $ssl_port_set         = value_true($ssl_port)         ? { true => $ssl_port, default => '443', }
-  $rewrite_to_https_set = value_true($rewrite_to_https) ? { true => true,      default => false, }
-  $spdy_set             = value_true($spdy)             ? { true => on,        default => off, }
-
-  nginx::resource::vhost { $server_name:
-    server_name      => $merged_server_name,
-    www_root         => $www_root,
-    listen_port      => $listen_port,
-    index_files      => $index_files,
-    try_files        => ['$uri', '$uri/', "/${try_files}?\$args"],
-    ssl              => $ssl_set,
-    ssl_cert         => $ssl_cert_set,
-    ssl_key          => $ssl_key_set,
-    ssl_port         => $ssl_port_set,
-    rewrite_to_https => $rewrite_to_https_set,
-    spdy             => $spdy_set,
-    vhost_cfg_append => {
-       sendfile => 'off'
-    }
-  }
-
-  $fastcgi_param = concat($fastcgi_param_parts, $envvars)
-
-  $fastcgi_pass_hash = fastcgi_pass ? {
-    null    => {},
-    ''      => {},
-    default => {'fastcgi_pass' => $fastcgi_pass},
-  }
-
-  $location_cfg_append = merge({
-    'fastcgi_split_path_info' => '^(.+\.php)(/.+)$',
-    'fastcgi_param'           => $fastcgi_param,
-    'fastcgi_index'           => 'index.php',
-    'include'                 => 'fastcgi_params'
-  }, $fastcgi_pass_hash)
-
-  nginx::resource::location { "${server_name}-php":
-    ensure              => present,
-    vhost               => $server_name,
-    location            => '~ \.php$',
-    proxy               => undef,
-    try_files           => ['$uri', '$uri/', "/${try_files}?\$args"],
-    ssl                 => $ssl_set,
-    www_root            => $www_root,
-    location_cfg_append => $location_cfg_append,
-    notify              => Class['nginx::service'],
-  }
-}
-
-define set_nginx_php5_fpm_sock_group_and_user () {
-  exec { 'set php5_fpm_sock group and user':
-    command => "chmod 660 ${php5_fpm_sock} && \
-                chown www-data ${php5_fpm_sock} && \
-                chgrp www-data ${php5_fpm_sock} && \
-                touch /.puphpet-stuff/php5_fpm_sock",
-    creates => '/.puphpet-stuff/php5_fpm_sock',
-  }
-}
-
-## Begin PHP manifest
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-} if $mailcatcher_values == undef {
-  $mailcatcher_values = hiera('mailcatcher', false)
-}
-
-if hash_key_equals($php_values, 'install', 1) {
-  Class['Php'] -> Class['Php::Devel'] -> Php::Module <| |> -> Php::Pear::Module <| |> -> Php::Pecl::Module <| |>
-
-  if $php_prefix == undef {
-    $php_prefix = $::operatingsystem ? {
-      /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'php5-',
-      default                                 => 'php-',
-    }
-  }
-
-  if $php_fpm_ini == undef {
-    $php_fpm_ini = $::operatingsystem ? {
-      /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => '/etc/php5/fpm/php.ini',
-      default                                 => '/etc/php.ini',
-    }
-  }
-
-  if hash_key_equals($apache_values, 'install', 1) {
-    include apache::params
-
-    if has_key($apache_values, 'mod_spdy') and $apache_values['mod_spdy'] == 1 {
-      $php_webserver_service_ini = 'cgi'
-    } else {
-      $php_webserver_service_ini = 'httpd'
-    }
-
-    $php_webserver_service = 'httpd'
-    $php_webserver_user    = $apache::params::user
-    $php_webserver_restart = true
-
-    class { 'php':
-      service => $php_webserver_service
-    }
-  } elsif hash_key_equals($nginx_values, 'install', 1) {
-    include nginx::params
-
-    $php_webserver_service     = "${php_prefix}fpm"
-    $php_webserver_service_ini = $php_webserver_service
-    $php_webserver_user        = $nginx::params::nx_daemon_user
-    $php_webserver_restart     = true
-
-    class { 'php':
-      package             => $php_webserver_service,
-      service             => $php_webserver_service,
-      service_autorestart => false,
-      config_file         => $php_fpm_ini,
-    }
-
-    service { $php_webserver_service:
-      ensure     => running,
-      enable     => true,
-      hasrestart => true,
-      hasstatus  => true,
-      require    => Package[$php_webserver_service]
-    }
-  } else {
-    $php_webserver_service     = undef
-    $php_webserver_service_ini = undef
-    $php_webserver_restart     = false
-
-    class { 'php':
-      package             => "${php_prefix}cli",
-      service             => $php_webserver_service,
-      service_autorestart => false,
-    }
-  }
-
-  class { 'php::devel': }
-
-  if count($php_values['modules']['php']) > 0 {
-    php_mod { $php_values['modules']['php']:; }
-  }
-  if count($php_values['modules']['pear']) > 0 {
-    php_pear_mod { $php_values['modules']['pear']:; }
-  }
-  if count($php_values['modules']['pecl']) > 0 {
-    php_pecl_mod { $php_values['modules']['pecl']:; }
-  }
-  if count($php_values['ini']) > 0 {
-    each( $php_values['ini'] ) |$key, $value| {
-      if is_array($value) {
-        each( $php_values['ini'][$key] ) |$innerkey, $innervalue| {
-          puphpet::ini { "${key}_${innerkey}":
-            entry       => "CUSTOM_${innerkey}/${key}",
-            value       => $innervalue,
-            php_version => $php_values['version'],
-            webserver   => $php_webserver_service_ini
-          }
-        }
-      } else {
-        puphpet::ini { $key:
-          entry       => "CUSTOM/${key}",
-          value       => $value,
-          php_version => $php_values['version'],
-          webserver   => $php_webserver_service_ini
-        }
-      }
-    }
-
-    if $php_values['ini']['session.save_path'] != undef {
-      $php_sess_save_path = $php_values['ini']['session.save_path']
-
-      exec {"mkdir -p ${php_sess_save_path}":
-        onlyif => "test ! -d ${php_sess_save_path}",
-        before => Class['php']
-      }
-      exec {"chmod 775 ${php_sess_save_path} && chown www-data ${php_sess_save_path} && chgrp www-data ${php_sess_save_path}":
-        require => Class['php']
-      }
-    }
-  }
-
-  puphpet::ini { $key:
-    entry       => 'CUSTOM/date.timezone',
-    value       => $php_values['timezone'],
-    php_version => $php_values['version'],
-    webserver   => $php_webserver_service_ini
-  }
-
-  if hash_key_equals($php_values, 'composer', 1) {
-    $php_composer_home = $php_values['composer_home'] ? {
-      false   => false,
-      undef   => false,
-      ''      => false,
-      default => $php_values['composer_home'],
-    }
-
-    if $php_composer_home {
-      file { $php_composer_home:
-        ensure  => directory,
-        owner   => 'www-data',
-        group   => 'www-data',
-        mode    => 0775,
-        require => [Group['www-data'], Group['www-user']]
-      }
-
-      file_line { "COMPOSER_HOME=${php_composer_home}":
-        path => '/etc/environment',
-        line => "COMPOSER_HOME=${php_composer_home}",
-      }
-    }
-
-    class { 'composer':
-      target_dir      => '/usr/local/bin',
-      composer_file   => 'composer',
-      download_method => 'curl',
-      logoutput       => false,
-      tmp_path        => '/tmp',
-      php_package     => "${php::params::module_prefix}cli",
-      curl_package    => 'curl',
-      suhosin_enabled => false,
-    }
-  }
-
-  # Usually this would go within the library that needs in (Mailcatcher)
-  # but the values required are sufficiently complex that it's easier to
-  # add here
-  if hash_key_equals($mailcatcher_values, 'install', 1)
-    and ! defined(Puphpet::Ini['sendmail_path'])
-  {
-    puphpet::ini { 'sendmail_path':
-      entry       => 'CUSTOM/sendmail_path',
-      value       => "${mailcatcher_values['settings']['mailcatcher_path']}/catchmail -f",
-      php_version => $php_values['version'],
-      webserver   => $php_webserver_service_ini
-    }
-  }
-}
-
-define php_mod {
-  if ! defined(Puphpet::Php::Module[$name]) {
-    puphpet::php::module { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-define php_pear_mod {
-  if ! defined(Puphpet::Php::Pear[$name]) {
-    puphpet::php::pear { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-define php_pecl_mod {
-  if ! defined(Puphpet::Php::Extra_repos[$name]) {
-    puphpet::php::extra_repos { $name:
-      before => Puphpet::Php::Pecl[$name],
-    }
-  }
-
-  if ! defined(Puphpet::Php::Pecl[$name]) {
-    puphpet::php::pecl { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-
-## Begin Xdebug manifest
-
-if $xdebug_values == undef {
-  $xdebug_values = hiera('xdebug', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  $xdebug_webserver_service = 'httpd'
-} elsif hash_key_equals($nginx_values, 'install', 1) {
-  $xdebug_webserver_service = 'nginx'
-} else {
-  $xdebug_webserver_service = undef
-}
-
-if hash_key_equals($xdebug_values, 'install', 1)
-  and hash_key_equals($php_values, 'install', 1)
-{
-  class { 'puphpet::xdebug':
-    webserver => $xdebug_webserver_service
-  }
-
-  if is_hash($xdebug_values['settings']) and count($xdebug_values['settings']) > 0 {
-    each( $xdebug_values['settings'] ) |$key, $value| {
-      puphpet::ini { $key:
-        entry       => "XDEBUG/${key}",
-        value       => $value,
-        php_version => $php_values['version'],
-        webserver   => $xdebug_webserver_service
-      }
-    }
-  }
-}
-
-## Begin Xhprof manifest
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $xhprof_values == undef {
-  $xhprof_values = hiera('xhprof', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($xhprof_values, 'install', 1)
-  and hash_key_equals($php_values, 'install', 1)
-{
-  if $::operatingsystem == 'ubuntu' and $lsbdistcodename in ['lucid', 'maverick', 'natty', 'oneiric', 'precise'] {
-    apt::key { '8D0DC64F':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-
-    apt::ppa { 'ppa:brianmercer/php5-xhprof': require => Apt::Key['8D0DC64F'] }
-  }
-
-  if hash_key_equals($apache_values, 'install', 1) {
-    $xhprof_webroot_location = '/var/www/default'
-    $xhprof_webserver_service = 'httpd'
-  } elsif hash_key_equals($nginx_values, 'install', 1) {
-    $xhprof_webroot_location = $puphpet::params::nginx_webroot_location
-    $xhprof_webserver_service = 'nginx'
-  } else {
-    $xhprof_webroot_location = $xhprof_values['location']
-    $xhprof_webserver_service = undef
-  }
-
-  if ! defined(Package['graphviz']) {
-    package { 'graphviz':
-      ensure  => present,
-    }
-  }
-
-  class { 'puphpet::xhprof':
-    php_version       => $php_values['version'],
-    webroot_location  => $xhprof_webroot_location,
-    webserver_service => $xhprof_webserver_service
-  }
-}
-
-## Begin Drush manifest
-
-if $drush_values == undef {
-  $drush_values = hiera('drush', false)
-}
-
-if hash_key_equals($drush_values, 'install', 1) {
-  if ($drush_values['settings']['drush.tag_branch'] != undef) {
-    $drush_tag_branch = $drush_values['settings']['drush.tag_branch']
-  } else {
-    $drush_tag_branch = ''
-  }
-
-  include drush::git::drush
-}
-
-## Begin MySQL manifest
-
-if $mysql_values == undef {
-  $mysql_values = hiera('mysql', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-include 'mysql::params'
-
-if hash_key_equals($mysql_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $mysql_webserver_restart = true
-  } else {
-    $mysql_webserver_restart = false
-  }
-
-  if $::osfamily == 'redhat' {
-    exec { 'mysql-community-repo':
-      command => 'yum -y --nogpgcheck install "http://dev.mysql.com/get/mysql-community-release-el6-5.noarch.rpm" && touch /.puphpet-stuff/mysql-community-release',
-      creates => '/.puphpet-stuff/mysql-community-release'
-    }
-
-    $mysql_server_require             = Exec['mysql-community-repo']
-    $mysql_server_server_package_name = 'mysql-community-server'
-    $mysql_server_client_package_name = 'mysql-community-client'
-  } else {
-    $mysql_server_require             = []
-    $mysql_server_server_package_name = $mysql::params::server_package_name
-    $mysql_server_client_package_name = $mysql::params::client_package_name
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $mysql_php_installed = true
-    $mysql_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $mysql_php_installed = true
-    $mysql_php_package   = 'hhvm'
-  } else {
-    $mysql_php_installed = false
-  }
-
-  if $mysql_values['root_password'] {
-    class { 'mysql::server':
-      package_name  => $mysql_server_server_package_name,
-      root_password => $mysql_values['root_password'],
-      require       => $mysql_server_require
-    }
-
-    class { 'mysql::client':
-      package_name => $mysql_server_client_package_name,
-      require      => $mysql_server_require
-    }
-
-    if is_hash($mysql_values['databases']) and count($mysql_values['databases']) > 0 {
-      create_resources(mysql_db, $mysql_values['databases'])
-    }
-
-    if $mysql_php_installed and $mysql_php_package == 'php' {
-      if $::osfamily == 'redhat' and $php_values['version'] == '53' {
-        $mysql_php_module = 'mysql'
-      } elsif $lsbdistcodename == 'lucid' or $lsbdistcodename == 'squeeze' {
-        $mysql_php_module = 'mysql'
-      } else {
-        $mysql_php_module = 'mysqlnd'
-      }
-
-      if ! defined(Php::Module[$mysql_php_module]) {
-        php::module { $mysql_php_module:
-          service_autorestart => $mysql_webserver_restart,
-        }
-      }
-    }
-  }
-
-  if hash_key_equals($mysql_values, 'adminer', 1) and $mysql_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $mysql_adminer_webroot_location = '/var/www/default'
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $mysql_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $mysql_adminer_webroot_location = '/var/www/default'
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${mysql_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $mysql_php_package
-    }
-  }
-}
-
-define mysql_db (
-  $user,
-  $password,
-  $host,
-  $grant    = [],
-  $sql_file = false
-) {
-  if $name == '' or $password == '' or $host == '' {
-    fail( 'MySQL DB requires that name, password and host be set. Please check your settings!' )
-  }
-
-  mysql::db { $name:
-    user     => $user,
-    password => $password,
-    host     => $host,
-    grant    => $grant,
-    sql      => $sql_file,
-  }
-}
-
-# @todo update this
-define mysql_nginx_default_conf (
-  $webroot
-) {
-  if $php5_fpm_sock == undef {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-  }
-
-  if $fastcgi_pass == undef {
-    $fastcgi_pass = $php_values['version'] ? {
-      undef   => null,
-      '53'    => '127.0.0.1:9000',
-      default => "unix:${php5_fpm_sock}"
-    }
-  }
-
-  class { 'puphpet::nginx':
-    fastcgi_pass => $fastcgi_pass,
-    notify       => Class['nginx::service'],
-  }
-}
-
-## Begin PostgreSQL manifest
-
-if $postgresql_values == undef {
-  $postgresql_values = hiera('postgresql', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($postgresql_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $postgresql_webserver_restart = true
-  } else {
-    $postgresql_webserver_restart = false
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $postgresql_php_installed = true
-    $postgresql_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $postgresql_php_installed = true
-    $postgresql_php_package   = 'hhvm'
-  } else {
-    $postgresql_php_installed = false
-  }
-
-  if $postgresql_values['settings']['root_password'] {
-    group { $postgresql_values['settings']['user_group']:
-      ensure => present
-    }
-
-    class { 'postgresql::globals':
-      manage_package_repo => true,
-      encoding            => $postgresql_values['settings']['encoding'],
-      version             => $postgresql_values['settings']['version']
-    }->
-    class { 'postgresql::server':
-      postgres_password => $postgresql_values['settings']['root_password'],
-      version           => $postgresql_values['settings']['version'],
-      require           => Group[$postgresql_values['settings']['user_group']]
-    }
-
-    if is_hash($postgresql_values['databases']) and count($postgresql_values['databases']) > 0 {
-      create_resources(postgresql_db, $postgresql_values['databases'])
-    }
-
-    if $postgresql_php_installed and $postgresql_php_package == 'php' and ! defined(Php::Module['pgsql']) {
-      php::module { 'pgsql':
-        service_autorestart => $postgresql_webserver_restart,
-      }
-    }
-  }
-
-  if hash_key_equals($postgresql_values, 'adminer', 1) and $postgresql_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $postgresql_adminer_webroot_location = '/var/www/default'
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $postgresql_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $postgresql_adminer_webroot_location = '/var/www/default'
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${postgresql_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $postgresql_php_package
-    }
-  }
-}
-
-define postgresql_db (
-  $user,
-  $password,
-  $grant,
-  $sql_file = false
-) {
-  if $name == '' or $user == '' or $password == '' or $grant == '' {
-    fail( 'PostgreSQL DB requires that name, user, password and grant be set. Please check your settings!' )
-  }
-
-  postgresql::server::db { $name:
-    user     => $user,
-    password => $password,
-    grant    => $grant
-  }
-
-  if $sql_file {
-    $table = "${name}.*"
-
-    exec{ "${name}-import":
-      command     => "sudo -u postgres psql ${name} < ${sql_file}",
-      logoutput   => true,
-      refreshonly => $refresh,
-      require     => Postgresql::Server::Db[$name],
-      onlyif      => "test -f ${sql_file}"
-    }
-  }
-}
-
-## Begin MariaDb manifest
-
-if $mariadb_values == undef {
-  $mariadb_values = hiera('mariadb', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($mariadb_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $mariadb_webserver_restart = true
-  } else {
-    $mariadb_webserver_restart = false
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $mariadb_php_installed = true
-    $mariadb_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $mariadb_php_installed = true
-    $mariadb_php_package   = 'hhvm'
-  } else {
-    $mariadb_php_installed = false
-  }
-
-  if has_key($mariadb_values, 'root_password') and $mariadb_values['root_password'] {
-    include 'mysql::params'
-
-    if (! defined(File[$mysql::params::datadir])) {
-      file { $mysql::params::datadir :
-        ensure => directory,
-        group  => $mysql::params::root_group,
-        before => Class['mysql::server']
-      }
-    }
-
-    if ! defined(Group['mysql']) {
-      group { 'mysql':
-        ensure => present
-      }
-    }
-
-    if ! defined(User['mysql']) {
-      user { 'mysql':
-        ensure => present,
-      }
-    }
-
-    if (! defined(File['/var/run/mysqld'])) {
-      file { '/var/run/mysqld' :
-        ensure  => directory,
-        group   => 'mysql',
-        owner   => 'mysql',
-        before  => Class['mysql::server'],
-        require => [User['mysql'], Group['mysql']],
-        notify  => Service['mysql'],
-      }
-    }
-
-    if ! defined(File[$mysql::params::socket]) {
-      file { $mysql::params::socket :
-        ensure  => file,
-        group   => $mysql::params::root_group,
-        before  => Class['mysql::server'],
-        require => File[$mysql::params::datadir]
-      }
-    }
-
-    if ! defined(Package['mysql-libs']) {
-      package { 'mysql-libs':
-        ensure => purged,
-        before => Class['mysql::server'],
-      }
-    }
-
-    class { 'puphpet::mariadb':
-      version => $mariadb_values['version']
-    }
-
-    class { 'mysql::server':
-      package_name  => $puphpet::params::mariadb_package_server_name,
-      root_password => $mariadb_values['root_password'],
-      service_name  => 'mysql',
-    }
-
-    class { 'mysql::client':
-      package_name => $puphpet::params::mariadb_package_client_name
-    }
-
-    if is_hash($mariadb_values['databases']) and count($mariadb_values['databases']) > 0 {
-      create_resources(mariadb_db, $mariadb_values['databases'])
-    }
-
-    if $mariadb_php_installed and $mariadb_php_package == 'php' {
-      if $::osfamily == 'redhat' and $php_values['version'] == '53' {
-        $mariadb_php_module = 'mysql'
-      } elsif $lsbdistcodename == 'lucid' or $lsbdistcodename == 'squeeze' {
-        $mariadb_php_module = 'mysql'
-      } else {
-        $mariadb_php_module = 'mysqlnd'
-      }
-
-      if ! defined(Php::Module[$mariadb_php_module]) {
-        php::module { $mariadb_php_module:
-          service_autorestart => $mariadb_webserver_restart,
-        }
-      }
-    }
-  }
-
-  if hash_key_equals($mariadb_values, 'adminer', 1) and $mariadb_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $mariadb_adminer_webroot_location = '/var/www/default'
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $mariadb_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $mariadb_adminer_webroot_location = '/var/www/default'
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${mariadb_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $mariadb_php_package
-    }
-  }
-}
-
-define mariadb_db (
-  $user,
-  $password,
-  $host,
-  $grant    = [],
-  $sql_file = false
-) {
-  if $name == '' or $password == '' or $host == '' {
-    fail( 'MariaDB requires that name, password and host be set. Please check your settings!' )
-  }
-
-  mysql::db { $name:
-    user     => $user,
-    password => $password,
-    host     => $host,
-    grant    => $grant,
-    sql      => $sql_file,
-  }
-}
-
-# @todo update this!
-define mariadb_nginx_default_conf (
-  $webroot
-) {
-  if $php5_fpm_sock == undef {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-  }
-
-  if $fastcgi_pass == undef {
-    $fastcgi_pass = $php_values['version'] ? {
-      undef   => null,
-      '53'    => '127.0.0.1:9000',
-      default => "unix:${php5_fpm_sock}"
-    }
-  }
-
-  class { 'puphpet::nginx':
-    fastcgi_pass => $fastcgi_pass,
-    notify       => Class['nginx::service'],
-  }
-}
-
-## Begin MongoDb manifest
-
-if $mongodb_values == undef {
-  $mongodb_values = hiera('mongodb', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $mongodb_webserver_restart = true
-} else {
-  $mongodb_webserver_restart = false
-}
-
-if hash_key_equals($mongodb_values, 'install', 1) {
-  file { ['/data', '/data/db']:
-    ensure  => directory,
-    mode    => 0775,
-    before  => Class['Mongodb::Globals'],
-  }
-
-  Class['Mongodb::Globals'] -> Class['Mongodb::Server']
-
-  class { 'mongodb::globals':
-    manage_package_repo => true,
-  }
-
-  create_resources('class', { 'mongodb::server' => $mongodb_values['settings'] })
-
-  if $::osfamily == 'redhat' {
-    class { '::mongodb::client':
-      require => Class['::Mongodb::Server']
-    }
-  }
-
-  if is_hash($mongodb_values['databases']) and count($mongodb_values['databases']) > 0 {
-    create_resources(mongodb_db, $mongodb_values['databases'])
-  }
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Puphpet::Php::Pecl['mongo']) {
-    puphpet::php::pecl { 'mongo':
-      service_autorestart => $mongodb_webserver_restart,
-      require             => Class['mongodb::server']
-    }
-  }
-}
-
-define mongodb_db (
-  $user,
-  $password
-) {
-  if $name == '' or $password == '' {
-    fail( 'MongoDB requires that name and password be set. Please check your settings!' )
-  }
-
-  mongodb::db { $name:
-    user     => $user,
-    password => $password
-  }
-}
-
-# Begin redis
-
-if $redis_values == undef {
-  $redis_values = hiera('redis', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $redis_webserver_restart = true
-} else {
-  $redis_webserver_restart = false
-}
-
-if hash_key_equals($redis_values, 'install', 1) {
-  create_resources('class', { 'redis' => $redis_values['settings'] })
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Php::Pecl::Module['redis']) {
-    php::pecl::module { 'redis':
-      use_package         => false,
-      service_autorestart => $redis_webserver_restart,
-      require             => Class['redis']
-    }
-  }
-}
-
-# Begin beanstalkd
-
-if $beanstalkd_values == undef {
-  $beanstalkd_values = hiera('beanstalkd', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  $beanstalk_console_webroot_location = '/var/www/default/beanstalk_console'
-} elsif hash_key_equals($nginx_values, 'install', 1) {
-  $beanstalk_console_webroot_location = "${puphpet::params::nginx_webroot_location}/beanstalk_console"
-} else {
-  $beanstalk_console_webroot_location = undef
-}
-
-if hash_key_equals($php_values, 'install', 1) or hash_key_equals($hhvm_values, 'install', 1) {
-  $beanstalkd_php_installed = true
-} else {
-  $beanstalkd_php_installed = false
-}
-
-if hash_key_equals($beanstalkd_values, 'install', 1) {
-  create_resources(beanstalkd::config, { 'beanstalkd' => $beanstalkd_values['settings'] })
-
-  if hash_key_equals($beanstalkd_values, 'beanstalk_console', 1)
-    and $beanstalk_console_webroot_location != undef
-    and $beanstalkd_php_installed
-  {
-    exec { 'delete-beanstalk_console-path-if-not-git-repo':
-      command => "rm -rf ${beanstalk_console_webroot_location}",
-      onlyif  => "test ! -d ${beanstalk_console_webroot_location}/.git"
-    }
-
-    vcsrepo { $beanstalk_console_webroot_location:
-      ensure   => present,
-      provider => git,
-      source   => 'https://github.com/ptrofimov/beanstalk_console.git',
-      require  => Exec['delete-beanstalk_console-path-if-not-git-repo']
-    }
-
-    file { "${beanstalk_console_webroot_location}/storage.json":
-      ensure  => present,
-      group   => 'www-data',
-      mode    => 0775,
-      require => Vcsrepo[$beanstalk_console_webroot_location]
-    }
-  }
-}
-
-# Begin rabbitmq
-
-if $rabbitmq_values == undef {
-  $rabbitmq_values = hiera('rabbitmq', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $rabbitmq_webserver_restart = true
-} else {
-  $rabbitmq_webserver_restart = false
-}
-
-if hash_key_equals($rabbitmq_values, 'install', 1) {
-  if $::osfamily == 'redhat' {
-    Class['erlang'] -> Class['rabbitmq']
-    include 'erlang'
-  }
-
-  create_resources('class', { 'rabbitmq' => $rabbitmq_values['settings'] })
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Php::Pecl::Module['amqp']) {
-    php::pecl::module { 'amqp':
-      use_package         => false,
-      service_autorestart => $rabbitmq_webserver_restart,
-      require             => Class['rabbitmq']
-    }
-  }
-
-  if ! defined(Firewall['100 tcp/15672']) {
-    firewall { '100 tcp/15672':
-      port   => 15672,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
deleted file mode 100644
index b5f76c03ac5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
-  symlinks:
-    apache: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
deleted file mode 100644
index df733ca8119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
+++ /dev/null
@@ -1,5 +0,0 @@
---no-single_quote_string_with_variables-check
---no-80chars-check
---no-class_inherits_from_params_class-check
---no-class_parameter_defaults-check
---no-documentation-check
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
deleted file mode 100644
index 1d00b8eb041..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
deleted file mode 100644
index 26e8d75d4db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
+++ /dev/null
@@ -1,246 +0,0 @@
-## 2014-03-04 Supported Release 1.0.1
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
- 
-## 2014-03-04 Supported Release 1.0.0
-###Summary
-
-This is a supported release. This release introduces Apache 2.4 support for
-Debian and RHEL based osfamilies.
-
-####Features
-
-- Add apache24 support
-- Add rewrite_base functionality to rewrites
-- Updated README documentation
-- Add WSGIApplicationGroup and WSGIImportScript directives
-
-####Bugfixes
-
-- Replace mutating hashes with merge() for Puppet 3.5
-- Fix WSGI import_script and mod_ssl issues on Lucid
-
-####Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
-
----
-
-## 2014-01-31 Release 0.11.0
-### Summary:
-
-This release adds preliminary support for Windows compatibility and multiple rewrite support.
-
-#### Backwards-incompatible Changes:
-
-- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
-  and will be removed in a future release.
-
-#### Features:
-
-- add Match directive
-- quote paths for windows compatibility
-- add auth_group_file option to README.md
-- allow AuthGroupFile directive for vhosts
-- Support Header directives in vhost context
-- Don't purge mods-available dir when separate enable dir is used
-- Fix the servername used in log file name
-- Added support for mod_include
-- Remove index parameters.
-- Support environment variable control for CustomLog
-- added redirectmatch support
-- Setting up the ability to do multiple rewrites and conditions.
-- Convert spec tests to beaker.
-- Support php_admin_(flag|value)s
-
-#### Bugfixes:
-
-- directories are either a Hash or an Array of Hashes
-- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
-- (docs) Update list of `apache::mod::[name]` classes
-- (docs) Fix apache::namevirtualhost example call style
-- Fix $ports_file reference in apache::listen.
-- Fix $ports_file reference in Namevirtualhost.
-
-
-## 2013-12-05 Release 0.10.0
-### Summary:
-
-This release adds FreeBSD osfamily support and various other improvements to some mods.
-
-#### Features:
-
-- Add suPHP_UserGroup directive to directory context
-- Add support for ScriptAliasMatch directives
-- Set SSLOptions StdEnvVars in server context
-- No implicit <Directory> entry for ScriptAlias path
-- Add support for overriding ErrorDocument
-- Add support for AliasMatch directives
-- Disable default "allow from all" in vhost-directories
-- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
-- Add mod_rpaf support
-- Add directives: IndexOptions, IndexOrderDefault
-- Add ability to include additional external configurations in vhost
-- need to use the provider variable not the provider key value from the directory hash for matches
-- Support for FreeBSD and few other features
-- Add new params to apache::mod::mime class
-- Allow apache::mod to specify module id and path
-- added $server_root parameter
-- Add Allow and ExtendedStatus support to mod_status
-- Expand vhost/_directories.pp directive support
-- Add initial support for nss module (no directives in vhost template yet)
-- added peruser and event mpms
-- added $service_name parameter
-- add parameter for TraceEnable
-- Make LogLevel configurable for server and vhost
-- Add documentation about $ip
-- Add ability to pass ip (instead of wildcard) in default vhost files
-
-#### Bugfixes:
-
-- Don't listen on port or set NameVirtualHost for non-existent vhost
-- only apply Directory defaults when provider is a directory
-- Working mod_authnz_ldap support on Debian/Ubuntu
-
-## 2013-09-06 Release 0.9.0
-### Summary:
-This release adds more parameters to the base apache class and apache defined
-resource to make the module more flexible. It also adds or enhances SuPHP,
-WSGI, and Passenger mod support, and support for the ITK mpm module.
-
-#### Backwards-incompatible Changes:
-- Remove many default mods that are not normally needed.
-- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
-- Specify dependencies on stdlib >=2.4.0 (this was already the case, but
-making explicit)
-- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
-defined resource.
-
-#### Features:
-- `apache` class
-  - Add `httpd_dir` parameter to change the location of the configuration
-  files.
-  - Add `logroot` parameter to change the logroot
-  - Add `ports_file` parameter to changes the `ports.conf` file location
-  - Add `keepalive` parameter to enable persistent connections
-  - Add `keepalive_timeout` parameter to change the timeout
-  - Update `default_mods` to be able to take an array of mods to enable.
-- `apache::vhost`
-  - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
-  `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
-  WSGI configuration.
-  - Add `access_log_syslog` parameter to enable syslogging.
-  - Add `error_log_syslog` parameter to enable syslogging of errors.
-  - Add `directories` hash parameter. Please see README for documentation.
-  - Add `sslproxyengine` parameter to enable SSLProxyEngine
-  - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
-  configuring SuPHP.
-  - Add `custom_fragment` parameter to allow for arbitrary apache
-  configuration injection. (Feature pull requests are prefered over using
-  this, but it is available in a pinch.)
-- Add `apache::mod::suphp` class for configuring SuPHP.
-- Add `apache::mod::itk` class for configuring ITK mpm module.
-- Update `apache::mod::wsgi` class for global WSGI configuration with
-`wsgi_socket_prefix` and `wsgi_python_home` parameters.
-- Add README.passenger.md to document the `apache::mod::passenger` usage.
-Added `passenger_high_performance`, `passenger_pool_idle_time`,
-`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
-and `rails_autodetect` parameters.
-- Separate the httpd service resource into a new `apache::service` class for
-dependency chaining of `Class['apache'] -> <resource> ~>
-Class['apache::service']`
-- Added `apache::mod::proxy_balancer` class for `apache::balancer`
-
-#### Bugfixes:
-- Change dependency to puppetlabs-concat
-- Fix ruby 1.9 bug for `a2mod`
-- Change servername to be `$::hostname` if there is no `$::fqdn`
-- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
-- Make `php` the default php package for RedHat non-5.
-- Made `aliases` able to take a single alias hash instead of requiring an
-array.
-
-## 2013-07-26 Release 0.8.1
-#### Bugfixes:
-- Update `apache::mpm_module` detection for worker/prefork
-- Update `apache::mod::cgi` and `apache::mod::cgid` detection for
-worker/prefork
-
-## 2013-07-16 Release 0.8.0
-#### Features:
-- Add `servername` parameter to `apache` class
-- Add `proxy_set` parameter to `apache::balancer` define
-
-#### Bugfixes:
-- Fix ordering for multiple `apache::balancer` clusters
-- Fix symlinking for sites-available on Debian-based OSs
-- Fix dependency ordering for recursive confdir management
-- Fix `apache::mod::*` to notify the service on config change
-- Documentation updates
-
-## 2013-07-09 Release 0.7.0
-#### Changes:
-- Essentially rewrite the module -- too many to list
-- `apache::vhost` has many abilities -- see README.md for details
-- `apache::mod::*` classes provide httpd mod-loading capabilities
-- `apache` base class is much more configurable
-
-#### Bugfixes:
-- Many. And many more to come
-
-## 2013-03-2 Release 0.6.0
-- update travis tests (add more supported versions)
-- add access log_parameter
-- make purging of vhost dir configurable
-
-## 2012-08-24 Release 0.4.0
-#### Changes:
-- `include apache` is now required when using `apache::mod::*`
-
-#### Bugfixes:
-- Fix syntax for validate_re
-- Fix formatting in vhost template
-- Fix spec tests such that they pass
-
-##2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
-* e62e362 Fix broken tests for ssl, vhost, vhost::*
-* 42c6363 Changes to match style guide and pass puppet-lint without error
-* 42bc8ba changed name => path for file resources in order to name namevar by it's name
-* 72e13de One end too much
-* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
-* 273f94d fix tests
-* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-* 98d774e (#13860) Autorequire Package['httpd']
-* 05fcec5 (#13073) Add missing puppet spec tests
-* 541afda (#6899) Remove virtual a2mod definition
-* 976cb69 (#13072) Move mod python and wsgi package names to params
-* 323915a (#13060) Add .gitignore to repo
-* fdf40af (#13060) Remove pkg directory from source tree
-* fd90015 Add LICENSE file and update the ModuleFile
-* d3d0d23 Re-enable local php class
-* d7516c7 Make management of firewalls configurable for vhosts
-* 60f83ba Explicitly lookup scope of apache_name in templates.
-* f4d287f (#12581) Add explicit ordering for vdir directory
-* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-* a776a8b (#11071) Fix to work with latest firewall module
-* 2b79e8b (#11070) Add support for Scientific Linux
-* 405b3e9 Fix for a2mod
-* 57b9048 Commit apache::vhost::redirect Manifest
-* 8862d01 Commit apache::vhost::proxy Manifest
-* d5c1fd0 Commit apache::mod::wsgi Manifest
-* a825ac7 Commit apache::mod::python Manifest
-* b77062f Commit Templates
-* 9a51b4a Vhost File Declarations
-* 6cf7312 Defaults for Parameters
-* 6a5b11a Ensure installed
-* f672e46 a2mod fix
-* 8a56ee9 add pthon support to apache
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
deleted file mode 100644
index e1288478a24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
+++ /dev/null
@@ -1,234 +0,0 @@
-Checklist (and a short version for the impatient)
-=================================================
-
-  * Commits:
-
-    - Make commits of logical units.
-
-    - Check for unnecessary whitespace with "git diff --check" before
-      committing.
-
-    - Commit using Unix line endings (check the settings around "crlf" in
-      git-config(1)).
-
-    - Do not check in commented out code or unneeded files.
-
-    - The first line of the commit message should be a short
-      description (50 characters is the soft limit, excluding ticket
-      number(s)), and should skip the full stop.
-
-    - Associate the issue in the message. The first line should include
-      the issue number in the form "(#XXXX) Rest of message".
-
-    - The body should provide a meaningful commit message, which:
-
-      - uses the imperative, present tense: "change", not "changed" or
-        "changes".
-
-      - includes motivation for the change, and contrasts its
-        implementation with the previous behavior.
-
-    - Make sure that you have tests for the bug you are fixing, or
-      feature you are adding.
-
-    - Make sure the test suites passes after your commit:
-      `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
-
-    - When introducing a new feature, make sure it is properly
-      documented in the README.md
-
-  * Submission:
-
-    * Pre-requisites:
-
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
-      - Make sure you have a [GitHub account](https://github.com/join)
-
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
-
-    * Preferred method:
-
-      - Fork the repository on GitHub.
-
-      - Push your changes to a topic branch in your fork of the
-        repository. (the format ticket/1234-short_description_of_change is
-        usually preferred for this project).
-
-      - Submit a pull request to the repository in the puppetlabs
-        organization.
-
-The long version
-================
-
-  1.  Make separate commits for logically separate changes.
-
-      Please break your commits down into logically consistent units
-      which include new or changed tests relevant to the rest of the
-      change.  The goal of doing this is to make the diff easier to
-      read for whoever is reviewing your code.  In general, the easier
-      your diff is to read, the more likely someone will be happy to
-      review it and get it into the code base.
-
-      If you are going to refactor a piece of code, please do so as a
-      separate commit from your feature or bug fix changes.
-
-      We also really appreciate changes that include tests to make
-      sure the bug is not re-introduced, and that the feature is not
-      accidentally broken.
-
-      Describe the technical detail of the change(s).  If your
-      description starts to get too long, that is a good sign that you
-      probably need to split up your commit into more finely grained
-      pieces.
-
-      Commits which plainly describe the things which help
-      reviewers check the patch and future developers understand the
-      code are much more likely to be merged in with a minimum of
-      bike-shedding or requested changes.  Ideally, the commit message
-      would include information, and be in a form suitable for
-      inclusion in the release notes for the version of Puppet that
-      includes them.
-
-      Please also check that you are not introducing any trailing
-      whitespace or other "whitespace errors".  You can do this by
-      running "git diff --check" on your changes before you commit.
-
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at cla-submissions@puppetlabs.com.
-
-  3.  Sending your patches
-
-      To submit your changes via a GitHub pull request, we _highly_
-      recommend that you have them on a topic branch, instead of
-      directly on "master".
-      It makes things much easier to keep track of, especially if
-      you decide to work on another thing before your first change
-      is merged in.
-
-      GitHub has some pretty good
-      [general documentation](http://help.github.com/) on using
-      their site.  They also have documentation on
-      [creating pull requests](http://help.github.com/send-pull-requests/).
-
-      In general, after pushing your topic branch up to your
-      repository on GitHub, you can switch to the branch in the
-      GitHub UI and click "Pull Request" towards the top of the page
-      in order to open a pull request.
-
-
-  4.  Update the related GitHub issue.
-
-      If there is a GitHub issue associated with the change you
-      submitted, then you should update the ticket to include the
-      location of your branch, along with any other commentary you
-      may wish to make.
-
-Testing
-=======
-
-Getting Started
----------------
-
-Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
-package manager such as [bundler](http://bundler.io/) what Ruby packages,
-or Gems, are required to build, develop, and test this software.
-
-Please make sure you have [bundler installed](http://bundler.io/#getting-started)
-on your system, then use it to install all dependencies needed for this project,
-by running
-
-```shell
-% bundle install
-Fetching gem metadata from https://rubygems.org/........
-Fetching gem metadata from https://rubygems.org/..
-Using rake (10.1.0)
-Using builder (3.2.2)
--- 8><-- many more --><8 --
-Using rspec-system-puppet (2.2.0)
-Using serverspec (0.6.3)
-Using rspec-system-serverspec (1.0.0)
-Using bundler (1.3.5)
-Your bundle is complete!
-Use `bundle show [gemname]` to see where a bundled gem is installed.
-```
-
-NOTE some systems may require you to run this command with sudo.
-
-If you already have those gems installed, make sure they are up-to-date:
-
-```shell
-% bundle update
-```
-
-With all dependencies in place and up-to-date we can now run the tests:
-
-```shell
-% rake spec
-```
-
-This will execute all the [rspec tests](http://rspec-puppet.com/) tests
-under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
-and so on. rspec tests may have the same kind of dependencies as the
-module they are testing. While the module defines in its [Modulefile](./Modulefile),
-rspec tests define them in [.fixtures.yml](./fixtures.yml).
-
-Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
-tests. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
-[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
-scenarios. In order to run these, you will need both of those tools
-installed on your system.
-
-You can run them by issuing the following command
-
-```shell
-% rake spec_clean
-% rspec spec/acceptance
-```
-
-This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
-and then run all the tests under [spec/acceptance](./spec/acceptance).
-
-Writing Tests
--------------
-
-XXX getting started writing tests.
-
-If you have commit access to the repository
-===========================================
-
-Even if you have commit access to the repository, you will still need to
-go through the process above, and have someone else review and merge
-in your changes.  The rule is that all changes must be reviewed by a
-developer on the project (that did not write the code) to ensure that
-all changes go through a code review process.
-
-Having someone other than the author of the topic branch recorded as
-performing the merge is the record that they performed the code
-review.
-
-
-Additional Resources
-====================
-
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
-
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
-
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
-* [General GitHub documentation](http://help.github.com/)
-
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
deleted file mode 100644
index fc45295a102..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'rspec', '~> 2.11',        :require => false
-end  
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
deleted file mode 100644
index 8961ce8a6d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Puppet Labs Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
deleted file mode 100644
index 227947cbba4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-apache'
-version '1.0.1'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 2.4.0'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
deleted file mode 100644
index 385130df31f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
+++ /dev/null
@@ -1,1958 +0,0 @@
-#apache
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apache.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apache)
-
-####Table of Contents
-
-1. [Overview - What is the apache module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with apache](#setup)
-    * [Beginning with apache - Installation](#beginning-with-apache)
-    * [Configure a virtual host - Basic options for getting started](#configure-a-virtual-host)
-4. [Usage - The classes and defined types available for configuration](#usage)
-    * [Classes and Defined Types](#classes-and-defined-types)
-        * [Class: apache](#class-apache)
-        * [Class: apache::default_mods](#class-apachedefault_mods)
-        * [Defined Type: apache::mod](#defined-type-apachemod)
-        * [Classes: apache::mod::*](#classes-apachemodname)
-        * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
-        * [Class: apache::mod::php](#class-apachemodphp)
-        * [Class: apache::mod::ssl](#class-apachemodssl)
-        * [Class: apache::mod::wsgi](#class-apachemodwsgi)
-        * [Class: apache::mod::fcgid](#class-apachemodfcgid)
-        * [Defined Type: apache::vhost](#defined-type-apachevhost)
-        * [Parameter: `directories` for apache::vhost](#parameter-directories-for-apachevhost)
-        * [SSL parameters for apache::vhost](#ssl-parameters-for-apachevhost)
-    * [Virtual Host Examples - Demonstrations of some configuration options](#virtual-host-examples)
-    * [Load Balancing](#load-balancing)
-        * [Defined Type: apache::balancer](#defined-type-apachebalancer)
-        * [Defined Type: apache::balancermember](#defined-type-apachebalancermember)
-        * [Examples - Load balancing with exported and non-exported resources](#examples)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-    * [Classes](#classes)
-        * [Public Classes](#public-classes)
-        * [Private Classes](#private-classes)
-    * [Defined Types](#defined-types)
-        * [Public Defined Types](#public-defined-types)
-        * [Private Defined Types](#private-defined-types)
-    * [Templates](#templates)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-    * [Contributing to the apache module](#contributing)
-    * [Running tests - A quick guide](#running-tests)
-
-##Overview
-
-The apache module allows you to set up virtual hosts and manage web services with minimal effort.
-
-##Module Description
-
-Apache is a widely-used web server, and this module provides a simplified way of creating configurations to manage your infrastructure. This includes the ability to configure and manage a range of different virtual host setups, as well as a streamlined way to install and configure Apache modules.
-
-##Setup
-
-**What apache affects:**
-
-* configuration files and directories (created and written to)
-    * **WARNING**: Configurations that are *not* managed by Puppet will be purged.
-* package/service/configuration files for Apache
-* Apache modules
-* virtual hosts
-* listened-to ports
-* `/etc/make.conf` on FreeBSD 
-
-###Beginning with Apache
-
-To install Apache with the default parameters
-
-```puppet
-    class { 'apache':  }
-```
-
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults will work well in a testing environment, but are not suggested for production. To establish customized parameters
-
-```puppet
-    class { 'apache':
-      default_mods        => false,
-      default_confd_files => false,
-    }
-```
-
-###Configure a virtual host
-
-Declaring the `apache` class will create a default virtual host by setting up a vhost on port 80, listening on all interfaces and serving `$apache::docroot`.
-
-```puppet
-    class { 'apache': }
-```
-
-To configure a very basic, name-based virtual host
-
-```puppet
-    apache::vhost { 'first.example.com':
-      port    => '80',
-      docroot => '/var/www/first',
-    }
-```
-
-*Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost will be used. This is also true if you pass a higher priority and no names match anything else.
-
-A slightly more complicated example, changes the docroot owner/group from the default 'root'
-
-```puppet
-    apache::vhost { 'second.example.com':
-      port          => '80',
-      docroot       => '/var/www/second',
-      docroot_owner => 'third',
-      docroot_group => 'third',
-    }
-```
-
-To set up a virtual host with SSL and default SSL certificates
-
-```puppet
-    apache::vhost { 'ssl.example.com':
-      port    => '443',
-      docroot => '/var/www/ssl',
-      ssl     => true,
-    }
-```
-
-To set up a virtual host with SSL and specific SSL certificates
-
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port     => '443',
-      docroot  => '/var/www/fourth',
-      ssl      => true,
-      ssl_cert => '/etc/ssl/fourth.example.com.cert',
-      ssl_key  => '/etc/ssl/fourth.example.com.key',
-    }
-```
-
-Virtual hosts listen on '*' by default. To listen on a specific IP address
-
-```puppet
-    apache::vhost { 'subdomain.example.com':
-      ip      => '127.0.0.1',
-      port    => '80',
-      docroot => '/var/www/subdomain',
-    }
-```
-
-To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, for example: `http://example.com.loc` to `/var/www/example.com`
-
-```puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
-```
-
-To set up a virtual host with suPHP
-
-```puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
-```
-
-To set up a virtual host with WSGI
-
-```puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_application_group      => '%{GLOBAL}',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options => { 
-        processes    => '2', 
-        threads      => '15', 
-        display-name => '%{GROUP}',
-       },
-      wsgi_import_script          => '/var/www/demo.wsgi',
-      wsgi_import_script_options  =>
-        { process-group => 'wsgi', application-group => '%{GLOBAL}' },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-    }
-```
-
-Starting in Apache 2.2.16, HTTPD supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replacement for common RewriteRules.
-
-```puppet
-    apache::vhost { 'wordpress.example.com':
-      port                => '80',
-      docroot             => '/var/www/wordpress',
-      fallbackresource    => '/index.php',
-    }
-```
-
-Please note that the 'disabled' argument to FallbackResource is only supported since Apache 2.2.24.
-
-See a list of all [virtual host parameters](#defined-type-apachevhost). See an extensive list of [virtual host examples](#virtual-host-examples).
-
-##Usage
-
-###Classes and Defined Types
-
-This module modifies Apache configuration files and directories, and will purge any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
-
-It is possible to temporarily disable full Puppet management by setting the [`purge_configs`](#purge_configs) parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations. See the [`purge_configs` parameter](#purge_configs) for more information.
-
-####Class: `apache`
-
-The apache module's primary class, `apache`, guides the basic setup of Apache on your system.
-
-You may establish a default vhost in this class, the `vhost` class, or both. You may add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
-
-**Parameters within `apache`:**
-
-#####`apache_version`
-
-Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
-
-#####`confd_dir`
-
-Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`conf_template`
-
-Overrides the template used for the main apache configuration file. Defaults to 'apache/httpd.conf.erb'.
-
-*Note:* Using this parameter is potentially risky, as the module has been built for a minimal configuration file with the configuration primarily coming from conf.d/ entries.
-
-#####`default_confd_files`
-
-Generates default set of include-able Apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with the Apache package on a given platform.
-
-#####`default_mods`
-
-Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
-
-Defaults to 'true', which will include the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
-
-If false, it will only include the mods required to make HTTPD work, and any other mods can be declared on their own.
-
-If an array, the apache module will include the array of mods listed.
-
-#####`default_ssl_ca`
-
-The default certificate authority, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_cert`
-
-The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_chain`
-
-The default SSL chain, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_crl`
-
-The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_crl_path`
-
-The default certificate revocation list path, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_key`
-
-The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_vhost`
-
-Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', will set up the following vhost:
-
-```puppet
-    apache::vhost { 'default-ssl':
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => "ssl_${access_log_file}",
-      }
-```
-
-SSL vhosts only respond to HTTPS queries.
-
-#####`default_vhost`
-
-Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
-
-#####`error_documents`
-
-Enables custom error documents. Defaults to 'false'.
-
-#####`httpd_dir`
-
-Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but may have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`keepalive`
-
-Enables persistent connections.
-
-#####`keepalive_timeout`
-
-Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
-
-#####`max_keepalive_requests`
-
-Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
-
-#####`loadfile_name`
-
-Sets the file name for the module loadfile. Should be in the format *.load.  This can be used to set the module load order.
-
-#####`log_level`
-
-Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
-
-#####`log_formats`
-
-Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat). This is done in a Hash:
-
-```puppet
-  $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-```
-
-#####`logroot`
-
-Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
-
-#####`manage_group`
-
-Setting this to 'false' will stop the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
-
-#####`manage_user`
-
-Setting this to 'false' will stop the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
-
-#####`mod_dir`
-
-Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, and '/usr/local/etc/apache22/Modules' for FreeBSD.
-
-#####`mpm_module`
-
-Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat and FreeBSD, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
-
-* `apache::mod::event`
-* `apache::mod::itk`
-* `apache::mod::peruser`
-* `apache::mod::prefork`
-* `apache::mod::worker` 
-
-*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache. 
-
-#####`package_ensure`
-
-Allows control over the package ensure attribute. Can be 'present','absent', or a version string.
-
-#####`ports_file`
-
-Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
-
-#####`purge_configs`
-
-Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to 'false' is a stopgap measure to allow the apache module to coexist with existing or otherwise-managed configuration. It is recommended that you move your configuration entirely to resources within this module.
-
-#####`sendfile`
-
-Makes Apache use the Linux kernel sendfile to serve static files. Defaults to 'On'.
-
-#####`serveradmin`
-
-Sets the server administrator. Defaults to 'root@localhost'.
-
-#####`servername`
-
-Sets the server name. Defaults to `fqdn` provided by Facter.
-
-#####`server_root`
-
-Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local' on FreeBSD.
-
-#####`server_signature`
-
-Configures a trailing footer line under server-generated documents. More information about [ServerSignature](http://httpd.apache.org/docs/current/mod/core.html#serversignature). Defaults to 'On'.
-
-#####`server_tokens`
-
-Controls how much information Apache sends to the browser about itself and the operating system. More information about [ServerTokens](http://httpd.apache.org/docs/current/mod/core.html#servertokens). Defaults to 'OS'.
-
-#####`service_enable`
-
-Determines whether the HTTPD service is enabled when the machine is booted. Defaults to 'true'.
-
-#####`service_ensure`
-
-Determines whether the service should be running. Valid values are true, false, 'running' or 'stopped' when Puppet should manage the service. Any other value will set ensure to false for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
-
-#####`service_name`
-
-Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
-
-#####`trace_enable`
-
-Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
-
-#####`vhost_dir`
-
-Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, and '/usr/local/etc/apache22/Vhosts' on FreeBSD.
-
-####Class: `apache::default_mods`
-
-Installs default Apache modules based on what OS you are running.
-
-```puppet
-    class { 'apache::default_mods': }
-```
-
-####Defined Type: `apache::mod`
-
-Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type will also install the required packages to enable the module, if any.
-
-```puppet
-    apache::mod { 'rewrite': }
-    apache::mod { 'ldap': }
-```
-
-####Classes: `apache::mod::[name]`
-
-There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
-
-* `actions`
-* `alias`
-* `auth_basic`
-* `auth_kerb`
-* `authnz_ldap`*
-* `autoindex`
-* `cache`
-* `cgi`
-* `cgid`
-* `dav`
-* `dav_fs`
-* `dav_svn`*
-* `deflate`
-* `dev`
-* `dir`*
-* `disk_cache`
-* `event`
-* `expires`
-* `fastcgi`
-* `fcgid`
-* `headers`
-* `include`
-* `info`
-* `itk`
-* `ldap`
-* `mime`
-* `mime_magic`*
-* `negotiation`
-* `nss`*
-* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed) below)
-* `passenger`*
-* `perl`
-* `peruser`
-* `php` (requires [`mpm_module`](#mpm_module) set to `prefork`)
-* `prefork`*
-* `proxy`*
-* `proxy_ajp`
-* `proxy_balancer`
-* `proxy_html`
-* `proxy_http`
-* `python`
-* `reqtimeout`
-* `rewrite`
-* `rpaf`*
-* `setenvif`
-* `speling`
-* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
-* `status`*
-* `suphp`
-* `userdir`*
-* `vhost_alias`
-* `worker`*
-* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi) below)
-* `xsendfile`
-
-Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters will not require any configuration or attention.
-
-The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
-
-####Class: `apache::mod::pagespeed`
-
-Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
-
-This module does *not* manage the software repositories needed to automatically install the
-mod-pagespeed-stable package. The module does however require that the package be installed,
-or be installable using the system's default package provider.  You should ensure that this
-pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
-
-These are the defaults:
-
-```puppet
-    class { 'apache::mod::pagespeed':
-      inherit_vhost_config          => 'on',
-      filter_xhtml                  => false,
-      cache_path                    => '/var/cache/mod_pagespeed/',
-      log_dir                       => '/var/log/pagespeed',
-      memache_servers               => [],
-      rewrite_level                 => 'CoreFilters',
-      disable_filters               => [],
-      enable_filters                => [],
-      forbid_filters                => [],
-      rewrite_deadline_per_flush_ms => 10,
-      additional_domains            => undef,
-      file_cache_size_kb            => 102400,
-      file_cache_clean_interval_ms  => 3600000,
-      lru_cache_per_process         => 1024,
-      lru_cache_byte_limit          => 16384,
-      css_flatten_max_bytes         => 2048,
-      css_inline_max_bytes          => 2048,
-      css_image_inline_max_bytes    => 2048,
-      image_inline_max_bytes        => 2048,
-      js_inline_max_bytes           => 2048,
-      css_outline_min_bytes         => 3000,
-      js_outline_min_bytes          => 3000,
-      inode_limit                   => 500000,
-      image_max_rewrites_at_once    => 8,
-      num_rewrite_threads           => 4,
-      num_expensive_rewrite_threads => 4,
-      collect_statistics            => 'on',
-      statistics_logging            => 'on',
-      allow_view_stats              => [],
-      allow_pagespeed_console       => [],
-      allow_pagespeed_message       => [],
-      message_buffer_size           => 100000,
-      additional_configuration      => { }
-    }
-```
-
-Full documentation for mod_pagespeed is available from [Google](http://modpagespeed.com).
-
-####Class: `apache::mod::php`
-
-Installs and configures mod_php. The defaults are OS-dependant.
-
-Overriding the package name:
-```
-  class {'::apache::mod::php':
-    package_name => "php54-php",
-    path         => "${::apache::params::lib_path}/libphp54-php5.so",
-  }
-```
-
-Overriding the default configuartion:
-```puppet
-  class {'::apache::mod::php':
-    source => 'puppet:///modules/apache/my_php.conf',
-  }
-```
-
-or 
-```puppet
-  class {'::apache::mod::php':
-    template => 'apache/php.conf.erb',
-  }
-```
-
-or
-
-```puppet
-  class {'::apache::mod::php':
-    content => '
-AddHandler php5-script .php
-AddType text/html .php',
-  }
-```
-####Class: `apache::mod::ssl`
-
-Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
-
-```puppet
-    class { 'apache::mod::ssl':
-      ssl_compression => false,
-      ssl_options     => [ 'StdEnvVars' ],
-  }
-```
-
-To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
-
-####Class: `apache::mod::wsgi`
-
-Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`. 
-
-For customized parameters, which tell Apache how Python is currently configured on the operating system,
-
-```puppet
-    class { 'apache::mod::wsgi':
-      wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
-      wsgi_python_home   => '/path/to/venv',
-      wsgi_python_path   => '/path/to/venv/site-packages',
-    }
-```
-
-More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
-
-####Class: `apache::mod::fcgid`
-
-Installs and configures mod_fcgid.
-
-The class makes no effort to list all available options, but rather uses an options hash to allow for ultimate flexibility:
-
-```puppet
-    class { 'apache::mod::fcgid':
-      options => {
-        'FcgidIPCDir'  => '/var/run/fcgidsock',
-        'SharememPath' => '/var/run/fcgid_shm',
-        'AddHandler'   => 'fcgid-script .fcgi',
-      },
-    }
-```
-
-For a full list op options, see the [official mod_fcgid documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
-
-It is also possible to set the FcgidWrapper per directory per vhost. You must ensure the fcgid module is loaded because there is no auto loading.
-
-```puppet
-    include apache::mod::fcgid
-    apache::vhost { 'example.org':
-      docroot     => '/var/www/html',
-      directories => {
-        path        => '/var/www/html',
-        fcgiwrapper => {
-          command => '/usr/local/bin/fcgiwrapper',
-        }
-      },
-    }
-```
-
-See [FcgidWrapper documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidwrapper) for more information.
-
-####Defined Type: `apache::vhost`
-
-The Apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost`'s being a defined resource type, which allows it to be evaluated multiple times with different parameters.
-
-The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
-
-If you have a series of specific configurations and do not want a base `::apache` class default vhost, make sure to set the base class `default_vhost` to 'false'.
-
-```puppet
-    class { 'apache':
-      default_vhost => false,
-    }
-```
-
-**Parameters within `apache::vhost`:**
-
-#####`access_log`
-
-Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' will choose none. Defaults to 'true'. 
-
-#####`access_log_file`
-
-Sets the `*_access.log` filename that is placed in `$logroot`. Given a vhost, example.com, it defaults to 'example.com_ssl.log' for SSL vhosts and 'example.com_access.log' for non-SSL vhosts.
-
-#####`access_log_pipe`
-
-Specifies a pipe to send access log messages to. Defaults to 'undef'.
-
-#####`access_log_syslog`
-
-Sends all access log messages to syslog. Defaults to 'undef'.
-
-#####`access_log_format`
-
-Specifies the use of either a LogFormat nickname or a custom format string for the access log. Defaults to 'combined'. See [these examples](http://httpd.apache.org/docs/current/mod/mod_log_config.html).
-
-#####`access_log_env_var`
-
-Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
-
-#####`add_listen`
-
-Determines whether the vhost creates a Listen statement. The default value is 'true'.
-
-Setting `add_listen` to 'false' stops the vhost from creating a Listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
-
-#####`additional_includes`
-
-Specifies paths to additional static, vhost-specific Apache configuration files. Useful for implementing a unique, custom configuration not supported by this module. Can be an array. Defaults to '[]'.
-
-#####`aliases`
-
-Passes a list of hashes to the vhost to create Alias or AliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
-
-```puppet
-aliases => [
-  { aliasmatch => '^/image/(.*)\.jpg$', 
-    path       => '/files/jpg.images/$1.jpg',
-  }
-  { alias      => '/image',
-    path       => '/ftp/pub/image', 
-  },
-],
-```
-
-For `alias` and `aliasmatch` to work, each will need a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
-
-*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias may have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
-
-#####`block`
-
-Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
-
-#####`custom_fragment`
-
-Passes a string of custom configuration directives to be placed at the end of the vhost configuration. Defaults to 'undef'.
-
-#####`default_vhost`
-
-Sets a given `apache::vhost` as the default to serve requests that do not match any other `apache::vhost` definitions. The default value is 'false'.
-
-#####`directories`
-
-See the [`directories` section](#parameter-directories-for-apachevhost).
-
-#####`directoryindex`
-
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. [DirectoryIndex](http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex) has more information. Defaults to 'undef'.
-
-#####`docroot`
-
-Provides the [DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot) directive, which identifies the directory Apache serves files from. Required. 
-
-#####`docroot_group`
-
-Sets group access to the docroot directory. Defaults to 'root'.
-
-#####`docroot_owner`
-
-Sets individual user access to the docroot directory. Defaults to 'root'.
-
-#####`docroot_mode`
-
-Sets access permissions of the docroot directory. Defaults to 'undef'.
-
-#####`error_log`
-
-Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
-
-#####`error_log_file`
-
-Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
-
-#####`error_log_pipe`
-
-Specifies a pipe to send error log messages to. Defaults to 'undef'.
-
-#####`error_log_syslog`
-
-Sends all error log messages to syslog. Defaults to 'undef'.
-
-#####`error_documents`
-
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      error_documents => [
-        { 'error_code' => '503', 'document' => '/service-unavail' },
-        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-      ],
-    }
-```
-
-#####`ensure`
-
-Specifies if the vhost file is present or absent. Defaults to 'present'.
-
-#####`fallbackresource`
-
-Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
-
-#####`headers`
-
-Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
-
-#####`ip`
-
-Sets the IP address the vhost listens on. Defaults to listen on all IPs.
-
-#####`ip_based`
-
-Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
-
-#####`itk`
-
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys may be:
-
-* user + group
-* `assignuseridexpr`
-* `assigngroupidexpr`
-* `maxclientvhost`
-* `nice`
-* `limituidrange` (Linux 3.5.0 or newer)
-* `limitgidrange` (Linux 3.5.0 or newer)
-
-Usage will typically look like:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot => '/path/to/directory',
-      itk     => {
-        user  => 'someuser',
-        group => 'somegroup',
-      },
-    }
-```
-
-#####`logroot`
-
-Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
-
-#####`log_level`
-
-Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
-
-#####`no_proxy_uris`
-
-Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
-
-#####`proxy_preserve_host`
-
-Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
-
-#####`options`
-
-Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      options => ['Indexes','FollowSymLinks','MultiViews'],
-    }
-```
-
-*Note:* If you use [`directories`](#parameter-directories-for-apachevhost), 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
-
-#####`override`
-
-Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
-
-#####`php_admin_flags & values`
-
-Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
-
-#####`port`
-
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host will only listen on the port set in this parameter. 
-
-#####`priority`
-
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
-
-If nothing matches the priority, the first name-based vhost will be used. Likewise, passing a higher priority will cause the alphabetically first name-based vhost to be used if no other names match.
-
-*Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
-
-#####`proxy_dest`
-
-Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
-
-#####`proxy_pass`
-
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
-
-```puppet
-apache::vhost { 'site.name.fdqn':
-  … 
-  proxy_pass => [
-    { 'path' => '/a', 'url' => 'http://backend-a/' },
-    { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c' },
-  ],
-}
-```
-
-#####`rack_base_uris`
-
-Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
-
-#####`redirect_dest`
-
-Specifies the address to redirect to. Defaults to 'undef'.
-
-#####`redirect_source`
-
-Specifies the source URIs that will redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length and the items will be order-dependent. 
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_source => ['/images','/downloads'],
-      redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-    }
-```
-
-#####`redirect_status`
-
-Specifies the status to append to the redirect. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_status => ['temp','permanent'],
-    }
-```
-
-#####`redirectmatch_regexp` & `redirectmatch_status`
-
-Determines which server status should be raised for a given regular expression. Entered as an array. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirectmatch_status => ['404','404'],
-      redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-    }
-```
-
-#####`request_headers`
-
-Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      request_headers => [
-        'append MirrorID "mirror 12"',
-        'unset MirrorID',
-      ],
-    }
-```
-
-#####`rewrites`
-
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
-
-For example, you can specify that anyone trying to access index.html will be served welcome.html
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-    }
-```
-
-The parameter allows rewrite conditions that, when true, will execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'redirect IE',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
-```
-
-You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
-```
-
-Multiple rewrites and conditions are also possible
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-        {
-          comment      => 'Internet Explorer',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-        },
-        {
-          rewrite_base => /apps/,
-          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-        },
-     ], 
-    }
-```
-
-Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
-
-#####`scriptalias`
-
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for example: '/usr/scripts'. Defaults to 'undef'.
-
-#####`scriptaliases`
-
-Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
-
-```puppet
-    scriptaliases => [
-      {
-        alias => '/myscript',
-        path  => '/usr/share/myscript',
-      },
-      {
-        aliasmatch => '^/foo(.*)',
-        path       => '/usr/share/fooscripts$1',
-      },
-      {
-        aliasmatch => '^/bar/(.*)',
-        path       => '/usr/share/bar/wrapper.sh/$1',
-      },
-      {
-        alias => '/neatscript',
-        path  => '/usr/share/neatscript',
-      },
-    ]
-```
-
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
-
-#####`serveradmin`
-
-Specifies the email address Apache will display when it renders one of its error pages. Defaults to 'undef'.
-
-#####`serveraliases`
-
-Sets the [ServerAliases](http://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Defaults to '[]'.
-
-#####`servername`
-
-Sets the servername corresponding to the hostname you connect to the virtual host at. Defaults to the title of the resource.
-
-#####`setenv`
-
-Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
-
-#####`setenvif`
-
-Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
-
-#####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
-
-Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). 
-
-`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
-
-`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian.
-
-`suphp_engine` allows values 'on' or 'off'. Defaults to 'off'
-
-To set up a virtual host with suPHP
-
-```puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
-```
-
-#####`vhost_name`
-
-Enables name-based virtual hosting. If no IP is passed to the virtual host but the vhost is assigned a port, then the vhost name will be 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name will be set to the title of the resource. Defaults to '*'.
-
-#####`virtual_docroot` 
-
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'. 
-
-```puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
-```
-
-#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
-
-Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
-
-`wsgi_daemon_process` sets the name of the WSGI daemon. It is a hash, accepting [these keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html), and it defaults to 'undef'.
-
-`wsgi_daemon_process_options` is optional and defaults to 'undef'.
-
-`wsgi_process_group` sets the group ID the virtual host will run under. Defaults to 'undef'.
-
-`wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
-
-`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache will set the defaults setting to 'Off'.
-
-To set up a virtual host with WSGI
-
-```puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options =>
-        { processes    => '2', 
-          threads      => '15', 
-          display-name => '%{GROUP}',
-         },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-    }
-```
-
-####Parameter `directories` for `apache::vhost`
-
-The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
-
-Each hash passed to `directories` must contain `path` as one of the keys.  You may also pass in `provider` which, if missing, defaults to 'directory'. (A full list of acceptable keys is below.) General usage will look something like
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', <key> => <value> },
-        { path => '/path/to/another/directory', <key> => <value> },
-      ],
-    }
-```
-
-*Note:* At least one directory should match the `docroot` parameter. Once you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block will be created that matches the `docroot` parameter.
-
-The `provider` key can be set to 'directory', 'files', or 'location'. If the path starts with a [~](https://httpd.apache.org/docs/current/mod/core.html#files), HTTPD will interpret this as the equivalent of DirectoryMatch, FilesMatch, or LocationMatch.
-
-```puppet
-    apache::vhost { 'files.example.net':
-      docroot     => '/var/www/files',
-      directories => [
-        { 'path'     => '/var/www/files', 
-          'provider' => 'files', 
-          'deny'     => 'from all' 
-         },
-      ],
-    }
-```
-
-Available handlers, represented as keys, should be placed within the  `directory`,`'files`, or `location` hashes.  This looks like
-
-```puppet
-  apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', handler => value } ],
-}
-```
-
-Any handlers you do not set in these hashes will be considered 'undefined' within Puppet and will not be added to the virtual host, resulting in the module using their default values. Currently this is the list of supported handlers:
-
-######`addhandlers`
-
-Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path        => '/path/to/directory',
-          addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        }, 
-      ],
-    }
-```
-
-######`allow`
-
-Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          allow => 'from example.org', 
-        }, 
-      ],
-    }
-```
-
-######`allow_override`
-
-Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot      => '/path/to/directory',
-      directories  => [ 
-        { path           => '/path/to/directory', 
-          allow_override => ['AuthConfig', 'Indexes'], 
-        }, 
-      ],
-    }
-```
-
-######`auth_basic_authoritative`
-
-Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
-
-######`auth_basic_fake`
-
-Sets the value for [AuthBasicFake](http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
-
-######`auth_basic_provider`
-
-Sets the value for [AuthBasicProvider] (http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
-
-######`auth_digest_algorithm`
-
-Sets the value for [AuthDigestAlgorithm](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
-
-######`auth_digest_domain`
-
-Sets the value for [AuthDigestDomain](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
-
-######`auth_digest_nonce_lifetime`
-
-Sets the value for [AuthDigestNonceLifetime](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
-
-######`auth_digest_provider`
-
-Sets the value for [AuthDigestProvider](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
-
-######`auth_digest_qop`
-
-Sets the value for [AuthDigestQop](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
-
-######`auth_digest_shmem_size`
-
-Sets the value for [AuthAuthDigestShmemSize](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
-
-######`auth_group_file`
-
-Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
-
-######`auth_name`
-
-Sets the value for [AuthName](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
-
-######`auth_require`
-
-Sets the entity name you're requiring to allow access. Read more about [Require](http://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
-
-######`auth_type`
-
-Sets the value for [AuthType](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
-
-######`auth_user_file`
-
-Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
-
-######`custom_fragment`
-
-Pass a string of custom configuration directives to be placed at the end of the directory configuration.
-
-```puppet
-  apache::vhost { 'monitor':
-    … 
-    custom_fragment => '
-  <Location /balancer-manager>
-    SetHandler balancer-manager
-    Order allow,deny
-    Allow from all
-  </Location>
-  <Location /server-status>
-    SetHandler server-status
-    Order allow,deny
-    Allow from all
-  </Location>
-  ProxyStatus On',
-}
-```
-
-######`deny`
-
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path => '/path/to/directory', 
-          deny => 'from example.org', 
-        }, 
-      ],
-    }
-```
-
-######`error_documents`
-
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      directories => [ 
-        { path            => '/srv/www',
-          error_documents => [
-            { 'error_code' => '503', 
-              'document'   => '/service-unavail',
-            },
-          ],
-        },
-      ],
-    }
-```
-
-######`headers`
-
-Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => {
-        path    => '/path/to/directory',
-        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-      },
-    }
-```
-
-######`index_options`
-
-Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path          => '/path/to/directory', 
-          options       => ['Indexes','FollowSymLinks','MultiViews'], 
-          index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
-        },
-      ],
-    }
-```
-
-######`index_order_default`
-
-Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path                => '/path/to/directory', 
-          order               => 'Allow,Deny', 
-          index_order_default => ['Descending', 'Date'],
-        }, 
-      ],
-    }
-```
-
-######`options`
-
-Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path    => '/path/to/directory', 
-          options => ['Indexes','FollowSymLinks','MultiViews'], 
-        },
-      ],
-    }
-```
-
-######`order`
-
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          order => 'Allow,Deny', 
-        },
-      ],
-    }
-```
-
-######`sethandler`
-
-Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path       => '/path/to/directory', 
-          sethandler => 'None', 
-        }
-      ],
-    }
-```
-
-######`passenger_enabled`
-
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path              => '/path/to/directory', 
-          passenger_enabled => 'on',
-        }, 
-      ],
-    }
-```
-
-*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
-
-######`php_admin_value` and `php_admin_flag`
-
-`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
-
-######`ssl_options`
-
-String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
-
-```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory', 
-          ssl_options => '+ExportCertData', 
-        },
-        { path        => '/path/to/different/dir', 
-          ssl_options => [ '-StdEnvVars', '+ExportCertData'],
-        },
-      ],
-    }
-```
-
-######`suphp`
-
-A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and may only be passed within `directories`.
-
-```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory', 
-          suphp => 
-            { user  =>  'myappuser', 
-              group => 'myappgroup', 
-            },
-        },
-      ],
-    }
-```
-
-####SSL parameters for `apache::vhost`
-
-All of the SSL parameters for `::vhost` will default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
-
-#####`ssl`
-
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'. 
-
-#####`ssl_ca`
-
-Specifies the SSL certificate authority. Defaults to 'undef'.
-
-#####`ssl_cert`
-
-Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD.
-
-#####`ssl_protocol`
-
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
-
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
-
-#####`ssl_cipher`
-
-Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'undef'.
-
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
-
-#####`ssl_honorcipherorder`
-
-Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Defaults to 'On' in the base `apache` config.
-
-#####`ssl_certs_dir`
-
-Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`ssl_chain`
-
-Specifies the SSL chain. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_crl`
-
-Specifies the certificate revocation list to use. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_crl_path`
-
-Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_key`
-
-Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_verify_client`
-
-Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_client => 'optional',
-    }
-```
-
-#####`ssl_verify_depth`
-
-Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_depth => 1,
-    }
-```
-
-#####`ssl_options`
-
-Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'. 
-
-A string:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => '+ExportCertData',
-    }
-```
-
-An array:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => [ '+StrictRequire', '+ExportCertData' ],
-    }
-```
-
-#####`ssl_proxyengine`
-
-Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
-
-
-###Virtual Host Examples
-
-The apache module allows you to set up pretty much any configuration of virtual host you might need. This section will address some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
-
-Configure a vhost with a server administrator
-
-```puppet
-    apache::vhost { 'third.example.com':
-      port        => '80',
-      docroot     => '/var/www/third',
-      serveradmin => 'admin@example.com',
-    }
-```
-
-- - -
-
-Set up a vhost with aliased servers
-
-```puppet
-    apache::vhost { 'sixth.example.com':
-      serveraliases => [
-        'sixth.example.org',
-        'sixth.example.net',
-      ],
-      port          => '80',
-      docroot       => '/var/www/fifth',
-    }
-```
-
-- - -
-
-Configure a vhost with a cgi-bin
-
-```puppet
-    apache::vhost { 'eleventh.example.com':
-      port        => '80',
-      docroot     => '/var/www/eleventh',
-      scriptalias => '/usr/lib/cgi-bin',
-    }
-```
-
-- - -
-
-Set up a vhost with a rack configuration
-
-```puppet
-    apache::vhost { 'fifteenth.example.com':
-      port           => '80',
-      docroot        => '/var/www/fifteenth',
-      rack_base_uris => ['/rackapp1', '/rackapp2'],
-    }
-```
-
-- - -
-
-Set up a mix of SSL and non-SSL vhosts at the same domain
-
-```puppet
-    #The non-ssl vhost
-    apache::vhost { 'first.example.com non-ssl':
-      servername => 'first.example.com',
-      port       => '80',
-      docroot    => '/var/www/first',
-    }
-
-    #The SSL vhost at the same domain
-    apache::vhost { 'first.example.com ssl':
-      servername => 'first.example.com',
-      port       => '443',
-      docroot    => '/var/www/first',
-      ssl        => true,
-    }
-```
-
-- - -
-
-Configure a vhost to redirect non-SSL connections to SSL
-
-```puppet
-    apache::vhost { 'sixteenth.example.com non-ssl':
-      servername      => 'sixteenth.example.com',
-      port            => '80',
-      docroot         => '/var/www/sixteenth',
-      redirect_status => 'permanent',
-      redirect_dest   => 'https://sixteenth.example.com/'
-    }
-    apache::vhost { 'sixteenth.example.com ssl':
-      servername => 'sixteenth.example.com',
-      port       => '443',
-      docroot    => '/var/www/sixteenth',
-      ssl        => true,
-    }
-```
-
-- - -
-
-Set up IP-based vhosts on any listen port and have them respond to requests on specific IP addresses. In this example, we will set listening on ports 80 and 81. This is required because the example vhosts are not declared with a port parameter.
-
-```puppet
-    apache::listen { '80': }
-    apache::listen { '81': }
-```
-
-Then we will set up the IP-based vhosts
-
-```puppet
-    apache::vhost { 'first.example.com':
-      ip       => '10.0.0.10',
-      docroot  => '/var/www/first',
-      ip_based => true,
-    }
-    apache::vhost { 'second.example.com':
-      ip       => '10.0.0.11',
-      docroot  => '/var/www/second',
-      ip_based => true,
-    }
-```
-
-- - -
-
-Configure a mix of name-based and IP-based vhosts. First, we will add two IP-based vhosts on 10.0.0.10, one SSL and one non-SSL
-
-```puppet
-    apache::vhost { 'The first IP-based vhost, non-ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '80',
-      ip_based   => true,
-      docroot    => '/var/www/first',
-    }
-    apache::vhost { 'The first IP-based vhost, ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '443',
-      ip_based   => true,
-      docroot    => '/var/www/first-ssl',
-      ssl        => true,
-    }
-```
-
-Then, we will add two name-based vhosts listening on 10.0.0.20
-
-```puppet
-    apache::vhost { 'second.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/second',
-    }
-    apache::vhost { 'third.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/third',
-    }
-```
-
-If you want to add two name-based vhosts so that they will answer on either 10.0.0.10 or 10.0.0.20, you **MUST** declare `add_listen => 'false'` to disable the otherwise automatic 'Listen 80', as it will conflict with the preceding IP-based vhosts.
-
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fourth',
-      add_listen => false,
-    }
-    apache::vhost { 'fifth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fifth',
-      add_listen => false,
-    }
-```
-
-###Load Balancing
-
-####Defined Type: `apache::balancer`
-
-`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember). 
-
-One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
-
-**Parameters within `apache::balancer`:**
-
-#####`name`
-
-Sets the balancer cluster's title. This parameter will also set the title of the conf.d file.
-
-#####`proxy_set`
-
-Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) lines. Accepts a hash, and defaults to '{}'.
-
-#####`collect_exported`
-
-Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'. 
-
-If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
-
-If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
-
-If you choose not to use exported resources, all balancer members will be configured in a single puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
-
-####Defined Type: `apache::balancermember`
-
-Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which will set up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
-
-**Parameters within `apache::balancermember`:**
-
-#####`name`
-
-Sets the title of the resource. This name will also set the name of the concat fragment.
-
-#####`balancer_cluster`
-
-Sets the Apache service's instance name. This must match the name of a declared `apache::balancer` resource. Required.
-
-#####`url`
-
-Specifies the URL used to contact the balancer member server. Defaults to 'http://${::fqdn}/'.
-
-#####`options`
-
-An array of [options](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#balancermember) to be specified after the URL. Accepts any key-value pairs available to [ProxyPass](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass).
-
-####Examples
-
-To load balance with exported resources, export the `balancermember` from the balancer member
-
-```puppet
-      @@apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then, on the proxy server, create the balancer cluster
-
-```puppet
-      apache::balancer { 'puppet00': }
-```
-
-To load balance without exported resources, declare the following on the proxy
-
-```puppet
-    apache::balancer { 'puppet00': }
-    apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then declare `apache::balancer` and `apache::balancermember` on the proxy server.
-
-If you need to use ProxySet in the balancer config
-
-```puppet
-      apache::balancer { 'puppet01':
-        proxy_set => {'stickysession' => 'JSESSIONID'},
-      }
-```
-
-##Reference
-
-###Classes
-
-####Public Classes
-
-* [`apache`](#class-apache): Guides the basic setup of Apache.
-* `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
-* [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
- 
-####Private Classes
-
-* `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
-* `apache::default_confd_files`: Includes conf.d files for FreeBSD.
-* `apache::default_mods`: Installs the Apache modules required to run the default configuration.
-* `apache::package`: Installs and configures basic Apache packages.
-* `apache::params`: Manages Apache parameters.
-* `apache::service`: Manages the Apache daemon.
-
-###Defined Types
-
-####Public Defined Types
-
-* `apache::balancer`: Creates an Apache balancer cluster.
-* `apache::balancermember`: Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
-* `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
-* `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
-* `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
-* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults. 
-
-####Private Defined Types
-
-* `apache::peruser::multiplexer`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-* `apache::peruser::processor`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-
-###Templates
-
-The Apache module relies heavily on templates to enable the `vhost` and `apache::mod` defined types. These templates are built based on Facter facts around your operating system. Unless explicitly called out, most templates are not meant for configuration.
-
-##Limitations
-
-###Ubuntu 10.04
-
-The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
-
-###RHEL/CentOS 5
-
-The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.   
-
-###RHEL/CentOS 7
-
-The `apache::mod::passenger` class is untested as the repository does not have packages for EL7 yet.  The fact that passenger packages aren't available also makes us unable to test the `rack_base_uri` parameter in `apache::vhost`.
-
-###General
-
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
-
-The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
-
-###SELinux and Custom Paths
-
-If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you will need to manage the context for the files yourself.
-
-Something along the lines of:
-
-```puppet
-        exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package['policycoreutils-python'],
-        }
-        package { 'policycoreutils-python': ensure => installed }
-        exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
-        }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/custom/path': ensure => directory, }
-        file { '/custom/path/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/custom/path',
-          additional_includes => '/custom/path/include',
-        }
-```
-
-You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources will reset the context to the values in the database if the resource isn't specifying the context.
-
-##Development
-
-###Contributing
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Running tests
-
-This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
-
-Quickstart:
-
-    gem install bundler
-    bundle install
-    bundle exec rake spec
-    bundle exec rspec spec/acceptance
-    RS_DEBUG=yes bundle exec rspec spec/acceptance
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
deleted file mode 100644
index 4b4caa8c09f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
+++ /dev/null
@@ -1,278 +0,0 @@
-# Passenger
-
-Just enabling the Passenger module is insufficient for the use of Passenger in
-production. Passenger should be tunable to better fit the environment in which
-it is run while being aware of the resources it required.
-
-To this end the Apache passenger module has been modified to apply system wide
-Passenger tuning declarations to `passenger.conf`. Declarations specific to a
-virtual host should be passed through when defining a `vhost` (e.g.
-`rack_base_uris` parameter on the `apache::vhost` type, check `README.md`).
-
-Also, general apache module loading parameters can be supplied to enable using
-a customized passenger module in place of a default-package-based version of
-the module.
-
-# Operating system support and Passenger versions
-
-The most important configuration directive for the Apache Passenger module is
-`PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
-4.x) and on the operating system package from which the Apache Passenger module
-is installed.
-
-The following table summarises the current *default versions* and
-`PassengerRoot` settings for the operating systems supported by
-puppetlabs-apache:
-
-OS               | Passenger version  | `PassengerRoot` 
----------------- | ------------------ | ----------------
-Debian 7         | 3.0.13             | /usr
-Ubuntu 12.04     | 2.2.11             | /usr
-Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
-RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
-
-As mentioned in `README.md` there are no compatible packages available for
-RHEL/CentOS 5 or RHEL/CentOS 7.
-
-## Configuration files and locations on RHEL/CentOS
-
-Notice two important points:
-
-1. The Passenger version packaged in the EPEL repositories may change over time.
-2. The value of `PassengerRoot` depends on the Passenger version installed.
-
-To prevent the puppetlabs-apache module from having to keep up with these
-package versions the Passenger configuration files installed by the
-packages are left untouched by this module. All configuration is placed in an
-extra configuration file managed by puppetlabs-apache.
-
-This means '/etc/httpd/conf.d/passenger.conf' is installed by the
-`mod_passenger` package and contains correct values for `PassengerRoot` and
-`PassengerRuby`. Puppet will ignore this file. Additional configuration
-directives as described in the remainder of this document are placed in
-'/etc/httpd/conf.d/passenger_extra.conf', managed by Puppet.
-
-This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
-
-## Third-party and custom Passenger packages and versions
-
-The Passenger version distributed by the default OS packages may be too old to
-be useful. Newer versions may be installed via Gems, from source or from
-third-party OS packages.
-
-Most notably the Passenger developers officially provide Debian packages for a
-variety of Debian and Ubuntu releases in the [Passenger APT
-repository](https://oss-binaries.phusionpassenger.com/apt/passenger). Read more
-about [installing these packages in the offical user
-guide](http://www.modrails.com/documentation/Users%20guide%20Apache.html#install_on_debian_ubuntu).
-
-If you install custom Passenger packages and newer version make sure to set the
-directives `PassengerRoot`, `PassengerRuby` and/or `PassengerDefaultRuby`
-correctly, or Passenger and Apache will fail to function properly.
-
-For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
-should almost universally be set to
-`/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
-
-# Parameters for `apache::mod::passenger`
-
-The following class parameters configure Passenger in a global, server-wide
-context.
-
-Example:
-
-```puppet
-class { 'apache::mod::passenger':
-  passenger_root             => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
-  passenger_default_ruby     => '/usr/bin/ruby1.9.3',
-  passenger_high_performance => 'on',
-  rails_autodetect           => 'off',
-  mod_lib_path               => '/usr/lib/apache2/custom_modules',
-}
-```
-
-The general form is using the all lower-case version of the configuration
-directive, with underscores instead of CamelCase.
-
-## Parameters used with passenger.conf
-
-If you pass a default value to `apache::mod::passenger` it will be ignored and
-not passed through to the configuration file. 
-
-### passenger_root
-
-The location to the Phusion Passenger root directory. This configuration option
-is essential to Phusion Passenger, and allows Phusion Passenger to locate its
-own data files. 
-
-The default depends on the Passenger version and the means of installation. See
-the above section on operating system support, versions and packages for more
-information.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
-
-### passenger_default_ruby
-
-This option specifies the default Ruby interpreter to use for web apps as well
-as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
-used by PassengerPreStart.
-
-This directive was introduced in Passenger 4.0.0 and will not work in versions
-< 4.x. Do not set this parameter if your Passenger version is older than 4.0.0.
-
-Defaults to `undef` for all operating systems except Ubuntu 14.04, where it is
-set to '/usr/bin/ruby'.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
-
-### passenger_ruby
-
-This directive is the same as `passenger_default_ruby` for Passenger versions
-< 4.x and must be used instead of `passenger_default_ruby` for such versions.
-
-It makes no sense to set `PassengerRuby` for Passenger >= 4.x. That
-directive should only be used to override the value of `PassengerDefaultRuby`
-on a non-global context, i.e. in `<VirtualHost>`, `<Directory>`, `<Location>`
-and so on.
-
-Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
-14.04, where it is set to `undef`.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
-
-### passenger_high_performance
-
-Default is `off`. When turned `on` Passenger runs in a higher performance mode
-that can be less compatible with other Apache modules.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
-
-### passenger_max_pool_size
-
-Sets the maximum number of Passenger application processes that may
-simultaneously run. The default value is 6.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
-
-### passenger_pool_idle_time
-
-The maximum number of seconds a Passenger Application process will be allowed
-to remain idle before being shut down. The default value is 300.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
-
-### passenger_max_requests
-
-The maximum number of request a Passenger application will process before being
-restarted. The default value is 0, which indicates that a process will only
-shut down if the Pool Idle Time (see above) expires.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
-
-### passenger_stat_throttle_rate
-
-Sets how often Passenger performs file system checks, at most once every _x_
-seconds. Default is 0, which means the checks are performed with every request.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
-
-### rack_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rack application. Not set by default (`undef`). Note that this directive has
-been removed in Passenger 4.0.0 and `PassengerEnabled` should be used instead.
-Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
-
-### rails_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rails application.  Not set by default (`undef`). Note that this directive
-has been removed in Passenger 4.0.0 and `PassengerEnabled` should be used
-instead. Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
-
-### passenger_use_global_queue
-
-Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
-the default in Passenger 4.x and the versions >= 4.x have disabled this
-configuration option altogether.  Use with caution.
-
-## Parameters used to load the module
-
-Unlike the tuning parameters specified above, the following parameters are only
-used when loading customized passenger modules.
-
-### mod_package
-
-Allows overriding the default package name used for the passenger module
-package.
-
-### mod_package_ensure
-
-Allows overriding the package installation setting used by puppet when
-installing the passenger module. The default is 'present'.
-
-### mod_id
-
-Allows overriding the value used by apache to identify the passenger module.
-The default is 'passenger_module'.
-
-### mod_lib_path
-
-Allows overriding the directory path used by apache when loading the passenger
-module. The default is the value of `$apache::params::lib_path`.
-
-### mod_lib
-
-Allows overriding the library file name used by apache when loading the
-passenger module. The default is 'mod_passenger.so'.
-
-### mod_path
-
-Allows overriding the full path to the library file used by apache when loading
-the passenger module. The default is the concatenation of the `mod_lib_path`
-and `mod_lib` parameters.
-
-# Dependencies
-
-RedHat-based systems will need to configure additional package repositories in
-order to install Passenger, specifically:
-
-* [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
-* [Phusion Passenger](http://passenger.stealthymonkeys.com)
-
-Configuration of these repositories is beyond the scope of this module and is
-left to the user.
-
-# Attribution
-
-The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
-was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
-NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the
-PuppetLabs Apache module on GitHub.
-
-* https://github.com/puppetlabs/puppetlabs-apache
-* https://github.com/nesi/puppetlabs-apache
-* http://www.nesi.org.nz//
-* https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
-
-# Copyright and License
-
-Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
deleted file mode 100644
index 5868545f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
deleted file mode 100644
index d65a8d445c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model.  A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
-#OPTIONS=-DDOWN
-
-#
-# By default, the httpd process is started in the C locale; to 
-# change the locale in which the server runs, the HTTPD_LANG
-# variable can be set.
-#
-#HTTPD_LANG=C
-export SHORTHOST=`hostname -s`
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
deleted file mode 100644
index 670aca3d03b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class Puppet::Provider::A2mod < Puppet::Provider
-  def self.prefetch(mods)
-    instances.each do |prov|
-      if mod = mods[prov.name]
-        mod.provider = prov
-      end
-    end
-  end
-
-  def flush
-    @property_hash.clear
-  end
-
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-      @property_hash[:ensure] = :absent if @property_hash.empty?
-    end
-    @property_hash.dup
-  end
-
-  def query
-    self.class.instances.each do |mod|
-      if mod.name == self.name or mod.name.downcase == self.name
-        return mod.properties
-      end
-    end
-    nil
-  end
-
-  def exists?
-    properties[:ensure] != :absent
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
deleted file mode 100644
index e257a579e89..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do
-    desc "Manage Apache 2 modules on Debian and Ubuntu"
-
-    optional_commands :encmd => "a2enmod"
-    optional_commands :discmd => "a2dismod"
-    commands :apache2ctl => "apache2ctl"
-
-    confine :osfamily => :debian
-    defaultfor :operatingsystem => [:debian, :ubuntu]
-
-    def self.instances
-      modules = apache2ctl("-M").lines.collect { |line|
-        m = line.match(/(\w+)_module \(shared\)$/)
-        m[1] if m
-      }.compact
-
-      modules.map do |mod|
-        new(
-          :name     => mod,
-          :ensure   => :present,
-          :provider => :a2mod
-        )
-      end
-    end
-
-    def create
-        encmd resource[:name]
-    end
-
-    def destroy
-        discmd resource[:name]
-    end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
deleted file mode 100644
index 07319dfdc8f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'puppet/util/filetype'
-Puppet::Type.type(:a2mod).provide(:gentoo, :parent => Puppet::Provider) do
-  desc "Manage Apache 2 modules on Gentoo"
-
-  confine :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :gentoo
-
-  attr_accessor :property_hash
-
-  def create
-    @property_hash[:ensure] = :present
-  end
-
-  def exists?
-    (!(@property_hash[:ensure].nil?) and @property_hash[:ensure] == :present)
-  end
-
-  def destroy
-    @property_hash[:ensure] = :absent
-  end
-
-  def flush
-    self.class.flush
-  end
-
-  class << self
-    attr_reader :conf_file
-  end
-
-  def self.clear
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ""
-  end
-
-  def self.initvars
-    @conf_file     = "/etc/conf.d/apache2"
-    @filetype      = Puppet::Util::FileType.filetype(:flat).new(conf_file)
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ""
-  end
-
-  self.initvars
-
-  # Retrieve an array of all existing modules
-  def self.modules
-    if @modules.length <= 0
-      # Locate the APACHE_OPTS variable
-      records = filetype.read.split(/\n/)
-      apache2_opts = records.grep(/^\s*APACHE2_OPTS=/).first
-
-      # Extract all defines
-      while apache2_opts.sub!(/-D\s+(\w+)/, '')
-        @modules << $1.downcase
-      end
-
-      # Hang on to any remaining options.
-      if apache2_opts.match(/APACHE2_OPTS="(.+)"/)
-        @other_args = $1.strip
-      end
-
-      @modules.sort!.uniq!
-    end
-
-    @modules
-  end
-
-  def self.prefetch(resources={})
-    # Match resources with existing providers
-    instances.each do |provider|
-      if resource = resources[provider.name]
-        resource.provider = provider
-      end
-    end
-
-    # Store all resources using this provider for flushing
-    resources.each do |name, resource|
-      @mod_resources << resource
-    end
-  end
-
-  def self.instances
-    modules.map {|mod| new(:name => mod, :provider => :gentoo, :ensure => :present)}
-  end
-
-  def self.flush
-
-    mod_list       = modules
-    mods_to_remove = @mod_resources.select {|mod| mod.should(:ensure) == :absent}.map {|mod| mod[:name]}
-    mods_to_add    = @mod_resources.select {|mod| mod.should(:ensure) == :present}.map {|mod| mod[:name]}
-
-    mod_list -= mods_to_remove
-    mod_list += mods_to_add
-    mod_list.sort!.uniq!
-
-    if modules != mod_list
-      opts = @other_args + " "
-      opts << mod_list.map {|mod| "-D #{mod.upcase}"}.join(" ")
-      opts.strip!
-      opts.gsub!(/\s+/, ' ')
-
-      apache2_opts = %Q{APACHE2_OPTS="#{opts}"}
-      Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}")
-
-      records = filetype.read.split(/\n/)
-
-      opts_index = records.find_index {|i| i.match(/^\s*APACHE2_OPTS/)}
-      records[opts_index] = apache2_opts
-
-      filetype.backup
-      filetype.write(records.join("\n"))
-      @modules = mod_list
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
deleted file mode 100644
index 8f35b2e4a15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-Puppet::Type.type(:a2mod).provide :modfix do
-    desc "Dummy provider for A2mod.
-
-    Fake nil resources when there is no crontab binary available. Allows
-    puppetd to run on a bootstrapped machine before a Cron package has been
-    installed. Workaround for: http://projects.puppetlabs.com/issues/2384
-    "
-
-    def self.instances
-        []
-    end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
deleted file mode 100644
index ea5494cb481..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:redhat, :parent => Puppet::Provider::A2mod) do
-  desc "Manage Apache 2 modules on RedHat family OSs"
-
-  commands :apachectl => "apachectl"
-
-  confine :osfamily => :redhat
-  defaultfor :osfamily => :redhat
-
-  require 'pathname'
-
-  # modpath: Path to default apache modules directory /etc/httpd/mod.d
-  # modfile: Path to module load configuration file; Default: resides under modpath directory
-  # libfile: Path to actual apache module library. Added in modfile LoadModule
-
-  attr_accessor :modfile, :libfile
-  class << self
-    attr_accessor :modpath
-    def preinit
-      @modpath = "/etc/httpd/mod.d"
-    end
-  end
-
-  self.preinit
-
-  def create
-    File.open(modfile,'w') do |f|
-      f.puts "LoadModule #{resource[:identifier]} #{libfile}"
-    end
-  end
-
-  def destroy
-    File.delete(modfile)
-  end
-
-  def self.instances
-    modules = apachectl("-M").lines.collect { |line|
-      m = line.match(/(\w+)_module \(shared\)$/)
-      m[1] if m
-    }.compact
-
-    modules.map do |mod|
-      new(
-        :name     => mod,
-        :ensure   => :present,
-        :provider => :redhat
-      )
-    end
-  end
-
-  def modfile
-    modfile ||= "#{self.class.modpath}/#{resource[:name]}.load"
-  end
-
-  # Set libfile path: If absolute path is passed, then maintain it. Else, make it default from 'modules' dir.
-  def libfile
-    libfile = Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
deleted file mode 100644
index 07a911e5ee1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-Puppet::Type.newtype(:a2mod) do
-    @doc = "Manage Apache 2 modules"
-
-    ensurable
-
-    newparam(:name) do
-       Puppet.warning "The a2mod provider is deprecated, please use apache::mod instead"
-       desc "The name of the module to be managed"
-
-       isnamevar
-
-    end
-
-    newparam(:lib) do
-      desc "The name of the .so library to be loaded"
-
-      defaultto { "mod_#{@resource[:name]}.so" }
-    end
- 
-    newparam(:identifier) do
-      desc "Module identifier string used by LoadModule. Default: module-name_module"
-
-      # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier
-
-      defaultto { "#{resource[:name]}_module" }
-    end
-
-    autorequire(:package) { catalog.resource(:package, 'httpd')}
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
deleted file mode 100644
index 173aaec2dd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
+++ /dev/null
@@ -1,83 +0,0 @@
-# == Define Resource Type: apache::balancer
-#
-# This type will create an apache balancer cluster file inside the conf.d
-# directory. Each balancer cluster needs one or more balancer members (that can
-# be declared with the apache::balancermember defined resource type). Using
-# storeconfigs, you can export the apache::balancermember resources on all
-# balancer members, and then collect them on a single apache load balancer
-# server.
-#
-# === Requirement/Dependencies:
-#
-# Currently requires the puppetlabs/concat module on the Puppet Forge and uses
-# storeconfigs on the Puppet Master to export/collect resources from all
-# balancer members.
-#
-# === Parameters
-#
-# [*name*]
-# The namevar of the defined resource type is the balancer clusters name.
-# This name is also used in the name of the conf.d file
-#
-# [*proxy_set*]
-# Hash, default empty. If given, each key-value pair will be used as a ProxySet
-# line in the configuration.
-#
-# [*collect_exported*]
-# Boolean, default 'true'. True means 'collect exported @@balancermember
-# resources' (for the case when every balancermember node exports itself),
-# false means 'rely on the existing declared balancermember resources' (for the
-# case when you know the full set of balancermembers in advance and use
-# apache::balancermember with array arguments, which allows you to deploy
-# everything in 1 run)
-#
-#
-# === Examples
-#
-# Exporting the resource for a balancer member:
-#
-# apache::balancer { 'puppet00': }
-#
-define apache::balancer (
-  $proxy_set = {},
-  $collect_exported = true,
-) {
-  include concat::setup
-  include ::apache::mod::proxy_balancer
-
-  $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
-
-  concat { $target:
-    owner  => '0',
-    group  => '0',
-    mode   => '0644',
-    notify => Service['httpd'],
-  }
-
-  concat::fragment { "00-${name}-header":
-    ensure  => present,
-    target  => $target,
-    order   => '01',
-    content => "<Proxy balancer://${name}>\n",
-  }
-
-  if $collect_exported {
-    Apache::Balancermember <<| balancer_cluster == $name |>>
-  }
-  # else: the resources have been created and they introduced their
-  # concat fragments. We don't have to do anything about them.
-
-  concat::fragment { "01-${name}-proxyset":
-    ensure  => present,
-    target  => $target,
-    order   => '19',
-    content => inline_template("<% proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= proxy_set[key] %>\n<% end %>"),
-  }
-
-  concat::fragment { "01-${name}-footer":
-    ensure  => present,
-    target  => $target,
-    order   => '20',
-    content => "</Proxy>\n",
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
deleted file mode 100644
index 121e2c55331..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# == Define Resource Type: apache::balancermember
-#
-# This type will setup a balancer member inside a listening service
-# configuration block in /etc/apache/apache.cfg on the load balancer.
-# currently it only has the ability to specify the instance name, url and an
-# array of options. More features can be added as needed. The best way to
-# implement this is to export this resource for all apache balancer member
-# servers, and then collect them on the main apache load balancer.
-#
-# === Requirement/Dependencies:
-#
-# Currently requires the puppetlabs/concat module on the Puppet Forge and
-# uses storeconfigs on the Puppet Master to export/collect resources
-# from all balancer members.
-#
-# === Parameters
-#
-# [*name*]
-# The title of the resource is arbitrary and only utilized in the concat
-# fragment name.
-#
-# [*balancer_cluster*]
-# The apache service's instance name (or, the title of the apache::balancer
-# resource). This must match up with a declared apache::balancer resource.
-#
-# [*url*]
-# The url used to contact the balancer member server.
-#
-# [*options*]
-# An array of options to be specified after the url.
-#
-# === Examples
-#
-# Exporting the resource for a balancer member:
-#
-# @@apache::balancermember { 'apache':
-#   balancer_cluster => 'puppet00',
-#   url              => "ajp://${::fqdn}:8009"
-#   options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-# }
-#
-define apache::balancermember(
-  $balancer_cluster,
-  $url = "http://${::fqdn}/",
-  $options = [],
-) {
-
-  concat::fragment { "BalancerMember ${url}":
-    ensure  => present,
-    target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
-    content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
deleted file mode 100644
index f35c0c8b9d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apache::confd::no_accf {
-  # Template uses no variables
-  file { 'no-accf.conf':
-    ensure  => 'file',
-    path    => "${::apache::confd_dir}/no-accf.conf",
-    content => template('apache/confd/no-accf.conf.erb'),
-    require => Exec["mkdir ${::apache::confd_dir}"],
-    before  => File[$::apache::confd_dir],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
deleted file mode 100644
index c06b30c83b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class apache::default_confd_files (
-  $all = true,
-) {
-  # The rest of the conf.d/* files only get loaded if we want them
-  if $all {
-    case $::osfamily {
-      'freebsd': {
-        include ::apache::confd::no_accf
-      }
-      default: {
-        # do nothing
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
deleted file mode 100644
index f665d7383e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
+++ /dev/null
@@ -1,158 +0,0 @@
-class apache::default_mods (
-  $all            = true,
-  $mods           = undef,
-  $apache_version = $::apache::apache_version
-) {
-  # These are modules required to run the default configuration.
-  # They are not configurable at this time, so we just include
-  # them to make sure it works.
-  case $::osfamily {
-    'redhat', 'freebsd': {
-      ::apache::mod { 'log_config': }
-      if versioncmp($apache_version, '2.4') >= 0 {
-        # Lets fork it
-        ::apache::mod { 'systemd': }
-        ::apache::mod { 'unixd': }
-      }
-    }
-    default: {}
-  }
-  ::apache::mod { 'authz_host': }
-
-  # The rest of the modules only get loaded if we want all modules enabled
-  if $all {
-    case $::osfamily {
-      'debian': {
-        include ::apache::mod::reqtimeout
-      }
-      'redhat': {
-        include ::apache::mod::actions
-        include ::apache::mod::cache
-        include ::apache::mod::mime
-        include ::apache::mod::mime_magic
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::suexec
-        include ::apache::mod::rewrite
-        include ::apache::mod::speling
-        ::apache::mod { 'auth_digest': }
-        ::apache::mod { 'authn_anon': }
-        ::apache::mod { 'authn_dbm': }
-        ::apache::mod { 'authz_dbm': }
-        ::apache::mod { 'authz_owner': }
-        ::apache::mod { 'expires': }
-        ::apache::mod { 'ext_filter': }
-        ::apache::mod { 'include': }
-        ::apache::mod { 'logio': }
-        ::apache::mod { 'substitute': }
-        ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
-
-        if versioncmp($apache_version, '2.4') >= 0 {
-          ::apache::mod { 'authn_core': }
-        }
-        else {
-          ::apache::mod { 'authn_alias': }
-          ::apache::mod { 'authn_default': }
-        }
-      }
-      'freebsd': {
-        include ::apache::mod::actions
-        include ::apache::mod::cache
-        include ::apache::mod::disk_cache
-        include ::apache::mod::headers
-        include ::apache::mod::info
-        include ::apache::mod::mime_magic
-        include ::apache::mod::reqtimeout
-        include ::apache::mod::rewrite
-        include ::apache::mod::userdir
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::speling
-
-        ::apache::mod { 'asis': }
-        ::apache::mod { 'auth_digest': }
-        ::apache::mod { 'authn_alias': }
-        ::apache::mod { 'authn_anon': }
-        ::apache::mod { 'authn_dbm': }
-        ::apache::mod { 'authn_default': }
-        ::apache::mod { 'authz_dbm': }
-        ::apache::mod { 'authz_owner': }
-        ::apache::mod { 'cern_meta': }
-        ::apache::mod { 'charset_lite': }
-        ::apache::mod { 'dumpio': }
-        ::apache::mod { 'expires': }
-        ::apache::mod { 'file_cache': }
-        ::apache::mod { 'filter':}
-        ::apache::mod { 'imagemap':}
-        ::apache::mod { 'include': }
-        ::apache::mod { 'logio': }
-        ::apache::mod { 'unique_id': }
-        ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
-      }
-      default: {}
-    }
-    case $::apache::mpm_module {
-      'prefork': {
-        include ::apache::mod::cgi
-      }
-      'worker': {
-        include ::apache::mod::cgid
-      }
-      default: {
-        # do nothing
-      }
-    }
-    include ::apache::mod::alias
-    include ::apache::mod::autoindex
-    include ::apache::mod::dav
-    include ::apache::mod::dav_fs
-    include ::apache::mod::deflate
-    include ::apache::mod::dir
-    include ::apache::mod::mime
-    include ::apache::mod::negotiation
-    include ::apache::mod::setenvif
-    ::apache::mod { 'auth_basic': }
-    ::apache::mod { 'authn_file': }
-
-      if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-
-      # lots of stuff seems to break without access_compat
-      ::apache::mod { 'access_compat': }
-    } else {
-      ::apache::mod { 'authz_default': }
-    }
-
-    ::apache::mod { 'authz_groupfile': }
-    ::apache::mod { 'authz_user': }
-    ::apache::mod { 'env': }
-  } elsif $mods {
-    ::apache::default_mods::load { $mods: }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-    }
-  } else {
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
deleted file mode 100644
index 356e9fa00ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# private define
-define apache::default_mods::load ($module = $title) {
-  if defined("apache::mod::${module}") {
-    include "::apache::mod::${module}"
-  } else {
-    ::apache::mod { $module: }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
deleted file mode 100644
index 4eaeb557829..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class apache::dev {
-  if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
-    fail('apache::dev requires apache::package; please include apache or apache::package class first')
-  }
-  include ::apache::params
-  $packages = $::apache::params::dev_packages
-  package { $packages:
-    ensure  => present,
-    require => Package['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
deleted file mode 100644
index 9f77d5b4e7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
+++ /dev/null
@@ -1,340 +0,0 @@
-# Class: apache
-#
-# This class installs Apache
-#
-# Parameters:
-#
-# Actions:
-#   - Install Apache
-#   - Manage Apache service
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache (
-  $service_name         = $::apache::params::service_name,
-  $default_mods         = true,
-  $default_vhost        = true,
-  $default_confd_files  = true,
-  $default_ssl_vhost    = false,
-  $default_ssl_cert     = $::apache::params::default_ssl_cert,
-  $default_ssl_key      = $::apache::params::default_ssl_key,
-  $default_ssl_chain    = undef,
-  $default_ssl_ca       = undef,
-  $default_ssl_crl_path = undef,
-  $default_ssl_crl      = undef,
-  $ip                   = undef,
-  $service_enable       = true,
-  $service_ensure       = 'running',
-  $purge_configs        = true,
-  $purge_vdir           = false,
-  $serveradmin          = 'root@localhost',
-  $sendfile             = 'On',
-  $error_documents      = false,
-  $timeout              = '120',
-  $httpd_dir            = $::apache::params::httpd_dir,
-  $server_root          = $::apache::params::server_root,
-  $confd_dir            = $::apache::params::confd_dir,
-  $vhost_dir            = $::apache::params::vhost_dir,
-  $vhost_enable_dir     = $::apache::params::vhost_enable_dir,
-  $mod_dir              = $::apache::params::mod_dir,
-  $mod_enable_dir       = $::apache::params::mod_enable_dir,
-  $mpm_module           = $::apache::params::mpm_module,
-  $conf_template        = $::apache::params::conf_template,
-  $servername           = $::apache::params::servername,
-  $manage_user          = true,
-  $manage_group         = true,
-  $user                 = $::apache::params::user,
-  $group                = $::apache::params::group,
-  $keepalive            = $::apache::params::keepalive,
-  $keepalive_timeout    = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests = $apache::params::max_keepalive_requests,
-  $logroot              = $::apache::params::logroot,
-  $log_level            = $::apache::params::log_level,
-  $log_formats          = {},
-  $ports_file           = $::apache::params::ports_file,
-  $apache_version       = $::apache::version::default,
-  $server_tokens        = 'OS',
-  $server_signature     = 'On',
-  $trace_enable         = 'On',
-  $package_ensure       = 'installed',
-) inherits ::apache::params {
-  validate_bool($default_vhost)
-  validate_bool($default_ssl_vhost)
-  validate_bool($default_confd_files)
-  # true/false is sufficient for both ensure and enable
-  validate_bool($service_enable)
-
-  $valid_mpms_re = $apache_version ? {
-    '2.4'   => '(event|itk|peruser|prefork|worker)',
-    default => '(event|itk|prefork|worker)'
-  }
-
-  if $mpm_module {
-    validate_re($mpm_module, $valid_mpms_re)
-  }
-
-  # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
-  # NOTE: the same strategy may be introduced for other OSes. For this, you
-  # should delete the 'if' block below and modify all MPM modules' manifests
-  # such that they include apache::package class (currently event.pp, itk.pp,
-  # peruser.pp, prefork.pp, worker.pp).
-  if $::osfamily != 'FreeBSD' {
-    package { 'httpd':
-      ensure => $package_ensure,
-      name   => $::apache::params::apache_name,
-      notify => Class['Apache::Service'],
-    }
-  }
-  validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
-
-  # declare the web server user and group
-  # Note: requiring the package means the package ought to create them and not puppet
-  validate_bool($manage_user)
-  if $manage_user {
-    user { $user:
-      ensure  => present,
-      gid     => $group,
-      require => Package['httpd'],
-    }
-  }
-  validate_bool($manage_group)
-  if $manage_group {
-    group { $group:
-      ensure  => present,
-      require => Package['httpd']
-    }
-  }
-
-  $valid_log_level_re = '(emerg|alert|crit|error|warn|notice|info|debug)'
-
-  validate_re($log_level, $valid_log_level_re,
-  "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
-
-  class { '::apache::service':
-    service_name   => $service_name,
-    service_enable => $service_enable,
-    service_ensure => $service_ensure,
-  }
-
-  # Deprecated backwards-compatibility
-  if $purge_vdir {
-    warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs')
-    $purge_confd = $purge_vdir
-  } else {
-    $purge_confd = $purge_configs
-  }
-
-  Exec {
-    path => '/bin:/sbin:/usr/bin:/usr/sbin',
-  }
-
-  exec { "mkdir ${confd_dir}":
-    creates => $confd_dir,
-    require => Package['httpd'],
-  }
-  file { $confd_dir:
-    ensure  => directory,
-    recurse => true,
-    purge   => $purge_confd,
-    notify  => Class['Apache::Service'],
-    require => Package['httpd'],
-  }
-
-  if ! defined(File[$mod_dir]) {
-    exec { "mkdir ${mod_dir}":
-      creates => $mod_dir,
-      require => Package['httpd'],
-    }
-    # Don't purge available modules if an enable dir is used
-    $purge_mod_dir = $purge_configs and !$mod_enable_dir
-    file { $mod_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_mod_dir,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  }
-
-  if $mod_enable_dir and ! defined(File[$mod_enable_dir]) {
-    $mod_load_dir = $mod_enable_dir
-    exec { "mkdir ${mod_enable_dir}":
-      creates => $mod_enable_dir,
-      require => Package['httpd'],
-    }
-    file { $mod_enable_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  } else {
-    $mod_load_dir = $mod_dir
-  }
-
-  if ! defined(File[$vhost_dir]) {
-    exec { "mkdir ${vhost_dir}":
-      creates => $vhost_dir,
-      require => Package['httpd'],
-    }
-    file { $vhost_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  }
-
-  if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) {
-    $vhost_load_dir = $vhost_enable_dir
-    exec { "mkdir ${vhost_load_dir}":
-      creates => $vhost_load_dir,
-      require => Package['httpd'],
-    }
-    file { $vhost_enable_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  } else {
-    $vhost_load_dir = $vhost_dir
-  }
-
-  concat { $ports_file:
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    notify  => Class['Apache::Service'],
-    require => Package['httpd'],
-  }
-  concat::fragment { 'Apache ports header':
-    ensure  => present,
-    target  => $ports_file,
-    content => template('apache/ports_header.erb')
-  }
-
-  if $::apache::params::conf_dir and $::apache::params::conf_file {
-    case $::osfamily {
-      'debian': {
-        $docroot              = '/var/www'
-        $pidfile              = '${APACHE_PID_FILE}'
-        $error_log            = 'error.log'
-        $error_documents_path = '/usr/share/apache2/error'
-        $scriptalias          = '/usr/lib/cgi-bin'
-        $access_log_file      = 'access.log'
-      }
-      'redhat': {
-        $docroot              = '/var/www/html'
-        $pidfile              = 'run/httpd.pid'
-        $error_log            = 'error_log'
-        $error_documents_path = '/var/www/error'
-        $scriptalias          = '/var/www/cgi-bin'
-        $access_log_file      = 'access_log'
-      }
-      'freebsd': {
-        $docroot              = '/usr/local/www/apache22/data'
-        $pidfile              = '/var/run/httpd.pid'
-        $error_log            = 'httpd-error.log'
-        $error_documents_path = '/usr/local/www/apache22/error'
-        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
-        $access_log_file      = 'httpd-access.log'
-      }
-      default: {
-        fail("Unsupported osfamily ${::osfamily}")
-      }
-    }
-
-    $apxs_workaround = $::osfamily ? {
-      'freebsd' => true,
-      default   => false
-    }
-
-    # Template uses:
-    # - $pidfile
-    # - $user
-    # - $group
-    # - $logroot
-    # - $error_log
-    # - $sendfile
-    # - $mod_dir
-    # - $ports_file
-    # - $confd_dir
-    # - $vhost_dir
-    # - $error_documents
-    # - $error_documents_path
-    # - $apxs_workaround
-    # - $keepalive
-    # - $keepalive_timeout
-    # - $max_keepalive_requests
-    # - $server_root
-    # - $server_tokens
-    # - $server_signature
-    # - $trace_enable
-    file { "${::apache::params::conf_dir}/${::apache::params::conf_file}":
-      ensure  => file,
-      content => template($conf_template),
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-
-    # preserve back-wards compatibility to the times when default_mods was
-    # only a boolean value. Now it can be an array (too)
-    if is_array($default_mods) {
-      class { '::apache::default_mods':
-        all  => false,
-        mods => $default_mods,
-      }
-    } else {
-      class { '::apache::default_mods':
-        all => $default_mods,
-      }
-    }
-    class { '::apache::default_confd_files':
-      all => $default_confd_files
-    }
-    if $mpm_module {
-      class { "::apache::mod::${mpm_module}": }
-    }
-
-    $default_vhost_ensure = $default_vhost ? {
-      true  => 'present',
-      false => 'absent'
-    }
-    $default_ssl_vhost_ensure = $default_ssl_vhost ? {
-      true  => 'present',
-      false => 'absent'
-    }
-
-    ::apache::vhost { 'default':
-      ensure          => $default_vhost_ensure,
-      port            => 80,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $access_log_file,
-      priority        => '15',
-      ip              => $ip,
-    }
-    $ssl_access_log_file = $::osfamily ? {
-      'freebsd' => $access_log_file,
-      default   => "ssl_${access_log_file}",
-    }
-    ::apache::vhost { 'default-ssl':
-      ensure          => $default_ssl_vhost_ensure,
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $ssl_access_log_file,
-      priority        => '15',
-      ip              => $ip,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
deleted file mode 100644
index e6a8a3c767c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-define apache::listen {
-  $listen_addr_port = $name
-
-  # Template uses: $listen_addr_port
-  concat::fragment { "Listen ${listen_addr_port}":
-    ensure  => present,
-    target  => $::apache::ports_file,
-    content => template('apache/listen.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
deleted file mode 100644
index aa5ea3f3bd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
+++ /dev/null
@@ -1,130 +0,0 @@
-define apache::mod (
-  $package        = undef,
-  $package_ensure = 'present',
-  $lib            = undef,
-  $lib_path       = $::apache::params::lib_path,
-  $id             = undef,
-  $path           = undef,
-  $loadfile_name  = undef,
-  $loadfiles      = undef,
-) {
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $mod = $name
-  #include apache #This creates duplicate resources in rspec-puppet
-  $mod_dir = $::apache::mod_dir
-
-  # Determine if we have special lib
-  $mod_libs = $::apache::params::mod_libs
-  $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
-  if $lib {
-    $_lib = $lib
-  } elsif $mod_lib {
-    $_lib = $mod_lib
-  } else {
-    $_lib = "mod_${mod}.so"
-  }
-
-  # Determine if declaration specified a path to the module
-  if $path {
-    $_path = $path
-  } else {
-    $_path = "${lib_path}/${_lib}"
-  }
-
-  if $id {
-    $_id = $id
-  } else {
-    $_id = "${mod}_module"
-  }
-
-  if $loadfile_name {
-    $_loadfile_name = $loadfile_name
-  } else {
-    $_loadfile_name = "${mod}.load"
-  }
-
-  # Determine if we have a package
-  $mod_packages = $::apache::params::mod_packages
-  $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
-  if $package {
-    $_package = $package
-  } elsif $mod_package {
-    $_package = $mod_package
-  } else {
-    $_package = undef
-  }
-  if $_package and ! defined(Package[$_package]) {
-    # note: FreeBSD/ports uses apxs tool to activate modules; apxs clutters
-    # httpd.conf with 'LoadModule' directives; here, by proper resource
-    # ordering, we ensure that our version of httpd.conf is reverted after
-    # the module gets installed.
-    $package_before = $::osfamily ? {
-      'freebsd' => [
-        File[$_loadfile_name],
-        File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
-      ],
-      default => File[$_loadfile_name],
-    }
-    # $_package may be an array
-    package { $_package:
-      ensure  => $package_ensure,
-      require => Package['httpd'],
-      before  => $package_before,
-    }
-  }
-
-  file { "${_loadfile_name}":
-    ensure  => file,
-    path    => "${mod_dir}/${_loadfile_name}",
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    content => template('apache/mod/load.erb'),
-    require => [
-      Package['httpd'],
-      Exec["mkdir ${mod_dir}"],
-    ],
-    before  => File[$mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  if $::osfamily == 'Debian' {
-    $enable_dir = $::apache::mod_enable_dir
-    file{ "${_loadfile_name} symlink":
-      ensure  => link,
-      path    => "${enable_dir}/${_loadfile_name}",
-      target  => "${mod_dir}/${_loadfile_name}",
-      owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => '0644',
-      require => [
-        File[$_loadfile_name],
-        Exec["mkdir ${enable_dir}"],
-      ],
-      before  => File[$enable_dir],
-      notify  => Service['httpd'],
-    }
-    # Each module may have a .conf file as well, which should be
-    # defined in the class apache::mod::module
-    # Some modules do not require this file.
-    if defined(File["${mod}.conf"]) {
-      file{ "${mod}.conf symlink":
-        ensure  => link,
-        path    => "${enable_dir}/${mod}.conf",
-        target  => "${mod_dir}/${mod}.conf",
-        owner   => 'root',
-        group   => $::apache::params::root_group,
-        mode    => '0644',
-        require => [
-          File["${mod}.conf"],
-          Exec["mkdir ${enable_dir}"],
-        ],
-        before  => File[$enable_dir],
-        notify  => Service['httpd'],
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
deleted file mode 100644
index 3b60f297fdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::actions {
-  apache::mod { 'actions': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
deleted file mode 100644
index ee017b490f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class apache::mod::alias(
-  $apache_version = $apache::apache_version
-) {
-  $icons_path = $::osfamily ? {
-    'debian'  => '/usr/share/apache2/icons',
-    'redhat'  => '/var/www/icons',
-    'freebsd' => '/usr/local/www/apache22/icons',
-  }
-  apache::mod { 'alias': }
-  # Template uses $icons_path
-  file { 'alias.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/alias.conf",
-    content => template('apache/mod/alias.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
deleted file mode 100644
index cacfafa4d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::auth_basic {
-  ::apache::mod { 'auth_basic': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
deleted file mode 100644
index 6b53262a1bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::auth_kerb {
-  ::apache::mod { 'auth_kerb': }
-}
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
deleted file mode 100644
index 800e656e892..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class apache::mod::authnz_ldap (
-  $verifyServerCert = true,
-) {
-  include '::apache::mod::ldap'
-  ::apache::mod { 'authnz_ldap': }
-
-  validate_bool($verifyServerCert)
-
-  # Template uses:
-  # - $verifyServerCert
-  file { 'authnz_ldap.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/authnz_ldap.conf",
-    content => template('apache/mod/authnz_ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
deleted file mode 100644
index f5f0f07458b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::autoindex {
-  ::apache::mod { 'autoindex': }
-  # Template uses no variables
-  file { 'autoindex.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/autoindex.conf",
-    content => template('apache/mod/autoindex.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
deleted file mode 100644
index 4ab9f44bae0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::cache {
-  ::apache::mod { 'cache': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
deleted file mode 100644
index 6c3c6aec8d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::cgi {
-  Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
-  ::apache::mod { 'cgi': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
deleted file mode 100644
index 5c89251a1c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class apache::mod::cgid {
-  Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
-
-  # Debian specifies it's cgid sock path, but RedHat uses the default value
-  # with no config file
-  $cgisock_path = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/cgisock',
-    'freebsd' => 'cgisock',
-    default   => undef,
-  }
-  ::apache::mod { 'cgid': }
-  if $cgisock_path {
-    # Template uses $cgisock_path
-    file { 'cgid.conf':
-      ensure  => file,
-      path    => "${::apache::mod_dir}/cgid.conf",
-      content => template('apache/mod/cgid.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
deleted file mode 100644
index ade9c0809ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::dav {
-  ::apache::mod { 'dav': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
deleted file mode 100644
index 482f316171e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class apache::mod::dav_fs {
-  $dav_lock = $::osfamily ? {
-    'debian'  => '${APACHE_LOCK_DIR}/DAVLock',
-    'freebsd' => '/usr/local/var/DavLock',
-    default   => '/var/lib/dav/lockdb',
-  }
-
-  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_fs']
-  ::apache::mod { 'dav_fs': }
-
-  # Template uses: $dav_lock
-  file { 'dav_fs.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/dav_fs.conf",
-    content => template('apache/mod/dav_fs.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
deleted file mode 100644
index 0fd667bc3f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::dav_svn (
-  $authz_svn_enabled = false,
-) {
-    Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-    include ::apache::mod::dav
-    ::apache::mod { 'dav_svn': } 
-    
-    if $authz_svn_enabled {
-      ::apache::mod { 'authz_svn':
-        loadfile_name => 'dav_svn_authz_svn.load',
-        require       => Apache::Mod['dav_svn'],
-      }
-    }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
deleted file mode 100644
index 9b597d94664..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::deflate {
-  ::apache::mod { 'deflate': }
-  # Template uses no variables
-  file { 'deflate.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/deflate.conf",
-    content => template('apache/mod/deflate.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
deleted file mode 100644
index 5abdedd3618..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::dev {
-  # Development packages are not apache modules
-  warning('apache::mod::dev is deprecated; please use apache::dev')
-  include ::apache::dev
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
deleted file mode 100644
index 11631305a44..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Note: this sets the global DirectoryIndex directive, it may be necessary to consider being able to modify the apache::vhost to declare DirectoryIndex statements in a vhost configuration
-# Parameters:
-# - $indexes provides a string for the DirectoryIndex directive http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
-class apache::mod::dir (
-  $dir     = 'public_html',
-  $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
-) {
-  validate_array($indexes)
-  ::apache::mod { 'dir': }
-
-  # Template uses
-  # - $indexes
-  file { 'dir.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/dir.conf",
-    content => template('apache/mod/dir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
deleted file mode 100644
index 13c9c783523..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class apache::mod::disk_cache {
-  $cache_root = $::osfamily ? {
-    'debian'  => '/var/cache/apache2/mod_disk_cache',
-    'redhat'  => '/var/cache/mod_proxy',
-    'freebsd' => '/var/cache/mod_disk_cache',
-  }
-  if $::osfamily != 'FreeBSD' {
-    # FIXME: investigate why disk_cache was dependent on proxy
-    # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
-    Class['::apache::mod::proxy'] -> Class['::apache::mod::disk_cache']
-  }
-  Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
-
-  apache::mod { 'disk_cache': }
-  # Template uses $cache_proxy
-  file { 'disk_cache.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/disk_cache.conf",
-    content => template('apache/mod/disk_cache.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
deleted file mode 100644
index cb7ed96cd61..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
+++ /dev/null
@@ -1,62 +0,0 @@
-class apache::mod::event (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::event and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::event and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::event and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::event and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $maxclients
-  # - $minsparethreads
-  # - $maxsparethreads
-  # - $threadsperchild
-  # - $maxrequestsperchild
-  # - $serverlimit
-  file { "${::apache::mod_dir}/event.conf":
-    ensure  => file,
-    content => template('apache/mod/event.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        apache::mpm{ 'event':
-          apache_version => $apache_version,
-        }
-      }
-    }
-    'debian','freebsd' : {
-      apache::mpm{ 'event':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
deleted file mode 100644
index aae4c59d98a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::expires {
-  ::apache::mod { 'expires': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
deleted file mode 100644
index a185bb31fa1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class apache::mod::fastcgi {
-
-  # Debian specifies it's fastcgi lib path, but RedHat uses the default value
-  # with no config file
-  $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
-
-  ::apache::mod { 'fastcgi': }
-
-  if $fastcgi_lib_path {
-    # Template uses:
-    # - $fastcgi_server
-    # - $fastcgi_socket
-    # - $fastcgi_dir
-    file { 'fastcgi.conf':
-      ensure  => file,
-      path    => "${::apache::mod_dir}/fastcgi.conf",
-      content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
deleted file mode 100644
index 70997768bc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class apache::mod::fcgid(
-  $options = {},
-) {
-  ::apache::mod { 'fcgid': }
-
-  # Template uses:
-  # - $options
-  file { 'fcgid.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/fcgid.conf",
-    content => template('apache/mod/fcgid.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
deleted file mode 100644
index d18c5e2793e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::headers {
-  ::apache::mod { 'headers': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
deleted file mode 100644
index edbe81f3241..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::include {
-  ::apache::mod { 'include': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
deleted file mode 100644
index 18f9ea1dfe5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class apache::mod::info (
-  $allow_from = ['127.0.0.1','::1'],
-  $apache_version = $::apache::apache_version,
-){
-  apache::mod { 'info': }
-  # Template uses
-  # $allow_from
-  # $apache_version
-  file { 'info.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/info.conf",
-    content => template('apache/mod/info.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
deleted file mode 100644
index 1083e5ed244..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-class apache::mod::itk (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::itk and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::itk and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $minspareservers
-  # - $maxspareservers
-  # - $serverlimit
-  # - $maxclients
-  # - $maxrequestsperchild
-  file { "${::apache::mod_dir}/itk.conf":
-    ensure  => file,
-    content => template('apache/mod/itk.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'debian', 'freebsd': {
-      apache::mpm{ 'itk':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
deleted file mode 100644
index d3b17ff5b85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::ldap (
-  $apache_version = $::apache::apache_version,
-){
-  ::apache::mod { 'ldap': }
-  # Template uses $apache_version
-  file { 'ldap.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/ldap.conf",
-    content => template('apache/mod/ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
deleted file mode 100644
index ccdb5d4b3c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class apache::mod::mime (
-  $mime_support_package = $::apache::params::mime_support_package,
-  $mime_types_config    = $::apache::params::mime_types_config,
-) {
-  apache::mod { 'mime': }
-  # Template uses $mime_types_config
-  file { 'mime.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/mime.conf",
-    content => template('apache/mod/mime.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-  if $mime_support_package {
-    package { $mime_support_package:
-      ensure => 'installed',
-      before => File['mime.conf'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
deleted file mode 100644
index 9de8bc4bc6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::mime_magic (
-  $magic_file = "${::apache::params::conf_dir}/magic"
-) {
-  apache::mod { 'mime_magic': }
-  # Template uses $magic_file
-  file { 'mime_magic.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/mime_magic.conf",
-    content => template('apache/mod/mime_magic.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
deleted file mode 100644
index eff685b15c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::negotiation {
-  ::apache::mod { 'negotiation': }
-  # Template uses no variables
-  file { 'negotiation.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/negotiation.conf",
-    content => template('apache/mod/negotiation.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
deleted file mode 100644
index f0eff1cdf73..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-class apache::mod::nss (
-  $transfer_log = "${::apache::params::logroot}/access.log",
-  $error_log    = "${::apache::params::logroot}/error.log",
-  $passwd_file  = undef
-) {
-  include ::apache::mod::mime
-
-  apache::mod { 'nss': }
-
-  $httpd_dir = $::apache::httpd_dir
-
-  # Template uses:
-  # $transfer_log
-  # $error_log
-  # $http_dir
-  # passwd_file
-  file { 'nss.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/nss.conf",
-    content => template('apache/mod/nss.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
deleted file mode 100644
index 8c1c03bd5d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-class apache::mod::pagespeed (
-  $inherit_vhost_config          = 'on',
-  $filter_xhtml                  = false,
-  $cache_path                    = '/var/cache/mod_pagespeed/',
-  $log_dir                       = '/var/log/pagespeed',
-  $memache_servers               = [],
-  $rewrite_level                 = 'CoreFilters',
-  $disable_filters               = [],
-  $enable_filters                = [],
-  $forbid_filters                = [],
-  $rewrite_deadline_per_flush_ms = 10,
-  $additional_domains            = undef,
-  $file_cache_size_kb            = 102400,
-  $file_cache_clean_interval_ms  = 3600000,
-  $lru_cache_per_process         = 1024,
-  $lru_cache_byte_limit          = 16384,
-  $css_flatten_max_bytes         = 2048,
-  $css_inline_max_bytes          = 2048,
-  $css_image_inline_max_bytes    = 2048,
-  $image_inline_max_bytes        = 2048,
-  $js_inline_max_bytes           = 2048,
-  $css_outline_min_bytes         = 3000,
-  $js_outline_min_bytes          = 3000,
-  $inode_limit                   = 500000,
-  $image_max_rewrites_at_once    = 8,
-  $num_rewrite_threads           = 4,
-  $num_expensive_rewrite_threads = 4,
-  $collect_statistics            = 'on',
-  $statistics_logging            = 'on',
-  $allow_view_stats              = [],
-  $allow_pagespeed_console       = [],
-  $allow_pagespeed_message       = [],
-  $message_buffer_size           = 100000,
-  $additional_configuration      = {},
-  $apache_version                = $::apache::apache_version,
-){
-
-  $_lib = $::apache::apache_version ? {
-    '2.4'   => 'mod_pagespeed_ap24.so',
-    default => undef
-  }
-
-  apache::mod { 'pagespeed':
-    lib => $_lib,
-  }
-
-  file { 'pagespeed.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/pagespeed.conf",
-    content => template('apache/mod/pagespeed.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
deleted file mode 100644
index 12139cb2b49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
+++ /dev/null
@@ -1,86 +0,0 @@
-class apache::mod::passenger (
-  $passenger_conf_file            = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file    = $::apache::params::passenger_conf_package_file,
-  $passenger_high_performance     = undef,
-  $passenger_pool_idle_time       = undef,
-  $passenger_max_requests         = undef,
-  $passenger_stat_throttle_rate   = undef,
-  $rack_autodetect                = undef,
-  $rails_autodetect               = undef,
-  $passenger_root                 = $::apache::params::passenger_root,
-  $passenger_ruby                 = $::apache::params::passenger_ruby,
-  $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
-  $passenger_max_pool_size        = undef,
-  $passenger_use_global_queue     = undef,
-  $mod_package                    = undef,
-  $mod_package_ensure             = undef,
-  $mod_lib                        = undef,
-  $mod_lib_path                   = undef,
-  $mod_id                         = undef,
-  $mod_path                       = undef,
-) {
-  # Managed by the package, but declare it to avoid purging
-  if $passenger_conf_package_file {
-    file { 'passenger_package.conf':
-      path => "${::apache::mod_dir}/${passenger_conf_package_file}",
-    }
-  } else {
-    # Remove passenger_extra.conf left over from before Passenger support was
-    # reworked for Debian. This is a temporary fix for users running this
-    # module from master after release 1.0.1 It will be removed in two
-    # releases from now.
-    $passenger_package_conf_ensure = $::osfamily ? {
-      'Debian' => 'absent',
-      default  => undef,
-    }
-
-    file { 'passenger_package.conf':
-      ensure => $passenger_package_conf_ensure,
-      path   => "${::apache::mod_dir}/passenger_extra.conf",
-    }
-  }
-
-  $_package = $mod_package
-  $_package_ensure = $mod_package_ensure
-  $_lib = $mod_lib
-  if $::osfamily == 'FreeBSD' {
-    if $mod_lib_path {
-      $_lib_path = $mod_lib_path
-    } else {
-      $_lib_path = "${passenger_root}/buildout/apache2"
-    }
-  } else {
-    $_lib_path = $mod_lib_path
-  }
-
-  $_id = $mod_id
-  $_path = $mod_path
-  ::apache::mod { 'passenger':
-    package        => $_package,
-    package_ensure => $_package_ensure,
-    lib            => $_lib,
-    lib_path       => $_lib_path,
-    id             => $_id,
-    path           => $_path,
-  }
-
-  # Template uses:
-  # - $passenger_root
-  # - $passenger_ruby
-  # - $passenger_default_ruby
-  # - $passenger_max_pool_size
-  # - $passenger_high_performance
-  # - $passenger_max_requests
-  # - $passenger_stat_throttle_rate
-  # - $passenger_use_global_queue
-  # - $rack_autodetect
-  # - $rails_autodetect
-  file { 'passenger.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/${passenger_conf_file}",
-    content => template('apache/mod/passenger.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
deleted file mode 100644
index b57f25fd5fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::perl {
-  ::apache::mod { 'perl': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
deleted file mode 100644
index 518655a1d43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-class apache::mod::peruser (
-  $minspareprocessors = '2',
-  $minprocessors = '2',
-  $maxprocessors = '10',
-  $maxclients = '150',
-  $maxrequestsperchild = '1000',
-  $idletimeout = '120',
-  $expiretimeout = '120',
-  $keepalive = 'Off',
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::peruser and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::peruser and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  $mod_dir = $::apache::mod_dir
-
-  # Template uses:
-  # - $minspareprocessors
-  # - $minprocessors
-  # - $maxprocessors
-  # - $maxclients
-  # - $maxrequestsperchild
-  # - $idletimeout
-  # - $expiretimeout
-  # - $keepalive
-  # - $mod_dir
-  file { "${::apache::mod_dir}/peruser.conf":
-    ensure  => file,
-    content => template('apache/mod/peruser.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-  file { "${::apache::mod_dir}/peruser":
-    ensure  => directory,
-    require => File[$::apache::mod_dir],
-  }
-  file { "${::apache::mod_dir}/peruser/multiplexers":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-  file { "${::apache::mod_dir}/peruser/processors":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-
-  ::apache::peruser::multiplexer { '01-default': }
-
-  case $::osfamily {
-    'freebsd' : {
-      class { '::apache::package':
-        mpm_module => 'peruser'
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
deleted file mode 100644
index a94bfe50bd0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-class apache::mod::php (
-  $package_name   = undef,
-  $package_ensure = 'present',
-  $path           = undef,
-  $extensions     = ['.php'],
-  $content        = undef,
-  $template       = 'apache/mod/php5.conf.erb',
-  $source         = undef,
-) {
-  if ! defined(Class['apache::mod::prefork']) {
-    fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
-  }
-  validate_array($extensions)
-
-  if $source and ($content or $template != 'apache/mod/php5.conf.erb') {
-    warning('source and content or template parameters are provided. source parameter will be used')
-  } elsif $content and $template != 'apache/mod/php5.conf.erb' {
-    warning('content and template parameters are provided. content parameter will be used')
-  }
-
-  $manage_content = $source ? {
-    undef   => $content ? {
-      undef   => template($template),
-      default => $content,
-    },
-    default => undef,
-  }
-
-  ::apache::mod { 'php5':
-    package        => $package_name,
-    package_ensure => $package_ensure,
-    path           => $path,
-  }
-
-  include ::apache::mod::mime
-  include ::apache::mod::dir
-  Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
-
-  # Template uses $extensions
-  file { 'php5.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/php5.conf",
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => $manage_content,
-    source  => $source,
-    require => [
-      Class['::apache::mod::prefork'],
-      Exec["mkdir ${::apache::mod_dir}"],
-    ],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
deleted file mode 100644
index b3adeae8c88..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
+++ /dev/null
@@ -1,70 +0,0 @@
-class apache::mod::prefork (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $minspareservers
-  # - $maxspareservers
-  # - $serverlimit
-  # - $maxclients
-  # - $maxrequestsperchild
-  file { "${::apache::mod_dir}/prefork.conf":
-    ensure  => file,
-    content => template('apache/mod/prefork.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'prefork':
-          apache_version => $apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd prefork enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => '#HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Service['httpd'],
-        }
-      }
-    }
-    'debian', 'freebsd' : {
-      ::apache::mpm{ 'prefork':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
deleted file mode 100644
index 03c1e78c95f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class apache::mod::proxy (
-  $proxy_requests = 'Off',
-  $allow_from = undef,
-  $apache_version = $::apache::apache_version,
-) {
-  ::apache::mod { 'proxy': }
-  # Template uses $proxy_requests, $apache_version
-  file { 'proxy.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/proxy.conf",
-    content => template('apache/mod/proxy.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
deleted file mode 100644
index a011a178957..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::proxy_ajp {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp']
-  ::apache::mod { 'proxy_ajp': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
deleted file mode 100644
index 5a0768d8d01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apache::mod::proxy_balancer {
-
-  include ::apache::mod::proxy
-  include ::apache::mod::proxy_http
-
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
-  ::apache::mod { 'proxy_balancer': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
deleted file mode 100644
index 549eb117faa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-class apache::mod::proxy_html {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
-
-  # Add libxml2
-  case $::osfamily {
-    /RedHat|FreeBSD/: {
-      ::apache::mod { 'xml2enc': }
-      $loadfiles = undef
-    }
-    'Debian': {
-      $gnu_path = $::hardwaremodel ? {
-        'i686'  => 'i386',
-        default => $::hardwaremodel,
-      }
-      $loadfiles = $::apache::params::distrelease ? {
-        '6'     => ['/usr/lib/libxml2.so.2'],
-        '10'    => ['/usr/lib/libxml2.so.2'],
-        default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
-      }
-    }
-  }
-
-  ::apache::mod { 'proxy_html':
-    loadfiles => $loadfiles,
-  }
-
-  # Template uses $icons_path
-  file { 'proxy_html.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/proxy_html.conf",
-    content => template('apache/mod/proxy_html.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
deleted file mode 100644
index 1579e68ee20..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::proxy_http {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http']
-  ::apache::mod { 'proxy_http': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
deleted file mode 100644
index e326c8d757d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::python {
-  ::apache::mod { 'python': }
-}
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
deleted file mode 100644
index 80b30183062..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::reqtimeout {
-  ::apache::mod { 'reqtimeout': }
-  # Template uses no variables
-  file { 'reqtimeout.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/reqtimeout.conf",
-    content => template('apache/mod/reqtimeout.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
deleted file mode 100644
index 694f0b6f5c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::rewrite {
-  include ::apache::params
-  ::apache::mod { 'rewrite': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
deleted file mode 100644
index 6fbc1d4e04e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class apache::mod::rpaf (
-  $sethostname = true,
-  $proxy_ips   = [ '127.0.0.1' ],
-  $header      = 'X-Forwarded-For'
-) {
-  ::apache::mod { 'rpaf': }
-
-  # Template uses:
-  # - $sethostname
-  # - $proxy_ips
-  # - $header
-  file { 'rpaf.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/rpaf.conf",
-    content => template('apache/mod/rpaf.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
deleted file mode 100644
index 15b1441d838..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::setenvif {
-  ::apache::mod { 'setenvif': }
-  # Template uses no variables
-  file { 'setenvif.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/setenvif.conf",
-    content => template('apache/mod/setenvif.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
deleted file mode 100644
index eb46d78f044..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::speling {
-  ::apache::mod { 'speling': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
deleted file mode 100644
index dd178150c9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-class apache::mod::ssl (
-  $ssl_compression = false,
-  $ssl_options     = [ 'StdEnvVars' ],
-  $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
-  $apache_version  = $::apache::apache_version,
-) {
-  $session_cache = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
-    'freebsd' => '/var/run/ssl_scache(512000)',
-  }
-
-  case $::osfamily {
-    'debian': {
-      if versioncmp($apache_version, '2.4') >= 0 and $::operatingsystem == 'Ubuntu' {
-        $ssl_mutex = 'default'
-      } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
-        $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
-      } else {
-        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
-      }
-    }
-    'redhat': {
-      $ssl_mutex = 'default'
-    }
-    'freebsd': {
-      $ssl_mutex = 'default'
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-
-  ::apache::mod { 'ssl': }
-
-  if versioncmp($apache_version, '2.4') >= 0 {
-    ::apache::mod { 'socache_shmcb': }
-  }
-
-  # Template uses
-  #
-  # $ssl_compression
-  # $ssl_options
-  # $session_cache,
-  # $ssl_mutex
-  # $apache_version
-  #
-  file { 'ssl.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/ssl.conf",
-    content => template('apache/mod/ssl.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
deleted file mode 100644
index cfab5d58eab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Class: apache::mod::status
-#
-# This class enables and configures Apache mod_status
-# See: http://httpd.apache.org/docs/current/mod/mod_status.html
-#
-# Parameters:
-# - $allow_from is an array of hosts, ip addresses, partial network numbers
-#   or networks in CIDR notation specifying what hosts can view the special
-#   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
-# - $extended_status track and display extended status information. Valid
-#   values are 'On' or 'Off'.  Defaults to 'On'.
-#
-# Actions:
-# - Enable and configure Apache mod_status
-#
-# Requires:
-# - The apache class
-#
-# Sample Usage:
-#
-#  # Simple usage allowing access from localhost and a private subnet
-#  class { 'apache::mod::status':
-#    $allow_from => ['127.0.0.1', '10.10.10.10/24'],
-#  }
-#
-class apache::mod::status (
-  $allow_from      = ['127.0.0.1','::1'],
-  $extended_status = 'On',
-  $apache_version = $::apache::apache_version,
-){
-  validate_array($allow_from)
-  validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
-  ::apache::mod { 'status': }
-  # Template uses $allow_from, $extended_status, $apache_version
-  file { 'status.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/status.conf",
-    content => template('apache/mod/status.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
deleted file mode 100644
index ded013d4990..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::suexec {
-  ::apache::mod { 'suexec': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
deleted file mode 100644
index f9a572f4635..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::suphp (
-){
-  ::apache::mod { 'suphp': }
-
-  file {'suphp.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/suphp.conf",
-    content => template('apache/mod/suphp.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
deleted file mode 100644
index accfe64a794..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class apache::mod::userdir (
-  $home = '/home',
-  $dir = 'public_html',
-  $disable_root = true,
-  $apache_version = $::apache::apache_version,
-) {
-  ::apache::mod { 'userdir': }
-
-  # Template uses $home, $dir, $disable_root, $apache_version
-  file { 'userdir.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/userdir.conf",
-    content => template('apache/mod/userdir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
deleted file mode 100644
index 30ae122e15e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::vhost_alias {
-  ::apache::mod { 'vhost_alias': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
deleted file mode 100644
index 0d2815964bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-class apache::mod::worker (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $threadlimit         = '64',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::worker and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::worker and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::worker and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::worker and apache::mod::prefork on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $maxclients
-  # - $minsparethreads
-  # - $maxsparethreads
-  # - $threadsperchild
-  # - $maxrequestsperchild
-  # - $serverlimit
-  # - $threadLimit
-  file { "${::apache::mod_dir}/worker.conf":
-    ensure  => file,
-    content => template('apache/mod/worker.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'worker':
-          apache_version => $apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd worker enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => 'HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Service['httpd'],
-        }
-      }
-    }
-    'debian', 'freebsd': {
-      ::apache::mpm{ 'worker':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
deleted file mode 100644
index 244a3458b43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class apache::mod::wsgi (
-  $wsgi_socket_prefix = undef,
-  $wsgi_python_path   = undef,
-  $wsgi_python_home   = undef,
-){
-  ::apache::mod { 'wsgi': }
-
-  # Template uses:
-  # - $wsgi_socket_prefix
-  # - $wsgi_python_path
-  # - $wsgi_python_home
-  file {'wsgi.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/wsgi.conf",
-    content => template('apache/mod/wsgi.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
deleted file mode 100644
index 7c5e88437a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::xsendfile {
-  include ::apache::params
-  ::apache::mod { 'xsendfile': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
deleted file mode 100644
index 6437016ba7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
+++ /dev/null
@@ -1,68 +0,0 @@
-define apache::mpm (
-  $lib_path       = $::apache::params::lib_path,
-  $apache_version = $::apache::apache_version,
-) {
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $mpm     = $name
-  $mod_dir = $::apache::mod_dir
-
-  $_lib  = "mod_mpm_${mpm}.so"
-  $_path = "${lib_path}/${_lib}"
-  $_id   = "mpm_${mpm}_module"
-
-  if versioncmp($apache_version, '2.4') >= 0 {
-    file { "${mod_dir}/${mpm}.load":
-      ensure  => file,
-      path    => "${mod_dir}/${mpm}.load",
-      content => "LoadModule ${_id} ${_path}\n",
-      require => [
-        Package['httpd'],
-        Exec["mkdir ${mod_dir}"],
-      ],
-      before  => File[$mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-
-  case $::osfamily {
-    'debian': {
-      file { "${::apache::mod_enable_dir}/${mpm}.conf":
-        ensure  => link,
-        target  => "${::apache::mod_dir}/${mpm}.conf",
-        require => Exec["mkdir ${::apache::mod_enable_dir}"],
-        before  => File[$::apache::mod_enable_dir],
-        notify  => Service['httpd'],
-      }
-
-      if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${::apache::mod_enable_dir}/${mpm}.load":
-          ensure  => link,
-          target  => "${::apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${::apache::mod_enable_dir}"],
-          before  => File[$::apache::mod_enable_dir],
-          notify  => Service['httpd'],
-        }
-      }
-
-      if versioncmp($apache_version, '2.4') < 0 {
-        package { "apache2-mpm-${mpm}":
-          ensure => present,
-        }
-      }
-    }
-    'freebsd': {
-      class { '::apache::package':
-        mpm_module => $mpm
-      }
-    }
-    'redhat': {
-      # so we don't fail
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
deleted file mode 100644
index f8c3a80d859..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-define apache::namevirtualhost {
-  $addr_port = $name
-
-  # Template uses: $addr_port
-  concat::fragment { "NameVirtualHost ${addr_port}":
-    ensure  => present,
-    target  => $::apache::ports_file,
-    content => template('apache/namevirtualhost.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
deleted file mode 100644
index a4e4015c527..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-class apache::package (
-  $ensure     = 'present',
-  $mpm_module = $::apache::params::mpm_module,
-) inherits ::apache::params {
-  case $::osfamily {
-    'freebsd' : {
-      $all_mpms = [
-        'www/apache22',
-        'www/apache22-worker-mpm',
-        'www/apache22-event-mpm',
-        'www/apache22-itk-mpm',
-        'www/apache22-peruser-mpm',
-      ]
-      if $mpm_module {
-        $apache_package = $mpm_module ? {
-          'prefork' => 'www/apache22',
-          default   => "www/apache22-${mpm_module}-mpm"
-        }
-      } else {
-        $apache_package = 'www/apache22'
-      }
-      $other_mpms = delete($all_mpms, $apache_package)
-      # Configure ports to have apache module packages dependent on correct
-      # version of apache package (apache22, apache22-worker-mpm, ...)
-      file_line { 'APACHE_PORT in /etc/make.conf':
-        ensure => $ensure,
-        path   => '/etc/make.conf',
-        line   => "APACHE_PORT=${apache_package}",
-        match  => '^\s*#?\s*APACHE_PORT\s*=\s*',
-        before => Package['httpd'],
-      }
-      # remove other packages
-      ensure_resource('package', $other_mpms, {
-        ensure  => absent,
-        before  => Package['httpd'],
-        require => File_line['APACHE_PORT in /etc/make.conf'],
-      })
-    }
-    default: {
-      $apache_package = $::apache::params::apache_name
-    }
-  }
-  package { 'httpd':
-    ensure => $ensure,
-    name   => $apache_package,
-    notify => Class['Apache::Service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
deleted file mode 100644
index d272afb319c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
+++ /dev/null
@@ -1,258 +0,0 @@
-# Class: apache::params
-#
-# This class manages Apache parameters
-#
-# Parameters:
-# - The $user that Apache runs as
-# - The $group that Apache runs as
-# - The $apache_name is the name of the package and service on the relevant
-#   distribution
-# - The $php_package is the name of the package that provided PHP
-# - The $ssl_package is the name of the Apache SSL package
-# - The $apache_dev is the name of the Apache development libraries package
-# - The $conf_contents is the contents of the Apache configuration file
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::params inherits ::apache::version {
-  if($::fqdn) {
-    $servername = $::fqdn
-  } else {
-    $servername = $::hostname
-  }
-
-  # The default error log level
-  $log_level = 'warn'
-
-  if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
-    $user                 = 'apache'
-    $group                = 'apache'
-    $root_group           = 'root'
-    $apache_name          = 'httpd'
-    $service_name         = 'httpd'
-    $httpd_dir            = '/etc/httpd'
-    $server_root          = '/etc/httpd'
-    $conf_dir             = "${httpd_dir}/conf"
-    $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = "${httpd_dir}/conf.d"
-    $mod_enable_dir       = undef
-    $vhost_dir            = "${httpd_dir}/conf.d"
-    $vhost_enable_dir     = undef
-    $conf_file            = 'httpd.conf'
-    $ports_file           = "${conf_dir}/ports.conf"
-    $logroot              = '/var/log/httpd'
-    $lib_path             = 'modules'
-    $mpm_module           = 'prefork'
-    $dev_packages         = 'httpd-devel'
-    $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
-    $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
-    $ssl_certs_dir        = '/etc/pki/tls/certs'
-    $passenger_conf_file  = 'passenger_extra.conf'
-    $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root       = undef
-    $passenger_ruby       = undef
-    $passenger_default_ruby = undef
-    $suphp_addhandler     = 'php5-script'
-    $suphp_engine         = 'off'
-    $suphp_configpath     = undef
-    $mod_packages         = {
-      'auth_kerb'   => 'mod_auth_kerb',
-      'authnz_ldap' => 'mod_authz_ldap',
-      'fastcgi'     => 'mod_fastcgi',
-      'fcgid'       => 'mod_fcgid',
-      'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'mod_passenger',
-      'perl'        => 'mod_perl',
-      'php5'        => $::apache::version::distrelease ? {
-        '5'     => 'php53',
-        default => 'php',
-      },
-      'proxy_html'  => 'mod_proxy_html',
-      'python'      => 'mod_python',
-      'shibboleth'  => 'shibboleth',
-      'ssl'         => 'mod_ssl',
-      'wsgi'        => 'mod_wsgi',
-      'dav_svn'     => 'mod_dav_svn',
-      'suphp'       => 'mod_suphp',
-      'xsendfile'   => 'mod_xsendfile',
-      'nss'         => 'mod_nss',
-    }
-    $mod_libs             = {
-      'php5' => 'libphp5.so',
-      'nss'  => 'libmodnss.so',
-    }
-    $conf_template        = 'apache/httpd.conf.erb'
-    $keepalive            = 'Off'
-    $keepalive_timeout    = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
-    $mime_support_package = 'mailcap'
-    $mime_types_config    = '/etc/mime.types'
-  } elsif $::osfamily == 'Debian' {
-    $user                = 'www-data'
-    $group               = 'www-data'
-    $root_group          = 'root'
-    $apache_name         = 'apache2'
-    $service_name        = 'apache2'
-    $httpd_dir           = '/etc/apache2'
-    $server_root         = '/etc/apache2'
-    $conf_dir            = $httpd_dir
-    $confd_dir           = "${httpd_dir}/conf.d"
-    $mod_dir             = "${httpd_dir}/mods-available"
-    $mod_enable_dir      = "${httpd_dir}/mods-enabled"
-    $vhost_dir           = "${httpd_dir}/sites-available"
-    $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
-    $conf_file           = 'apache2.conf'
-    $ports_file          = "${conf_dir}/ports.conf"
-    $logroot             = '/var/log/apache2'
-    $lib_path            = '/usr/lib/apache2/modules'
-    $mpm_module          = 'worker'
-    $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-    $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-    $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
-    $ssl_certs_dir       = '/etc/ssl/certs'
-    $suphp_addhandler    = 'x-httpd-php'
-    $suphp_engine        = 'off'
-    $suphp_configpath    = '/etc/php5/apache2'
-    $mod_packages        = {
-      'auth_kerb'   => 'libapache2-mod-auth-kerb',
-      'dav_svn'     => 'libapache2-svn',
-      'fastcgi'     => 'libapache2-mod-fastcgi',
-      'fcgid'       => 'libapache2-mod-fcgid',
-      'nss'         => 'libapache2-mod-nss',
-      'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'libapache2-mod-passenger',
-      'perl'        => 'libapache2-mod-perl2',
-      'php5'        => 'libapache2-mod-php5',
-      'proxy_html'  => 'libapache2-mod-proxy-html',
-      'python'      => 'libapache2-mod-python',
-      'rpaf'        => 'libapache2-mod-rpaf',
-      'suphp'       => 'libapache2-mod-suphp',
-      'wsgi'        => 'libapache2-mod-wsgi',
-      'xsendfile'   => 'libapache2-mod-xsendfile',
-    }
-    $mod_libs             = {
-      'php5' => 'libphp5.so',
-    }
-    $conf_template          = 'apache/httpd.conf.erb'
-    $keepalive              = 'Off'
-    $keepalive_timeout      = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
-    $mime_support_package = 'mime-support'
-    $mime_types_config    = '/etc/mime.types'
-
-    #
-    # Passenger-specific settings
-    #
-
-    $passenger_conf_file         = 'passenger.conf'
-    $passenger_conf_package_file = undef
-
-    case $::operatingsystem {
-      'Ubuntu': {
-        case $::lsbdistrelease {
-          '12.04': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          '14.04': {
-            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-            $passenger_ruby         = undef
-            $passenger_default_ruby = '/usr/bin/ruby'
-          }
-          default: {
-            # The following settings may or may not work on Ubuntu releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
-      'Debian': {
-        case $::lsbdistcodename {
-          'wheezy': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          default: {
-            # The following settings may or may not work on Debian releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
-    }
-  } elsif $::osfamily == 'FreeBSD' {
-    $user             = 'www'
-    $group            = 'www'
-    $root_group       = 'wheel'
-    $apache_name      = 'apache22'
-    $service_name     = 'apache22'
-    $httpd_dir        = '/usr/local/etc/apache22'
-    $server_root      = '/usr/local'
-    $conf_dir         = $httpd_dir
-    $confd_dir        = "${httpd_dir}/Includes"
-    $mod_dir          = "${httpd_dir}/Modules"
-    $mod_enable_dir   = undef
-    $vhost_dir        = "${httpd_dir}/Vhosts"
-    $vhost_enable_dir = undef
-    $conf_file        = 'httpd.conf'
-    $ports_file       = "${conf_dir}/ports.conf"
-    $logroot          = '/var/log/apache22'
-    $lib_path         = '/usr/local/libexec/apache22'
-    $mpm_module       = 'prefork'
-    $dev_packages     = undef
-    $default_ssl_cert = '/usr/local/etc/apache22/server.crt'
-    $default_ssl_key  = '/usr/local/etc/apache22/server.key'
-    $ssl_certs_dir    = '/usr/local/etc/apache22'
-    $passenger_conf_file = 'passenger.conf'
-    $passenger_conf_package_file = undef
-    $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
-    $passenger_ruby   = '/usr/bin/ruby'
-    $passenger_default_ruby = undef
-    $suphp_addhandler = 'php5-script'
-    $suphp_engine     = 'off'
-    $suphp_configpath = undef
-    $mod_packages     = {
-      # NOTE: I list here only modules that are not included in www/apache22
-      # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config
-      # NOTE: 'php' needs to enable APACHE option in make config
-      # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
-      # NOTE: not sure where the shibboleth should come from
-      # NOTE: don't know where the shibboleth module should come from
-      'auth_kerb'  => 'www/mod_auth_kerb2',
-      'fcgid'      => 'www/mod_fcgid',
-      'passenger'  => 'www/rubygem-passenger',
-      'perl'       => 'www/mod_perl2',
-      'php5'       => 'lang/php5',
-      'proxy_html' => 'www/mod_proxy_html',
-      'python'     => 'www/mod_python3',
-      'wsgi'       => 'www/mod_wsgi',
-      'dav_svn'    => 'devel/subversion',
-      'xsendfile'  => 'www/mod_xsendfile',
-      'rpaf'       => 'www/mod_rpaf2'
-    }
-    $mod_libs         = {
-      'php5' => 'libphp5.so',
-    }
-    $conf_template        = 'apache/httpd.conf.erb'
-    $keepalive            = 'Off'
-    $keepalive_timeout    = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
-    $mime_support_package = 'misc/mime-support'
-    $mime_types_config    = '/usr/local/etc/mime.types'
-  } else {
-    fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
deleted file mode 100644
index 9e57ac30b2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-define apache::peruser::multiplexer (
-  $user = $::apache::user,
-  $group = $::apache::group,
-  $file = undef,
-) {
-  if ! $file {
-    $filename = "${name}.conf"
-  } else {
-    $filename = $file
-  }
-  file { "${::apache::mod_dir}/peruser/multiplexers/${filename}":
-    ensure  => file,
-    content => "Multiplexer ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/multiplexers"],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
deleted file mode 100644
index 1d68934657e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-define apache::peruser::processor (
-  $user,
-  $group,
-  $file = undef,
-) {
-  if ! $file {
-    $filename = "${name}.conf"
-  } else {
-    $filename = $file
-  }
-  file { "${::apache::mod_dir}/peruser/processors/${filename}":
-    ensure  => file,
-    content => "Processor ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/processors"],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
deleted file mode 100644
index 9fa9c682e23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::php
-#
-# This class installs PHP for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache PHP package
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::php {
-  warning('apache::php is deprecated; please use apache::mod::php')
-  include ::apache::mod::php
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
deleted file mode 100644
index 050f36c278a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# Class: apache::proxy
-#
-# This class enabled the proxy module for Apache
-#
-# Actions:
-#   - Enables Apache Proxy module
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::proxy {
-  warning('apache::proxy is deprecated; please use apache::mod::proxy')
-  include ::apache::mod::proxy
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
deleted file mode 100644
index 723a753f82c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::python
-#
-# This class installs Python for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache Python package
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::python {
-  warning('apache::python is deprecated; please use apache::mod::python')
-  include ::apache::mod::python
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
deleted file mode 100644
index 0c1f7b96aa2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Class: apache::service
-#
-# Manages the Apache daemon
-#
-# Parameters:
-#
-# Actions:
-#   - Manage Apache service
-#
-# Requires:
-#
-# Sample Usage:
-#
-#    sometype { 'foo':
-#      notify => Class['apache::service'],
-#    }
-#
-#
-class apache::service (
-  $service_name   = $::apache::params::service_name,
-  $service_enable = true,
-  $service_ensure = 'running',
-) {
-  # The base class must be included first because parameter defaults depend on it
-  if ! defined(Class['apache::params']) {
-    fail('You must include the apache::params class before using any apache defined resources')
-  }
-  validate_bool($service_enable)
-
-  case $service_ensure {
-    true, false, 'running', 'stopped': {
-      $_service_ensure = $service_ensure
-    }
-    default: {
-      $_service_ensure = undef
-    }
-  }
-
-  service { 'httpd':
-    ensure => $_service_ensure,
-    name   => $service_name,
-    enable => $service_enable,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
deleted file mode 100644
index d0b36593d63..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::ssl
-#
-# This class installs Apache SSL capabilities
-#
-# Parameters:
-# - The $ssl_package name from the apache::params class
-#
-# Actions:
-#   - Install Apache SSL capabilities
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::ssl {
-  warning('apache::ssl is deprecated; please use apache::mod::ssl')
-  include ::apache::mod::ssl
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
deleted file mode 100644
index a8592d5e958..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Class: apache::version
-#
-# Try to automatically detect the version by OS
-#
-class apache::version {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
-  $osr_array = split($::operatingsystemrelease,'[\/\.]')
-  $distrelease = $osr_array[0]
-  if ! $distrelease {
-    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
-  }
-
-  case $::osfamily {
-    'RedHat': {
-      if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    'FreeBSD': {
-      $default = '2.2'
-    }
-    default: {
-      fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
deleted file mode 100644
index 40edad7e21d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
+++ /dev/null
@@ -1,560 +0,0 @@
-# Definition: apache::vhost
-#
-# This class installs Apache Virtual Hosts
-#
-# Parameters:
-# - The $port to configure the host on
-# - The $docroot provides the DocumentRoot variable
-# - The $virtual_docroot provides VirtualDocumentationRoot variable
-# - The $serveradmin will specify an email address for Apache that it will
-#   display when it renders one of it's error pages
-# - The $ssl option is set true or false to enable SSL for this Virtual Host
-# - The $priority of the site
-# - The $servername is the primary name of the virtual host
-# - The $serveraliases of the site
-# - The $ip to configure the host on, defaulting to *
-# - The $options for the given vhost
-# - The $override for the given vhost (list of AllowOverride arguments)
-# - The $vhost_name for name based virtualhosting, defaulting to *
-# - The $logroot specifies the location of the virtual hosts logfiles, default
-#   to /var/log/<apache log location>/
-# - The $log_level specifies the verbosity of the error log for this vhost. Not
-#   set by default for the vhost, instead the global server configuration default
-#   of 'warn' is used.
-# - The $access_log specifies if *_access.log directives should be configured.
-# - The $ensure specifies if vhost file is present or absent.
-# - The $headers is a list of Header statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-# - The $request_headers is a list of RequestHeader statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-# - $aliases is a list of Alias hashes for mod_alias as per http://httpd.apache.org/docs/current/mod/mod_alias.html
-#   each statement is a hash in the form of { alias => '/alias', path => '/real/path/to/directory' }
-# - $directories is a lost of hashes for creating <Directory> statements as per http://httpd.apache.org/docs/2.2/mod/core.html#directory
-#   each statement is a hash in the form of { path => '/path/to/directory', <directive> => <value>}
-#   see README.md for list of supported directives.
-#
-# Actions:
-# - Install Apache Virtual Hosts
-#
-# Requires:
-# - The apache class
-#
-# Sample Usage:
-#
-#  # Simple vhost definition:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#  }
-#
-#  # Multiple Mod Rewrites:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#    rewrites => [
-#      {
-#        comment       => 'force www domain',
-#        rewrite_cond => ['%{HTTP_HOST} ^([a-z.]+)?example.com$ [NC]', '%{HTTP_HOST} !^www. [NC]'],
-#        rewrite_rule => ['.? http://www.%1example.com%{REQUEST_URI} [R=301,L]']
-#      },
-#      {
-#        comment       => 'prevent image hotlinking',
-#        rewrite_cond => ['%{HTTP_REFERER} !^$', '%{HTTP_REFERER} !^http://(www.)?example.com/ [NC]'],
-#        rewrite_rule => ['.(gif|jpg|png)$ - [F]']
-#      },
-#    ]
-#  }
-#
-#  # SSL vhost with non-SSL rewrite:
-#  apache::vhost { 'site.name.fqdn':
-#    port    => '443',
-#    ssl     => true,
-#    docroot => '/path/to/docroot',
-#  }
-#  apache::vhost { 'site.name.fqdn':
-#    port            => '80',
-#    docroot         => '/path/to/other_docroot',
-#    custom_fragment => template("${module_name}/my_fragment.erb"),
-#  }
-#
-define apache::vhost(
-    $docroot,
-    $virtual_docroot             = false,
-    $port                        = undef,
-    $ip                          = undef,
-    $ip_based                    = false,
-    $add_listen                  = true,
-    $docroot_owner               = 'root',
-    $docroot_group               = $::apache::params::root_group,
-    $docroot_mode                = undef,
-    $serveradmin                 = undef,
-    $ssl                         = false,
-    $ssl_cert                    = $::apache::default_ssl_cert,
-    $ssl_key                     = $::apache::default_ssl_key,
-    $ssl_chain                   = $::apache::default_ssl_chain,
-    $ssl_ca                      = $::apache::default_ssl_ca,
-    $ssl_crl_path                = $::apache::default_ssl_crl_path,
-    $ssl_crl                     = $::apache::default_ssl_crl,
-    $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
-    $ssl_protocol                = undef,
-    $ssl_cipher                  = undef,
-    $ssl_honorcipherorder        = undef,
-    $ssl_verify_client           = undef,
-    $ssl_verify_depth            = undef,
-    $ssl_options                 = undef,
-    $ssl_proxyengine             = false,
-    $priority                    = undef,
-    $default_vhost               = false,
-    $servername                  = $name,
-    $serveraliases               = [],
-    $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-    $override                    = ['None'],
-    $directoryindex              = '',
-    $vhost_name                  = '*',
-    $logroot                     = $::apache::logroot,
-    $log_level                   = undef,
-    $access_log                  = true,
-    $access_log_file             = undef,
-    $access_log_pipe             = undef,
-    $access_log_syslog           = undef,
-    $access_log_format           = undef,
-    $access_log_env_var          = undef,
-    $aliases                     = undef,
-    $directories                 = undef,
-    $error_log                   = true,
-    $error_log_file              = undef,
-    $error_log_pipe              = undef,
-    $error_log_syslog            = undef,
-    $error_documents             = [],
-    $fallbackresource            = undef,
-    $scriptalias                 = undef,
-    $scriptaliases               = [],
-    $proxy_dest                  = undef,
-    $proxy_pass                  = undef,
-    $suphp_addhandler            = $::apache::params::suphp_addhandler,
-    $suphp_engine                = $::apache::params::suphp_engine,
-    $suphp_configpath            = $::apache::params::suphp_configpath,
-    $php_admin_flags             = [],
-    $php_admin_values            = [],
-    $no_proxy_uris               = [],
-    $proxy_preserve_host         = false,
-    $redirect_source             = '/',
-    $redirect_dest               = undef,
-    $redirect_status             = undef,
-    $redirectmatch_status        = undef,
-    $redirectmatch_regexp        = undef,
-    $rack_base_uris              = undef,
-    $headers                     = undef,
-    $request_headers             = undef,
-    $rewrites                    = undef,
-    $rewrite_base                = undef,
-    $rewrite_rule                = undef,
-    $rewrite_cond                = undef,
-    $setenv                      = [],
-    $setenvif                    = [],
-    $block                       = [],
-    $ensure                      = 'present',
-    $wsgi_application_group      = undef,
-    $wsgi_daemon_process         = undef,
-    $wsgi_daemon_process_options = undef,
-    $wsgi_import_script          = undef,
-    $wsgi_import_script_options  = undef,
-    $wsgi_process_group          = undef,
-    $wsgi_script_aliases         = undef,
-    $wsgi_pass_authorization     = undef,
-    $custom_fragment             = undef,
-    $itk                         = undef,
-    $action                      = undef,
-    $fastcgi_server              = undef,
-    $fastcgi_socket              = undef,
-    $fastcgi_dir                 = undef,
-    $additional_includes         = [],
-    $apache_version              = $::apache::apache_version,
-    $suexec_user_group           = undef,
-  ) {
-  # The base class must be included first because it is used by parameter defaults
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $apache_name = $::apache::params::apache_name
-
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure.
-  Allowed values are 'present' and 'absent'.")
-  validate_re($suphp_engine, '^(on|off)$',
-  "${suphp_engine} is not supported for suphp_engine.
-  Allowed values are 'on' and 'off'.")
-  validate_bool($ip_based)
-  validate_bool($access_log)
-  validate_bool($error_log)
-  validate_bool($ssl)
-  validate_bool($default_vhost)
-  validate_bool($ssl_proxyengine)
-  if $rewrites {
-    validate_array($rewrites)
-    validate_hash($rewrites[0])
-  }
-
-  if $suexec_user_group {
-    validate_re($suexec_user_group, '^\w+ \w+$',
-    "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
-  }
-
-  # Deprecated backwards-compatibility
-  if $rewrite_base {
-    warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
-  }
-  if $rewrite_rule {
-    warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
-  }
-  if $rewrite_cond {
-    warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
-  }
-
-  if $wsgi_script_aliases {
-    validate_hash($wsgi_script_aliases)
-  }
-  if $wsgi_daemon_process_options {
-    validate_hash($wsgi_daemon_process_options)
-  }
-  if $wsgi_import_script_options {
-    validate_hash($wsgi_import_script_options)
-  }
-  if $itk {
-    validate_hash($itk)
-  }
-
-  if $log_level {
-    validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
-    "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
-  }
-
-  if $access_log_file and $access_log_pipe {
-    fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
-  }
-
-  if $error_log_file and $error_log_pipe {
-    fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time")
-  }
-
-  if $fallbackresource {
-    validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
-  }
-
-  if $ssl and $ensure == 'present' {
-    include ::apache::mod::ssl
-    # Required for the AddType lines.
-    include ::apache::mod::mime
-  }
-
-  if $virtual_docroot {
-    include ::apache::mod::vhost_alias
-  }
-
-  if $wsgi_daemon_process {
-    include ::apache::mod::wsgi
-  }
-
-  if $suexec_user_group {
-    include ::apache::mod::suexec
-  }
-
-  # This ensures that the docroot exists
-  # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) {
-    file { $docroot:
-      ensure  => directory,
-      owner   => $docroot_owner,
-      group   => $docroot_group,
-      mode    => $docroot_mode,
-      require => Package['httpd'],
-    }
-  }
-
-  # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
-    file { $logroot:
-      ensure  => directory,
-      require => Package['httpd'],
-    }
-  }
-
-
-  # Is apache::mod::passenger enabled (or apache::mod['passenger'])
-  $passenger_enabled = defined(Apache::Mod['passenger'])
-
-  # Define log file names
-  if $access_log_file {
-    $access_log_destination = "${logroot}/${access_log_file}"
-  } elsif $access_log_pipe {
-    $access_log_destination = $access_log_pipe
-  } elsif $access_log_syslog {
-    $access_log_destination = $access_log_syslog
-  } else {
-    if $ssl {
-      $access_log_destination = "${logroot}/${name}_access_ssl.log"
-    } else {
-      $access_log_destination = "${logroot}/${name}_access.log"
-    }
-  }
-
-  if $error_log_file {
-    $error_log_destination = "${logroot}/${error_log_file}"
-  } elsif $error_log_pipe {
-    $error_log_destination = $error_log_pipe
-  } elsif $error_log_syslog {
-    $error_log_destination = $error_log_syslog
-  } else {
-    if $ssl {
-      $error_log_destination = "${logroot}/${name}_error_ssl.log"
-    } else {
-      $error_log_destination = "${logroot}/${name}_error.log"
-    }
-  }
-
-  # Set access log format
-  if $access_log_format {
-    $_access_log_format = "\"${access_log_format}\""
-  } else {
-    $_access_log_format = 'combined'
-  }
-
-  if $access_log_env_var {
-    $_access_log_env_var = "env=${access_log_env_var}"
-  }
-
-  if $ip {
-    if $port {
-      $listen_addr_port = "${ip}:${port}"
-      $nvh_addr_port = "${ip}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $ip
-      if ! $servername and ! $ip_based {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
-      }
-    }
-  } else {
-    if $port {
-      $listen_addr_port = $port
-      $nvh_addr_port = "${vhost_name}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $name
-      if ! $servername {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
-      }
-    }
-  }
-  if $add_listen {
-    if $ip and defined(Apache::Listen[$port]) {
-      fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
-    }
-    if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { $listen_addr_port: }
-    }
-  }
-  if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
-      ::apache::namevirtualhost { $nvh_addr_port: }
-    }
-  }
-
-  # Load mod_rewrite if needed and not yet loaded
-  if $rewrites or $rewrite_cond {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include ::apache::mod::rewrite
-    }
-  }
-
-  # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
-    if ! defined(Class['apache::mod::alias']) {
-      include ::apache::mod::alias
-    }
-  }
-
-  # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass) {
-    if ! defined(Class['apache::mod::proxy']) {
-      include ::apache::mod::proxy
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      include ::apache::mod::proxy_http
-    }
-  }
-
-  # Load mod_passenger if needed and not yet loaded
-  if $rack_base_uris {
-    if ! defined(Class['apache::mod::passenger']) {
-      include ::apache::mod::passenger
-    }
-  }
-
-  # Load mod_fastci if needed and not yet loaded
-  if $fastcgi_server and $fastcgi_socket {
-    if ! defined(Class['apache::mod::fastcgi']) {
-      include ::apache::mod::fastcgi
-    }
-  }
-
-  # Configure the defaultness of a vhost
-  if $priority {
-    $priority_real = $priority
-  } elsif $default_vhost {
-    $priority_real = '10'
-  } else {
-    $priority_real = '25'
-  }
-
-  # Check if mod_headers is required to process $headers/$request_headers
-  if $headers or $request_headers {
-    if ! defined(Class['apache::mod::headers']) {
-      include ::apache::mod::headers
-    }
-  }
-
-  ## Apache include does not always work with spaces in the filename
-  $filename = regsubst($name, ' ', '_', 'G')
-
-  ## Create a default directory list if none defined
-  if $directories {
-    if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
-      fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
-    }
-    $_directories = $directories
-  } else {
-    $_directory = {
-      provider       => 'directory',
-      path           => $docroot,
-      options        => $options,
-      allow_override => $override,
-      directoryindex => $directoryindex,
-    }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      $_directory_version = {
-        require => 'all granted',
-      }
-    } else {
-      $_directory_version = {
-        order => 'allow,deny',
-        allow => 'from all',
-      }
-    }
-
-    $_directories = [ merge($_directory, $_directory_version) ]
-  }
-
-  # Template uses:
-  # - $nvh_addr_port
-  # - $servername
-  # - $serveradmin
-  # - $docroot
-  # - $virtual_docroot
-  # - $options
-  # - $override
-  # - $logroot
-  # - $name
-  # - $aliases
-  # - $_directories
-  # - $log_level
-  # - $access_log
-  # - $access_log_destination
-  # - $_access_log_format
-  # - $_access_log_env_var
-  # - $error_log
-  # - $error_log_destination
-  # - $error_documents
-  # - $fallbackresource
-  # - $custom_fragment
-  # - $additional_includes
-  # block fragment:
-  #   - $block
-  # directories fragment:
-  #   - $passenger_enabled
-  #   - $php_admin_flags
-  #   - $php_admin_values
-  #   - $directories (a list of key-value hashes is expected)
-  # fastcgi fragment:
-  #   - $fastcgi_server
-  #   - $fastcgi_socket
-  #   - $fastcgi_dir
-  # proxy fragment:
-  #   - $proxy_dest
-  #   - $no_proxy_uris
-  #   - $proxy_preserve_host (true to set ProxyPreserveHost to on and false to off
-  # rack fragment:
-  #   - $rack_base_uris
-  # redirect fragment:
-  #   - $redirect_source
-  #   - $redirect_dest
-  #   - $redirect_status
-  # header fragment
-  #   - $headers
-  # requestheader fragment:
-  #   - $request_headers
-  # rewrite fragment:
-  #   - $rewrites
-  # scriptalias fragment:
-  #   - $scriptalias
-  #   - $scriptaliases
-  #   - $ssl
-  # serveralias fragment:
-  #   - $serveraliases
-  # setenv fragment:
-  #   - $setenv
-  #   - $setenvif
-  # ssl fragment:
-  #   - $ssl
-  #   - $ssl_cert
-  #   - $ssl_key
-  #   - $ssl_chain
-  #   - $ssl_certs_dir
-  #   - $ssl_ca
-  #   - $ssl_crl
-  #   - $ssl_crl_path
-  #   - $ssl_verify_client
-  #   - $ssl_verify_depth
-  #   - $ssl_options
-  # suphp fragment:
-  #   - $suphp_addhandler
-  #   - $suphp_engine
-  #   - $suphp_configpath
-  # wsgi fragment:
-  #   - $wsgi_application_group
-  #   - $wsgi_daemon_process
-  #   - $wsgi_import_script
-  #   - $wsgi_process_group
-  #   - $wsgi_script_aliases
-  file { "${priority_real}-${filename}.conf":
-    ensure  => $ensure,
-    path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-    content => template('apache/vhost.conf.erb'),
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    require => [
-      Package['httpd'],
-      File[$docroot],
-      File[$logroot],
-    ],
-    notify  => Service['httpd'],
-  }
-  if $::osfamily == 'Debian' {
-    $vhost_enable_dir = $::apache::vhost_enable_dir
-    $vhost_symlink_ensure = $ensure ? {
-      present => link,
-      default => $ensure,
-    }
-    file{ "${priority_real}-${filename}.conf symlink":
-      ensure  => $vhost_symlink_ensure,
-      path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-      owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => '0644',
-      require => File["${priority_real}-${filename}.conf"],
-      notify  => Service['httpd'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
deleted file mode 100644
index 92663a43c49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "name": "puppetlabs-apache",
-    "version": "1.0.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-apache",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-    "summary": "Puppet module for Apache",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
deleted file mode 100644
index 4fa3bf6ec6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache parameters', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  # Currently this test only does something on FreeBSD.
-  describe 'default_confd_files => false' do
-    it 'doesnt do anything' do
-      pp = "class { 'apache': default_confd_files => false }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    if fact('osfamily') == 'FreeBSD'
-      describe file("#{confd_dir}/no-accf.conf.erb") do
-        it { should_not be_file }
-      end
-    end
-  end
-  describe 'default_confd_files => true' do
-    it 'copies conf.d files' do
-      pp = "class { 'apache': default_confd_files => true }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    if fact('osfamily') == 'FreeBSD'
-      describe file("#{$confd_dir}/no-accf.conf.erb") do
-        it { should be_file }
-      end
-    end
-  end
-
-  describe 'when set adds a listen statement' do
-    it 'applys cleanly' do
-      pp = "class { 'apache': ip => '10.1.1.1', service_ensure => stopped }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
-    end
-  end
-
-  describe 'service tests => true' do
-    it 'starts the service' do
-      pp = <<-EOS
-        class { 'apache':
-          service_enable => true,
-          service_ensure => running,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'service tests => false' do
-    it 'stops the service' do
-      pp = <<-EOS
-        class { 'apache':
-          service_enable => false,
-          service_ensure => stopped,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should_not be_running }
-      it { should_not be_enabled }
-    end
-  end
-
-  describe 'purge parameters => false' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          purge_configs => false,
-          purge_vdir    => false,
-        }
-      EOS
-      shell("touch #{$confd_dir}/test.conf")
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    # Ensure the file didn't disappear.
-    describe file("#{$confd_dir}/test.conf") do
-      it { should be_file }
-    end
-  end
-
-  if fact('osfamily') != 'Debian'
-    describe 'purge parameters => true' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            purge_configs => true,
-            purge_vdir    => true,
-          }
-        EOS
-        shell("touch #{$confd_dir}/test.conf")
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      # File should be gone
-      describe file("#{$confd_dir}/test.conf") do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  describe 'serveradmin' do
-    it 'applies cleanly' do
-      pp = "class { 'apache': serveradmin => 'test@example.com' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($vhost) do
-      it { should be_file }
-      it { should contain 'ServerAdmin test@example.com' }
-    end
-  end
-
-  describe 'sendfile' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': sendfile => 'On' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'EnableSendfile On' }
-    end
-
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': sendfile => 'Off' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Sendfile Off' }
-    end
-  end
-
-  describe 'error_documents' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': error_documents => true }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Alias /error/' }
-    end
-  end
-
-  describe 'timeout' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': timeout => '1234' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Timeout 1234' }
-    end
-  end
-
-  describe 'httpd_dir' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
-          include 'apache::mod::mime'
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file("#{$confd_dir}/mime.conf") do
-      it { should be_file }
-      it { should contain 'AddLanguage eo .eo' }
-    end
-  end
-
-  describe 'server_root' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': server_root => '/tmp/root', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerRoot "/tmp/root"' }
-    end
-  end
-
-  describe 'confd_dir' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    if $apache_version == '2.4'
-      describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'IncludeOptional "/tmp/root/*.conf"' }
-      end
-    else
-      describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'Include "/tmp/root/*.conf"' }
-      end
-    end
-  end
-
-  describe 'conf_template' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
-        shell("mkdir -p #{default['distmoduledir']}/another/templates")
-        shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb")
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'testcontent' }
-    end
-  end
-
-  describe 'servername' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': servername => 'test.server', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerName "test.server"' }
-    end
-  end
-
-  describe 'user' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            manage_user  => true,
-            manage_group => true,
-            user         => 'testweb',
-            group        => 'testweb',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe user('testweb') do
-      it { should exist }
-      it { should belong_to_group 'testweb' }
-    end
-
-    describe group('testweb') do
-      it { should exist }
-    end
-  end
-
-  describe 'logformats' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            log_formats => {
-              'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
-              'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
-            }
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
-    end
-  end
-
-
-  describe 'keepalive' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30', max_keepalive_requests => '200' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'KeepAlive On' }
-      it { should contain 'KeepAliveTimeout 30' }
-      it { should contain 'MaxKeepAliveRequests 200' }
-    end
-  end
-
-  describe 'logging' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::selinux == 'true' {
-            $semanage_package = $::operatingsystemmajrelease ? {
-              '5'       => 'policycoreutils',
-              'default' => 'policycoreutils-python',
-            }
-
-            package { $semanage_package: ensure => installed }
-            exec { 'set_apache_defaults':
-              command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
-              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              require => Package[$semanage_package],
-            }
-            exec { 'restorecon_apache':
-              command => 'restorecon -Rv /apache_spec',
-              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              before  => Service['httpd'],
-              require => Class['apache'],
-            }
-          }
-          file { '/apache_spec': ensure => directory, }
-          class { 'apache': logroot => '/apache_spec' }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file("/apache_spec/#{$error_log}") do
-      it { should be_file }
-    end
-  end
-
-  describe 'ports_file' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        file { '/apache_spec': ensure => directory, }
-        class { 'apache':
-          ports_file     => '/apache_spec/ports_file',
-          ip             => '10.1.1.1',
-          service_ensure => stopped
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/apache_spec/ports_file') do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
-    end
-  end
-
-  describe 'server_tokens' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          server_tokens  => 'Minor',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerTokens Minor' }
-    end
-  end
-
-  describe 'server_signature' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          server_signature  => 'testsig',
-          service_ensure    => stopped,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerSignature testsig' }
-    end
-  end
-
-  describe 'trace_enable' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          trace_enable  => 'Off',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'TraceEnable Off' }
-    end
-  end
-
-  describe 'package_ensure' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          package_ensure  => present,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package($package_name) do
-      it { should be_installed }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
deleted file mode 100644
index 649c02d8412..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  vhostd = '/etc/httpd/conf.d'
-when 'Debian'
-  vhostd = '/etc/apache2/sites-available'
-end
-
-describe 'apache ssl', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  describe 'ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
-        class { 'apache':
-          service_ensure       => stopped,
-          default_ssl_vhost    => true,
-          default_ssl_cert     => '/tmp/ssl_cert',
-          default_ssl_key      => '/tmp/ssl_key',
-          default_ssl_chain    => '/tmp/ssl_chain',
-          default_ssl_ca       => '/tmp/ssl_ca',
-          default_ssl_crl_path => '/tmp/ssl_crl_path',
-          default_ssl_crl      => '/tmp/ssl_crl',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{vhostd}/15-default-ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-    end
-  end
-
-  describe 'vhost ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
-        class { 'apache':
-          service_ensure       => stopped,
-        }
-
-        apache::vhost { 'test_ssl':
-          docroot              => '/tmp/test',
-          ssl                  => true,
-          ssl_cert             => '/tmp/ssl_cert',
-          ssl_key              => '/tmp/ssl_key',
-          ssl_chain            => '/tmp/ssl_chain',
-          ssl_ca               => '/tmp/ssl_ca',
-          ssl_crl_path         => '/tmp/ssl_crl_path',
-          ssl_crl              => '/tmp/ssl_crl',
-          ssl_certs_dir        => '/tmp',
-          ssl_protocol         => 'test',
-          ssl_cipher           => 'test',
-          ssl_honorcipherorder => 'test',
-          ssl_verify_client    => 'test',
-          ssl_verify_depth     => 'test',
-          ssl_options          => ['test', 'test1'],
-          ssl_proxyengine      => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{vhostd}/25-test_ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-      it { should contain 'SSLProxyEngine On' }
-      it { should contain 'SSLProtocol             test' }
-      it { should contain 'SSLCipherSuite          test' }
-      it { should contain 'SSLHonorCipherOrder     test' }
-      it { should contain 'SSLVerifyClient         test' }
-      it { should contain 'SSLVerifyDepth          test' }
-      it { should contain 'SSLOptions test test1' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
deleted file mode 100644
index 6c2b3f462fc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'disable selinux:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it "because otherwise apache won't work" do
-    apply_manifest(%{
-      exec { "setenforce 0":
-        path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-        onlyif => "which setenforce && getenforce | grep Enforcing",
-      }
-    }, :catch_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
deleted file mode 100644
index 830e3ed5b6c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'httpd'
-    service_name = 'httpd'
-  when 'Debian'
-    package_name = 'apache2'
-    service_name = 'apache2'
-  when 'FreeBSD'
-    package_name = 'apache22'
-    service_name = 'apache22'
-  end
-
-  context 'default parameters' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context 'custom site/mod dir parameters' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::selinux == 'true' {
-        $semanage_package = $::operatingsystemmajrelease ? {
-          '5'       => 'policycoreutils',
-          'default' => 'policycoreutils-python',
-        }
-
-        package { $semanage_package: ensure => installed }
-        exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package[$semanage_package],
-        }
-        exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
-        }
-      }
-      file { '/apache_spec': ensure => directory, }
-      file { '/apache_spec/apache_custom': ensure => directory, }
-      class { 'apache':
-        mod_dir   => '/apache_spec/apache_custom/mods',
-        vhost_dir => '/apache_spec/apache_custom/vhosts',
-      }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
deleted file mode 100644
index c7f87556051..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  mod_dir     = '/etc/httpd/conf.d'
-  servicename = 'httpd'
-when 'Debian'
-  mod_dir     = '/etc/apache2/mods-available'
-  servicename = 'apache2'
-when 'FreeBSD'
-  mod_dir     = '/usr/local/etc/apache22/Modules'
-  servicename = 'apache22'
-end
-
-describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'no default mods' do
-    # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => false,
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-  end
-
-  describe 'no default mods and failing' do
-    # Using puppet_apply as a helper
-    it 'should apply with errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => false,
-        }
-        apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
-          aliases => {
-            alias => '/css',
-            path  => '/var/www/css',
-          },
-          setenv  => 'TEST1 one',
-        }
-      EOS
-
-      apply_manifest(pp, { :expect_failures => true })
-    end
-
-    # Are these the same?
-    describe service(servicename) do
-      it { should_not be_running }
-    end
-    describe "service #{servicename}" do
-      it 'should not be running' do
-        shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
-      end
-    end
-  end
-
-  describe 'alternative default mods' do
-    # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => [
-            'info',
-            'alias',
-            'mime',
-            'env',
-            'expires',
-          ],
-        }
-        apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
-          aliases => {
-            alias => '/css',
-            path  => '/var/www/css',
-          },
-          setenv  => 'TEST1 one',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      shell('sleep 10')
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-  end
-
-  describe 'change loadfile name' do
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache': default_mods => false }
-        ::apache::mod { 'auth_basic': 
-          loadfile_name => 'zz_auth_basic.load',
-        }
-      EOS
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/zz_auth_basic.load") do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
deleted file mode 100644
index 86fc2c01ce5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'Debian'
-  service_name = 'apache2'
-when 'FreeBSD'
-  service_name = 'apache22'
-else
-  # Not implemented yet
-  service_name = :skip
-end
-
-describe 'apache::mod::itk class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or service_name.equal? :skip do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'itk',
-          }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(service_name) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
deleted file mode 100644
index 412b794540b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::dav_svn class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default dav_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::dav_svn
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/dav_svn.load") do
-      it { should contain "LoadModule dav_svn_module" }
-    end
-  end
-
-  context "dav_svn with enabled authz_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::dav_svn':
-            authz_svn_enabled => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/dav_svn_authz_svn.load") do
-      it { should contain "LoadModule authz_svn_module" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
deleted file mode 100644
index b2ffc1436a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::deflate class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default deflate config" do
-    it 'succeeds in puppeting deflate' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::deflate
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/deflate.conf") do
-      it { should contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
-      it { should contain "AddOutputFilterByType DEFLATE text/css" }
-      it { should contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
-      it { should contain "AddOutputFilterByType DEFLATE application/rss+xml" }
-      it { should contain "DeflateFilterNote Input instream" }
-      it { should contain "DeflateFilterNote Output outstream" }
-      it { should contain "DeflateFilterNote Ratio ratio" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
deleted file mode 100644
index 52f793be06d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    # Not implemented
-  when 'RedHat'
-    context "default fcgid config" do
-      it 'succeeds in puppeting fcgid' do
-        pp = <<-EOS
-          class { 'epel': } # mod_fcgid lives in epel
-          class { 'apache': }
-          class { 'apache::mod::php': } # For /usr/bin/php-cgi
-          class { 'apache::mod::fcgid':
-            options => {
-              'FcgidIPCDir'  => '/var/run/fcgidsock',
-            },
-          }
-          apache::vhost { 'fcgid.example.com':
-            port        => '80',
-            docroot     => '/var/www/fcgid',
-            directories => {
-              path        => '/var/www/fcgid',
-              options     => '+ExecCGI',
-              addhandlers => {
-                handler    => 'fcgid-script',
-                extensions => '.php',
-              },
-              fcgiwrapper => {
-                command => '/usr/bin/php-cgi',
-                suffix  => '.php',
-              }
-            },
-          }
-          file { '/var/www/fcgid/index.php':
-            ensure  => file,
-            owner   => 'root',
-            group   => 'root',
-            content => "<?php echo 'Hello world'; ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service('httpd') do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to fcgid.example.com' do
-        shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-          r.stdout.should =~ /^Hello world$/
-          r.exit_code.should == 0
-        end
-      end
-
-      it 'should run a php-cgi process' do
-        shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
deleted file mode 100644
index 71a7037a623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::mime class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default mime config" do
-    it 'succeeds in puppeting mime' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::mime
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/mime.conf") do
-      it { should contain "AddType application/x-compress .Z" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
deleted file mode 100644
index de59a347c11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::pagespeed class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default pagespeed config" do
-    it 'succeeds in puppeting pagespeed' do
-      pp= <<-EOS
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-
-          apt::source { 'mod-pagespeed':
-            key         => '7FAC5991',
-            key_server  => 'pgp.mit.edu',
-            location    => 'http://dl.google.com/linux/mod-pagespeed/deb/',
-            release     => 'stable',
-            repos       => 'main',
-            include_src => false,
-            before      => Class['apache'],
-          } 
-        } elsif $::osfamily == 'RedHat' {
-         yumrepo { 'mod-pagespeed':
-          baseurl  => 'http://dl.google.com/linux/mod-pagespeed/rpm/stable/x86_64',
-            enabled  => 1,
-            gpgcheck => 1,
-            gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
-            before   => Class['apache'],
-          }
-        }
-
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::pagespeed':
-          enable_filters  => ['remove_comments'],
-          disable_filters => ['extend_cache'],
-          forbid_filters  => ['rewrite_javascript'],
-        }
-        apache::vhost { 'pagespeed.example.com':
-          port    => '80',
-          docroot => '/var/www/pagespeed',
-        }
-        host { 'pagespeed.example.com': ip => '127.0.0.1', }
-        file { '/var/www/pagespeed/index.html':
-          ensure  => file,
-          content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/pagespeed.conf") do
-      it { should contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
-      it { should contain "ModPagespeedEnableFilters remove_comments" }
-      it { should contain "ModPagespeedDisableFilters extend_cache" }
-      it { should contain "ModPagespeedForbidFilters rewrite_javascript" }
-    end
-
-    it 'should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
-      shell("/usr/bin/curl pagespeed.example.com:80") do |r|
-        r.stdout.should =~ /<head\/>/
-        r.stdout.should_not =~ /<!-- comment -->/
-        r.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
deleted file mode 100644
index fbfac1672a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
+++ /dev/null
@@ -1,294 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::passenger class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    service_name = 'apache2'
-    mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
-
-    case fact('operatingsystem')
-    when 'Ubuntu'
-      case fact('lsbdistrelease')
-      when '10.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      when '12.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      when '14.04'
-        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_ruby         = '/usr/bin/ruby'
-        passenger_default_ruby = '/usr/bin/ruby'
-      else
-        # This may or may not work on Ubuntu releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    when 'Debian'
-      case fact('lsbdistcodename')
-      when 'wheezy'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      else
-        # This may or may not work on Debian releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    end
-
-    passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
-    rackapp_user = 'www-data'
-    rackapp_group = 'www-data'
-  when 'RedHat'
-    service_name = 'httpd'
-    mod_dir = '/etc/httpd/conf.d/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
-    # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
-    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
-    passenger_ruby = '/usr/bin/ruby'
-    passenger_tempdir = '/var/run/rubygem-passenger'
-    passenger_module_path = 'modules/mod_passenger.so'
-    rackapp_user = 'apache'
-    rackapp_group = 'apache'
-  end
-
-  pp_rackapp = <<-EOS
-          /* a simple ruby rack 'hellow world' app */
-          file { '/var/www/passenger':
-            ensure  => directory,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            require => Class['apache::mod::passenger'],
-          }
-          file { '/var/www/passenger/config.ru':
-            ensure  => file,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
-            require => File['/var/www/passenger'] ,
-          }
-          apache::vhost { 'passenger.example.com':
-            port    => '80',
-            docroot => '/var/www/passenger/public',
-            docroot_group => '#{rackapp_group}' ,
-            docroot_owner => '#{rackapp_user}' ,
-            custom_fragment => "PassengerRuby  #{passenger_ruby}\\nRailsEnv  development" ,
-            require => File['/var/www/passenger/config.ru'] ,
-          }
-          host { 'passenger.example.com': ip => '127.0.0.1', }
-  EOS
-
-  case fact('osfamily')
-  when 'Debian'
-    context "default passenger config" do
-      it 'succeeds in puppeting passenger' do
-        pp = <<-EOS
-          /* stock apache and mod_passenger */
-          class { 'apache': }
-          class { 'apache::mod::passenger': }
-          #{pp_rackapp}
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service(service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      describe file(conf_file) do
-        it { should contain "PassengerRoot \"#{passenger_root}\"" }
-
-        case fact('operatingsystem')
-        when 'Ubuntu'
-          case fact('lsbdistrelease')
-          when '10.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          when '12.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          when '14.04'
-            it { should contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerRuby/" }
-          else
-            # This may or may not work on Ubuntu releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          end
-        when 'Debian'
-          case fact('lsbdistcodename')
-          when 'wheezy'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          else
-            # This may or may not work on Debian releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          end
-        end
-      end
-
-      describe file(load_file) do
-        it { should contain "LoadModule passenger_module #{passenger_module_path}" }
-      end
-
-      it 'should output status via passenger-memory-stats' do
-        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
-          r.stdout.should =~ /Apache processes/
-          r.stdout.should =~ /Nginx processes/
-          r.stdout.should =~ /Passenger processes/
-
-          # passenger-memory-stats output on Ubuntu 14.04 does not contain
-          # these two lines
-          unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
-          end
-
-          r.exit_code.should == 0
-        end
-      end
-
-      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
-      # even when the passenger process is successfully installed and running
-      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-        it 'should output status via passenger-status' do
-          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("sudo /usr/sbin/passenger-status") do |r|
-            # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-              r.stdout.should =~ /Max pool size[ ]+: [0-9]+/
-              r.stdout.should =~ /Processes[ ]+: [0-9]+/
-              r.stdout.should =~ /Requests in top-level queue[ ]+: [0-9]+/
-            else
-              r.stdout.should =~ /max[ ]+= [0-9]+/
-              r.stdout.should =~ /count[ ]+= [0-9]+/
-              r.stdout.should =~ /active[ ]+= [0-9]+/
-              r.stdout.should =~ /inactive[ ]+= [0-9]+/
-              r.stdout.should =~ /Waiting on global queue: [0-9]+/
-            end
-
-            r.exit_code.should == 0
-          end
-        end
-      end
-
-      it 'should answer to passenger.example.com' do
-        shell("/usr/bin/curl passenger.example.com:80") do |r|
-          r.stdout.should =~ /^hello <b>world<\/b>$/
-          r.exit_code.should == 0
-        end
-      end
-
-    end
-
-  when 'RedHat'
-    # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
-    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
-
-      context "default passenger config" do
-        it 'succeeds in puppeting passenger' do
-          pp = <<-EOS
-            /* EPEL and passenger repositories */
-            class { 'epel': }
-            exec { 'passenger.repo GPG key':
-              command => '/usr/bin/sudo /usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-            }
-            file { 'passenger.repo GPG key':
-              ensure  => file,
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => Exec['passenger.repo GPG key'],
-            }
-            epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => [
-                Class['epel'],
-                File['passenger.repo GPG key'],
-              ]
-            }
-            yumrepo { 'passenger':
-              baseurl         => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch' ,
-              descr           => 'Red Hat Enterprise $releasever - Phusion Passenger',
-              enabled         => 1,
-              gpgcheck        => 1,
-              gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-              require => [
-                Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
-              ],
-            }
-            /* apache and mod_passenger */
-            class { 'apache':
-                require => [
-                  Class['epel'],
-              ],
-            }
-            class { 'apache::mod::passenger':
-              require => [
-                Yumrepo['passenger']
-              ],
-            }
-            #{pp_rackapp}
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe service(service_name) do
-          it { should be_enabled }
-          it { should be_running }
-        end
-
-        describe file(conf_file) do
-          it { should contain "PassengerRoot #{passenger_root}" }
-          it { should contain "PassengerRuby #{passenger_ruby}" }
-          it { should contain "PassengerTempDir #{passenger_tempdir}" }
-        end
-
-        describe file(load_file) do
-          it { should contain "LoadModule passenger_module #{passenger_module_path}" }
-        end
-
-        it 'should output status via passenger-memory-stats' do
-          shell("sudo /usr/bin/passenger-memory-stats") do |r|
-            r.stdout.should =~ /Apache processes/
-            r.stdout.should =~ /Nginx processes/
-            r.stdout.should =~ /Passenger processes/
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
-
-            r.exit_code.should == 0
-          end
-        end
-
-        it 'should output status via passenger-status' do
-          shell("sudo PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
-            # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            r.stdout.should =~ /max[ ]+= [0-9]+/
-            r.stdout.should =~ /count[ ]+= [0-9]+/
-            r.stdout.should =~ /active[ ]+= [0-9]+/
-            r.stdout.should =~ /inactive[ ]+= [0-9]+/
-            r.stdout.should =~ /Waiting on global queue: [0-9]+/
-
-            r.exit_code.should == 0
-          end
-        end
-
-        it 'should answer to passenger.example.com' do
-          shell("/usr/bin/curl passenger.example.com:80") do |r|
-            r.stdout.should =~ /^hello <b>world<\/b>$/
-            r.exit_code.should == 0
-          end
-        end
-      end
-
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
deleted file mode 100644
index ca21fbcd7e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::php class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default php config" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php': }
-        apache::vhost { 'php.example.com':
-          port    => '80',
-          docroot => '/var/www/php',
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "DirectoryIndex index.php" }
-    end
-
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /PHP Version/
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  context "custom extensions, php_admin_flag, and php_admin_value" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php':
-          extensions => ['.php','.php5'],
-        }
-        apache::vhost { 'php.example.com':
-          port             => '80',
-          docroot          => '/var/www/php',
-          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-          php_admin_flags  => { 'engine' => 'on', },
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php5':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{vhost_dir}/25-php.example.com.conf") do
-      it { should contain "  php_admin_flag engine on" }
-      it { should contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
-    end
-
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /\/usr\/share\/pear\//
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  context "provide custom config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
-    end
-  end
-
-  context "provide content and template config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content  => '# somecontent',
-          template => 'apache/mod/php5.conf.erb',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
-    end
-  end
-
-  context "provide source has priority over content" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-          source  => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
-  context "provide source has priority over template" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          template => 'apache/mod/php5.conf.erb',
-          source   => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
deleted file mode 100644
index f015f999416..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::proxy_html class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    service_name = 'apache2'
-  when 'RedHat'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    service_name = 'apache22'
-  end
-
-  context "default proxy_html config" do
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
-      it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    it 'succeeds in puppeting proxy_html' do
-      pp= <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::proxy': }
-        class { 'apache::mod::proxy_http': }
-        # mod_proxy_html doesn't exist in RHEL5
-        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' {
-          class { 'apache::mod::proxy_html': }
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
deleted file mode 100644
index 9e26731d618..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    context "default suphp config" do
-      it 'succeeds in puppeting suphp' do
-        pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php': }
-          class { 'apache::mod::suphp': }
-          apache::vhost { 'suphp.example.com':
-            port    => '80',
-            docroot => '/var/www/suphp',
-          }
-          host { 'suphp.example.com': ip => '127.0.0.1', }
-          file { '/var/www/suphp/index.php':
-            ensure  => file,
-            owner   => 'daemon',
-            group   => 'daemon',
-            content => "<?php echo get_current_user(); ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service('apache2') do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to suphp.example.com' do
-        shell("/usr/bin/curl suphp.example.com:80") do |r|
-          r.stdout.should =~ /^daemon$/
-          r.exit_code.should == 0
-        end
-      end
-    end
-  when 'RedHat'
-    # Not implemented yet
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index cde1fe5a85b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index e408d1be779..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index ac763497368..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index e642e099254..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index cbbbfb2cc62..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
deleted file mode 100644
index a38902d8971..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-i386:
-    roles:
-      - master
-    platform: debian-7-i386
-    box : debian-73-i386-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index f9cf0c9b8a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 086cae995c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index a9f01d5f423..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index c1b8bdf8fa9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index f7df2ccce12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
deleted file mode 100644
index f4b2366f3bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1310-x64:
-    roles:
-      - master
-    platform: ubuntu-13.10-amd64
-    box : ubuntu-server-1310-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index cba1cd04c25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
deleted file mode 100644
index beffe0a014b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  servicename = 'httpd'
-when 'Debian'
-  servicename = 'apache2'
-when 'FreeBSD'
-  servicename = 'apache22'
-end
-
-case fact('osfamily')
-when 'FreeBSD'
-  describe 'apache::mod::event class' do
-    describe 'running puppet code' do
-      # Using puppet_apply as a helper
-      it 'should work with no errors' do
-        pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'event',
-          }
-        EOS
-
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      end
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-end
-
-describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'worker',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
-
-describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
deleted file mode 100644
index b51ca386f0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'adding dependencies in between the base class and service class' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
-      file { '/tmp/test':
-        require => Class['apache'],
-        notify  => Class['apache::service'],
-      }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 085845dbfc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail' do
-    pp = <<-EOS
-      class { 'apache': }
-      apache::vhost { 'test.lan':
-        docroot => '/var/www',
-      }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
deleted file mode 100644
index 27498354b48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-_osfamily               = fact('osfamily')
-_operatingsystem        = fact('operatingsystem')
-_operatingsystemrelease = fact('operatingsystemrelease').to_f
-
-case _osfamily
-when 'RedHat'
-  $confd_dir        = '/etc/httpd/conf.d'
-  $conf_file        = '/etc/httpd/conf/httpd.conf'
-  $ports_file       = '/etc/httpd/conf/ports.conf'
-  $vhost_dir        = '/etc/httpd/conf.d'
-  $vhost            = '/etc/httpd/conf.d/15-default.conf'
-  $run_dir          = '/var/run/httpd'
-  $service_name     = 'httpd'
-  $package_name     = 'httpd'
-  $error_log        = 'error_log'
-  $suphp_handler    = 'php5-script'
-  $suphp_configpath = 'undef'
-
-  if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
-    $apache_version = '2.4'
-  else
-    $apache_version = '2.2'
-  end
-when 'Debian'
-  $confd_dir        = '/etc/apache2/mods-available'
-  $conf_file        = '/etc/apache2/apache2.conf'
-  $ports_file       = '/etc/apache2/ports.conf'
-  $vhost            = '/etc/apache2/sites-available/15-default.conf'
-  $vhost_dir        = '/etc/apache2/sites-enabled'
-  $run_dir          = '/var/run/apache2'
-  $service_name     = 'apache2'
-  $package_name     = 'apache2'
-  $error_log        = 'error.log'
-  $suphp_handler    = 'x-httpd-php'
-  $suphp_configpath = '/etc/php5/apache2'
-
-  if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
-    $apache_version = '2.4'
-  else
-    $apache_version = '2.2'
-  end
-when 'FreeBSD'
-  $confd_dir        = '/usr/local/etc/apache22/Includes'
-  $conf_file        = '/usr/local/etc/apache22/httpd.conf'
-  $ports_file       = '/usr/local/etc/apache22/Includes/ports.conf'
-  $vhost            = '/usr/local/etc/apache22/Vhosts/15-default.conf'
-  $vhost_dir        = '/usr/local/etc/apache22/Vhosts'
-  $run_dir          = '/var/run/apache22'
-  $service_name     = 'apache22'
-  $package_name     = 'apache22'
-  $error_log        = 'http-error.log'
-
-  $apache_version = '2.2'
-else
-  $apache_version = '0'
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
deleted file mode 100644
index c43d3f9e9e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
+++ /dev/null
@@ -1,1097 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::vhost define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'no default vhosts' do
-    it 'should create no default vhosts' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-          default_ssl_vhost => false,
-          service_ensure => stopped
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should_not be_file }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
-    end
-  end
-
-  context "default vhost without ssl" do
-    it 'should create a default vhost config' do
-      pp = <<-EOS
-        class { 'apache': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
-    end
-  end
-
-  context 'default vhost with ssl' do
-    it 'should create default vhost configs' do
-      pp = <<-EOS
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        class { 'apache':
-          default_ssl_vhost => true,
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should contain '<VirtualHost \*:443>' }
-      it { should contain "SSLEngine on" }
-    end
-  end
-
-  context 'new vhost on port 80' do
-    it 'should configure an apache vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-first.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName first.example.com" }
-    end
-  end
-
-  context 'new proxy vhost on port 80' do
-    it 'should configure an apache proxy vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'proxy.example.com':
-          port    => '80',
-          docroot => '/var/www/proxy',
-          proxy_pass => [
-            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-          ],
-    	  proxy_preserve_host   => true, 
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName proxy.example.com" }
-      it { should contain "ProxyPass" }
-      it { should contain "ProxyPreserveHost On" }
-      it { should_not contain "<Proxy \*>" }
-    end
-  end
-
-  context 'new vhost on port 80' do
-    it 'should configure two apache vhosts' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-        }
-        host { 'first.example.com': ip => '127.0.0.1', }
-        file { '/var/www/first/index.html':
-          ensure  => file,
-          content => "Hello from first\\n",
-        }
-        apache::vhost { 'second.example.com':
-          port    => '80',
-          docroot => '/var/www/second',
-        }
-        host { 'second.example.com': ip => '127.0.0.1', }
-        file { '/var/www/second/index.html':
-          ensure  => file,
-          content => "Hello from second\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should answer to first.example.com' do
-      shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from first\n"
-      end
-    end
-
-    it 'should answer to second.example.com' do
-      shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from second\n"
-      end
-    end
-  end
-
-  context 'apache_directories' do
-    describe 'readme example, adapted' do
-      it 'should configure a vhost with Files' do
-        pp = <<-EOS
-          class { 'apache': }
-
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
-          } else {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
-          }
-
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            $_files_match_directory,
-          ]
-
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/index.html.bak':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
-      end
-    end
-
-    describe 'other Directory options' do
-      it 'should configure a vhost with multiple Directory sections' do
-        pp = <<-EOS
-          class { 'apache': }
-
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
-          } else {
-            $_files_match_directory = [ 
-              { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
-              { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
-            ]
-          }
-
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
-            $_files_match_directory,
-          ]
-
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/foo':
-            ensure => directory,
-          }
-          file { '/var/www/files/foo/notindex.html':
-            ensure  => file,
-            content => "Hello Foo\\n",
-          }
-          file { '/var/www/files/private.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/bar':
-            ensure => directory,
-          }
-          file { '/var/www/files/bar/bar.html':
-            ensure  => file,
-            content => "Hello Bar\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
-        shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout.should eq("Hello Bar\n")
-      end
-    end
-
-    describe 'SetHandler directive' do
-      it 'should configure a vhost with a SetHandler directive' do
-        pp = <<-EOS
-          class { 'apache': }
-          apache::mod { 'status': }
-          host { 'files.example.net': ip => '127.0.0.1', }
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => [
-              { path => '/var/www/files', },
-              { path => '/server-status', provider => 'location', sethandler => 'server-status', },
-            ],
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
-      end
-    end
-  end
-
-  case fact('lsbdistcodename')
-  when 'precise', 'wheezy'
-    context 'vhost fallbackresouce example' do
-      it 'should configure a vhost with Fallbackresource' do
-        pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'fallback.example.net':
-          docroot         => '/var/www/fallback',
-          fallbackresource => '/index.html'
-        }
-        file { '/var/www/fallback/index.html':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        host { 'fallback.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to fallback.example.net' do
-        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
-          r.stdout.should == "Hello World\n"
-        end
-      end
-
-    end
-  else
-    # The current stable RHEL release (6.4) comes with Apache httpd 2.2.15
-    # That was released March 6, 2010.
-    # FallbackResource was backported to 2.2.16, and released July 25, 2010.
-    # Ubuntu Lucid (10.04) comes with apache2 2.2.14, released October 3, 2009.
-    # https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS
-  end
-
-  context 'virtual_docroot hosting separate sites' do
-    it 'should configure a vhost with VirtualDocumentRoot' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'virt.example.com':
-          vhost_name      => '*',
-          serveraliases   => '*virt.example.com',
-          port            => '80',
-          docroot         => '/var/www/virt',
-          virtual_docroot => '/var/www/virt/%1',
-        }
-        host { 'virt.example.com': ip => '127.0.0.1', }
-        host { 'a.virt.example.com': ip => '127.0.0.1', }
-        host { 'b.virt.example.com': ip => '127.0.0.1', }
-        file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, }
-        file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
-        file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should answer to a.virt.example.com' do
-      shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from a.virt\n"
-      end
-    end
-
-    it 'should answer to b.virt.example.com' do
-      shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from b.virt\n"
-      end
-    end
-  end
-
-  context 'proxy_pass for alternative vhost' do
-    it 'should configure a local vhost and a proxy vhost' do
-      apply_manifest(%{
-        class { 'apache': default_vhost => false, }
-        apache::vhost { 'localhost':
-          docroot => '/var/www/local',
-          ip      => '127.0.0.1',
-          port    => '8888',
-        }
-        apache::listen { '*:80': }
-        apache::vhost { 'proxy.example.com':
-          docroot    => '/var/www',
-          port       => '80',
-          add_listen => false,
-          proxy_pass => {
-            'path' => '/',
-            'url'  => 'http://localhost:8888/subdir/',
-          },
-        }
-        host { 'proxy.example.com': ip => '127.0.0.1', }
-        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
-        file { '/var/www/local/subdir/index.html':
-          ensure  => file,
-          content => "Hello from localhost\\n",
-        }
-      }, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should get a response from the back end' do
-      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
-        r.stdout.should == "Hello from localhost\n"
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  describe 'ip_based' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          ip_based   => true,
-          servername => 'test.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'NameVirtualHost test.server' }
-    end
-  end
-
-  describe 'add_listen' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': default_vhost => false }
-        host { 'testlisten.server': ip => '127.0.0.1' }
-        apache::listen { '81': }
-        apache::vhost { 'testlisten.server':
-          docroot    => '/tmp',
-          port       => '80',
-          add_listen => false,
-          servername => 'testlisten.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'Listen 80' }
-      it { should contain 'Listen 81' }
-    end
-  end
-
-  describe 'docroot' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        user { 'test_owner': ensure => present, }
-        group { 'test_group': ensure => present, }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot       => '/tmp/test',
-          docroot_owner => 'test_owner',
-          docroot_group => 'test_group',
-          docroot_mode  => '0750',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/tmp/test') do
-      it { should be_directory }
-      it { should be_owned_by 'test_owner' }
-      it { should be_grouped_into 'test_group' }
-      it { should be_mode 750 }
-    end
-  end
-
-  describe 'default_vhost' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          default_vhost => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        it { should_not contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
-        it { should_not contain 'NameVirtualHost test.server' }
-      else
-        it { should contain 'NameVirtualHost test.server' }
-      end
-    end
-
-    describe file("#{$vhost_dir}/10-test.server.conf") do
-      it { should be_file }
-    end
-  end
-
-  describe 'options' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
-    end
-  end
-
-  describe 'override' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          override   => ['All'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AllowOverride All' }
-    end
-  end
-
-  describe 'logroot' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '  CustomLog "/tmp' }
-    end
-  end
-
-  ['access', 'error'].each do |logtype|
-    case logtype
-    when 'access'
-      logname = 'CustomLog'
-    when 'error'
-      logname = 'ErrorLog'
-    end
-
-    describe "#{logtype}_log" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log => false,
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should_not contain "  #{logname} \"/tmp" }
-      end
-    end
-
-    describe "#{logtype}_log_pipe" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log_pipe => '|/bin/sh',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"|/bin/sh" }
-      end
-    end
-
-    describe "#{logtype}_log_syslog" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log_syslog => 'syslog',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"syslog\"" }
-      end
-    end
-  end
-
-  describe 'access_log_format' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-          access_log_syslog => 'syslog',
-          access_log_format => '%h %l',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" "%h %l"' }
-    end
-  end
-
-  describe 'access_log_env_var' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot            => '/tmp',
-          logroot            => '/tmp',
-          access_log_syslog  => 'syslog',
-          access_log_env_var => 'admin',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" combined env=admin' }
-    end
-  end
-
-  describe 'aliases' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          aliases => [{ alias => '/image', path => '/ftp/pub/image' }],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Alias /image "/ftp/pub/image"' }
-    end
-  end
-
-  describe 'scriptaliases' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
-    end
-  end
-
-  describe 'proxy' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          proxy_dest => 'test2',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / test2/' }
-    end
-  end
-
-  describe 'actions' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot => '/tmp',
-          action  => 'php-fastcgi',
-        }
-      EOS
-      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Action php-fastcgi /cgi-bin virtual' }
-    end
-  end
-
-  describe 'suphp' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          suphp_addhandler => '#{$suphp_handler}',
-          suphp_engine     => 'on',
-          suphp_configpath => '#{$suphp_configpath}',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain "suPHP_AddHandler #{$suphp_handler}" }
-      it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
-    end
-  end
-
-  describe 'no_proxy_uris' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          proxy_dest       => 'http://test2',
-          no_proxy_uris    => [ 'http://test2/test' ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / http://test2/' }
-      it { should contain 'ProxyPass        http://test2/test !' }
-    end
-  end
-
-  describe 'redirect' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          redirect_source  => ['/images'],
-          redirect_dest    => ['http://test.server/'],
-          redirect_status  => ['permanent'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Redirect permanent /images http://test.server/' }
-    end
-  end
-
-  # Passenger isn't even in EPEL on el-5
-  if default['platform'] !~ /^el-5/
-    describe 'rack_base_uris' do
-      if fact('osfamily') == 'RedHat'
-        it 'adds epel' do
-          pp = "class { 'epel': }"
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'RackBaseURI /test' }
-      end
-    end
-  end
-
-
-  describe 'request_headers' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          request_headers  => ['append MirrorID "mirror 12"'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'append MirrorID "mirror 12"' }
-    end
-  end
-
-  describe 'rewrite rules' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          rewrites => [
-            { comment => 'test',
-              rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-              rewrite_rule => ['^index\.html$ welcome.html'],
-            }
-          ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#test' }
-      it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
-      it { should contain 'RewriteRule ^index.html$ welcome.html' }
-    end
-  end
-
-  describe 'setenv/setenvif' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          setenv   => ['TEST /test'],
-          setenvif => ['Request_URI "\.gif$" object_is_image=gif']
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'SetEnv TEST /test' }
-      it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
-    end
-  end
-
-  describe 'block' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          block    => 'scm',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
-    end
-  end
-
-  describe 'wsgi' do
-    it 'import_script applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-	  wsgi_pass_authorization     => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'import_script applies cleanly', :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_import_script          => '/test1',
-          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-	  wsgi_pass_authorization     => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      it { should be_file }
-      it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
-      it { should contain 'WSGIDaemonProcess wsgi processes=2' }
-      it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-      it { should contain 'WSGIProcessGroup nobody' }
-      it { should contain 'WSGIScriptAlias /test "/test1"' }
-      it { should contain 'WSGIPassAuthorization On' }
-    end
-  end
-
-  describe 'custom_fragment' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          custom_fragment => inline_template('#weird test string'),
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#weird test string' }
-    end
-  end
-
-  describe 'itk' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          itk      => { user => 'nobody', group => 'nobody' }
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AssignUserId nobody nobody' }
-    end
-  end
-
-  # So what does this work on?
-  if default['platform'] !~ /^(debian-(6|7)|el-(5|6|7))/
-    describe 'fastcgi' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          class { 'apache::mod::fastcgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot        => '/tmp',
-            fastcgi_server => 'localhost',
-            fastcgi_socket => '/tmp/fast/1234',
-            fastcgi_dir    => '/tmp/fast',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { should contain '<Directory "/tmp/fast">' }
-      end
-    end
-  end
-
-  describe 'additional_includes' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::selinux == 'true' {
-          exec { 'set_apache_defaults':
-            command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            require => Package[$semanage_package],
-          }
-          $semanage_package = $::operatingsystemmajrelease ? {
-            '5'       => 'policycoreutils',
-            'default' => 'policycoreutils-python',
-          }
-
-          package { $semanage_package: ensure => installed }
-          exec { 'restorecon_apache':
-            command => 'restorecon -Rv /apache_spec',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            before  => Service['httpd'],
-            require => Class['apache'],
-          }
-        }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/apache_spec': ensure => directory, }
-        file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/apache_spec',
-          additional_includes => '/apache_spec/include',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Include "/apache_spec/include"' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
deleted file mode 100644
index f32fec80886..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
+++ /dev/null
@@ -1,563 +0,0 @@
-require 'spec_helper'
-
-describe 'apache', :type => :class do
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
-      )
-    }
-    it { should contain_user("www-data") }
-    it { should contain_group("www-data") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/apache2/sites-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_file("/etc/apache2/mods-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_file("/etc/apache2/mods-available").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'false',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_concat("/etc/apache2/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-      )
-    }
-    # Assert that load files are placed and symlinked for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_file',
-      'authz_default',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
-      it { should_not contain_file("#{modname}.conf") }
-      it { should_not contain_file("#{modname}.conf symlink") }
-    end
-
-    context "with Apache version < 2.4" do
-      let :params do
-        { :apache_version => '2.2' }
-      end
-
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        { :apache_version => '2.4' }
-      end
-
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
-    end
-
-    # Assert that both load files and conf files are placed and symlinked for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
-      it { should contain_file("#{modname}.conf").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.conf symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.conf"
-      ) }
-    end
-
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
-
-        it { should_not contain_user('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} }
-      end
-    end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
-
-        it { should_not contain_group('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
-      end
-    end
-
-    describe "Add extra LogFormats" do
-      context "When parameter log_formats is a hash" do
-        let :params do
-          { :log_formats => {
-            'vhost_common'   => "%v %h %l %u %t \"%r\" %>s %b",
-            'vhost_combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
-          } }
-        end
-
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
-      end
-    end
-
-    context "on Ubuntu" do
-      let :facts do
-        super().merge({
-          :operatingsystem => 'Ubuntu'
-        })
-      end
-
-      context "13.10" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.10',
-            :operatingsystemrelease => '13.10'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.4') }
-      end
-      context "12.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '12.04',
-            :operatingsystemrelease => '12.04'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.2') }
-      end
-      context "13.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.04',
-            :operatingsystemrelease => '13.04'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.2') }
-      end
-    end
-  end
-  context "on a RedHat 5 OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
-      )
-    }
-    it { should contain_user("apache") }
-    it { should contain_group("apache") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/httpd/conf.d").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_concat("/etc/httpd/conf/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-      )
-    }
-    describe "Alternate confd/mod/vhosts directory" do
-      let :params do
-        {
-          :vhost_dir => '/etc/httpd/site.d',
-          :confd_dir => '/etc/httpd/conf.d',
-          :mod_dir   => '/etc/httpd/mod.d',
-        }
-      end
-
-      ['mod.d','site.d','conf.d'].each do |dir|
-        it { should contain_file("/etc/httpd/#{dir}").with(
-          'ensure'  => 'directory',
-          'recurse' => 'true',
-          'purge'   => 'true',
-          'notify'  => 'Class[Apache::Service]',
-          'require' => 'Package[httpd]'
-        ) }
-      end
-
-      # Assert that load files are placed for these mods, but no conf file.
-      [
-        'auth_basic',
-        'authn_file',
-        'authz_default',
-        'authz_groupfile',
-        'authz_host',
-        'authz_user',
-        'dav',
-        'env',
-      ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { should_not contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
-      end
-
-      # Assert that both load files and conf files are placed for these mods
-      [
-        'alias',
-        'autoindex',
-        'dav_fs',
-        'deflate',
-        'dir',
-        'mime',
-        'negotiation',
-        'setenvif',
-      ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { should contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
-      end
-
-      context "with Apache version < 2.4" do
-        let :params do
-          { :apache_version => '2.2' }
-        end
-
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
-      end
-
-      context "with Apache version >= 2.4" do
-        let :params do
-          { :apache_version => '2.4' }
-        end
-
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
-      end
-
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
-    end
-
-    describe "Alternate conf.d directory" do
-      let :params do
-        { :confd_dir => '/etc/httpd/special_conf.d' }
-      end
-
-      it { should contain_file("/etc/httpd/special_conf.d").with(
-        'ensure'  => 'directory',
-        'recurse' => 'true',
-        'purge'   => 'true',
-        'notify'  => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      ) }
-    end
-
-    describe "Alternate mpm_modules" do
-      context "when declaring mpm_module is false" do
-        let :params do
-          { :mpm_module => false }
-        end
-        it 'should not declare mpm modules' do
-          should_not contain_class('apache::mod::event')
-          should_not contain_class('apache::mod::itk')
-          should_not contain_class('apache::mod::peruser')
-          should_not contain_class('apache::mod::prefork')
-          should_not contain_class('apache::mod::worker')
-        end
-      end
-      context "when declaring mpm_module => prefork" do
-        let :params do
-          { :mpm_module => 'prefork' }
-        end
-        it { should contain_class('apache::mod::prefork') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::worker') }
-      end
-      context "when declaring mpm_module => worker" do
-        let :params do
-          { :mpm_module => 'worker' }
-        end
-        it { should contain_class('apache::mod::worker') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::prefork') }
-      end
-      context "when declaring mpm_module => breakme" do
-        let :params do
-          { :mpm_module => 'breakme' }
-        end
-        it { expect { subject }.to raise_error Puppet::Error, /does not match/ }
-      end
-    end
-
-    describe "different templates for httpd.conf" do
-      context "with default" do
-        let :params do
-          { :conf_template => 'apache/httpd.conf.erb' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} }
-      end
-      context "with non-default" do
-        let :params do
-          { :conf_template => 'site_apache/fake.conf.erb' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
-      end
-    end
-
-    describe "default mods" do
-      context "without" do
-        let :params do
-          { :default_mods => false }
-        end
-
-        it { should contain_apache__mod('authz_host') }
-        it { should_not contain_apache__mod('env') }
-      end
-      context "custom" do
-        let :params do
-          { :default_mods => [
-            'info',
-            'alias',
-            'mime',
-            'env',
-            'setenv',
-            'expires',
-          ]}
-        end
-
-        it { should contain_apache__mod('authz_host') }
-        it { should contain_apache__mod('env') }
-        it { should contain_class('apache::mod::info') }
-        it { should contain_class('apache::mod::mime') }
-      end
-    end
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
-
-        it { should_not contain_user('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} }
-      end
-    end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
-
-        it { should_not contain_group('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} }
-
-      end
-    end
-    describe "sendfile" do
-      context "with invalid value" do
-        let :params do
-          { :sendfile => 'foo' }
-        end
-        it "should fail" do
-          expect do
-            subject
-          end.to raise_error(Puppet::Error, /"foo" does not match/)
-        end
-      end
-      context "On" do
-        let :params do
-          { :sendfile => 'On' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} }
-      end
-      context "Off" do
-        let :params do
-          { :sendfile => 'Off' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
-      end
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::package").with({'ensure' => 'present'}) }
-    it { should contain_user("www") }
-    it { should contain_group("www") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/usr/local/etc/apache22/Vhosts").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { should contain_file("/usr/local/etc/apache22/Modules").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { should contain_concat("/usr/local/etc/apache22/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'wheel',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-    ) }
-    # Assert that load files are placed for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_file',
-      'authz_default',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should_not contain_file("#{modname}.conf") }
-    end
-
-    # Assert that both load files and conf files are placed for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.conf").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
-    end
-  end
-  context 'on all OSes' do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context 'default vhost defaults' do
-      it { should contain_apache__vhost('default').with_ensure('present') }
-      it { should contain_apache__vhost('default-ssl').with_ensure('absent') }
-    end
-    context 'without default non-ssl vhost' do
-      let :params do {
-        :default_vhost  => false
-      }
-      end
-      it { should contain_apache__vhost('default').with_ensure('absent') }
-    end
-    context 'with default ssl vhost' do
-      let :params do {
-          :default_ssl_vhost  => true
-        }
-      end
-      it { should contain_apache__vhost('default-ssl').with_ensure('present') }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
deleted file mode 100644
index eceadca4a72..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::dev', :type => :class do
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libaprutil1-dev") }
-    it { should contain_package("libapr1-dev") }
-    it { should contain_package("apache2-prefork-dev") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd-devel") }
-  end
-  context "on a FreeBSD OS" do
-    let :pre_condition do
-      'include apache::package'
-    end
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-      }
-    end
-    it { should contain_class("apache::params") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
deleted file mode 100644
index 6e2c16b7e9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::auth_kerb', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("libapache2-mod-auth-kerb") }
-  end
-  context "on a RedHat OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("mod_auth_kerb") }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("www/mod_auth_kerb2") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
deleted file mode 100644
index d9ca5398b15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::authnz_ldap', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'Debian',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
-
-    context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
-
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
-
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
-      end
-    end
-  end #Debian
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'RedHat',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
-
-    context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
-
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
-
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
-      end
-    end
-  end # Redhat
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
deleted file mode 100644
index 4898cdece1c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dav_svn', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("libapache2-svn") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("mod_dav_svn") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("devel/subversion") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
deleted file mode 100644
index f8eb8810131..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_deflate_specs
-  it { should contain_apache__mod("deflate") }
-
-  it do
-    should contain_file("deflate.conf").with_content(
-      "AddOutputFilterByType DEFLATE text/html text/plain text/xml\n"\
-      "AddOutputFilterByType DEFLATE text/css\n"\
-      "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript\n"\
-      "AddOutputFilterByType DEFLATE application/rss+xml\n"\
-      "\n"\
-      "DeflateFilterNote Input instream\n"\
-      "DeflateFilterNote Output outstream\n"\
-      "DeflateFilterNote Ratio ratio\n"
-    )
-  end
-end
-
-describe 'apache::mod::deflate', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/deflate.conf',
-    } ) }
-    it { should contain_file("deflate.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/deflate.conf',
-    } ) }
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
-  end
-
-  context "On a FreeBSD OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/deflate.conf',
-    } ) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
deleted file mode 100644
index 0de62afcb53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dev', :type => :class do
-  [
-    ['RedHat',  '6', 'Santiago'],
-    ['Debian',  '6', 'squeeze'],
-    ['FreeBSD', '9', 'FreeBSD'],
-  ].each do |osfamily, operatingsystemrelease, lsbdistcodename|
-    if osfamily == 'FreeBSD'
-      let :pre_condition do
-        'include apache::package'
-      end
-    end
-    context "on a #{osfamily} OS" do
-      let :facts do
-        {
-          :lsbdistcodename        => lsbdistcodename,
-          :osfamily               => osfamily,
-          :operatingsystem        => osfamily,
-          :operatingsystemrelease => operatingsystemrelease,
-        }
-      end
-      it { should contain_class('apache::dev') }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
deleted file mode 100644
index 8bcdc0b6bea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dir', :type => :class do
-  let :pre_condition do
-    'class { "apache":
-      default_mods => false,
-    }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :lsbdistcodename        => 'squeeze',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Redhat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
deleted file mode 100644
index 850bd5c55b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::event', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/event.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/event.load") }
-
-      it { should contain_package("apache2-mpm-event") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_class("apache::params") }
-      it { should_not contain_apache__mod('worker') }
-      it { should_not contain_apache__mod('prefork') }
-
-      it { should contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
-
-      it { should contain_file("/etc/httpd/conf.d/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n",
-        })
-      }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
deleted file mode 100644
index 98ad2e87060..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::fastcgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("libapache2-mod-fastcgi") }
-    it { should contain_file('fastcgi.conf') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("mod_fastcgi") }
-    it { should_not contain_file('fastcgi.conf') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
deleted file mode 100644
index 16719415d56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::fcgid', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("libapache2-mod-fcgid") }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe 'without parameters' do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('fcgid') }
-      it { should contain_package("mod_fcgid") }
-    end
-
-    describe 'with parameters' do
-      let :params do {
-        :options                     => {
-          'FcgidIPCDir'               => '/var/run/fcgidsock',
-          'SharememPath'              => '/var/run/fcgid_shm',
-          'FcgidMinProcessesPerClass' => '0',
-          'AddHandler'                => 'fcgid-script .fcgi',
-        }
-      } end
-
-      it 'should contain the correct config' do
-        content = subject.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        content.split("\n").reject { |c| c =~ /(^#|^$)/ }.should == [
-          '<IfModule mod_fcgid.c>',
-          '  AddHandler fcgid-script .fcgi',
-          '  FcgidIPCDir /var/run/fcgidsock',
-          '  FcgidMinProcessesPerClass 0',
-          '  SharememPath /var/run/fcgid_shm',
-          '</IfModule>',
-        ]
-      end
-    end
-  end
-
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("www/mod_fcgid") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
deleted file mode 100644
index ed078c519fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_info_specs
-  it { should contain_apache__mod("info") }
-
-  it do
-    should contain_file("info.conf").with_content(
-      "<Location /server-info>\n"\
-      "    SetHandler server-info\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from 127.0.0.1 ::1\n"\
-      "</Location>\n"
-    )
-  end
-end
-
-describe 'apache::mod::info', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/info.conf',
-    } ) }
-    it { should contain_file("info.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/info.conf',
-    } ) }
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
-  end
-
-  context "On a FreeBSD OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/info.conf',
-    } ) }
-  end
-
-  context "with $allow_from => ['10.10.10.10','11.11.11.11']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10','11.11.11.11'] }
-    end
-    it do
-      should contain_file("info.conf").with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Order deny,allow\n"\
-        "    Deny from all\n"\
-        "    Allow from 10.10.10.10 11.11.11.11\n"\
-        "</Location>\n"
-      )
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
deleted file mode 100644
index d9fe2e3d128..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::itk', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/itk.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/itk.load") }
-
-      it { should contain_package("apache2-mpm-itk") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/itk.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
deleted file mode 100644
index e9984ecbaf5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_mime_magic_specs
-  it { should contain_apache__mod("mime_magic") }
-end
-
-describe 'apache::mod::mime_magic', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_magic_specs()
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/apache2/magic\"\n"
-      )
-    end
-
-    it { should contain_file("mime_magic.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/mime_magic.conf',
-    } ) }
-    it { should contain_file("mime_magic.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/mime_magic.conf',
-    } ) }
-
-    context "with magic_file => /tmp/Debian_magic" do
-      let :params do
-        { :magic_file => "/tmp/Debian_magic" }
-      end
-
-      it do
-        should contain_file("mime_magic.conf").with_content(
-          "MIMEMagicFile \"/tmp/Debian_magic\"\n"
-        )
-      end
-    end
-
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_magic_specs()
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/httpd/conf/magic\"\n"
-      )
-    end
-
-    it { should contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
-
-  end
-
-  context "with magic_file => /tmp/magic" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    let :params do
-      { :magic_file => "/tmp/magic" }
-    end
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/tmp/magic\"\n"
-      )
-    end
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
deleted file mode 100644
index 2b6154fb813..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific conte, :compilexts
-def general_mime_specs
-  it { should contain_apache__mod("mime") }
-end
-
-describe 'apache::mod::mime', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params", :compile do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_specs()
-
-    it { should contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
-
-  end
-
-  context "on a RedHat OS with default params", :compile do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_specs()
-
-    it { should contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
deleted file mode 100644
index 9439f719e65..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::pagespeed', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
deleted file mode 100644
index 3bf7d299520..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::passenger', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("libapache2-mod-passenger") }
-    it { should contain_file('passenger.load').with({
-      'path' => '/etc/apache2/mods-available/passenger.load',
-    }) }
-    it { should contain_file('passenger.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').with_ensure('absent') }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { :passenger_root => '/usr/lib/example' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
-    end
-    describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
-    end
-    describe "with passenger_high_performance => on" do
-      let :params do
-        { :passenger_high_performance => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
-    end
-    describe "with passenger_pool_idle_time => 1200" do
-      let :params do
-        { :passenger_pool_idle_time => 1200 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
-    end
-    describe "with passenger_max_requests => 20" do
-      let :params do
-        { :passenger_max_requests => 20 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
-    end
-    describe "with passenger_stat_throttle_rate => 10" do
-      let :params do
-        { :passenger_stat_throttle_rate => 10 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerStatThrottleRate 10$/) }
-    end
-    describe "with passenger_max_pool_size => 16" do
-      let :params do
-        { :passenger_max_pool_size => 16 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
-    end
-    describe "with rack_autodetect => on" do
-      let :params do
-        { :rack_autodetect => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
-    end
-    describe "with rails_autodetect => on" do
-      let :params do
-        { :rails_autodetect => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
-    end
-    describe "with passenger_use_global_queue => on" do
-      let :params do
-        { :passenger_use_global_queue => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
-    end
-    describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
-      let :params do
-        { :mod_path => '/usr/lib/foo/mod_foo.so' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
-    end
-    describe "with mod_lib_path => '/usr/lib/foo'" do
-      let :params do
-        { :mod_lib_path => '/usr/lib/foo' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
-    end
-    describe "with mod_lib => 'mod_foo.so'" do
-      let :params do
-        { :mod_lib => 'mod_foo.so' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
-    end
-    describe "with mod_id => 'mod_foo'" do
-      let :params do
-        { :mod_id => 'mod_foo' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
-    end
-
-    context "with Ubuntu 12.04 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '12.04',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '12.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
-    end
-
-    context "with Ubuntu 14.04 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '14.04',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '14.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-    end
-
-    context "with Debian 7 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '7.3',
-          :operatingsystem        => 'Debian',
-          :lsbdistcodename        => 'wheezy',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
-    end
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("mod_passenger") }
-    it { should contain_file('passenger_package.conf').with({
-      'path' => '/etc/httpd/conf.d/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
-    it { should contain_file('passenger.load').with({
-      'path' => '/etc/httpd/conf.d/passenger.load',
-    }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { :passenger_root => '/usr/lib/example' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("www/rubygem-passenger") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
deleted file mode 100644
index f674318e285..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::perl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("libapache2-mod-perl2") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("mod_perl") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("www/mod_perl2") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
deleted file mode 100644
index e1ee004e93a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::peruser', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('peruser') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
deleted file mode 100644
index e42f4fcfe4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::php', :type => :class do
-  describe "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("libapache2-mod-php5") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
-      ) }
-    end
-    context 'with mpm_module => worker' do
-      let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { subject }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
-      end
-    end
-  end
-  describe "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with default params" do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
-    end
-    context "with alternative package name" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :package_name => 'php54'}
-      end
-      it { should contain_package("php54") }
-    end
-    context "with alternative path" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :path => 'alternative-path'}
-      end
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module alternative-path\n"
-      ) }
-    end
-    context "with alternative extensions" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :extensions => ['.php','.php5']}
-      end
-      it { should contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
-    end
-    context "with specific version" do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :package_ensure => '5.3.13'}
-      end
-      it { should contain_package("php").with(
-        :ensure => '5.3.13'
-      ) }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
-    end
-  end
-  describe "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class('apache::params') }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("lang/php5") }
-      it { should contain_file('php5.load') }
-    end
-    # FIXME: not sure about the following context
-    context 'with mpm_module => worker' do
-      let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { subject.should contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
-      end
-    end
-  end
-  describe "OS independent tests" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
-    end
-    context 'with content param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :content => 'somecontent' }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
-    end
-    context 'with template param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :template => 'apache/mod/php5.conf.erb' }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/
-      ) }
-    end
-    context 'with source param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :source => 'some-path' }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-    context 'content has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :template => 'apache/mod/php5.conf.erb',
-          :content  => 'somecontent'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
-    end
-    context 'source has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :template => 'apache/mod/php5.conf.erb',
-          :source   => 'some-path'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-    context 'source has priority over content' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :content => 'somecontent',
-          :source  => 'some-path'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
deleted file mode 100644
index 847aecf9c70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::prefork', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/prefork.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/prefork.load") }
-
-      it { should contain_package("apache2-mpm-prefork") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
-        'require' => 'Package[httpd]',
-        })
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should_not contain_apache__mod('event') }
-
-      it { should contain_file("/etc/httpd/conf.d/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
-        })
-      }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
deleted file mode 100644
index 77e1ab15de8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::proxy_html', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-      'include apache::mod::proxy',
-      'include apache::mod::proxy_http',
-    ]
-  end
-  context "on a Debian OS" do
-    shared_examples "debian" do |loadfiles|
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
-      it { should contain_package("libapache2-mod-proxy-html") }
-    end
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-        :concat_basedir  => '/dne',
-        :architecture    => 'i386',
-        :lsbdistcodename => 'squeeze',
-        :operatingsystem => 'Debian',
-        :id              => 'root',
-        :kernel          => 'Linux',
-        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :hardwaremodel   => 'i386',
-      }
-    end
-
-    context "on squeeze" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '6' }) }
-      it_behaves_like "debian", ['/usr/lib/libxml2.so.2']
-    end
-    context "on wheezy" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '7' }) }
-      context "i386" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'i686',
-          :architecture  => 'i386'
-        })}
-        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
-      end
-      context "x64" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'x86_64',
-          :architecture  => 'amd64'
-        })}
-        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
-      end
-    end
-  end
-  context "on a RedHat OS", :compile do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("mod_proxy_html") }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("www/mod_proxy_html") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
deleted file mode 100644
index d2d1fca7b93..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::python', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("libapache2-mod-python") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("mod_python") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("www/mod_python3") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
deleted file mode 100644
index 949dd5702b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::rpaf', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-    ]
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("libapache2-mod-rpaf") }
-    it { should contain_file('rpaf.conf').with({
-      'path' => '/etc/apache2/mods-available/rpaf.conf',
-    }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
-
-    describe "with sethostname => true" do
-      let :params do
-        { :sethostname => 'true' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
-    end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
-      let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
-    end
-    describe "with header => X-Real-IP" do
-      let :params do
-        { :header => 'X-Real-IP' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("www/mod_rpaf2") }
-    it { should contain_file('rpaf.conf').with({
-      'path' => '/usr/local/etc/apache22/Modules/rpaf.conf',
-    }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
-
-    describe "with sethostname => true" do
-      let :params do
-        { :sethostname => 'true' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
-    end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
-      let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
-    end
-    describe "with header => X-Real-IP" do
-      let :params do
-        { :header => 'X-Real-IP' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
deleted file mode 100644
index e7e6e1d6401..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::speling', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__mod('speling') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__mod('speling') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
deleted file mode 100644
index 11e7964dedb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::ssl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context 'on an unsupported OS' do
-    let :facts do
-      {
-        :osfamily               => 'Magic',
-        :operatingsystemrelease => '0',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Magic',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { expect { subject }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
-  end
-
-  context 'on a RedHat OS' do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should contain_package('mod_ssl') }
-  end
-
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should_not contain_package('libapache2-mod-ssl') }
-  end
-
-  context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
deleted file mode 100644
index 5023bc7bf17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-require 'spec_helper'
-
-# Helper function for testing the contents of `status.conf`
-def status_conf_spec(allow_from, extended_status)
-  it do
-    should contain_file("status.conf").with_content(
-      "<Location /server-status>\n"\
-      "    SetHandler server-status\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from #{Array(allow_from).join(' ')}\n"\
-      "</Location>\n"\
-      "ExtendedStatus #{extended_status}\n"\
-      "\n"\
-      "<IfModule mod_proxy.c>\n"\
-      "    # Show Proxy LoadBalancer status in mod_status\n"\
-      "    ProxyStatus On\n"\
-      "</IfModule>\n"
-    )
-  end
-end
-
-describe 'apache::mod::status', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_apache__mod("status") }
-
-    status_conf_spec(["127.0.0.1", "::1"], "On")
-
-    it { should contain_file("status.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/status.conf',
-    } ) }
-
-    it { should contain_file("status.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/status.conf',
-    } ) }
-
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_apache__mod("status") }
-
-    status_conf_spec(["127.0.0.1", "::1"], "On")
-
-    it { should contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
-
-  end
-
-  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off'" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      {
-        :allow_from => ['10.10.10.10','11.11.11.11'],
-        :extended_status => 'Off',
-      }
-    end
-
-    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off")
-
-  end
-
-  context "with valid parameter type $allow_from => ['10.10.10.10']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10'] }
-    end
-    it 'should expect to succeed array validation' do
-      expect {
-        should contain_file("status.conf")
-      }.not_to raise_error()
-    end
-  end
-
-  context "with invalid parameter type $allow_from => '10.10.10.10'" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => '10.10.10.10' }
-    end
-    it 'should expect to fail array validation' do
-      expect {
-        should contain_file("status.conf")
-      }.to raise_error(Puppet::Error)
-    end
-  end
-
-  # Only On or Off are valid options
-  ['On', 'Off'].each do |valid_param|
-    context "with valid value $extended_status => '#{valid_param}'" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do
-        { :extended_status => valid_param }
-      end
-      it 'should expect to succeed regular expression validation' do
-        expect {
-          should contain_file("status.conf")
-        }.not_to raise_error()
-      end
-    end
-  end
-
-  ['Yes', 'No'].each do |invalid_param|
-    context "with invalid value $extended_status => '#{invalid_param}'" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do
-        { :extended_status => invalid_param }
-      end
-      it 'should expect to fail regular expression validation' do
-        expect {
-          should contain_file("status.conf")
-        }.to raise_error(Puppet::Error)
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
deleted file mode 100644
index cb91997ac16..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::suphp', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libapache2-mod-suphp") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("mod_suphp") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
deleted file mode 100644
index 4843a26e65a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::worker', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/worker.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/worker.load") }
-
-      it { should contain_package("apache2-mpm-worker") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should contain_file_line("/etc/sysconfig/httpd worker enable").with({
-        'require' => 'Package[httpd]',
-        })
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should_not contain_apache__mod('event') }
-
-      it { should contain_file("/etc/httpd/conf.d/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n",
-        })
-      }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
-  end
-
-  # Template config doesn't vary by distro
-  context "on all distros" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    context 'defaults' do
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+2$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+150$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+75$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) }
-    end
-
-    context 'setting params' do
-      let :params do
-        {
-          :serverlimit          => 10,
-          :startservers         => 11,
-          :maxclients           => 12,
-          :minsparethreads      => 13,
-          :maxsparethreads      => 14,
-          :threadsperchild      => 15,
-          :maxrequestsperchild  => 16,
-          :threadlimit          => 17
-        }
-      end
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+10$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+11$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+12$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+13$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+14$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
deleted file mode 100644
index d4c391a2911..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::wsgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("libapache2-mod-wsgi") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("mod_wsgi") }
-
-    describe "with custom WSGISocketPrefix" do
-      let :params do
-        { :wsgi_socket_prefix => 'run/wsgi' }
-      end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGISocketPrefix run\/wsgi$/)}
-    end
-    describe "with custom WSGIPythonHome" do
-      let :params do
-        { :wsgi_python_home => '/path/to/virtenv' }
-      end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("www/mod_wsgi") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
deleted file mode 100644
index eaa178c41d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::params', :type => :class do
-  context "On a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__params }
-
-    # There are 4 resources in this class currently
-    # there should not be any more resources because it is a params class
-    # The resources are class[apache::version], class[apache::params], class[main], class[settings], stage[main]
-    it "Should not contain any resources" do
-      subject.resources.size.should == 5
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
deleted file mode 100644
index 2cd075357d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::service', :type => :class do
-  let :pre_condition do
-    'include apache::params'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'apache2',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-
-    context "with $service_name => 'foo'" do
-      let (:params) {{ :service_name => 'foo' }}
-      it { should contain_service("httpd").with(
-        'name'      => 'foo'
-        )
-      }
-    end
-
-    context "with $service_enable => true" do
-      let (:params) {{ :service_enable => true }}
-      it { should contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_enable => false" do
-      let (:params) {{ :service_enable => false }}
-      it { should contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'false'
-        )
-      }
-    end
-
-    context "$service_enable must be a bool" do
-      let (:params) {{ :service_enable => 'not-a-boolean' }}
-
-      it 'should fail' do
-        expect { subject }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-
-    context "with $service_ensure => 'running'" do
-      let (:params) {{ :service_ensure => 'running', }}
-      it { should contain_service("httpd").with(
-        'ensure'    => 'running',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_ensure => 'stopped'" do
-      let (:params) {{ :service_ensure => 'stopped', }}
-      it { should contain_service("httpd").with(
-        'ensure'    => 'stopped',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_ensure => 'UNDEF'" do
-      let (:params) {{ :service_ensure => 'UNDEF' }}
-      it { should contain_service("httpd").without_ensure }
-    end
-  end
-
-
-  context "on a RedHat 5 OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'httpd',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-  end
-
-  context "on a FreeBSD 5 OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'apache22',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
deleted file mode 100644
index e6d5214097d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod', :type => :define do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a RedHat osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/etc/httpd/conf.d/spec_m.load',
-          :content => "LoadModule spec_m_module modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-    end
-
-    describe "with shibboleth module and package param passed" do
-      # name/title for the apache::mod define
-      let :title do
-        'xsendfile'
-      end
-      # parameters
-      let(:params) { {:package => 'mod_xsendfile'} }
-
-      it { should contain_class("apache::params") }
-      it { should contain_package('mod_xsendfile') }
-    end
-  end
-
-  context "on a Debian osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/etc/apache2/mods-available/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-      it "should link the module load file" do
-        should contain_file('spec_m.load symlink').with({
-          :path   => '/etc/apache2/mods-enabled/spec_m.load',
-          :target => '/etc/apache2/mods-available/spec_m.load',
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-    end
-  end
-
-  context "on a FreeBSD osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/local/libexec/apache22/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'wheel',
-          :mode    => '0644',
-        } )
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
deleted file mode 100644
index 4037b3011c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
+++ /dev/null
@@ -1,1469 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::vhost', :type => :define do
-  let :pre_condition do
-    'class { "apache": default_vhost => false, }'
-  end
-  let :title do
-    'rspec.example.com'
-  end
-  let :default_params do
-    {
-      :docroot => '/rspec/docroot',
-      :port    => '84',
-    }
-  end
-  describe 'os-dependent items' do
-    context "on RedHat based systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-    end
-    context "on Debian based systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
-      it { should contain_file("25-rspec.example.com.conf symlink").with(
-        :ensure => 'link',
-        :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
-        :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
-    end
-    context "on FreeBSD systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'FreeBSD',
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
-      ) }
-    end
-  end
-  describe 'os-independent items' do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_apache__listen(params[:port]) }
-      it { should contain_apache__namevirtualhost("*:#{params[:port]}") }
-    end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content" do
-      [
-        {
-          :title => 'should contain docroot',
-          :attr  => 'docroot',
-          :value => '/not/default',
-          :match => [/^  DocumentRoot "\/not\/default"$/,/  <Directory "\/not\/default">/],
-        },
-        {
-          :title => 'should set a port',
-          :attr  => 'port',
-          :value => '8080',
-          :match => [/^<VirtualHost \*:8080>$/],
-        },
-        {
-          :title => 'should set an ip',
-          :attr  => 'ip',
-          :value => '10.0.0.1',
-          :match => [/^<VirtualHost 10\.0\.0\.1:84>$/],
-        },
-        {
-          :title => 'should set a serveradmin',
-          :attr  => 'serveradmin',
-          :value => 'test@test.com',
-          :match => [/^  ServerAdmin test@test.com$/],
-        },
-        {
-          :title => 'should enable ssl',
-          :attr  => 'ssl',
-          :value => true,
-          :match => [/^  SSLEngine on$/],
-        },
-        {
-          :title => 'should set a servername',
-          :attr  => 'servername',
-          :value => 'param.test',
-          :match => [/^  ServerName param.test$/],
-        },
-        {
-          :title => 'should accept server aliases',
-          :attr  => 'serveraliases',
-          :value => ['one.com','two.com'],
-          :match => [
-            /^  ServerAlias one\.com$/,
-            /^  ServerAlias two\.com$/
-          ],
-        },
-        {
-          :title => 'should accept setenv',
-          :attr  => 'setenv',
-          :value => ['TEST1 one','TEST2 two'],
-          :match => [
-            /^  SetEnv TEST1 one$/,
-            /^  SetEnv TEST2 two$/
-          ],
-        },
-        {
-          :title => 'should accept setenvif',
-          :attr  => 'setenvif',
-          ## These are bugged in rspec-puppet; the $1 is droped
-          #:value => ['Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          #:match => ['  SetEnvIf Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          :value => ['Host "^test\.com$" VHOST_ACCESS=test'],
-          :match => [/^  SetEnvIf Host "\^test\\.com\$" VHOST_ACCESS=test$/],
-        },
-        {
-          :title => 'should accept options',
-          :attr  => 'options',
-          :value => ['Fake','Options'],
-          :match => [/^    Options Fake Options$/],
-        },
-        {
-          :title => 'should accept overrides',
-          :attr  => 'override',
-          :value => ['Fake', 'Override'],
-          :match => [/^    AllowOverride Fake Override$/],
-        },
-        {
-          :title => 'should accept logroot',
-          :attr  => 'logroot',
-          :value => '/fake/log',
-          :match => [/CustomLog "\/fake\/log\//,/ErrorLog "\/fake\/log\//],
-        },
-        {
-          :title => 'should accept log_level',
-          :attr  => 'log_level',
-          :value => 'info',
-          :match => [/LogLevel info/],
-        },
-        {
-          :title => 'should accept pipe destination for access log',
-          :attr  => 'access_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/CustomLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept pipe destination for error log',
-          :attr  => 'error_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/ErrorLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for access log',
-          :attr  => 'access_log_syslog',
-          :value => 'syslog:local1',
-          :match => [/CustomLog "syslog:local1" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for error log',
-          :attr  => 'error_log_syslog',
-          :value => 'syslog',
-          :match => [/ErrorLog "syslog"$/],
-        },
-        {
-          :title => 'should accept custom format for access logs',
-          :attr  => 'access_log_format',
-          :value => '%h %{X-Forwarded-For}i %l %u %t \"%r\" %s %b  \"%{Referer}i\" \"%{User-agent}i\" \"Host: %{Host}i\" %T %D',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
-        },
-        {
-          :title => 'should contain access logs',
-          :attr  => 'access_log',
-          :value => true,
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title    => 'should not contain access logs',
-          :attr     => 'access_log',
-          :value    => false,
-          :notmatch => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title => 'should contain error logs',
-          :attr  => 'error_log',
-          :value => true,
-          :match => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should not contain error logs',
-          :attr     => 'error_log',
-          :value    => false,
-          :notmatch => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should set ErrorDocument 503',
-          :attr     => 'error_documents',
-          :value    => [ { 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}],
-          :match => [/^  ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407',
-          :attr     => 'error_documents',
-          :value    => [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ],
-          :match => [
-            /^  ErrorDocument 503 \/service-unavail$/,
-            /^  ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title    => 'should set ErrorDocument 503 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' => [{ 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}] },
-          :match => [/^    ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' =>
-          [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ]},
-          :match => [
-            /^    ErrorDocument 503 \/service-unavail$/,
-            /^    ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title => 'should accept a scriptalias',
-          :attr  => 'scriptalias',
-          :value => '/usr/scripts',
-          :match => [
-            /^  ScriptAlias \/cgi-bin "\/usr\/scripts"$/,
-          ],
-        },
-        {
-          :title    => 'should accept a single scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
-          :match    => [
-            /^  ScriptAlias \/blah\/ "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2', 'path' => '/usr/scripts' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2 "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases with and without trailing slashes',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts2/' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2\/ "\/usr\/scripts2\/"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept a ScriptAliasMatch directive',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [ { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' } ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/
-          ],
-        },
-        {
-          :title    => 'should accept multiple ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-          ],
-        },
-        {
-          :title    => 'should accept mixed ScriptAlias and ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-            { 'alias' => '/git', 'path' => '/var/www/gitweb/index.cgi' },
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'alias' => '/trac', 'path' => '/etc/apache2/trac.fcgi' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-            /^  ScriptAlias \/git "\/var\/www\/gitweb\/index\.cgi"$/,
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAlias \/trac "\/etc\/apache2\/trac.fcgi"$/,
-          ],
-        },
-        {
-          :title    => 'should accept proxy destinations',
-          :attr     => 'proxy_dest',
-          :value    => 'http://fake.com',
-          :match    => [
-            /^  ProxyPass          \/ http:\/\/fake.com\/$/,
-            /^  <Location          \/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept proxy_pass hash',
-          :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a' },
-          :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
-            /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a$/,
-            /^  <\/Location>$/,
-
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept proxy_pass array of hash',
-          :attr     => 'proxy_pass',
-          :value    => [
-            { 'path' => '/path-a/', 'url' => 'http://fake.com/a/' },
-            { 'path' => '/path-b', 'url' => 'http://fake.com/b' },
-          ],
-          :match    => [
-            /^  ProxyPass \/path-a\/ http:\/\/fake.com\/a\/$/,
-            /^  <Location \/path-a\/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a\/$/,
-            /^  <\/Location>$/,
-            /^  ProxyPass \/path-b http:\/\/fake.com\/b$/,
-            /^  <Location \/path-b>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/b$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title => 'should enable rack',
-          :attr  => 'rack_base_uris',
-          :value => ['/rack1','/rack2'],
-          :match => [
-            /^  RackBaseURI \/rack1$/,
-            /^  RackBaseURI \/rack2$/,
-          ],
-        },
-        {
-          :title => 'should accept headers',
-          :attr  => 'headers',
-          :value => ['add something', 'merge something_else'],
-          :match => [
-            /^  Header add something$/,
-            /^  Header merge something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept request headers',
-          :attr  => 'request_headers',
-          :value => ['append something', 'unset something_else'],
-          :match => [
-            /^  RequestHeader append something$/,
-            /^  RequestHeader unset something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrite_rule',
-          :value => 'not a real rule',
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrites',
-          :value => [{'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite comment',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'rewrite comment', 'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  #rewrite comment/],
-        },
-        {
-          :title => 'should accept rewrite conditions',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'redirect IE', 'rewrite_cond' => ['%{HTTP_USER_AGENT} ^MSIE'], 'rewrite_rule' => ['^index\.html$ welcome.html'],}],
-          :match => [
-            /^  #redirect IE$/,
-            /^  RewriteCond %{HTTP_USER_AGENT} \^MSIE$/,
-            /^  RewriteRule \^index\\\.html\$ welcome.html$/,
-          ],
-        },
-        {
-          :title => 'should accept multiple rewrites',
-          :attr  => 'rewrites',
-          :value => [
-            {'rewrite_rule' => ['not a real rule']},
-            {'rewrite_rule' => ['not a real rule two']},
-          ],
-          :match => [
-            /^  RewriteRule not a real rule$/,
-            /^  RewriteRule not a real rule two$/,
-          ],
-        },
-        {
-          :title => 'should block scm',
-          :attr  => 'block',
-          :value => 'scm',
-          :match => [/^  <DirectoryMatch \.\*\\\.\(svn\|git\|bzr\)\/\.\*>$/],
-        },
-        {
-          :title => 'should accept a custom fragment',
-          :attr  => 'custom_fragment',
-          :value => "  Some custom fragment line\n  That spans multiple lines",
-          :match => [
-            /^  Some custom fragment line$/,
-            /^  That spans multiple lines$/,
-            /^<\/VirtualHost>$/,
-          ],
-        },
-        {
-          :title => 'should accept an array of alias hashes',
-          :attr  => 'aliases',
-          :value => [ { 'alias' => '/', 'path' => '/var/www'} ],
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept an alias hash',
-          :attr  => 'aliases',
-          :value => { 'alias' => '/', 'path' => '/var/www'},
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept multiple aliases',
-          :attr  => 'aliases',
-          :value => [
-            { 'alias' => '/', 'path' => '/var/www'},
-            { 'alias' => '/cgi-bin', 'path' => '/var/www/cgi-bin'},
-            { 'alias' => '/css', 'path' => '/opt/someapp/css'},
-          ],
-          :match => [
-            /^  Alias \/ "\/var\/www"$/,
-            /^  Alias \/cgi-bin "\/var\/www\/cgi-bin"$/,
-            /^  Alias \/css "\/opt\/someapp\/css"$/,
-          ],
-        },
-        {
-          :title => 'should accept an aliasmatch hash',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #:match => [/^  AliasMatch \^\/image\/\(\.\*\)\.gif \/files\/gifs\/\$1\.gif$/],
-        },
-        {
-          :title => 'should accept a array of alias and aliasmatch hashes mixed',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => [
-          #  { 'alias' => '/css', 'path' => '/files/css' },
-          #  { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #  { 'aliasmatch' => '^/image/(.*).jpg', 'path' => '/files/jpgs/$1.jpg' },
-          #  { 'alias' => '/image', 'path' => '/files/images' },
-          #],
-          #:match => [
-          #  /^  Alias \/css \/files\/css$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.gif \/files\/gifs\/\$1\.gif$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.jpg \/files\/jpgs\/\$1\.jpg$/,
-          #  /^  Alias \/image \/files\/images$/
-          #],
-        },
-        {
-          :title => 'should accept multiple additional includes',
-          :attr  => 'additional_includes',
-          :value => [
-            '/tmp/proxy_group_a',
-            '/tmp/proxy_group_b',
-            '/tmp/proxy_group_c',
-          ],
-          :match => [
-            /^  Include "\/tmp\/proxy_group_a"$/,
-            /^  Include "\/tmp\/proxy_group_b"$/,
-            /^  Include "\/tmp\/proxy_group_c"$/,
-          ],
-        },
-        {
-          :title => 'should accept a suPHP_Engine',
-          :attr  => 'suphp_engine',
-          :value => 'on',
-          :match => [/^  suPHP_Engine on$/],
-        },
-        {
-          :title => 'should accept a php_admin_flags',
-          :attr  => 'php_admin_flags',
-          :value => { 'engine' => 'on' },
-          :match => [/^  php_admin_flag engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_flags in directories',
-          :attr  => 'directories',
-          :value => {
-						'path'            => '/srv/www',
-						'php_admin_flags' => { 'php_engine' => 'on' }
-					},
-          :match => [/^    php_admin_flag php_engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_values in directories',
-          :attr  => 'directories',
-          :value => {
-            'path'             => '/srv/www',
-            'php_admin_values' => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' }
-          },
-          :match => [/^    php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept a wsgi script alias',
-          :attr  => 'wsgi_script_aliases',
-          :value => { '/' => '/var/www/myapp.wsgi'},
-          :match => [/^  WSGIScriptAlias \/ "\/var\/www\/myapp.wsgi"$/],
-        },
-        {
-          :title => 'should accept multiple wsgi aliases',
-          :attr  => 'wsgi_script_aliases',
-          :value => {
-            '/wiki' => '/usr/local/wsgi/scripts/mywiki.wsgi',
-            '/blog' => '/usr/local/wsgi/scripts/myblog.wsgi',
-            '/'     => '/usr/local/wsgi/scripts/myapp.wsgi',
-          },
-          :match => [
-            /^  WSGIScriptAlias \/wiki "\/usr\/local\/wsgi\/scripts\/mywiki.wsgi"$/,
-            /^  WSGIScriptAlias \/blog "\/usr\/local\/wsgi\/scripts\/myblog.wsgi"$/,
-            /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
-          ],
-        },
-        {
-          :title => 'should accept a wsgi application group',
-          :attr  => 'wsgi_application_group',
-          :value => '%{GLOBAL}',
-          :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'On',
-          :match => [/^  WSGIPassAuthorization On$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization false',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'Off',
-          :match => [/^  WSGIPassAuthorization Off$/],
-        },
-        {
-          :title => 'should contain environment variables',
-          :attr  => 'access_log_env_var',
-          :value => 'admin',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
-        },
-        {
-          :title => 'should contain virtual_docroot',
-          :attr  => 'virtual_docroot',
-          :value => '/not/default',
-          :match => [
-            /^  VirtualDocumentRoot "\/not\/default"$/,
-          ],
-        },
-        {
-          :title    => 'should accept multiple directories',
-          :attr     => 'directories',
-          :value    => [
-            { 'path' => '/opt/app' },
-            { 'path' => '/var/www' },
-            { 'path' => '/rspec/docroot'}
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^  <Directory "\/var\/www">$/,
-            /^  <Directory "\/rspec\/docroot">$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache below 2.4 (Default Version). All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version < 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow'             => 'from rspec.org',
-            'allow_override'    => 'Lol',
-            'deny'              => 'from google.com',
-            'options'           => '-MultiViews',
-            'order'             => 'deny,yned',
-            'passenger_enabled' => 'onf',
-            'sethandler'        => 'None',
-          },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride Lol$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    SetHandler None$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
-            {
-              'path'              => '/opt/app1',
-              'allow'             => 'from rspec.org',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'deny'              => 'from google.com',
-              'options'           => ['-MultiViews','+MultiViews'],
-              'order'             => ['deny','yned'],
-              'passenger_enabled' => 'onf',
-            },
-            {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
-            },
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.2',
-          }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache equals or above 2.4. All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version >= 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow_override'    => 'Lol',
-            'options'           => '-MultiViews',
-            'require'           => 'something denied',
-            'passenger_enabled' => 'onf',
-          },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    AllowOverride Lol$/,
-            /^    Options -MultiViews$/,
-            /^    Require something denied$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
-            {
-              'path'              => '/opt/app1',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'options'           => ['-MultiViews','+MultiViews'],
-              'require'           => ['host','example.org'],
-              'passenger_enabled' => 'onf',
-            },
-            {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
-            },
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Require host example.org$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Require all granted$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.4',
-          }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with SSL" do
-      [
-        {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_cert',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateFile      "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateKeyFile',
-            :attr  => 'ssl_key',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateKeyFile   "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateChainFile',
-            :attr  => 'ssl_chain',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateChainFile "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificatePath',
-            :attr  => 'ssl_certs_dir',
-            :value => '/path/to/certs',
-            :match => [/^  SSLCACertificatePath    "\/path\/to\/certs"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_ca',
-            :value => '/path/to/ca.pem',
-            :match => [/^  SSLCACertificateFile    "\/path\/to\/ca\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationPath',
-            :attr  => 'ssl_crl_path',
-            :value => '/path/to/crl',
-            :match => [/^  SSLCARevocationPath     "\/path\/to\/crl"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationFile',
-            :attr  => 'ssl_crl',
-            :value => '/path/to/crl.pem',
-            :match => [/^  SSLCARevocationFile     "\/path\/to\/crl\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLProxyEngine',
-            :attr  => 'ssl_proxyengine',
-            :value => true,
-            :match => [/^  SSLProxyEngine On$/],
-        },
-        {
-            :title => 'should accept setting SSLProtocol',
-            :attr  => 'ssl_protocol',
-            :value => 'all -SSLv2',
-            :match => [/^  SSLProtocol             all -SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLCipherSuite',
-            :attr  => 'ssl_cipher',
-            :value => 'RC4-SHA:HIGH:!ADH:!SSLv2',
-            :match => [/^  SSLCipherSuite          RC4-SHA:HIGH:!ADH:!SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLHonorCipherOrder',
-            :attr  => 'ssl_honorcipherorder',
-            :value => 'On',
-            :match => [/^  SSLHonorCipherOrder     On$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyClient',
-            :attr  => 'ssl_verify_client',
-            :value => 'optional',
-            :match => [/^  SSLVerifyClient         optional$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyDepth',
-            :attr  => 'ssl_verify_depth',
-            :value => '1',
-            :match => [/^  SSLVerifyDepth          1$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with a string',
-            :attr  => 'ssl_options',
-            :value => '+ExportCertData',
-            :match => [/^  SSLOptions \+ExportCertData$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with an array',
-            :attr  => 'ssl_options',
-            :value => ['+StrictRequire','+ExportCertData'],
-            :match => [/^  SSLOptions \+StrictRequire \+ExportCertData/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with a string in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => '+ExportCertData'},
-            :match => [/^    SSLOptions \+ExportCertData$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with an array in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => ['-StdEnvVars','+ExportCertData']},
-            :match => [/^    SSLOptions -StdEnvVars \+ExportCertData/],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]} with SSL" do
-          let :params do
-            default_params.merge( {
-              param[:attr].to_sym => param[:value],
-              :ssl                => true,
-            } )
-          end
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      describe 'when access_log_file and access_log_pipe are specified' do
-        let :params do default_params.merge({
-          :access_log_file => 'fake.log',
-          :access_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'access_log_file' and 'access_log_pipe' cannot be defined at the same time/)
-        end
-      end
-      describe 'when error_log_file and error_log_pipe are specified' do
-        let :params do default_params.merge({
-          :error_log_file => 'fake.log',
-          :error_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'error_log_file' and 'error_log_pipe' cannot be defined at the same time/)
-        end
-      end
-      describe 'when docroot owner and mode is specified' do
-        let :params do default_params.merge({
-          :docroot_owner => 'testuser',
-          :docroot_group => 'testgroup',
-          :docroot_mode  => '0750',
-        }) end
-        it 'should set vhost ownership and permissions' do
-          should contain_file(params[:docroot]).with({
-            :ensure => :directory,
-            :owner  => 'testuser',
-            :group  => 'testgroup',
-            :mode   => '0750',
-          })
-        end
-      end
-
-      describe 'when wsgi_daemon_process and wsgi_daemon_process_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_daemon_process         => 'example.org',
-          :wsgi_daemon_process_options => { 'processes' => '2', 'threads' => '15' },
-        }) end
-        it 'should set wsgi_daemon_process_options' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  WSGIDaemonProcess example.org processes=2 threads=15$/
-          )
-        end
-      end
-
-      describe 'when wsgi_import_script and wsgi_import_script_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_import_script         => '/var/www/demo.wsgi',
-          :wsgi_import_script_options => { 'application-group' => '%{GLOBAL}', 'process-group' => 'wsgi' },
-        }) end
-        it 'should set wsgi_import_script_options' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  WSGIImportScript \/var\/www\/demo.wsgi application-group=%{GLOBAL} process-group=wsgi$/
-          )
-        end
-      end
-
-      describe 'when rewrites are specified' do
-        let :params do default_params.merge({
-          :rewrites => [
-            {
-              'comment'      => 'test rewrites',
-              'rewrite_base' => '/mytestpath/',
-              'rewrite_cond' => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-              'rewrite_rule' => ['^index\.html$ welcome.html', '^index\.cgi$ index.php'],
-            }
-          ]
-        }) end
-        it 'should set RewriteConds and RewriteRules' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  #test rewrites$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteBase \/mytestpath\/$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.html\$ welcome.html$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.cgi\$ index.php$/
-          )
-        end
-      end
-
-      describe 'when rewrite_rule and rewrite_cond are specified' do
-        let :params do default_params.merge({
-          :rewrite_cond => '%{HTTPS} off',
-          :rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
-        }) end
-        it 'should set RewriteCond' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTPS\} off$/
-          )
-        end
-      end
-
-      describe 'when action is specified specified' do
-        let :params do default_params.merge({
-          :action => 'php-fastcgi',
-        }) end
-        it 'should set Action' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  Action php-fastcgi \/cgi-bin virtual$/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp_configpath is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_configpath => '/etc/php5/apache2',
-        }) end
-        it 'should set suphp_configpath' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_ConfigPath "\/etc\/php5\/apache2"$/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp_addhandler is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_addhandler => 'x-httpd-php',
-        }) end
-        it 'should set suphp_addhandler' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_AddHandler x-httpd-php/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp { user & group } is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :directories      => { 'path' => '/srv/www',
-            'suphp' => { 'user' => 'myappuser', 'group' => 'myappgroup' },
-          }
-        }) end
-        it 'should set suphp_UserGroup' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^    suPHP_UserGroup myappuser myappgroup/
-          )
-        end
-      end
-
-      describe 'priority/default settings' do
-        describe 'when neither priority/default is specified' do
-          let :params do default_params end
-          it { should contain_file("25-#{title}.conf").with_path(
-            /25-#{title}.conf/
-          ) }
-        end
-        describe 'when both priority/default_vhost is specified' do
-          let :params do
-            default_params.merge({
-              :priority      => 15,
-              :default_vhost => true,
-            })
-          end
-          it { should contain_file("15-#{title}.conf").with_path(
-            /15-#{title}.conf/
-          ) }
-        end
-        describe 'when only priority is specified' do
-          let :params do
-            default_params.merge({ :priority => 14, })
-          end
-          it { should contain_file("14-#{title}.conf").with_path(
-            /14-#{title}.conf/
-          ) }
-        end
-        describe 'when only default is specified' do
-          let :params do
-            default_params.merge({ :default_vhost => true, })
-          end
-          it { should contain_file("10-#{title}.conf").with_path(
-            /10-#{title}.conf/
-          ) }
-        end
-      end
-
-      describe 'fcgid directory options' do
-        describe 'No fcgiwrapper' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www' },
-            })
-          end
-
-          it { should_not contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
-        end
-
-        describe 'Only a command' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper' },
-              }
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
-        end
-
-        describe 'All parameters' do
-          let :params do
-            default_params.merge({
-              :directories    => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper', 'suffix' => '.php', 'virtual' => 'virtual' },
-              }
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
-        end
-      end
-
-      describe 'various ip/port combos' do
-        describe 'when ip_based is true' do
-          let :params do default_params.merge({ :ip_based => true }) end
-          it 'should not specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should_not contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when ip_based is default' do
-          let :params do default_params end
-          it 'should specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when an ip is set' do
-          let :params do default_params.merge({ :ip => '10.0.0.1' }) end
-          it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:port])
-            should contain_apache__listen("10.0.0.1:#{params[:port]}")
-            should contain_apache__namevirtualhost("10.0.0.1:#{params[:port]}")
-          end
-        end
-
-        describe 'an ip_based vhost without a port' do
-          let :params do
-            {
-              :docroot  => '/fake',
-              :ip       => '10.0.0.1',
-              :ip_based => true,
-            }
-          end
-          it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:ip])
-            should_not contain_apache__namevirtualhost(params[:ip])
-            should contain_file("25-#{title}.conf").with_content %r{<VirtualHost 10\.0\.0\.1>}
-          end
-        end
-      end
-
-      describe 'when suexec_user_group is specified' do
-        let :params do
-          default_params.merge({
-            :suexec_user_group => 'nobody nogroup',
-          })
-        end
-
-        it { should contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
-      end
-
-      describe 'redirect rules' do
-        describe 'without lockstep arrays' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-              :redirect_status   => [
-                'permanent',
-                '',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'redirect match rules' do
-          let :params do
-            default_params.merge({
-              :redirectmatch_status => [
-                '404',
-              ],
-              :redirectmatch_regexp   => [
-                '/\.git(/.*|$)',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
-        end
-        describe 'without a status' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'with a single status and dest' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => 'http://10.0.0.10/test',
-              :redirect_status => 'permanent',
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/test} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /logout http://10\.0\.0\.10/test} }
-        end
-
-        describe 'with a directoryindex specified' do
-          let :params do
-            default_params.merge({
-              :directoryindex => 'index.php'
-            })
-          end
-          it { should contain_file("25-#{title}.conf").with_content %r{DirectoryIndex index.php} }
-	end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
deleted file mode 100644
index 76e9a144667..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
+++ /dev/null
@@ -1 +0,0 @@
-# This is a file only for spec testing
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
deleted file mode 100644
index 019debfe481..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-Fake template for rspec.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
deleted file mode 100644
index de653df4b3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---format s
---colour
---loadby mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
deleted file mode 100644
index 65379ee38a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
-    # Store any environment variables away to be restored later
-    @old_env = {}
-    ENV.each_key {|k| @old_env[k] = ENV[k]}
-
-    if ENV['STRICT_VARIABLES'] == 'yes'
-      Puppet.settings[:strict_variables]=true
-    end
-  end
-end
-
-shared_examples :compile, :compile => true do
-  it { should compile.with_all_deps }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 370de46c0d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host['platform'] =~ /debian/
-      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-    end
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apache')
-    hosts.each do |host|
-      # Required for mod_passenger tests.
-      if fact('osfamily') == 'RedHat'
-        on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
-      end
-      # Required for manifest to make mod_pagespeed repository available
-      if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
-      end
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
deleted file mode 100644
index ddb9dddda4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
-
-describe provider_class do
-  before :each do
-    provider_class.clear
-  end
-
-  [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
-    it "should respond to the class method #{method}" do
-      provider_class.should respond_to(method)
-    end
-  end
-
-  describe "when fetching modules" do
-    before do
-      @filetype = mock()
-    end
-
-    it "should return a sorted array of the defined parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar baz foo}
-    end
-
-    it "should cache the module list" do
-      @filetype.expects(:read).once.returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).once.returns(@filetype)
-
-      2.times { provider_class.modules.should == %w{bar baz foo} }
-    end
-
-    it "should normalize parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar foo}
-    end
-  end
-
-  describe "when prefetching" do
-    it "should match providers to resources" do
-      provider = mock("ssl_provider", :name => "ssl")
-      resource = mock("ssl_resource")
-      resource.expects(:provider=).with(provider)
-
-      provider_class.expects(:instances).returns([provider])
-      provider_class.prefetch("ssl" => resource)
-    end
-  end
-
-  describe "when flushing" do
-    before :each do
-      @filetype = mock()
-      @filetype.stubs(:backup)
-      provider_class.expects(:filetype).at_least_once.returns(@filetype)
-
-      @info = mock()
-      @info.stubs(:[]).with(:name).returns("info")
-      @info.stubs(:provider=)
-
-      @mpm = mock()
-      @mpm.stubs(:[]).with(:name).returns("mpm")
-      @mpm.stubs(:provider=)
-
-      @ssl = mock()
-      @ssl.stubs(:[]).with(:name).returns("ssl")
-      @ssl.stubs(:provider=)
-    end
-
-    it "should add modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should remove modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS=""})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      @info.stubs(:provider=)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should not modify providers without resources" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO -D MPM"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the modules in sorted order" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
-
-      @mpm.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("mpm" => @mpm)
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the records back once" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should only modify the line containing APACHE2_OPTS" do
-      @filetype.expects(:read).at_least_once.returns(%Q{# Comment\nAPACHE2_OPTS=""\n# Another comment})
-      @filetype.expects(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should restore any arbitrary arguments" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-Y -D MPM -X"})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should backup the file once if changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup)
-      provider_class.flush
-    end
-
-    it "should not write the file or run backups if no changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"})
-      @filetype.expects(:write).never
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup).never
-      provider_class.flush
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
deleted file mode 100644
index 10e51644ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<IfDefine NOHTTPACCEPT>
-   AcceptFilter http none
-   AcceptFilter https none
-</IfDefine>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
deleted file mode 100644
index cac3aaf1025..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
+++ /dev/null
@@ -1,109 +0,0 @@
-# Security
-ServerTokens <%= @server_tokens %>
-ServerSignature <%= @server_signature %>
-TraceEnable <%= @trace_enable %>
-
-ServerName "<%= @servername %>"
-ServerRoot "<%= @server_root %>"
-PidFile <%= @pidfile %>
-Timeout <%= @timeout %>
-KeepAlive <%= @keepalive %>
-MaxKeepAliveRequests <%= @max_keepalive_requests %>
-KeepAliveTimeout <%= @keepalive_timeout %>
-
-User <%= @user %>
-Group <%= @group %>
-
-AccessFileName .htaccess
-<FilesMatch "^\.ht">
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all denied
-<%- else -%>
-     Order allow,deny
-     Deny from all
-     Satisfy all
-<%- end -%>
-</FilesMatch>
-
-<Directory />
-  Options FollowSymLinks
-  AllowOverride None
-</Directory>
-
-DefaultType none
-HostnameLookups Off
-ErrorLog "<%= @logroot %>/<%= @error_log %>"
-LogLevel <%= @log_level %>
-EnableSendfile <%= @sendfile %>
-
-#Listen 80
-
-<% if @apxs_workaround -%>
-# Workaround: without this hack apxs would be confused about where to put
-# LoadModule directives and fail entire procedure of apache package
-# installation/reinstallation. This problem was observed on FreeBSD (apache22).
-#LoadModule fake_module libexec/apache22/mod_fake.so
-<% end -%>
-
-Include "<%= @mod_load_dir %>/*.load"
-<% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%>
-Include "<%= @mod_load_dir %>/*.conf"
-<% end -%>
-Include "<%= @ports_file %>"
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-<% if @log_formats and !@log_formats.empty? -%>
-  <%- @log_formats.each do |nickname,format| -%>
-LogFormat "<%= format -%>" <%= nickname %>
-  <%- end -%>
-<% end -%>
-
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @confd_dir %>/*.conf"
-<%- else -%>
-Include "<%= @confd_dir %>/*.conf"
-<%- end -%>
-<% if @vhost_load_dir != @confd_dir -%>
-Include "<%= @vhost_load_dir %>/*"
-<% end -%>
-
-<% if @error_documents -%>
-# /usr/share/apache2/error on debian
-Alias /error/ "<%= @error_documents_path %>/"
-
-<Directory "<%= @error_documents_path %>">
-  AllowOverride None
-  Options IncludesNoExec
-  AddOutputFilter Includes html
-  AddHandler type-map var
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  Require all granted
-<%- else -%>
-  Order allow,deny
-  Allow from all
-<%- end -%>
-  LanguagePriority en cs de es fr it nl sv pt-br ro
-  ForceLanguagePriority Prefer Fallback
-</Directory>
-
-ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-ErrorDocument 410 /error/HTTP_GONE.html.var
-ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
deleted file mode 100644
index 8fc871b0ad7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%# Listen should always be one of:
-  - <port>
-  - <ipv4>:<port>
-  - [<ipv6]:<port>
--%>
-Listen <%= @listen_addr_port %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
deleted file mode 100644
index 151a806c9f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<IfModule alias_module>
-Alias /icons/ "<%= @icons_path %>/"
-<Directory "<%= @icons_path %>">
-    Options Indexes MultiViews
-    AllowOverride None
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-<%- else -%>
-     Order allow,deny
-     Allow from all
-<%- end -%>
-</Directory>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
deleted file mode 100644
index 565fcf0df90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @verifyServerCert == true -%>
-LDAPVerifyServerCert On
-<% else -%>
-LDAPVerifyServerCert Off
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
deleted file mode 100644
index ef6bbebea60..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2
-
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
-
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif /core
-AddIcon (SND,/icons/sound2.gif) .ogg
-AddIcon (VID,/icons/movie.gif) .ogm
-
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
-
-AddIcon /icons/odf6odt-20x22.png .odt
-AddIcon /icons/odf6ods-20x22.png .ods
-AddIcon /icons/odf6odp-20x22.png .odp
-AddIcon /icons/odf6odg-20x22.png .odg
-AddIcon /icons/odf6odc-20x22.png .odc
-AddIcon /icons/odf6odf-20x22.png .odf
-AddIcon /icons/odf6odb-20x22.png .odb
-AddIcon /icons/odf6odi-20x22.png .odi
-AddIcon /icons/odf6odm-20x22.png .odm
-
-AddIcon /icons/odf6ott-20x22.png .ott
-AddIcon /icons/odf6ots-20x22.png .ots
-AddIcon /icons/odf6otp-20x22.png .otp
-AddIcon /icons/odf6otg-20x22.png .otg
-AddIcon /icons/odf6otc-20x22.png .otc
-AddIcon /icons/odf6otf-20x22.png .otf
-AddIcon /icons/odf6oti-20x22.png .oti
-AddIcon /icons/odf6oth-20x22.png .oth
-
-DefaultIcon /icons/unknown.gif
-ReadmeName README.html
-HeaderName HEADER.html
-
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
deleted file mode 100644
index 5f82d7424c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-ScriptSock "<%= @cgisock_path %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
deleted file mode 100644
index 3c53e9e14b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DAVLockDB "<%= @dav_lock %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
deleted file mode 100644
index a3cdf0552e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
-AddOutputFilterByType DEFLATE application/rss+xml
-
-DeflateFilterNote Input instream
-DeflateFilterNote Output outstream
-DeflateFilterNote Ratio ratio
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
deleted file mode 100644
index 741f6ae034a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DirectoryIndex <%= @indexes.join(' ') %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
deleted file mode 100644
index 0c7e2c4b73e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mod_proxy.c>
-  <IfModule mod_disk_cache.c>
-     CacheEnable disk /
-     CacheRoot "<%= @cache_root %>"
-     CacheDirLevels 2
-     CacheDirLength 1
-  </IfModule>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
deleted file mode 100644
index 40099543d5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfModule mpm_event_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  MaxClients          <%= @maxclients %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
deleted file mode 100644
index 8d94a236141..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-# The Fastcgi Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_fastcgi.c>
-  AddHandler fastcgi-script .fcgi
-  FastCgiIpcDir "<%= @fastcgi_lib_path %>"
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
deleted file mode 100644
index a82bc30df90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_fcgid.c>
-<% @options.sort_by {|key, value| key}.each do |key, value| -%>
-  <%= key %> <%= value %>
-<% end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
deleted file mode 100644
index d5288fb8c92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<Location /server-info>
-    SetHandler server-info
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
deleted file mode 100644
index f45f2b35dd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mpm_itk_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
deleted file mode 100644
index 00197761753..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<Location /ldap-status>
-    SetHandler ldap-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 ::1
-    Satisfy all
-    <%- end -%>
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
deleted file mode 100644
index 51f45edb21a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @loadfiles -%>
-<% Array(@loadfiles).each do |loadfile| -%>
-LoadFile <%= loadfile %>
-<% end -%>
-
-<% end -%>
-LoadModule <%= @_id %> <%= @_path %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
deleted file mode 100644
index a69a424a6a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-TypesConfig <%= @mime_types_config %>
-
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-AddType application/x-bzip2 .bz2
-
-AddLanguage ca .ca
-AddLanguage cs .cz .cs
-AddLanguage da .dk
-AddLanguage de .de
-AddLanguage el .el
-AddLanguage en .en
-AddLanguage eo .eo
-AddLanguage es .es
-AddLanguage et .et
-AddLanguage fr .fr
-AddLanguage he .he
-AddLanguage hr .hr
-AddLanguage it .it
-AddLanguage ja .ja
-AddLanguage ko .ko
-AddLanguage ltz .ltz
-AddLanguage nl .nl
-AddLanguage nn .nn
-AddLanguage no .no
-AddLanguage pl .po
-AddLanguage pt .pt
-AddLanguage pt-BR .pt-br
-AddLanguage ru .ru
-AddLanguage sv .sv
-AddLanguage zh-CN .zh-cn
-AddLanguage zh-TW .zh-tw
-
-AddHandler type-map var
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
deleted file mode 100644
index 1ce1bc3c169..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-MIMEMagicFile "<%= @magic_file %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
deleted file mode 100644
index eb6f1ff5f51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfModule mpm_event_module>
-  StartServers          2
-  MinSpareThreads      25
-  MaxSpareThreads      75
-  ThreadLimit          64
-  ThreadsPerChild      25
-  MaxClients          150
-  MaxRequestsPerChild   0
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
deleted file mode 100644
index 50921019bcf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-ForceLanguagePriority Prefer Fallback
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
deleted file mode 100644
index a5c81752f3e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
+++ /dev/null
@@ -1,228 +0,0 @@
-#
-# This is the Apache server configuration file providing SSL support using.
-# the mod_nss plugin.  It contains the configuration directives to instruct
-# the server how to serve pages over an https connection.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.
-#
-
-#LoadModule nss_module modules/libmodnss.so
-
-#
-# When we also provide SSL we have to listen to the
-# standard HTTP port (see above) and to the HTTPS port
-#
-# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-#       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
-#
-Listen 8443
-
-##
-##  SSL Global Context
-##
-##  All SSL configuration in this context applies both to
-##  the main server and all SSL-enabled virtual hosts.
-##
-
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
-#   Pass Phrase Dialog:
-#   Configure the pass phrase gathering process.
-#   The filtering dialog program (`builtin' is a internal
-#   terminal dialog) has to provide the pass phrase on stdout.
-<% if @passwd_file -%>
-NSSPassPhraseDialog  "file:<%= @passwd_file %>"
-<% else -%>
-NSSPassPhraseDialog  builtin
-<% end -%>
-
-#   Pass Phrase Helper:
-#   This helper program stores the token password pins between
-#   restarts of Apache.
-NSSPassPhraseHelper /usr/sbin/nss_pcache
-
-#   Configure the SSL Session Cache.
-#   NSSSessionCacheSize is the number of entries in the cache.
-#   NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
-#   NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
-NSSSessionCacheSize 10000
-NSSSessionCacheTimeout 100
-NSSSession3CacheTimeout 86400
-
-#
-# Pseudo Random Number Generator (PRNG):
-# Configure one or more sources to seed the PRNG of the SSL library.
-# The seed data should be of good random quality.
-# WARNING! On some platforms /dev/random blocks if not enough entropy
-# is available. Those platforms usually also provide a non-blocking
-# device, /dev/urandom, which may be used instead.
-#
-# This does not support seeding the RNG with each connection.
-
-NSSRandomSeed startup builtin
-#NSSRandomSeed startup file:/dev/random  512
-#NSSRandomSeed startup file:/dev/urandom 512
-
-#
-# TLS Negotiation configuration under RFC 5746
-#
-# Only renegotiate if the peer's hello bears the TLS renegotiation_info
-# extension. Default off.
-NSSRenegotiation off
-
-# Peer must send Signaling Cipher Suite Value (SCSV) or
-# Renegotiation Info (RI) extension in ALL handshakes.  Default: off
-NSSRequireSafeNegotiation off
-
-##
-## SSL Virtual Host Context
-##
-
-<VirtualHost _default_:8443>
-
-#   General setup for the virtual host
-#DocumentRoot "/etc/httpd/htdocs"
-#ServerName www.example.com:8443
-#ServerAdmin you@example.com
-
-# mod_nss can log to separate log files, you can choose to do that if you'd like
-# LogLevel is not inherited from httpd.conf.
-ErrorLog "<%= @error_log %>"
-TransferLog "<%= @transfer_log %>"
-LogLevel warn
-
-#   SSL Engine Switch:
-#   Enable/Disable SSL for this virtual host.
-NSSEngine on
-
-#   SSL Cipher Suite:
-#   List the ciphers that the client is permitted to negotiate.
-#   See the mod_nss documentation for a complete list.
-
-# SSL 3 ciphers. SSL 2 is disabled by default.
-NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha
-
-# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default.
-#
-# Comment out the NSSCipherSuite line above and use the one below if you have
-# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography
-#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha
-
-#   SSL Protocol:
-#   Cryptographic protocols that provide communication security.
-#   NSS handles the specified protocols as "ranges", and automatically
-#   negotiates the use of the strongest protocol for a connection starting
-#   with the maximum specified protocol and downgrading as necessary to the
-#   minimum specified protocol that can be used between two processes.
-#   Since all protocol ranges are completely inclusive, and no protocol in the
-#   middle of a range may be excluded, the entry "NSSProtocol SSLv3,TLSv1.1"
-#   is identical to the entry "NSSProtocol SSLv3,TLSv1.0,TLSv1.1".
-NSSProtocol SSLv3,TLSv1.0,TLSv1.1
-
-#   SSL Certificate Nickname:
-#   The nickname of the RSA server certificate you are going to use.
-NSSNickname Server-Cert
-
-#   SSL Certificate Nickname:
-#   The nickname of the ECC server certificate you are going to use, if you
-#   have an ECC-enabled version of NSS and mod_nss
-#NSSECCNickname Server-Cert-ecc
-
-#   Server Certificate Database:
-#   The NSS security database directory that holds the certificates and
-#   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
-#   Provide the directory that these files exist.
-NSSCertificateDatabase "<%= @httpd_dir -%>/alias"
-
-#   Database Prefix:
-#   In order to be able to store multiple NSS databases in one directory
-#   they need unique names. This option sets the database prefix used for
-#   cert8.db and key3.db.
-#NSSDBPrefix my-prefix-
-
-#   Client Authentication (Type):
-#   Client certificate verification type.  Types are none, optional and
-#   require.
-#NSSVerifyClient none
-
-#
-#   Online Certificate Status Protocol (OCSP).
-#   Verify that certificates have not been revoked before accepting them.
-#NSSOCSP off
-
-#
-#   Use a default OCSP responder. If enabled this will be used regardless
-#   of whether one is included in a client certificate. Note that the
-#   server certificate is verified during startup.
-#
-#   NSSOCSPDefaultURL defines the service URL of the OCSP responder
-#   NSSOCSPDefaultName is the nickname of the certificate to trust to
-#       sign the OCSP responses.
-#NSSOCSPDefaultResponder on
-#NSSOCSPDefaultURL http://example.com/ocsp/status
-#NSSOCSPDefaultName ocsp-nickname
-
-#   Access Control:
-#   With SSLRequire you can do per-directory access control based
-#   on arbitrary complex boolean expressions containing server
-#   variable checks and other lookup directives.  The syntax is a
-#   mixture between C and Perl.  See the mod_nss documentation
-#   for more details.
-#<Location />
-#NSSRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
-#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
-#</Location>
-
-#   SSL Engine Options:
-#   Set various options for the SSL engine.
-#   o FakeBasicAuth:
-#     Translate the client X.509 into a Basic Authorisation.  This means that
-#     the standard Auth/DBMAuth methods can be used for access control.  The
-#     user name is the `one line' version of the client's X.509 certificate.
-#     Note that no password is obtained from the user. Every entry in the user
-#     file needs this password: `xxj31ZMTZzkVA'.
-#   o ExportCertData:
-#     This exports two additional environment variables: SSL_CLIENT_CERT and
-#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-#     server (always existing) and the client (only existing when client
-#     authentication is used). This can be used to import the certificates
-#     into CGI scripts.
-#   o StdEnvVars:
-#     This exports the standard SSL/TLS related `SSL_*' environment variables.
-#     Per default this exportation is switched off for performance reasons,
-#     because the extraction step is an expensive operation and is usually
-#     useless for serving static content. So one usually enables the
-#     exportation for CGI and SSI requests only.
-#   o StrictRequire:
-#     This denies access when "NSSRequireSSL" or "NSSRequire" applied even
-#     under a "Satisfy any" situation, i.e. when it applies access is denied
-#     and no other module can change it.
-#   o OptRenegotiate:
-#     This enables optimized SSL connection renegotiation handling when SSL
-#     directives are used in per-directory context.
-#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
-<FilesMatch "\.(cgi|shtml|phtml|php3?)$">
-    NSSOptions +StdEnvVars
-</FilesMatch>
-<Directory "/var/www/cgi-bin">
-    NSSOptions +StdEnvVars
-</Directory>
-
-#   Per-Server Logging:
-#   The home of a custom SSL log file. Use this when you want a
-#   compact non-error SSL logfile on a virtual host basis.
-#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
-#          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-</VirtualHost>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
deleted file mode 100644
index a4d8a7220e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-ModPagespeed on
-
-ModPagespeedInheritVHostConfig <%= @inherit_vhost_config %>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
-<% if @filter_xhtml -%>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
-<% end -%>
-ModPagespeedFileCachePath "<%= @cache_path %>"
-ModPagespeedLogDir "<%= @log_dir %>"
-    
-<% @memache_servers.each do |server| -%>
-ModPagespeedMemcachedServers <%= server -%>
-<% end -%>
-
-ModPagespeedRewriteLevel <%= @rewrite_level -%>
-
-<% @disable_filters.each do |filter| -%>
-ModPagespeedDisableFilters <%= filter -%>
-<% end -%>
-    
-<% @enable_filters.each do |filter| -%>
-ModPagespeedEnableFilters <%= filter -%>
-<% end -%>
-
-<% @forbid_filters.each do |filter| -%>
-ModPagespeedForbidFilters <%= filter -%>
-<% end -%>
-
-ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %>
-
-<% if @additional_domains -%>
-ModPagespeedDomain <%= @additional_domains -%>
-<% end -%>
-
-ModPagespeedFileCacheSizeKb          <%= @file_cache_size_kb %>
-ModPagespeedFileCacheCleanIntervalMs <%= @file_cache_clean_interval_ms %>
-ModPagespeedLRUCacheKbPerProcess     <%= @lru_cache_per_process %>
-ModPagespeedLRUCacheByteLimit        <%= @lru_cache_byte_limit %>
-ModPagespeedCssFlattenMaxBytes       <%= @css_flatten_max_bytes %>
-ModPagespeedCssInlineMaxBytes        <%= @css_inline_max_bytes %>
-ModPagespeedCssImageInlineMaxBytes   <%= @css_image_inline_max_bytes %>
-ModPagespeedImageInlineMaxBytes      <%= @image_inline_max_bytes %>
-ModPagespeedJsInlineMaxBytes         <%= @js_inline_max_bytes %>
-ModPagespeedCssOutlineMinBytes       <%= @css_outline_min_bytes %>
-ModPagespeedJsOutlineMinBytes        <%= @js_outline_min_bytes %>
-
-
-ModPagespeedFileCacheInodeLimit <%= @inode_limit %>
-ModPagespeedImageMaxRewritesAtOnce <%= @image_max_rewrites_at_once %>
-
-ModPagespeedNumRewriteThreads <%= @num_rewrite_threads %>
-ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %>
-
-ModPagespeedStatistics <%= @collect_statistics %>
-
-<Location /mod_pagespeed_statistics>
-    # You may insert other "Allow from" lines to add hosts you want to
-    # allow to look at generated statistics.  Another possibility is
-    # to comment out the "Order" and "Allow" options from the config
-    # file, to allow any client that can reach your server to examine
-    # statistics.  This might be appropriate in an experimental setup or
-    # if the Apache server is protected by a reverse proxy that will
-    # filter URLs in some fashion.
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- end -%>
-    SetHandler mod_pagespeed_statistics
-</Location>
-
-ModPagespeedStatisticsLogging <%= @statistics_logging %>
-<Location /pagespeed_console>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- end -%>
-    SetHandler pagespeed_console
-</Location>
-
-ModPagespeedMessageBufferSize <%= @message_buffer_size %>
-
-<Location /mod_pagespeed_message>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- end -%>
-    SetHandler mod_pagespeed_message
-</Location>
-
-<% @additional_configuration.each_pair do |key, value| -%>
-<%= key %> <%= value %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
deleted file mode 100644
index dd9eee3b134..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-# The Passanger Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_passenger.c>
-  <%- if @passenger_root -%>
-  PassengerRoot "<%= @passenger_root %>"
-  <%- end -%>
-  <%- if @passenger_ruby -%>
-  PassengerRuby "<%= @passenger_ruby %>"
-  <%- end -%>
-  <%- if @passenger_default_ruby -%>
-  PassengerDefaultRuby "<%= @passenger_default_ruby %>"
-  <%- end -%>
-  <%- if @passenger_high_performance -%>
-  PassengerHighPerformance <%= @passenger_high_performance %>
-  <%- end -%>
-  <%- if @passenger_max_pool_size -%>
-  PassengerMaxPoolSize <%= @passenger_max_pool_size %>
-  <%- end -%>
-  <%- if @passenger_pool_idle_time -%>
-  PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
-  <%- end -%>
-  <%- if @passenger_max_requests -%>
-  PassengerMaxRequests <%= @passenger_max_requests %>
-  <%- end -%>
-  <%- if @passenger_stat_throttle_rate -%>
-  PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
-  <%- end -%>
-  <%- if @rack_autodetect -%>
-  RackAutoDetect <%= @rack_autodetect %>
-  <%- end -%>
-  <%- if @rails_autodetect -%>
-  RailsAutoDetect <%= @rails_autodetect %>
-  <%- end -%>
-  <%- if @passenger_use_global_queue -%>
-  PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
-  <%- end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
deleted file mode 100644
index 13c8d708db4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<IfModule mpm_peruser_module>
-  MinSpareProcessors  <%= @minspareprocessors %>
-  MinProcessors       <%= @minprocessors %>
-  MaxProcessors       <%= @maxprocessors %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  IdleTimeout         <%= @idletimeout %>
-  ExpireTimeout       <%= @expiretimeout %>
-  KeepAlive           <%= @keepalive %>
-  Include             "<%= @mod_dir %>/peruser/multiplexers/*.conf"
-  Include             "<%= @mod_dir %>/peruser/processors/*.conf"
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
deleted file mode 100644
index 44df2ae066d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# PHP is an HTML-embedded scripting language which attempts to make it
-# easy for developers to write dynamically generated webpages.
-#
-#<IfModule prefork.c>
-#  LoadModule php5_module modules/libphp5.so
-#</IfModule>
-#<IfModule worker.c>
-#  # Use of the "ZTS" build with worker is experimental, and no shared
-#  # modules are supported.
-#  LoadModule php5_module modules/libphp5-zts.so
-#</IfModule>
-
-#
-# Cause the PHP interpreter to handle files with a .php extension.
-#
-AddHandler php5-script <%= @extensions.flatten.compact.join(' ') %>
-AddType text/html .php
-
-#
-# Add index.php to the list of files that will be served as directory
-# indexes.
-#
-DirectoryIndex index.php
-
-#
-# Uncomment the following line to allow PHP to pretty-print .phps
-# files as PHP source code:
-#
-#AddType application/x-httpd-php-source .phps
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
deleted file mode 100644
index aabfdf7b22a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mpm_prefork_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
deleted file mode 100644
index 5ea829eeb3a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-<IfModule mod_proxy.c>
-  # Do not enable proxying with ProxyRequests until you have secured your
-  # server.  Open proxy servers are dangerous both to your network and to the
-  # Internet at large.
-  ProxyRequests <%= @proxy_requests %>
-
-  <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
-  <Proxy *>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-  </Proxy>
-  <% end -%>
-
-  # Enable/disable the handling of HTTP/1.1 "Via:" headers.
-  # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-  # Set to one of: Off | On | Full | Block
-  ProxyVia On
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
deleted file mode 100644
index fea15f393f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-ProxyHTMLLinks  a               href
-ProxyHTMLLinks  area            href
-ProxyHTMLLinks  link            href
-ProxyHTMLLinks  img             src longdesc usemap
-ProxyHTMLLinks  object          classid codebase data usemap
-ProxyHTMLLinks  q               cite
-ProxyHTMLLinks  blockquote      cite
-ProxyHTMLLinks  ins             cite
-ProxyHTMLLinks  del             cite
-ProxyHTMLLinks  form            action
-ProxyHTMLLinks  input           src usemap
-ProxyHTMLLinks  head            profileProxyHTMLLinks  base            href
-ProxyHTMLLinks  script          src for
-
-ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
-                onmouseover onmousemove onmouseout onkeypress \
-                onkeydown onkeyup onfocus onblur onload \
-                onunload onsubmit onreset onselect onchange
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
deleted file mode 100644
index 9a18800da5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-RequestReadTimeout header=20-40,minrate=500
-RequestReadTimeout body=10,minrate=500
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
deleted file mode 100644
index 56e2398b55b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Enable reverse proxy add forward
-RPAFenable On
-# RPAFsethostname will, when enabled, take the incoming X-Host header and
-# update the virtual host settings accordingly. This allows to have the same
-# hostnames as in the "real" configuration for the forwarding proxy.
-<% if @sethostname -%>
-RPAFsethostname On
-<% else -%>
-RPAFsethostname Off
-<% end -%>
-# Which IPs are forwarding requests to us
-RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
-# Setting RPAFheader allows you to change the header name to parse from the
-# default X-Forwarded-For to something of your choice.
-RPAFheader <%= @header %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
deleted file mode 100644
index d31c79fe5d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# The following directives modify normal HTTP response behavior to
-# handle known problems with browser implementations.
-#
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-BrowserMatch "RealPlayer 4\.0" force-response-1.0
-BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-
-#
-# The following directive disables redirects on non-GET requests for
-# a directory that does not include the trailing slash.  This fixes a 
-# problem with Microsoft WebFolders which does not appropriately handle 
-# redirects for folders with DAV methods.
-# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
-#
-BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
-BrowserMatch "MS FrontPage" redirect-carefully
-BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
-BrowserMatch "^gnome-vfs/1.0" redirect-carefully
-BrowserMatch "^gvfs/1" redirect-carefully
-BrowserMatch "^XML Spy" redirect-carefully
-BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-BrowserMatch " Konqueror/4" redirect-carefully
-
-<IfModule mod_ssl.c>
-  BrowserMatch "MSIE [2-6]" \
-    nokeepalive ssl-unclean-shutdown \
-    downgrade-1.0 force-response-1.0
-  # MSIE 7 and newer should be able to use keepalive
-  BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
deleted file mode 100644
index 24274050c28..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<IfModule mod_ssl.c>
-  SSLRandomSeed startup builtin
-  SSLRandomSeed startup file:/dev/urandom 512
-  SSLRandomSeed connect builtin
-  SSLRandomSeed connect file:/dev/urandom 512
-
-  AddType application/x-x509-ca-cert .crt
-  AddType application/x-pkcs7-crl    .crl
-
-  SSLPassPhraseDialog  builtin
-  SSLSessionCache "shmcb:<%= @session_cache %>"
-  SSLSessionCacheTimeout 300
-<% if @ssl_compression -%>
-  SSLCompression On
-<% end -%>
-  <% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  Mutex <%= @ssl_mutex %>
-  <% else -%>
-  SSLMutex <%= @ssl_mutex %>
-  <% end -%>
-  SSLCryptoDevice builtin
-  SSLHonorCipherOrder On
-  SSLCipherSuite <%= @ssl_cipher %>
-  SSLProtocol all -SSLv2
-<% if @ssl_options -%>
-  SSLOptions <%= @ssl_options.compact.join(' ') %>
-<% end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
deleted file mode 100644
index 84f2e034309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<Location /server-status>
-    SetHandler server-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-</Location>
-ExtendedStatus <%= @extended_status %>
-
-<IfModule mod_proxy.c>
-    # Show Proxy LoadBalancer status in mod_status
-    ProxyStatus On
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
deleted file mode 100644
index 95fbf97c782..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfModule mod_suphp.c>
-    AddType application/x-httpd-suphp .php .php3 .php4 .php5 .phtml
-    suPHP_AddHandler application/x-httpd-suphp
-
-    <Directory />
-        suPHP_Engine on
-    </Directory>
-
-    # By default, disable suPHP for debian packaged web applications as files
-    # are owned by root and cannot be executed by suPHP because of min_uid.
-    <Directory /usr/share>
-        suPHP_Engine off
-    </Directory>
-
-# # Use a specific php config file (a dir which contains a php.ini file)
-#       suPHP_ConfigPath /etc/php4/cgi/suphp/
-# # Tells mod_suphp NOT to handle requests with the type <mime-type>.
-#       suPHP_RemoveHandler <mime-type>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
deleted file mode 100644
index add525d5eac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<IfModule mod_userdir.c>
-<% if @disable_root -%>
-  UserDir disabled root
-<% end -%>
-  UserDir <%= @dir %>
-
-  <Directory "<%= @home %>/*/<%= @dir %>">
-    AllowOverride FileInfo AuthConfig Limit Indexes
-    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-    <Limit GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
-    </Limit>
-    <LimitExcept GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
-    </LimitExcept>
-  </Directory>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
deleted file mode 100644
index 597e05f8d55..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfModule mpm_worker_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  MaxClients          <%= @maxclients %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  ThreadLimit         <%= @threadlimit %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
deleted file mode 100644
index 18752d2c4a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# The WSGI Apache module configuration file is being
-# managed by Puppet an changes will be overwritten.
-<IfModule mod_wsgi.c>
-  <%- if @wsgi_socket_prefix -%>
-  WSGISocketPrefix <%= @wsgi_socket_prefix %>
-  <%- end -%>
-  <%- if @wsgi_python_home -%>
-  WSGIPythonHome "<%= @wsgi_python_home %>"
-  <%- end -%>
-  <%- if @wsgi_python_path -%>
-  WSGIPythonPath "<%= @wsgi_python_path %>"
-  <%- end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
deleted file mode 100644
index cf767680fc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%# NameVirtualHost should always be one of:
-  - *
-  - *:<port>
-  - _default_:<port>
-  - <ip>
-  - <ip>:<port>
--%>
-NameVirtualHost <%= @addr_port %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
deleted file mode 100644
index 4908db4ad35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# ************************************
-# Listen & NameVirtualHost resources in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
deleted file mode 100644
index 64024cfef3d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-# ************************************
-# Vhost template in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-
-<VirtualHost <%= @nvh_addr_port %>>
-  ServerName <%= @servername %>
-<% if @serveradmin -%>
-  ServerAdmin <%= @serveradmin %>
-<% end -%>
-
-  ## Vhost docroot
-<% if @virtual_docroot -%>
-  VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% else -%>
-  DocumentRoot "<%= @docroot %>"
-<% end -%>
-<%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
-
-<%= scope.function_template(['apache/vhost/_itk.erb']) -%>
-
-<% if @fallbackresource -%>
-  FallbackResource <%= @fallbackresource %>
-<% end -%>
-
-  ## Directories, there should at least be a declaration for <%= @docroot %>
-<%= scope.function_template(['apache/vhost/_directories.erb']) -%>
-
-  ## Load additional static includes
-<% Array(@additional_includes).each do |include| %>
-  Include "<%= include %>"
-<% end %>
-
-  ## Logging
-<% if @error_log -%>
-  ErrorLog "<%= @error_log_destination %>"
-<% end -%>
-<% if @log_level -%>
-  LogLevel <%= @log_level %>
-<% end -%>
-  ServerSignature Off
-<% if @access_log and @_access_log_env_var -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
-<% elsif @access_log -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
-<% end -%>
-<%= scope.function_template(['apache/vhost/_action.erb']) -%>
-<%= scope.function_template(['apache/vhost/_block.erb']) -%>
-<%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
-<%= scope.function_template(['apache/vhost/_proxy.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rack.erb']) -%>
-<%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rewrite.erb']) -%>
-<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_serveralias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
-<%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
-<%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
-<%= scope.function_template(['apache/vhost/_header.erb']) -%>
-<%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
-<%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
-<%= scope.function_template(['apache/vhost/_fastcgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suexec.erb']) -%>
-</VirtualHost>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
deleted file mode 100644
index 8a022905950..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @action -%>
-
-  Action <%= @action %> /cgi-bin virtual
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
deleted file mode 100644
index 5fdd76ba240..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @aliases and ! @aliases.empty? -%>
-  ## Alias declarations for resources outside the DocumentRoot
-  <%- [@aliases].flatten.compact.each do |alias_statement| -%>
-    <%- if alias_statement["path"] != '' -%>
-      <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%>
-  Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
-  AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
deleted file mode 100644
index d0776829da3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% if @block and ! @block.empty? -%>
-
-  ## Block access statements
-<% if @block.include? 'scm' -%>
-  # Block access to SCM directories.
-  <DirectoryMatch .*\.(svn|git|bzr)/.*>
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all denied
-  <%- else -%>
-    Deny From All
-  <%- end -%>
-  </DirectoryMatch>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
deleted file mode 100644
index 973964655ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @custom_fragment -%>
-
-  ## Custom fragment
-<%= @custom_fragment %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
deleted file mode 100644
index f4307c76187..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
+++ /dev/null
@@ -1,171 +0,0 @@
-<% if @_directories and ! @_directories.empty? -%>
-  <%- [@_directories].flatten.compact.each do |directory| -%>
-    <%- if directory['path'] and directory['path'] != '' -%>
-  <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
-    <%- if /^(.*)match$/ =~ directory['provider'] -%>
-      <%- provider = $1.capitalize + 'Match' -%>
-    <%- else -%>
-      <%- provider = directory['provider'].capitalize -%>
-    <%- end -%>
-  <%- else -%>
-    <%- provider = 'Directory' -%>
-  <%- end -%>
-  <%- path = directory['path'] -%>
-
-  <<%= provider %> "<%= path %>">
-    <%- if directory['headers'] -%>
-      <%- Array(directory['headers']).each do |header| -%>
-    Header <%= header %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['options'] -%>
-    Options <%= Array(directory['options']).join(' ') %>
-    <%- end -%>
-    <%- if provider == 'Directory' -%>
-      <%- if directory['index_options'] -%>
-    IndexOptions <%= Array(directory['index_options']).join(' ') %>
-      <%- end -%>
-      <%- if directory['index_order_default'] -%>
-    IndexOrderDefault <%= Array(directory['index_order_default']).join(' ') %>
-      <%- end -%>
-      <%- if directory['allow_override'] -%>
-    AllowOverride <%= Array(directory['allow_override']).join(' ') %>
-      <%- elsif provider == 'Directory' -%>
-    AllowOverride None
-      <%- end -%>
-    <%- end -%>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      <%- if directory['require'] and directory['require'] != '' -%>
-    Require <%= Array(directory['require']).join(' ') %>
-      <%- else -%>
-    Require all granted
-      <%- end -%>
-    <%- else -%>
-      <%- if directory['order'] and directory['order'] != '' -%>
-    Order <%= Array(directory['order']).join(',') %>
-      <%- else -%>
-    Order allow,deny
-      <%- end -%>
-      <%- if directory['deny'] and directory['deny'] != '' -%>
-    Deny <%= directory['deny'] %>
-      <%- end -%>
-      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
-        <%- if directory['allow'].kind_of?(Array) -%>
-          <%- Array(directory['allow']).each do |access| -%>
-    Allow <%=  access %>
-        <%- end -%>
-      <%- else -%>
-    Allow <%= directory['allow'] %>
-      <%- end -%>
-      <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
-      <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
-    Deny from all
-      <%- else -%>
-    Allow from all
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
-      <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>
-    AddHandler <%= addhandler['handler'] %> <%= Array(addhandler['extensions']).join(' ') %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['sethandler'] and directory['sethandler'] != '' -%>
-    SetHandler <%= directory['sethandler'] %>
-    <%- end -%>
-    <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
-    PassengerEnabled <%= directory['passenger_enabled'] %>
-    <%- end -%>
-    <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
-      <%- directory['php_admin_flags'].each do |flag,value| -%>
-      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
-    php_admin_flag <%= "#{flag} #{value}" %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%>
-      <%- directory['php_admin_values'].each do |key,value| -%>
-    php_admin_value <%= "#{key} #{value}" %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
-    DirectoryIndex <%= directory['directoryindex'] %>
-    <%- end -%>
-    <%- if directory['error_documents'] and ! directory['error_documents'].empty? -%>
-      <%- [directory['error_documents']].flatten.compact.each do |error_document| -%>
-    ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['auth_type'] -%>
-    AuthType <%= directory['auth_type'] %>
-    <%- end -%>
-    <%- if directory['auth_name'] -%>
-    AuthName "<%= directory['auth_name'] %>"
-    <%- end -%>
-    <%- if directory['auth_digest_algorithm'] -%>
-    AuthDigestAlgorithm <%= directory['auth_digest_algorithm'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_domain'] -%>
-    AuthDigestDomain <%= Array(directory['auth_digest_domain']).join(' ') %>
-    <%- end -%>
-    <%- if directory['auth_digest_nonce_lifetime'] -%>
-    AuthDigestNonceLifetime <%= directory['auth_digest_nonce_lifetime'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_provider'] -%>
-    AuthDigestProvider <%= directory['auth_digest_provider'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_qop'] -%>
-    AuthDigestQop <%= directory['auth_digest_qop'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_shmem_size'] -%>
-    AuthDigestShmemSize <%= directory['auth_digest_shmem_size'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_authoritative'] -%>
-    AuthBasicAuthoritative <%= directory['auth_basic_authoritative'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_fake'] -%>
-    AuthBasicFake <%= directory['auth_basic_fake'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_provider'] -%>
-    AuthBasicProvider <%= directory['auth_basic_provider'] %>
-    <%- end -%>
-    <%- if directory['auth_user_file'] -%>
-    AuthUserFile <%= directory['auth_user_file'] %>
-    <%- end -%>
-    <%- if directory['auth_group_file'] -%>
-    AuthGroupFile <%= directory['auth_group_file'] %>
-    <%- end -%>
-    <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-    <%- end -%>
-    <%- if directory['fallbackresource'] -%>
-    FallbackResource <%= directory['fallbackresource'] %>
-    <%- end -%>
-    <%- if directory['expires_active'] -%>
-    ExpiresActive <%= directory['expires_active'] %>
-    <%- end -%>
-    <%- if directory['expires_default'] -%>
-    ExpiresDefault <%= directory['expires_default'] %>
-    <%- end -%>
-    <%- if directory['expires_by_type'] -%>
-    <%- Array(directory['expires_by_type']).each do |rule| -%>
-    ExpiresByType <%= rule %>
-    <%- end -%>
-    <%- end -%>
-    <%- if directory['force_type'] -%>
-    ForceType <%= directory['force_type'] %>
-    <%- end -%>
-    <%- if directory['ssl_options'] -%>
-    SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
-    <%- end -%>
-    <%- if directory['suphp'] and @suphp_engine == 'on' -%>
-    suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
-    <%- end -%>
-    <%- if directory['fcgiwrapper'] -%>
-    FcgidWrapper <%= directory['fcgiwrapper']['command'] %> <%= directory['fcgiwrapper']['suffix'] %> <%= directory['fcgiwrapper']['virtual'] %>
-    <%- end -%>
-    <%- if directory['custom_fragment'] -%>
-    <%= directory['custom_fragment'] %>
-    <%- end -%>
-  </<%= provider %>>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
deleted file mode 100644
index 654e72c6760..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @error_documents and ! @error_documents.empty? -%>
-  <%- [@error_documents].flatten.compact.each do |error_document| -%>
-    <%- if error_document["error_code"] != '' and error_document["document"] != '' -%>
-  ErrorDocument <%= error_document["error_code"] %> <%= error_document["document"] %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
deleted file mode 100644
index 3a2baa5596a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% if @fastcgi_server -%>
-
-  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket %>
-<% end -%>
-<% if @fastcgi_dir -%>
-
-  <Directory "<%= @fastcgi_dir %>">
-    Options +ExecCGI
-    AllowOverride All
-    SetHandler fastcgi-script
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-  <%- else -%>
-    Order allow,deny
-    Allow From All
-  <%- end -%>
-    AuthBasicAuthoritative Off
-  </Directory>
-
-  AllowEncodedSlashes On
-  ServerSignature Off
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
deleted file mode 100644
index c0f68c82573..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @headers and ! @headers.empty? -%>
-
-  ## Header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-  <%- Array(@headers).each do |header_statement| -%>
-    <%- if header_statement != '' -%>
-  Header <%= header_statement %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
deleted file mode 100644
index 2971c7a7d04..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% if @itk and ! @itk.empty? -%>
-  ## ITK statement
-  <IfModule mpm_itk_module>
-     <%- if @itk["user"] and @itk["group"] -%>
-     AssignUserId <%= @itk["user"] %> <%= @itk["group"] %>
-     <%- end -%>
-     <%- if @itk["assignuseridexpr"] -%>
-     AssignUserIdExpr <%= @itk["assignuseridexpr"] %>
-     <%- end -%>
-     <%- if @itk["assigngroupidexpr"] -%>
-     AssignGroupIdExpr <%= @itk["assigngroupidexpr"] %>
-     <%- end -%>
-     <%- if @itk["maxclientvhost"] -%>
-     MaxClientsVHost <%= @itk["maxclientvhost"] %>
-     <%- end -%>
-     <%- if @itk["nice"] -%>
-     NiceValue <%= @itk["nice"] %>
-     <%- end -%>
-     <%- if @kernelversion >= '3.5.0' -%>
-       <%- if @itk["limituidrange"] -%>
-     LimitUIDRange <%= @itk["limituidrange"] %>
-       <%- end -%>
-       <%- if @itk["limitgidrange"] -%>
-     LimitGIDRange <%= @itk["limitgidrange"] %>
-       <%- end -%>
-     <%- end -%>
-  </IfModule>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
deleted file mode 100644
index 59536cbc990..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @php_admin_values and not @php_admin_values.empty? -%>
-<% @php_admin_values.each do |key,value| -%>
-  php_admin_value <%= key %> <%= value %>
-<% end -%>
-<% end -%>
-<% if @php_admin_flags and not @php_admin_flags.empty? -%>
-<% @php_admin_flags.each do |key,flag| -%>
-<%# normalize flag -%>
-<% if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
-  php_admin_flag <%= key %> <%= flag %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
deleted file mode 100644
index a1d2e52923e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @proxy_dest or @proxy_pass -%>
-
-  ## Proxy rules
-  ProxyRequests Off
-<%- end -%>
-<% if @proxy_preserve_host %>
-  ProxyPreserveHost On
-<%- end -%>
-<%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
-  <Location <%= proxy['path']%>>
-    ProxyPassReverse <%= proxy['url'] %>
-  </Location>
-<% end %>
-<% if @proxy_dest -%>
-<%- Array(@no_proxy_uris).each do |uri| -%>
-  ProxyPass        <%= uri %> !
-<% end %>
-  ProxyPass          / <%= @proxy_dest %>/
-  <Location          />
-    ProxyPassReverse <%= @proxy_dest %>/
-  </Location>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
deleted file mode 100644
index 4a5b5f1cdcd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @rack_base_uris -%>
-
-  ## Enable rack
-<% Array(@rack_base_uris).each do |uri| -%>
-  RackBaseURI <%= uri %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
deleted file mode 100644
index e865bd9afaf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @redirect_source and @redirect_dest -%>
-<% @redirect_dest_a   = Array(@redirect_dest) -%>
-<% @redirect_source_a = Array(@redirect_source) -%>
-<% @redirect_status_a = Array(@redirect_status) -%>
-
-  ## Redirect rules
-<% @redirect_source_a.each_with_index do |source, i| -%>
-<% @redirect_dest_a[i] ||= @redirect_dest_a[0] -%>
-<% @redirect_status_a[i] ||= @redirect_status_a[0] -%>
-  Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %>
-<% end -%>
-<% end -%>
-
-<%- if @redirectmatch_status and @redirectmatch_regexp -%>
-<% @redirectmatch_status_a = Array(@redirectmatch_status) -%>
-<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
-
-  ## RedirectMatch rules
-<% @redirectmatch_status_a.each_with_index do |status, i| -%>
-<% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%>
-<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
-  RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
deleted file mode 100644
index 9f175052b59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @request_headers and ! @request_headers.empty? -%>
-
-  ## Request header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  <%- Array(@request_headers).each do |request_statement| -%>
-    <%- if request_statement != '' -%>
-  RequestHeader <%= request_statement %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
deleted file mode 100644
index af8b45001e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<%- if @rewrites -%>
-  ## Rewrite rules
-  RewriteEngine On
-  <%- if @rewrite_base -%>
-  RewriteBase <%= @rewrite_base %>
-  <%- end -%>
-
-  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
-    <%- if rewrite_details['comment'] -%>
-  #<%= rewrite_details['comment'] %>
-    <%- end -%>
-    <%- if rewrite_details['rewrite_base'] -%>
-  RewriteBase <%= rewrite_details['rewrite_base'] %>
-    <%- end -%>
-    <%- if rewrite_details['rewrite_cond'] -%>
-      <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
-        <%- Array(commands).each do |command| -%>
-  RewriteCond <%= command %>
-        <%- end -%>
-      <%- end -%>
-    <%- end -%>
-    <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
-      <%- Array(commands).each do |command| -%>
-  RewriteRule <%= command %>
-      <%- end -%>
-
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
-<%# reverse compatibility %>
-<% if @rewrite_rule and !@rewrites -%>
-  ## Rewrite rules
-  RewriteEngine On
-<% if @rewrite_base -%>
-  RewriteBase <%= @rewrite_base %>
-<% end -%>
-<% if @rewrite_cond -%>
-<% Array(@rewrite_cond).each do |cond| -%>
-  RewriteCond <%= cond %>
-<% end -%>
-<% end -%>
-  RewriteRule <%= @rewrite_rule %>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
deleted file mode 100644
index bb4f6b316ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<%- if @scriptaliases.is_a?(Array) -%>
-<%-  aliases = @scriptaliases -%>
-<%- elsif @scriptaliases.is_a?(Hash) -%>
-<%-  aliases = [@scriptaliases] -%>
-<%- else -%>
-<%-  # Nothing to do with any other data type -%>
-<%-  aliases = [] -%>
-<%- end -%>
-<%- if @scriptalias or !aliases.empty? -%>
-  ## Script alias directives
-<%# Combine scriptalais and scriptaliases into a single data structure -%>
-<%# for backward compatibility and ease of implementation -%>
-<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
-<%- aliases.flatten.compact! -%>
-<%- aliases.each do |salias| -%>
-  <%- if salias["path"] != '' -%>
-    <%- if salias["alias"] and salias["alias"] != '' -%>
-  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>"
-    <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%>
-  ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>"
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
deleted file mode 100644
index 278b6ddc538..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @serveraliases and ! @serveraliases.empty? -%>
-
-  ## Server aliases
-<% Array(@serveraliases).each do |serveralias| -%>
-  ServerAlias <%= serveralias %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
deleted file mode 100644
index d5f9ea84501..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @setenv and ! @setenv.empty? -%>
-
-  ## SetEnv/SetEnvIf for environment variables
-<% Array(@setenv).each do |envvar| -%>
-  SetEnv <%= envvar %>
-<% end -%>
-<% end -%>
-<% if @setenvif and ! @setenvif.empty? -%>
-<% Array(@setenvif).each do |envifvar| -%>
-  SetEnvIf <%= envifvar %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
deleted file mode 100644
index 03c78ef427b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% if @ssl -%>
-
-  ## SSL directives
-  SSLEngine on
-  SSLCertificateFile      "<%= @ssl_cert %>"
-  SSLCertificateKeyFile   "<%= @ssl_key %>"
-<% if @ssl_chain -%>
-  SSLCertificateChainFile "<%= @ssl_chain %>"
-<% end -%>
-  SSLCACertificatePath    "<%= @ssl_certs_dir %>"
-<% if @ssl_ca -%>
-  SSLCACertificateFile    "<%= @ssl_ca %>"
-<% end -%>
-<% if @ssl_crl_path -%>
-  SSLCARevocationPath     "<%= @ssl_crl_path %>"
-<% end -%>
-<% if @ssl_crl -%>
-  SSLCARevocationFile     "<%= @ssl_crl %>"
-<% end -%>
-<% if @ssl_proxyengine -%>
-  SSLProxyEngine On
-<% end -%>
-<% if @ssl_protocol -%>
-  SSLProtocol             <%= @ssl_protocol %>
-<% end -%>
-<% if @ssl_cipher -%>
-  SSLCipherSuite          <%= @ssl_cipher %>
-<% end -%>
-<% if @ssl_honorcipherorder -%>
-  SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
-<% end -%>
-<% if @ssl_verify_client -%>
-  SSLVerifyClient         <%= @ssl_verify_client %>
-<% end -%>
-<% if @ssl_verify_depth -%>
-  SSLVerifyDepth          <%= @ssl_verify_depth %>
-<% end -%>
-<% if @ssl_options -%>
-  SSLOptions <%= Array(@ssl_options).join(' ') %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
deleted file mode 100644
index 8a7ae0f17fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @suexec_user_group -%>
-
-  SuexecUserGroup <%= @suexec_user_group %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
deleted file mode 100644
index 9389581805a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if @suphp_engine == 'on' -%>
-<% if @suphp_addhandler -%>
-  suPHP_AddHandler <%= @suphp_addhandler %>
-<% end -%>
-<% if @suphp_engine -%>
-  suPHP_Engine <%= @suphp_engine %>
-<% end -%>
-<% if @suphp_configpath -%>
-  suPHP_ConfigPath "<%= @suphp_configpath %>"
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
deleted file mode 100644
index 473b223ab6d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @wsgi_application_group -%>
-  WSGIApplicationGroup <%= @wsgi_application_group %>
-<% end -%>
-<% if @wsgi_daemon_process and @wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% elsif @wsgi_daemon_process and !@wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %>
-<% end -%>
-<% if @wsgi_import_script and @wsgi_import_script_options -%>
-  WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% end -%>
-<% if @wsgi_process_group -%>
-  WSGIProcessGroup <%= @wsgi_process_group %>
-<% end -%>
-<% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.each do |a, p| -%>
-    <%- if a != '' and p != ''-%>
-  WSGIScriptAlias <%= a %> "<%= p %>"
-    <%- end -%>
-  <%- end -%>
-<% end -%>
-<% if @wsgi_pass_authorization -%>
-  WSGIPassAuthorization <%= @wsgi_pass_authorization %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
deleted file mode 100644
index 0d4543564c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-include apache
-include apache::mod::php
-include apache::mod::cgi
-include apache::mod::userdir
-include apache::mod::disk_cache
-include apache::mod::proxy_http
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
deleted file mode 100644
index 805ad7e373a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apache::dev
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
deleted file mode 100644
index b3f9f13aac1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apache
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
deleted file mode 100644
index 0e84c5efbf5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tests the path and identifier parameters for the apache::mod class
-
-# Base class for clarity:
-class { 'apache': }
-
-
-# Exaple parameter usage:
-apache::mod { 'testmod':
-  path => '/usr/some/path/mod_testmod.so',
-  id   => 'testmod_custom_name',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
deleted file mode 100644
index 59362bd9a00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-## Default mods
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot, and declaring our default set of modules.
-class { 'apache':
-  default_mods => true,
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
deleted file mode 100644
index 0ae699c73d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-## custom mods
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot, and declaring a custom set of modules.
-class { 'apache':
-  default_mods => [
-    'info',
-    'alias',
-    'mime',
-    'env',
-    'setenv',
-    'expires',
-  ],
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
deleted file mode 100644
index 1d926bfb466..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apache':
-  mpm_module => 'prefork',
-}
-include apache::mod::php
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
deleted file mode 100644
index a6c61360a75..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
+++ /dev/null
@@ -1,238 +0,0 @@
-## Default vhosts, and custom vhosts
-# NB: Please see the other vhost_*.pp example files for further
-# examples.
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot
-class { 'apache': }
-
-# Most basic vhost
-apache::vhost { 'first.example.com':
-  port    => '80',
-  docroot => '/var/www/first',
-}
-
-# Vhost with different docroot owner/group/mode
-apache::vhost { 'second.example.com':
-  port          => '80',
-  docroot       => '/var/www/second',
-  docroot_owner => 'third',
-  docroot_group => 'third',
-  docroot_mode  => '0770',
-}
-
-# Vhost with serveradmin
-apache::vhost { 'third.example.com':
-  port        => '80',
-  docroot     => '/var/www/third',
-  serveradmin => 'admin@example.com',
-}
-
-# Vhost with ssl (uses default ssl certs)
-apache::vhost { 'ssl.example.com':
-  port    => '443',
-  docroot => '/var/www/ssl',
-  ssl     => true,
-}
-
-# Vhost with ssl and specific ssl certs
-apache::vhost { 'fourth.example.com':
-  port     => '443',
-  docroot  => '/var/www/fourth',
-  ssl      => true,
-  ssl_cert => '/etc/ssl/fourth.example.com.cert',
-  ssl_key  => '/etc/ssl/fourth.example.com.key',
-}
-
-# Vhost with english title and servername parameter
-apache::vhost { 'The fifth vhost':
-  servername => 'fifth.example.com',
-  port       => '80',
-  docroot    => '/var/www/fifth',
-}
-
-# Vhost with server aliases
-apache::vhost { 'sixth.example.com':
-  serveraliases => [
-    'sixth.example.org',
-    'sixth.example.net',
-  ],
-  port          => '80',
-  docroot       => '/var/www/fifth',
-}
-
-# Vhost with alternate options
-apache::vhost { 'seventh.example.com':
-  port    => '80',
-  docroot => '/var/www/seventh',
-  options => [
-    'Indexes',
-    'MultiViews',
-  ],
-}
-
-# Vhost with AllowOverride for .htaccess
-apache::vhost { 'eighth.example.com':
-  port     => '80',
-  docroot  => '/var/www/eighth',
-  override => 'All',
-}
-
-# Vhost with access and error logs disabled
-apache::vhost { 'ninth.example.com':
-  port       => '80',
-  docroot    => '/var/www/ninth',
-  access_log => false,
-  error_log  => false,
-}
-
-# Vhost with custom access and error logs and logroot
-apache::vhost { 'tenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/tenth',
-  access_log_file => 'tenth_vhost.log',
-  error_log_file  => 'tenth_vhost_error.log',
-  logroot         => '/var/log',
-}
-
-# Vhost with a cgi-bin
-apache::vhost { 'eleventh.example.com':
-  port        => '80',
-  docroot     => '/var/www/eleventh',
-  scriptalias => '/usr/lib/cgi-bin',
-}
-
-# Vhost with a proxypass configuration
-apache::vhost { 'twelfth.example.com':
-  port          => '80',
-  docroot       => '/var/www/twelfth',
-  proxy_dest    => 'http://internal.example.com:8080/twelfth',
-  no_proxy_uris => ['/login','/logout'],
-}
-
-# Vhost to redirect /login and /logout
-apache::vhost { 'thirteenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/thirteenth',
-  redirect_source => [
-    '/login',
-    '/logout',
-  ],
-  redirect_dest   => [
-    'http://10.0.0.10/login',
-    'http://10.0.0.10/logout',
-  ],
-}
-
-# Vhost to permamently redirect
-apache::vhost { 'fourteenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/fourteenth',
-  redirect_source => '/blog',
-  redirect_dest   => 'http://blog.example.com',
-  redirect_status => 'permanent',
-}
-
-# Vhost with a rack configuration
-apache::vhost { 'fifteenth.example.com':
-  port           => '80',
-  docroot        => '/var/www/fifteenth',
-  rack_base_uris => ['/rackapp1', '/rackapp2'],
-}
-
-# Vhost to redirect non-ssl to ssl
-apache::vhost { 'sixteenth.example.com non-ssl':
-  servername   => 'sixteenth.example.com',
-  port         => '80',
-  docroot      => '/var/www/sixteenth',
-  rewrites     => [
-    {
-      comment       => 'redirect non-SSL traffic to SSL site',
-      rewrite_cond  => ['%{HTTPS} off'],
-      rewrite_rule  => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
-    }
-  ]
-}
-apache::vhost { 'sixteenth.example.com ssl':
-  servername => 'sixteenth.example.com',
-  port       => '443',
-  docroot    => '/var/www/sixteenth',
-  ssl        => true,
-}
-
-# Vhost to redirect non-ssl to ssl using old rewrite method
-apache::vhost { 'sixteenth.example.com non-ssl old rewrite':
-  servername   => 'sixteenth.example.com',
-  port         => '80',
-  docroot      => '/var/www/sixteenth',
-  rewrite_cond => '%{HTTPS} off',
-  rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
-}
-apache::vhost { 'sixteenth.example.com ssl old rewrite':
-  servername => 'sixteenth.example.com',
-  port       => '443',
-  docroot    => '/var/www/sixteenth',
-  ssl        => true,
-}
-
-# Vhost to block repository files
-apache::vhost { 'seventeenth.example.com':
-  port    => '80',
-  docroot => '/var/www/seventeenth',
-  block   => 'scm',
-}
-
-# Vhost with special environment variables
-apache::vhost { 'eighteenth.example.com':
-  port    => '80',
-  docroot => '/var/www/eighteenth',
-  setenv  => ['SPECIAL_PATH /foo/bin','KILROY was_here'],
-}
-
-apache::vhost { 'nineteenth.example.com':
-  port     => '80',
-  docroot  => '/var/www/nineteenth',
-  setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1',
-}
-
-# Vhost with additional include files
-apache::vhost { 'twentyieth.example.com':
-  port                => '80',
-  docroot             => '/var/www/twelfth',
-  additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'],
-}
-
-# Vhost with alias for subdomain mapped to same named directory
-# http://example.com.loc => /var/www/example.com
-apache::vhost { 'subdomain.loc':
-  vhost_name      => '*',
-  port            => '80',
-  virtual_docroot => '/var/www/%-2+',
-  docroot         => '/var/www',
-  serveraliases   => ['*.loc',],
-}
-
-# Vhost with SSLProtocol,SSLCipherSuite, SSLHonorCipherOrder
-apache::vhost { 'securedomain.com':
-        priority              => '10',
-        vhost_name            => 'www.securedomain.com',
-        port                  => '443',
-        docroot               => '/var/www/secure',
-        ssl                   => true,
-        ssl_cert              => '/etc/ssl/securedomain.cert',
-        ssl_key               => '/etc/ssl/securedomain.key',
-        ssl_chain             => '/etc/ssl/securedomain.crt',
-        ssl_protocol          => '-ALL +SSLv3 +TLSv1',
-        ssl_cipher            => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
-        ssl_honorcipherorder  => 'On',
-        add_listen            => false,
-}
-
-# Vhost with access log environment variables writing control
-apache::vhost { 'twentyfirst.example.com':
-  port               => '80',
-  docroot            => '/var/www/twentyfirst',
-  access_log_env_var => 'admin',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
deleted file mode 100644
index b8953ee3217..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot
-class { 'apache': }
-
-# Example from README adapted.
-apache::vhost { 'readme.example.net':
-  docroot     => '/var/www/readme',
-  directories => [
-    {
-      'path'         => '/var/www/readme',
-      'ServerTokens' => 'prod' ,
-    },
-    {
-      'path'  => '/usr/share/empty',
-      'allow' => 'from all',
-    },
-  ],
-}
-
-# location test
-apache::vhost { 'location.example.net':
-  docroot     => '/var/www/location',
-  directories => [
-    {
-      'path'         => '/location',
-      'provider'     => 'location',
-      'ServerTokens' => 'prod'
-    },
-  ],
-}
-
-# files test, curedly disable access to accidental backup files.
-apache::vhost { 'files.example.net':
-  docroot     => '/var/www/files',
-  directories => [
-    {
-      'path'     => '(\.swp|\.bak|~)$',
-      'provider' => 'filesmatch',
-      'deny'     => 'from all'
-    },
-  ],
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
deleted file mode 100644
index dc0fa4f33ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-## IP-based vhosts on any listen port
-# IP-based vhosts respond to requests on specific IP addresses.
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-# Listen on port 80 and 81; required because the following vhosts
-# are not declared with a port parameter.
-apache::listen { '80': }
-apache::listen { '81': }
-
-# IP-based vhosts
-apache::vhost { 'first.example.com':
-  ip       => '10.0.0.10',
-  docroot  => '/var/www/first',
-  ip_based => true,
-}
-apache::vhost { 'second.example.com':
-  ip       => '10.0.0.11',
-  docroot  => '/var/www/second',
-  ip_based => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
deleted file mode 100644
index 8e7a2b279ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-## SSL-enabled vhosts
-# SSL-enabled vhosts respond only to HTTPS queries.
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-# Non-ssl vhost
-apache::vhost { 'first.example.com non-ssl':
-  servername => 'first.example.com',
-  port       => '80',
-  docroot    => '/var/www/first',
-}
-
-# SSL vhost at the same domain
-apache::vhost { 'first.example.com ssl':
-  servername => 'first.example.com',
-  port       => '443',
-  docroot    => '/var/www/first',
-  ssl        => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
deleted file mode 100644
index e7d6cc036c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-## Declare ip-based and name-based vhosts
-# Mixing Name-based vhost with IP-specific vhosts requires `add_listen =>
-# 'false'` on the non-IP vhosts
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-
-# Add two an IP-based vhost on 10.0.0.10, ssl and non-ssl
-apache::vhost { 'The first IP-based vhost, non-ssl':
-  servername => 'first.example.com',
-  ip         => '10.0.0.10',
-  port       => '80',
-  ip_based   => true,
-  docroot    => '/var/www/first',
-}
-apache::vhost { 'The first IP-based vhost, ssl':
-  servername => 'first.example.com',
-  ip         => '10.0.0.10',
-  port       => '443',
-  ip_based   => true,
-  docroot    => '/var/www/first-ssl',
-  ssl        => true,
-}
-
-# Two name-based vhost listening on 10.0.0.20
-apache::vhost { 'second.example.com':
-  ip      => '10.0.0.20',
-  port    => '80',
-  docroot => '/var/www/second',
-}
-apache::vhost { 'third.example.com':
-  ip      => '10.0.0.20',
-  port    => '80',
-  docroot => '/var/www/third',
-}
-
-# Two name-based vhosts without IPs specified, so that they will answer on either 10.0.0.10 or 10.0.0.20 . It is requried to declare
-# `add_listen => 'false'` to disable declaring "Listen 80" which will conflict
-# with the IP-based preceeding vhosts.
-apache::vhost { 'fourth.example.com':
-  port       => '80',
-  docroot    => '/var/www/fourth',
-  add_listen => false,
-}
-apache::vhost { 'fifth.example.com':
-  port       => '80',
-  docroot    => '/var/www/fifth',
-  add_listen => false,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
deleted file mode 100644
index 2bb941de237..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib":
-      "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      "ref": "v2.2.1"
-  symlinks:
-    "apt": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
deleted file mode 100644
index 6523c6dafad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>apt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
deleted file mode 100644
index f4abb47dc59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
+++ /dev/null
@@ -1 +0,0 @@
---no-single_quote_string_with_variables-check
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
deleted file mode 100644
index 582efdf70ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ipB/CV1rVSTXU9ZDuzrFOlzJrRmJob36tKns2xszuH4r9s5P9qivNAngRGdV
-      msb69xvOlzQykM0WRF+4kJ6TZ7AbMiDI+VZ8GDtsRaU5/q3BpsvFe8aato+6
-      QeyFtBG62OsosTEhGws4mqiFsPDu3dHlakuJc9zevlTuhNwbKSs=
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
deleted file mode 100644
index 10503c9144c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
+++ /dev/null
@@ -1,222 +0,0 @@
-##2014-03-04 - Supported Release 1.4.2
-###Summary
-
-This is a supported release. This release tidies up 1.4.1 and re-enables
-support for Ubuntu 10.04
-
-####Features
-
-####Bugfixes
-- Fix apt:ppa to include the -y Ubuntu 10.04 requires.
-- Documentation changes.
-- Test fixups.
-
-####Known Bugs
-
-* No known issues.
-
-
-
-##2014-02-13 1.4.1
-###Summary
-This is a bugfix release.
-
-####Bugfixes
-- Fix apt::force unable to upgrade packages from releases other than its original
-- Removed a few refeneces to aptitude instead of apt-get for portability
-- Removed call to getparam() due to stdlib dependency
-- Correct apt::source template when architecture is provided
-- Retry package installs if apt is locked
-- Use root to exec in apt::ppa
-- Updated tests and converted acceptance tests to beaker
-
-##2013-10-08 - Release 1.4.0
-
-###Summary
-
-Minor bugfix and allow the timeout to be adjusted.
-
-####Features
-- Add an `updates_timeout` to apt::params
-
-####Bugfixes
-- Ensure apt::ppa can read a ppa removed by hand.
-
-
-##2013-10-08 - Release 1.3.0
-###Summary
-
-This major feature in this release is the new apt::unattended_upgrades class,
-allowing you to handle Ubuntu's unattended feature.  This allows you to select
-specific packages to automatically upgrade without any further user
-involvement.
-
-In addition we extend our Wheezy support, add proxy support to apt:ppa and do
-various cleanups and tweaks.
-
-####Features
-- Add apt::unattended_upgrades support for Ubuntu.
-- Add wheezy backports support.
-- Use the geoDNS http.debian.net instead of the main debian ftp server.
-- Add `options` parameter to apt::ppa in order to pass options to apt-add-repository command.
-- Add proxy support for apt::ppa (uses proxy_host and proxy_port from apt).
-
-####Bugfixes
-- Fix regsubst() calls to quote single letters (for future parser).
-- Fix lint warnings and other misc cleanup.
-
-
-##2013-07-03 - Release 1.2.0
-
-####Features
-- Add geppetto `.project` natures
-- Add GH auto-release
-- Add `apt::key::key_options` parameter
-- Add complex pin support using distribution properties for `apt::pin` via new properties:
-  - `apt::pin::codename`
-  - `apt::pin::release_version`
-  - `apt::pin::component`
-  - `apt::pin::originator`
-  - `apt::pin::label`
-- Add source architecture support to `apt::source::architecture`
-
-####Bugfixes
-- Use apt-get instead of aptitude in apt::force
-- Update default backports location
-- Add dependency for required packages before apt-get update
-
-
-##2013-06-02 - Release 1.1.1
-###Summary
-
-This is a bug fix release that resolves a number of issues:
-
-* By changing template variable usage, we remove the deprecation warnings
-  for Puppet 3.2.x
-* Fixed proxy file removal, when proxy absent
-
-Some documentation, style and whitespaces changes were also merged. This
-release also introduced proper rspec-puppet unit testing on Travis-CI to help
-reduce regression.
-
-Thanks to all the community contributors below that made this patch possible.
-
-#### Detail Changes
-
-* fix minor comment type (Chris Rutter)
-* whitespace fixes (Michael Moll)
-* Update travis config file (William Van Hevelingen)
-* Build all branches on travis (William Van Hevelingen)
-* Standardize travis.yml on pattern introduced in stdlib (William Van Hevelingen)
-* Updated content to conform to README best practices template (Lauren Rother)
-* Fix apt::release example in readme (Brian Galey)
-* add @ to variables in template (Peter Hoeg)
-* Remove deprecation warnings for pin.pref.erb as well (Ken Barber)
-* Update travis.yml to latest versions of puppet (Ken Barber)
-* Fix proxy file removal (Scott Barber)
-* Add spec test for removing proxy configuration (Dean Reilly)
-* Fix apt::key listing longer than 8 chars (Benjamin Knofe)
-
-
-
-
-## Release 1.1.0
-###Summary
-
-This release includes Ubuntu 12.10 (Quantal) support for PPAs.
-
----
-
-##2012-05-25 - Puppet Labs <info@puppetlabs.com> - Release 0.0.4
-###Summary
-
- * Fix ppa list filename when there is a period in the PPA name
- * Add .pref extension to apt preferences files
- * Allow preferences to be purged
- * Extend pin support
-
-
-##2012-05-04 - Puppet Labs <info@puppetlabs.com> - Release 0.0.3
-###Summary
- 
- * only invoke apt-get update once
- * only install python-software-properties if a ppa is added
- * support 'ensure => absent' for all defined types
- * add apt::conf
- * add apt::backports
- * fixed Modulefile for module tool dependency resolution
- * configure proxy before doing apt-get update
- * use apt-get update instead of aptitude for apt::ppa
- * add support to pin release
-
-
-##2012-03-26 - Puppet Labs <info@puppetlabs.com> - Release 0.0.2
-###Summary
-
-* 41cedbb (#13261) Add real examples to smoke tests.
-* d159a78 (#13261) Add key.pp smoke test
-* 7116c7a (#13261) Replace foo source with puppetlabs source
-* 1ead0bf Ignore pkg directory.
-* 9c13872 (#13289) Fix some more style violations
-* 0ea4ffa (#13289) Change test scaffolding to use a module & manifest dir fixture path
-* a758247 (#13289) Clean up style violations and fix corresponding tests
-* 99c3fd3 (#13289) Add puppet lint tests to Rakefile
-* 5148cbf (#13125) Apt keys should be case insensitive
-* b9607a4 Convert apt::key to use anchors
-
-
-##2012-03-07 - Puppet Labs <info@puppetlabs.com> - Release 0.0.1
-###Summary
-
-* d4fec56 Modify apt::source release parameter test
-* 1132a07 (#12917) Add contributors to README
-* 8cdaf85 (#12823) Add apt::key defined type and modify apt::source to use it
-* 7c0d10b (#12809) $release should use $lsbdistcodename and fall back to manual input
-* be2cc3e (#12522) Adjust spec test for splitting purge
-* 7dc60ae (#12522) Split purge option to spare sources.list
-* 9059c4e Fix source specs to test all key permutations
-* 8acb202 Add test for python-software-properties package
-* a4af11f Check if python-software-properties is defined before attempting to define it.
-* 1dcbf3d Add tests for required_packages change
-* f3735d2 Allow duplicate $required_packages
-* 74c8371 (#12430) Add tests for changes to apt module
-* 97ebb2d Test two sources with the same key
-* 1160bcd (#12526) Add ability to reverse apt { disable_keys => true }
-* 2842d73 Add Modulefile to puppet-apt
-* c657742 Allow the use of the same key in multiple sources
-* 8c27963 (#12522) Adding purge option to apt class
-* 997c9fd (#12529) Add unit test for apt proxy settings
-* 50f3cca (#12529) Add parameter to support setting a proxy for apt
-* d522877 (#12094) Replace chained .with_* with a hash
-* 8cf1bd0 (#12094) Remove deprecated spec.opts file
-* 2d688f4 (#12094) Add rspec-puppet tests for apt
-* 0fb5f78 (#12094) Replace name with path in file resources
-* f759bc0 (#11953) Apt::force passes $version to aptitude
-* f71db53 (#11413) Add spec test for apt::force to verify changes to unless
-* 2f5d317 (#11413) Update dpkg query used by apt::force
-* cf6caa1 (#10451) Add test coverage to apt::ppa
-* 0dd697d include_src parameter in example; Whitespace cleanup
-* b662eb8 fix typos in "repositories"
-* 1be7457 Fix (#10451) - apt::ppa fails to "apt-get update" when new PPA source is added
-* 864302a Set the pin priority before adding the source (Fix #10449)
-* 1de4e0a Refactored as per mlitteken
-* 1af9a13 Added some crazy bash madness to check if the ppa is installed already. Otherwise the manifest tries to add it on every run!
-* 52ca73e (#8720) Replace Apt::Ppa with Apt::Builddep
-* 5c05fa0 added builddep command.
-* a11af50 added the ability to specify the content of a key
-* c42db0f Fixes ppa test.
-* 77d2b0d reformatted whitespace to match recommended style of 2 space indentation.
-* 27ebdfc ignore swap files.
-* 377d58a added smoke tests for module.
-* 18f614b reformatted apt::ppa according to recommended style.
-* d8a1e4e Created a params class to hold global data.
-* 636ae85 Added two params for apt class
-* 148fc73 Update LICENSE.
-* ed2d19e Support ability to add more than one PPA
-* 420d537 Add call to apt-update after add-apt-repository in apt::ppa
-* 945be77 Add package definition for python-software-properties
-* 71fc425 Abs paths for all commands
-* 9d51cd1 Adding LICENSE
-* 71796e3 Heading fix in README
-* 87777d8 Typo in README
-* f848bac First commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
deleted file mode 100644
index 1e359d07b56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'pry',                     :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
deleted file mode 100644
index 30ce036d5e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
+++ /dev/null
@@ -1,34 +0,0 @@
-Copyright (c) 2011 Evolving Web Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-Copyright 2014 Puppet Labs
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
deleted file mode 100644
index 40a87f4ef39..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
+++ /dev/null
@@ -1,14 +0,0 @@
-name    'puppetlabs-apt'
-version '1.4.2'
-source  'https://github.com/puppetlabs/puppetlabs-apt'
-author  'Evolving Web / Puppet Labs'
-license 'Apache License 2.0'
-summary 'Puppet Labs Apt Module'
-description 'APT Module for Puppet'
-project_page 'https://github.com/puppetlabs/puppetlabs-apt'
-
-## Add dependencies, if any:
-#dependency 'puppetlabs/stdlib', '2.x'
-# The dependency should be written as above but librarian-puppet
-# does not support the expression as the PMT does.
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
deleted file mode 100644
index ec8b4c5e49b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
+++ /dev/null
@@ -1,236 +0,0 @@
-apt
-===
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apt.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apt)
-
-## Description
-
-Provides helpful definitions for dealing with Apt.
-
-=======
-
-Overview
---------
-
-The APT module provides a simple interface for managing APT source, key, and definitions with Puppet.
-
-Module Description
-------------------
-
-APT automates obtaining and installing software packages on \*nix systems.
-
-Setup
------
-
-**What APT affects:**
-
-* package/service/configuration files for APT
-* your system's `sources.list` file and `sources.list.d` directory
-    * NOTE: Setting the `purge_sources_list` and `purge_sources_list_d` parameters to 'true' will destroy any existing content that was not declared with Puppet. The default for these parameters is 'false'.
-* system repositories
-* authentication keys
-* wget (optional)
-
-### Beginning with APT
-
-To begin using the APT module with default parameters, declare the class
-
-    include apt
-
-Puppet code that uses anything from the APT module requires that the core apt class be declared/\s\+$//e
-
-Usage
------
-
-Using the APT module consists predominantly in declaring classes that provide desired functionality and features.
-
-### apt
-
-`apt` provides a number of common resources and options that are shared by the various defined types in this module, so you MUST always include this class in your manifests.
-
-The parameters for `apt` are not required in general and are predominantly for development environment use-cases.
-
-    class { 'apt':
-      always_apt_update    => false,
-      disable_keys         => undef,
-      proxy_host           => false,
-      proxy_port           => '8080',
-      purge_sources_list   => false,
-      purge_sources_list_d => false,
-      purge_preferences_d  => false,
-      update_timeout       => undef
-    }
-
-Puppet will manage your system's `sources.list` file and `sources.list.d` directory but will do its best to respect existing content.
-
-If you declare your apt class with `purge_sources_list` and `purge_sources_list_d` set to 'true', Puppet will unapologetically purge any existing content it finds that wasn't declared with Puppet.
-
-### apt::builddep
-
-Installs the build depends of a specified package.
-
-    apt::builddep { 'glusterfs-server': }
-
-### apt::force
-
-Forces a package to be installed from a specific release.  This class is particularly useful when using repositories, like Debian, that are unstable in Ubuntu.
-
-    apt::force { 'glusterfs-server':
-      release => 'unstable',
-      version => '3.0.3',
-      require => Apt::Source['debian_unstable'],
-    }
-
-### apt::key
-
-Adds a key to the list of keys used by APT to authenticate packages.
-
-    apt::key { 'puppetlabs':
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-    apt::key { 'jenkins':
-      key        => 'D50582E6',
-      key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-    }
-
-Note that use of `key_source` requires wget to be installed and working.
-
-### apt::pin
-
-Adds an apt pin for a certain release.
-
-    apt::pin { 'karmic': priority => 700 }
-    apt::pin { 'karmic-updates': priority => 700 }
-    apt::pin { 'karmic-security': priority => 700 }
-
-Note you can also specifying more complex pins using distribution properties.
-
-    apt::pin { 'stable':
-      priority        => -10,
-      originator      => 'Debian',
-      release_version => '3.0',
-      component       => 'main',
-      label           => 'Debian'
-    }
-
-### apt::ppa
-
-Adds a ppa repository using `add-apt-repository`.
-
-    apt::ppa { 'ppa:drizzle-developers/ppa': }
-
-### apt::release
-
-Sets the default apt release. This class is particularly useful when using repositories, like Debian, that are unstable in Ubuntu.
-
-    class { 'apt::release':
-      release_id => 'precise',
-    }
-
-### apt::source
-
-Adds an apt source to `/etc/apt/sources.list.d/`.
-
-    apt::source { 'debian_unstable':
-      location          => 'http://debian.mirror.iweb.ca/debian/',
-      release           => 'unstable',
-      repos             => 'main contrib non-free',
-      required_packages => 'debian-keyring debian-archive-keyring',
-      key               => '46925553',
-      key_server        => 'subkeys.pgp.net',
-      pin               => '-10',
-      include_src       => true
-    }
-
-If you would like to configure your system so the source is the Puppet Labs APT repository
-
-    apt::source { 'puppetlabs':
-      location   => 'http://apt.puppetlabs.com',
-      repos      => 'main',
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-### Testing
-
-The APT module is mostly a collection of defined resource types, which provide reusable logic that can be leveraged to manage APT. It does provide smoke tests for testing functionality on a target system, as well as spec tests for checking a compiled catalog against an expected set of resources.
-
-#### Example Test
-
-This test will set up a Puppet Labs apt repository. Start by creating a new smoke test in the apt module's test folder. Call it puppetlabs-apt.pp. Inside, declare a single resource representing the Puppet Labs APT source and gpg key
-
-    apt::source { 'puppetlabs':
-      location   => 'http://apt.puppetlabs.com',
-      repos      => 'main',
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-This resource creates an apt source named puppetlabs and gives Puppet information about the repository's location and key used to sign its packages. Puppet leverages Facter to determine the appropriate release, but you can set it directly by adding the release type.
-
-Check your smoke test for syntax errors
-
-    $ puppet parser validate tests/puppetlabs-apt.pp
-
-If you receive no output from that command, it means nothing is wrong. Then apply the code
-
-    $ puppet apply --verbose tests/puppetlabs-apt.pp
-    notice: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]/ensure: defined content as '{md5}3be1da4923fb910f1102a233b77e982e'
-    info: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]: Scheduling refresh of Exec[puppetlabs apt update]
-    notice: /Stage[main]//Apt::Source[puppetlabs]/Exec[puppetlabs apt update]: Triggered 'refresh' from 1 events>
-
-The above example used a smoke test to easily lay out a resource declaration and apply it on your system. In production, you may want to declare your APT sources inside the classes where they’re needed.
-
-Implementation
---------------
-
-### apt::backports
-
-Adds the necessary components to get backports for Ubuntu and Debian. The release name defaults to `$lsbdistcodename`. Setting this manually can cause undefined behavior (read: universe exploding).
-
-Limitations
------------
-
-This module should work across all versions of Debian/Ubuntu and support all major APT repository management features.
-
-Development
-------------
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-License
--------
-
-The original code for this module comes from Evolving Web and was licensed under the MIT license. Code added since the fork of this module is licensed under the Apache 2.0 License like the rest of the Puppet Labs products.
-
-The LICENSE contains both licenses.
-
-Contributors
-------------
-
-A lot of great people have contributed to this module. A somewhat current list follows:
-
-* Ben Godfrey <ben.godfrey@wonga.com>
-* Branan Purvine-Riley <branan@puppetlabs.com>
-* Christian G. Warden <cwarden@xerus.org>
-* Dan Bode <bodepd@gmail.com> <dan@puppetlabs.com>
-* Garrett Honeycutt <github@garretthoneycutt.com>
-* Jeff Wallace <jeff@evolvingweb.ca> <jeff@tjwallace.ca>
-* Ken Barber <ken@bob.sh>
-* Matthaus Litteken <matthaus@puppetlabs.com> <mlitteken@gmail.com>
-* Matthias Pigulla <mp@webfactory.de>
-* Monty Taylor <mordred@inaugust.com>
-* Peter Drake <pdrake@allplayers.com>
-* Reid Vandewiele <marut@cat.pdx.edu>
-* Robert Navarro <rnavarro@phiivo.com>
-* Ryan Coleman <ryan@puppetlabs.com>
-* Scott McLeod <scott.mcleod@theice.com>
-* Spencer Krum <spencer@puppetlabs.com>
-* William Van Hevelingen <blkperl@cat.pdx.edu> <wvan13@gmail.com>
-* Zach Leslie <zach@puppetlabs.com>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
deleted file mode 100644
index 6d067dc56c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
deleted file mode 100644
index 9cfa1c01130..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# This adds the necessary components to get backports for ubuntu and debian
-#
-# == Parameters
-#
-# [*release*]
-#   The ubuntu/debian release name. Defaults to $lsbdistcodename. Setting this
-#   manually can cause undefined behavior. (Read: universe exploding)
-#
-# == Examples
-#
-#   include apt::backports
-#
-#   class { 'apt::backports':
-#     release => 'natty',
-#   }
-#
-# == Authors
-#
-# Ben Hughes, I think. At least blame him if this goes wrong.
-# I just added puppet doc.
-#
-# == Copyright
-#
-# Copyright 2011 Puppet Labs Inc, unless otherwise noted.
-class apt::backports(
-  $release  = $::lsbdistcodename,
-  $location = $apt::params::backports_location
-) inherits apt::params {
-
-  $release_real = downcase($release)
-  $key = $::lsbdistid ? {
-    'debian' => '46925553',
-    'ubuntu' => '437D05B5',
-  }
-  $repos = $::lsbdistid ? {
-    'debian' => 'main contrib non-free',
-    'ubuntu' => 'main universe multiverse restricted',
-  }
-
-  apt::source { 'backports':
-    location   => $location,
-    release    => "${release_real}-backports",
-    repos      => $repos,
-    key        => $key,
-    key_server => 'pgp.mit.edu',
-    pin        => '200',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
deleted file mode 100644
index 3294f713391..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# builddep.pp
-
-define apt::builddep() {
-  include apt::update
-
-  exec { "apt-builddep-${name}":
-    command   => "/usr/bin/apt-get -y --force-yes build-dep ${name}",
-    logoutput => 'on_failure',
-    notify    => Exec['apt_update'],
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::builddep::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
deleted file mode 100644
index 3c4cb1975cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-define apt::conf (
-  $content,
-  $ensure   = present,
-  $priority = '50'
-) {
-
-  include apt::params
-
-  $apt_conf_d = $apt::params::apt_conf_d
-
-  file { "${apt_conf_d}/${priority}${name}":
-    ensure  => $ensure,
-    content => $content,
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
deleted file mode 100644
index 3a82b4f7fd9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# testing.pp
-
-class apt::debian::testing {
-  include apt
-
-  # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-  # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-  # Key: 46925553  Server: subkeys.pgp.net
-  # debian-keyring
-  # debian-archive-keyring
-
-  apt::source { 'debian_testing':
-    location          => 'http://debian.mirror.iweb.ca/debian/',
-    release           => 'testing',
-    repos             => 'main contrib non-free',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '46925553',
-    key_server        => 'subkeys.pgp.net',
-    pin               => '-10',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
deleted file mode 100644
index 77df94b0af5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# unstable.pp
-
-class apt::debian::unstable {
-  include apt
-
-  # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-  # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-  # Key: 46925553  Server: subkeys.pgp.net
-  # debian-keyring
-  # debian-archive-keyring
-
-  apt::source { 'debian_unstable':
-    location          => 'http://debian.mirror.iweb.ca/debian/',
-    release           => 'unstable',
-    repos             => 'main contrib non-free',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '46925553',
-    key_server        => 'subkeys.pgp.net',
-    pin               => '-10',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
deleted file mode 100644
index 70b7d47239b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# force.pp
-# force a package from a specific release
-
-define apt::force(
-  $release = 'testing',
-  $version = false,
-  $timeout = 300
-) {
-
-  $provider = $apt::params::provider
-
-  $version_string = $version ? {
-    false   => undef,
-    default => "=${version}",
-  }
-
-  $release_string = $release ? {
-    false   => undef,
-    default => "-t ${release}",
-  }
-
-  if $version == false {
-    if $release == false {
-      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'"
-    } else {
-      # If installed version and candidate version differ, this check returns 1 (false).
-      $install_check = "/usr/bin/test \$(/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1"
-    }
-  } else {
-    if $release == false {
-      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'"
-    } else {
-      $install_check = "/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -q 'Installed: ${version}'"
-    }
-  }
-
-  exec { "${provider} -y ${release_string} install ${name}${version_string}":
-    unless    => $install_check,
-    logoutput => 'on_failure',
-    timeout   => $timeout,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
deleted file mode 100644
index 364ce8cb4e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-# Class: apt
-#
-# This module manages the initial configuration of apt.
-#
-# Parameters:
-#   The parameters listed here are not required in general and were
-#     added for use cases related to development environments.
-#   disable_keys - disables the requirement for all packages to be signed
-#   always_apt_update - rather apt should be updated on every run (intended
-#     for development environments where package updates are frequent)
-#   purge_sources_list - Accepts true or false. Defaults to false If set to
-#     true, Puppet will purge all unmanaged entries from sources.list
-#   purge_sources_list_d - Accepts true or false. Defaults to false. If set
-#     to true, Puppet will purge all unmanaged entries from sources.list.d
-#   update_timeout - Overrides the exec timeout in seconds for apt-get update.
-#     If not set defaults to Exec's default (300)
-#
-# Actions:
-#
-# Requires:
-#   puppetlabs/stdlib
-# Sample Usage:
-#  class { 'apt': }
-
-class apt(
-  $always_apt_update    = false,
-  $disable_keys         = undef,
-  $proxy_host           = undef,
-  $proxy_port           = '8080',
-  $purge_sources_list   = false,
-  $purge_sources_list_d = false,
-  $purge_preferences_d  = false,
-  $update_timeout       = undef
-) {
-
-  include apt::params
-  include apt::update
-
-  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
-
-  $sources_list_content = $purge_sources_list ? {
-    false => undef,
-    true  => "# Repos managed by puppet.\n",
-  }
-
-  if $always_apt_update == true {
-    Exec <| title=='apt_update' |> {
-      refreshonly => false,
-    }
-  }
-
-  $root           = $apt::params::root
-  $apt_conf_d     = $apt::params::apt_conf_d
-  $sources_list_d = $apt::params::sources_list_d
-  $preferences_d  = $apt::params::preferences_d
-  $provider       = $apt::params::provider
-
-  file { 'sources.list':
-    ensure  => present,
-    path    => "${root}/sources.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => $sources_list_content,
-    notify  => Exec['apt_update'],
-  }
-
-  file { 'sources.list.d':
-    ensure  => directory,
-    path    => $sources_list_d,
-    owner   => root,
-    group   => root,
-    purge   => $purge_sources_list_d,
-    recurse => $purge_sources_list_d,
-    notify  => Exec['apt_update'],
-  }
-
-  file { 'preferences.d':
-    ensure  => directory,
-    path    => $preferences_d,
-    owner   => root,
-    group   => root,
-    purge   => $purge_preferences_d,
-    recurse => $purge_preferences_d,
-  }
-
-  case $disable_keys {
-    true: {
-      file { '99unauth':
-        ensure  => present,
-        content => "APT::Get::AllowUnauthenticated 1;\n",
-        path    => "${apt_conf_d}/99unauth",
-      }
-    }
-    false: {
-      file { '99unauth':
-        ensure => absent,
-        path   => "${apt_conf_d}/99unauth",
-      }
-    }
-    undef:   { } # do nothing
-    default: { fail('Valid values for disable_keys are true or false') }
-  }
-
-  $proxy_set = $proxy_host ? {
-    undef   => absent,
-    default => present
-  }
-
-  file { 'configure-apt-proxy':
-    ensure  => $proxy_set,
-    path    => "${apt_conf_d}/proxy",
-    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
-    notify  => Exec['apt_update'],
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { 'apt::update':
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
deleted file mode 100644
index c78bf658ce9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
+++ /dev/null
@@ -1,90 +0,0 @@
-define apt::key (
-  $key = $title,
-  $ensure = present,
-  $key_content = false,
-  $key_source = false,
-  $key_server = 'keyserver.ubuntu.com',
-  $key_options = false
-) {
-
-  include apt::params
-
-  $upkey = upcase($key)
-  # trim the key to the last 8 chars so we can match longer keys with apt-key list too
-  $trimmedkey = regsubst($upkey, '^.*(.{8})$', '\1')
-
-  if $key_content {
-    $method = 'content'
-  } elsif $key_source {
-    $method = 'source'
-  } elsif $key_server {
-    $method = 'server'
-  }
-
-  # This is a hash of the parts of the key definition that we care about.
-  # It is used as a unique identifier for this instance of apt::key. It gets
-  # hashed to ensure that the resource name doesn't end up being pages and
-  # pages (e.g. in the situation where key_content is specified).
-  $digest = sha1("${upkey}/${key_content}/${key_source}/${key_server}/")
-
-  # Allow multiple ensure => present for the same key to account for many
-  # apt::source resources that all reference the same key.
-  case $ensure {
-    present: {
-
-      anchor { "apt::key/${title}": }
-
-      if defined(Exec["apt::key ${upkey} absent"]) {
-        fail("Cannot ensure Apt::Key[${upkey}] present; ${upkey} already ensured absent")
-      }
-
-      if !defined(Anchor["apt::key ${upkey} present"]) {
-        anchor { "apt::key ${upkey} present": }
-      }
-
-      if $key_options{
-        $options_string = "--keyserver-options ${key_options}"
-      }
-      else{
-        $options_string = ''
-      }
-
-      if !defined(Exec[$digest]) {
-        $digest_command = $method ? {
-          'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
-          'source'  => "wget -q '${key_source}' -O- | apt-key add -",
-          'server'  => "apt-key adv --keyserver '${key_server}' ${options_string} --recv-keys '${upkey}'",
-        }
-        exec { $digest:
-          command   => $digest_command,
-          path      => '/bin:/usr/bin',
-          unless    => "/usr/bin/apt-key list | /bin/grep '${trimmedkey}'",
-          logoutput => 'on_failure',
-          before    => Anchor["apt::key ${upkey} present"],
-        }
-      }
-
-      Anchor["apt::key ${upkey} present"] -> Anchor["apt::key/${title}"]
-
-    }
-    absent: {
-
-      if defined(Anchor["apt::key ${upkey} present"]) {
-        fail("Cannot ensure Apt::Key[${upkey}] absent; ${upkey} already ensured present")
-      }
-
-      exec { "apt::key ${upkey} absent":
-        command   => "apt-key del '${upkey}'",
-        path      => '/bin:/usr/bin',
-        onlyif    => "apt-key list | grep '${trimmedkey}'",
-        user      => 'root',
-        group     => 'root',
-        logoutput => 'on_failure',
-      }
-    }
-
-    default: {
-      fail "Invalid 'ensure' value '${ensure}' for aptkey"
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
deleted file mode 100644
index b35bb1c8d91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class apt::params {
-  $root           = '/etc/apt'
-  $provider       = '/usr/bin/apt-get'
-  $sources_list_d = "${root}/sources.list.d"
-  $apt_conf_d     = "${root}/apt.conf.d"
-  $preferences_d  = "${root}/preferences.d"
-
-  case $::lsbdistid {
-    'debian': {
-      case $::lsbdistcodename {
-        'squeeze': {
-          $backports_location = 'http://backports.debian.org/debian-backports'
-        }
-        'wheezy': {
-          $backports_location = 'http://ftp.debian.org/debian/'
-        }
-        default: {
-          $backports_location = 'http://http.debian.net/debian/'
-        }
-      }
-    }
-    'ubuntu': {
-      case $::lsbdistcodename {
-        'hardy','maverick','natty','oneiric','precise': {
-          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
-          $ppa_options = '-y'
-        }
-        'lucid': {
-          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
-          $ppa_options = undef
-        }
-        default: {
-          $backports_location = 'http://old-releases.ubuntu.com/ubuntu'
-          $ppa_options = '-y'
-        }
-      }
-    }
-    default: {
-      fail("Unsupported osfamily (${::osfamily}) or lsbdistid (${::lsbdistid})")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
deleted file mode 100644
index 402e79ede7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# pin.pp
-# pin a release in apt, useful for unstable repositories
-
-define apt::pin(
-  $ensure          = present,
-  $explanation     = "${::caller_module_name}: ${name}",
-  $order           = '',
-  $packages        = '*',
-  $priority        = 0,
-  $release         = '', # a=
-  $origin          = '',
-  $version         = '',
-  $codename        = '', # n=
-  $release_version = '', # v=
-  $component       = '', # c=
-  $originator      = '', # o=
-  $label           = ''  # l=
-) {
-
-  include apt::params
-
-  $preferences_d = $apt::params::preferences_d
-
-  if $order != '' and !is_integer($order) {
-    fail('Only integers are allowed in the apt::pin order param')
-  }
-
-  $pin_release_array = [
-    $release,
-    $codename,
-    $release_version,
-    $component,
-    $originator,
-    $label]
-  $pin_release = join($pin_release_array, '')
-
-  # Read the manpage 'apt_preferences(5)', especially the chapter
-  # 'Thea Effect of APT Preferences' to understand the following logic
-  # and the difference between specific and general form
-  if $packages != '*' { # specific form
-
-    if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
-      ( $origin != '' and ( $pin_release != '' or $version != '' )) or
-      ( $version != '' and ( $pin_release != '' or $origin != '' )) {
-      fail('parameters release, origin, and version are mutually exclusive')
-    }
-
-  } else { # general form
-
-    if $version != '' {
-      fail('parameter version cannot be used in general form')
-    }
-
-    if ( $pin_release != '' and $origin != '' ) or
-      ( $origin != '' and $pin_release != '' ) {
-      fail('parmeters release and origin are mutually exclusive')
-    }
-
-  }
-
-  $path = $order ? {
-    ''      => "${preferences_d}/${name}.pref",
-    default => "${preferences_d}/${order}-${name}.pref",
-  }
-  file { "${name}.pref":
-    ensure  => $ensure,
-    path    => $path,
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template('apt/pin.pref.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
deleted file mode 100644
index f2629809e0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
+++ /dev/null
@@ -1,81 +0,0 @@
-# ppa.pp
-
-define apt::ppa(
-  $release = $::lsbdistcodename,
-  $options = $apt::params::ppa_options,
-) {
-  $ensure  = 'present'
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-
-  if ! $release {
-    fail('lsbdistcodename fact not available: release parameter required')
-  }
-
-  if $::operatingsystem != 'Ubuntu' {
-    fail("apt::ppa is currently supported on Ubuntu only.")
-  }
-
-  $filename_without_slashes = regsubst($name, '/', '-', 'G')
-  $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', 'G')
-  $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', 'G')
-  $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
-
-  if $ensure == 'present' {
-    $package = $::lsbdistrelease ? {
-        /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
-        default  => 'software-properties-common',
-    }
-
-    if ! defined(Package[$package]) {
-        package { $package: }
-    }
-
-    if defined(Class[apt]) {
-        $proxy_host = $apt::proxy_host
-        $proxy_port = $apt::proxy_port
-        case  $proxy_host {
-        false, '': {
-            $proxy_env = []
-        }
-        default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
-        }
-    } else {
-        $proxy_env = []
-    }
-    exec { "add-apt-repository-${name}":
-        environment  => $proxy_env,
-        command      => "/usr/bin/add-apt-repository ${options} ${name}",
-        unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
-        user         => 'root',
-        logoutput    => 'on_failure',
-        notify       => Exec['apt_update'],
-        require      => [
-        File['sources.list.d'],
-        Package[$package],
-        ],
-    }
-
-    file { "${sources_list_d}/${sources_list_d_filename}":
-        ensure  => file,
-        require => Exec["add-apt-repository-${name}"],
-    }
-  }
-  else {
-
-    file { "${sources_list_d}/${sources_list_d_filename}":
-        ensure => 'absent',
-        mode   => '0644',
-        owner  => 'root',
-        gruop  => 'root',
-        notify => Exec['apt_update'],
-    }
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::ppa::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
deleted file mode 100644
index 6e0a38f73f7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# release.pp
-
-class apt::release (
-  $release_id
-) {
-
-  include apt::params
-
-  $root = $apt::params::root
-
-  file { "${root}/apt.conf.d/01release":
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => "APT::Default-Release \"${release_id}\";"
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
deleted file mode 100644
index bc93ad9d571..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
+++ /dev/null
@@ -1,87 +0,0 @@
-# source.pp
-# add an apt source
-
-define apt::source(
-  $ensure            = present,
-  $location          = '',
-  $release           = 'UNDEF',
-  $repos             = 'main',
-  $include_src       = true,
-  $required_packages = false,
-  $key               = false,
-  $key_server        = 'keyserver.ubuntu.com',
-  $key_content       = false,
-  $key_source        = false,
-  $pin               = false,
-  $architecture      = undef
-) {
-
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
-
-  if $release == 'UNDEF' {
-    if $::lsbdistcodename == undef {
-      fail('lsbdistcodename fact not available: release parameter required')
-    } else {
-      $release_real = $::lsbdistcodename
-    }
-  } else {
-    $release_real = $release
-  }
-
-  file { "${name}.list":
-    ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template("${module_name}/source.list.erb"),
-    notify  => Exec['apt_update'],
-  }
-
-
-  if ($pin != false) {
-    # Get the host portion out of the url so we can pin to origin
-    $url_split = split($location, '/')
-    $host      = $url_split[2]
-
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => File["${name}.list"],
-      origin   => $host,
-    }
-  }
-
-  if ($required_packages != false) and ($ensure == 'present') {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${provider} -y install ${required_packages}",
-      logoutput   => 'on_failure',
-      refreshonly => true,
-      tries       => 3,
-      try_sleep   => 1,
-      subscribe   => File["${name}.list"],
-      before      => Exec['apt_update'],
-    }
-  }
-
-  # We do not want to remove keys when the source is absent.
-  if ($key != false) and ($ensure == 'present') {
-    apt::key { "Add key: ${key} from Apt::Source ${title}":
-      ensure      => present,
-      key         => $key,
-      key_server  => $key_server,
-      key_content => $key_content,
-      key_source  => $key_source,
-      before      => File["${name}.list"],
-    }
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
deleted file mode 100644
index b0bd8ab1e09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Class: apt::unattended_upgrades
-#
-# This class manages the unattended-upgrades package and related configuration
-# files for ubuntu
-#
-# origins are the repositories to automatically upgrade included packages
-# blacklist is a list of packages to not automatically upgrade
-# update is how often to run "apt-get update" in days
-# download is how often to run "apt-get upgrade --download-only" in days
-# upgrade is how often to upgrade packages included in the origins list in days
-# autoclean is how often to run "apt-get autoclean" in days
-#
-# information on the other options can be found in the 50unattended-upgrades
-# file and in /etc/cron.daily/apt
-#
-class apt::unattended_upgrades (
-  $origins = ['${distro_id}:${distro_codename}-security'],
-  $blacklist = [],
-  $update = "1",
-  $download = "1",
-  $upgrade = "1",
-  $autoclean = "7",
-  $auto_fix = true,
-  $minimal_steps = false,
-  $install_on_shutdown = false,
-  $mail_to = "NONE",
-  $mail_only_on_error = false,
-  $remove_unused = true,
-  $auto_reboot = false,
-  $dl_limit = "NONE",
-  $enable = "1",
-  $backup_interval = "0",
-  $backup_level = "3",
-  $max_age = "0",
-  $min_age = "0",
-  $max_size = "0",
-  $download_delta = "0",
-  $verbose = "0",
-) {
-  include apt::params
-
-  validate_bool(
-    $auto_fix,
-    $minimal_steps,
-    $install_on_shutdown,
-    $mail_only_on_error,
-    $remove_unused,
-    $auto_reboot
-  )
-
-  package { 'unattended-upgrades':
-    ensure => present,
-  }
-
-  File {
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    require => Package['unattended-upgrades'],
-  }
-
-  file {
-    '/etc/apt/apt.conf.d/50unattended-upgrades':
-      content => template('apt/50unattended-upgrades.erb');
-    '/etc/apt/apt.conf.d/10periodic':
-      content => template('apt/10periodic.erb');
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
deleted file mode 100644
index ce0b78fbddb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apt::update {
-  include apt::params
-
-  exec { 'apt_update':
-    command     => "${apt::params::provider} update",
-    logoutput   => 'on_failure',
-    refreshonly => true,
-    timeout     => $apt::update_timeout,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
deleted file mode 100644
index f1e8663059b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "puppetlabs-apt",
-    "version": "1.4.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-apt",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
-    "summary": "Puppet Labs Apt Module",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
deleted file mode 100644
index 1e35e4aa68d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::builddep', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'reset' do
-    it 'removes packages' do
-      shell('apt-get -y remove znc')
-      shell('apt-get -y remove g++')
-    end
-  end
-
-  context 'apt::builddep' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include '::apt'
-      apt::builddep { 'znc': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe 'should install g++ as a dependency' do
-      describe package('g++') do
-        it { should be_installed }
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'removes packages' do
-      shell('apt-get -y remove znc')
-      shell('apt-get -y remove g++')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
deleted file mode 100644
index 9f2ba395ad5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
+++ /dev/null
@@ -1,200 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::key', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'apt::key' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include '::apt'
-      apt::key { 'puppetlabs':
-        key        => '4BD6EC30',
-        key_server => 'pgp.mit.edu',
-      }
-
-      apt::key { 'jenkins':
-        key        => 'D50582E6',
-        key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-      }
-      EOS
-
-      shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-      shell('apt-key del D50582E6', :acceptable_exit_codes => [0,1,2])
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe 'keys should exist' do
-      it 'finds puppetlabs key' do
-        shell('apt-key list | grep 4BD6EC30')
-      end
-      it 'finds jenkins key' do
-        shell('apt-key list | grep D50582E6')
-      end
-    end
-  end
-  context 'ensure' do
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          ensure     => absent,
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-
-        apt::key { 'jenkins':
-          ensure     => absent,
-          key        => 'D50582E6',
-          key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys shouldnt exist' do
-        it 'fails' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [1])
-        end
-        it 'fails' do
-          shell('apt-key list | grep D50582E6', :acceptable_exit_codes => [1])
-        end
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'clean up keys' do
-      shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-      shell('apt-key del D50582E6', :acceptable_exit_codes => [0,1,2])
-    end
-  end
-
-  context 'key options' do
-    context 'key_content' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key         => '4BD6EC30',
-          key_content => '-----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1.4.12 (GNU/Linux)
-          Comment: GPGTools - http://gpgtools.org
-
-          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
-            =a34C
-          -----END PGP PUBLIC KEY BLOCK-----
-          ',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-    describe 'keys should exist' do
-      it 'finds puppetlabs key' do
-        shell('apt-key list | grep 4BD6EC30')
-      end
-    end
-
-    context 'key_source' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key        => '4BD6EC30',
-          key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-
-    context 'key_options' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key        => '4BD6EC30',
-          key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
-          key_options => 'debug'
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
deleted file mode 100644
index c11da9123be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'spec_helper_acceptance'
-
-if fact('operatingsystem') == 'Ubuntu'
-  describe 'apt::ppa', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-    context 'reset' do
-      it 'removes ppa' do
-        shell('rm /etc/apt/sources.list.d/canonical-kernel-team-ppa-*', :acceptable_exit_codes => [0,1,2])
-        shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*', :acceptable_exit_codes => [0,1,2])
-      end
-    end
-
-    context 'adding a ppa that doesnt exist' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::ppa { 'ppa:canonical-kernel-team/ppa': }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'contains the source file' do
-        it 'contains a kernel ppa source' do
-          shell('ls /etc/apt/sources.list.d/canonical-kernel-team-ppa-*', :acceptable_exit_codes => [0])
-        end
-      end
-    end
-
-    context 'reading a removed ppa.' do
-      it 'setup' do
-        # This leaves a blank file
-        shell('echo > /etc/apt/sources.list.d/raravena80-collectd5-$(lsb_release -c -s).list')
-      end
-
-      it 'should read it successfully' do
-        pp = <<-EOS
-        include '::apt'
-        apt::ppa { 'ppa:raravena80/collectd5': }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    context 'reset' do
-      it 'removes added ppas' do
-        shell('rm /etc/apt/sources.list.d/canonical-kernel-team-ppa-*')
-        shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*')
-      end
-    end
-
-    context 'release' do
-      context 'precise' do
-        it 'works without failure' do
-          pp = <<-EOS
-          include '::apt'
-          apt::ppa { 'ppa:canonical-kernel-team/ppa':
-            release => precise,
-          }
-          EOS
-
-          shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
-          it { should be_file }
-        end
-      end
-    end
-
-    context 'options' do
-      context '-y', :unless => default[:platform].match(/10\.04/) do
-        it 'works without failure' do
-          pp = <<-EOS
-          include '::apt'
-          apt::ppa { 'ppa:canonical-kernel-team/ppa':
-            release => precise,
-            options => '-y',
-          }
-          EOS
-
-          shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
-          it { should be_file }
-        end
-      end
-    end
-
-    context 'reset' do
-      it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
deleted file mode 100644
index c2d076cbff4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::source', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'apt::source' do
-    context 'ensure => present' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        shell('rm /etc/apt/sources.list.d/puppetlabs.list', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'key should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [0])
-        end
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-      end
-    end
-
-    context 'ensure => absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => absent,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      # The key should remain -we don't delete those when deleting a source.
-      describe 'key should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [0])
-        end
-      end
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should_not be_file }
-      end
-    end
-
-  end
-
-  context 'release' do
-    context 'test' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          release    => 'precise',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb http://apt.puppetlabs.com precise main' }
-      end
-    end
-  end
-
-  context 'include_src' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_server  => 'pgp.mit.edu',
-          include_src => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb-src http://apt.puppetlabs.com' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_server  => 'pgp.mit.edu',
-          include_src => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should_not contain 'deb-src http://apt.puppetlabs.com' }
-      end
-    end
-  end
-
-  context 'required_packages' do
-    context 'vim' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure             => present,
-          location           => 'http://apt.puppetlabs.com',
-          repos              => 'main',
-          key                => '4BD6EC30',
-          key_server         => 'pgp.mit.edu',
-          required_packages  => 'vim',
-        }
-        EOS
-
-        shell('apt-get -y remove vim')
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe package('vim') do
-        it { should be_installed }
-      end
-    end
-  end
-
-  context 'key content' do
-    context 'giant key' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_content => '-----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1.4.12 (GNU/Linux)
-          Comment: GPGTools - http://gpgtools.org
-
-          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
-          =a34C
-          -----END PGP PUBLIC KEY BLOCK-----',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-      end
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-  context 'key_source' do
-    context 'http://apt.puppetlabs.com/pubkey.gpg' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          release    => 'precise',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_source  => 'http://apt.puppetlabs.com/pubkey.gpg',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb http://apt.puppetlabs.com precise main' }
-      end
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-  context 'pin' do
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          pin        => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/puppetlabs.pref') do
-        it { should_not be_file }
-      end
-    end
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          pin        => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/puppetlabs.pref') do
-        it { should be_file }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
deleted file mode 100644
index 775139145ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'reset' do
-    it 'fixes the sources.list' do
-      shell('cp /etc/apt/sources.list /tmp')
-    end
-  end
-
-  context 'always_apt_update => true' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': always_apt_update => true }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/apt_update/)
-      end
-    end
-  end
-  context 'always_apt_update => false' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': always_apt_update => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/apt_update/)
-      end
-    end
-  end
-
-  # disable_keys drops in a 99unauth file to ignore keys in
-  # other files.
-  context 'disable_keys => true' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': disable_keys => true }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/99unauth') do
-      it { should be_file }
-      it { should contain 'APT::Get::AllowUnauthenticated 1;' }
-    end
-  end
-  context 'disable_keys => false' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': disable_keys => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/99unauth') do
-      it { should_not be_file }
-    end
-  end
-
-  # proxy_host sets the proxy to use for transfers.
-  # proxy_port sets the proxy port to use.
-  context 'proxy settings' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': 
-        proxy_host => 'localhost',
-        proxy_port => '7042',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/proxy') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
-    end
-  end
-
-  context 'purge_sources' do
-    it 'creates a fake apt file' do
-      shell('touch /etc/apt/sources.list.d/fake.list')
-      shell('echo "deb fake" >> /etc/apt/sources.list')
-    end
-    it 'purge_sources_list and purge_sources_list_d => true' do
-      pp = <<-EOS
-      class { 'apt':
-        purge_sources_list   => true,
-        purge_sources_list_d => true,
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list') do
-      it { should_not contain 'deb fake' }
-    end
-
-    describe file('/etc/apt/sources.list.d/fake.list') do
-      it { should_not be_file }
-    end
-  end
-  context 'proxy settings' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': 
-        proxy_host => 'localhost',
-        proxy_port => '7042',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/proxy') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
-    end
-  end
-
-  context 'purge_sources' do
-    context 'false' do
-      it 'creates a fake apt file' do
-        shell('touch /etc/apt/sources.list.d/fake.list')
-        shell('echo "deb fake" >> /etc/apt/sources.list')
-      end
-      it 'purge_sources_list and purge_sources_list_d => false' do
-        pp = <<-EOS
-        class { 'apt':
-          purge_sources_list   => false,
-          purge_sources_list_d => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => false)
-      end
-
-      describe file('/etc/apt/sources.list') do
-        it { should contain 'deb fake' }
-      end
-
-      describe file('/etc/apt/sources.list.d/fake.list') do
-        it { should be_file }
-      end
-    end
-
-    context 'true' do
-      it 'creates a fake apt file' do
-        shell('touch /etc/apt/sources.list.d/fake.list')
-        shell('echo "deb fake" >> /etc/apt/sources.list')
-      end
-      it 'purge_sources_list and purge_sources_list_d => true' do
-        pp = <<-EOS
-        class { 'apt':
-          purge_sources_list   => true,
-          purge_sources_list_d => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list') do
-        it { should_not contain 'deb fake' }
-      end
-
-      describe file('/etc/apt/sources.list.d/fake.list') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'purge_preferences_d' do
-    context 'false' do
-      it 'creates a preferences file' do
-        shell('touch /etc/apt/preferences.d/test')
-      end
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': purge_preferences_d => false }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/test') do
-        it { should be_file }
-      end
-    end
-    context 'true' do
-      it 'creates a preferences file' do
-        shell('touch /etc/apt/preferences.d/test')
-      end
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': purge_preferences_d => true }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/test') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'update_timeout' do
-    context '5000' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': update_timeout => '5000' }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'fixes the sources.list' do
-      shell('cp /tmp/sources.list /etc/apt')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
deleted file mode 100644
index 6d3f7f0e687..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'spec_helper_acceptance'
-
-codename = fact('lsbdistcodename')
-case fact('operatingsystem')
-when 'Ubuntu'
-  repos = 'main universe multiverse restricted'
-when 'Debian'
-  repos = 'main contrib non-free'
-end
-
-describe 'apt::backports class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  context 'release' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': release => '#{codename}' }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list.d/backports.list') do
-      it { should be_file }
-      it { should contain "#{codename}-backports #{repos}" }
-    end
-  end
-
-  context 'location' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': release => 'precise', location => 'http://localhost/ubuntu' }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list.d/backports.list') do
-      it { should be_file }
-      it { should contain "deb http://localhost/ubuntu precise-backports #{repos}" }
-    end
-  end
-
-  context 'reset' do
-    it 'deletes backport files' do
-      shell('rm -rf /etc/apt/sources.list.d/backports.list')
-      shell('rm -rf /etc/apt/preferences.d/backports.pref')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
deleted file mode 100644
index e5994498b90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'default parameters' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
deleted file mode 100644
index 8a8ed63db4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::conf define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      apt::conf { 'test':
-        content => 'test',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50test') do
-      it { should be_file }
-      it { should contain 'test' }
-    end
-  end
-
-  context 'ensure' do
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        apt::conf { 'test':
-          ensure  => absent,
-          content => 'test',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50test') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'priority' do
-    context '99' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        apt::conf { 'test':
-          ensure   => present,
-          content  => 'test',
-          priority => '99',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/99test') do
-        it { should be_file }
-        it { should contain 'test' }
-      end
-    end
-  end
-
-  context 'cleanup' do
-    it 'deletes 99test' do
-      shell ('rm -rf /etc/apt/apt.conf.d/99test')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
deleted file mode 100644
index 00572eae37d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper_acceptance'
-
-codename = fact('lsbdistcodename')
-
-describe 'apt::force define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => false, }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package('vim') do
-      it { should be_installed }
-    end
-  end
-
-  context 'release' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => '#{codename}' }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/apt-get -y -t #{codename} install vim/)
-      end
-    end
-
-    describe package('vim') do
-      it { should be_installed }
-    end
-  end
-
-  context 'version' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': version => '1.1.1', release => false, }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => false) do |r|
-        expect(r.stdout).to match(/apt-get -y  install vim=1.1.1/)
-      end
-    end
-
-    describe package('vim') do
-      it { should_not be_installed }
-    end
-  end
-
-  context 'timeout' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => false, timeout => '1' }
-      EOS
-
-      shell('apt-get clean')
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/Error: Command exceeded timeout/)
-      end
-    end
-
-    describe package('vim') do
-      it { should_not be_installed }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 4b55677f4c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-70rc1-x64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index a5f38f784c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-server-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index c1b8bdf8fa9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index a5f38f784c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-server-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb
deleted file mode 100644
index 6de11748d0e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::pin define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::pin { 'vim-puppet': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-      it { should be_file }
-      it { should contain 'Pin: release a=vim-puppet' }
-    end
-  end
-
-  context 'ensure' do
-    context 'present' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet': ensure => present }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet': ensure => absent }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'order' do
-    context '99' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure => present,
-          order  => '99',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/99-vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-  end
-
-  context 'packages' do
-    context 'test' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          packages => 'test',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Package: test' }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-  end
-
-  context 'release' do
-    context 'testrelease' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure  => present,
-          release => 'testrelease',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=testrelease' }
-      end
-    end
-  end
-
-  context 'origin' do
-    context 'testrelease' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure  => present,
-          origin  => 'testrelease',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: origin testrelease' }
-      end
-    end
-  end
-
-  context 'version' do
-    context '1.0.0' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          packages => 'test',
-          version  => '1.0.0',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Package: test' }
-        it { should contain 'Pin: version 1.0.0' }
-      end
-    end
-  end
-
-  context 'codename' do
-    context 'testname' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          codename => 'testname',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release n=testname' }
-      end
-    end
-  end
-
-  context 'release_version' do
-    context '1.1.1' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure          => present,
-          release_version => '1.1.1',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release v=1.1.1' }
-      end
-    end
-  end
-
-  context 'component' do
-    context 'testcomponent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure    => present,
-          component => 'testcomponent',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release c=testcomponent' }
-      end
-    end
-  end
-
-  context 'originator' do
-    context 'testorigin' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure     => present,
-          originator => 'testorigin',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release o=testorigin' }
-      end
-    end
-  end
-
-  context 'label' do
-    context 'testlabel' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure => present,
-          label  => 'testlabel',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release l=testlabel' }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb
deleted file mode 100644
index e7467bf62de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::release class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'release_id' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::release': release_id => 'precise', }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/01release') do
-      it { should be_file }
-      it { should contain 'APT::Default-Release "precise";' }
-    end
-  end
-
-  context 'reset' do
-    it 'cleans up' do
-      shell('rm -rf /etc/apt/apt.conf.d/01release')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb
deleted file mode 100644
index 6a19f4e74e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb
+++ /dev/null
@@ -1,562 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::unattended_upgrades class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      include apt::unattended_upgrades
-      EOS
-
-      # Attempted workaround for problems seen on debian with
-      # something holding the package database open.
-      #shell('killall -9 apt-get')
-      #shell('killall -9 dpkg')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-    end
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-    end
-  end
-
-  context 'origins' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        origins => ['${distro_id}:${distro_codename}-test'],
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain '${distro_id}:${distro_codename}-test' }
-    end
-  end
-
-  context 'blacklist' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        blacklist => ['puppet']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'puppet' }
-    end
-  end
-
-  context 'update' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        update => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Update-Package-Lists "99";' }
-    end
-  end
-
-  context 'download' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        download => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Download-Upgradeable-Packages "99";' }
-    end
-  end
-
-  context 'upgrade' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        upgrade => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Unattended-Upgrade "99";' }
-    end
-  end
-
-  context 'autoclean' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        autoclean => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::AutocleanInterval "99";' }
-    end
-  end
-
-  context 'auto_fix' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_fix => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::AutoFixInterruptedDpkg "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_fix => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::AutoFixInterruptedDpkg "false";' }
-      end
-    end
-  end
-
-  context 'minimal_steps' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          minimal_steps => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MinimalSteps "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          minimal_steps => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MinimalSteps "false";' }
-      end
-    end
-  end
-
-  context 'install_on_shutdown' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          install_on_shutdown => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::InstallOnShutdown "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          install_on_shutdown => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::InstallOnShutdown "false";' }
-      end
-    end
-  end
-
-  context 'mail_to' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        mail_to => 'test@example.com'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'Unattended-Upgrade::Mail "test@example.com";' }
-    end
-  end
-
-  context 'mail_only_on_error' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_to            => 'test@example.com',
-          mail_only_on_error => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MailOnlyOnError "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_to            => 'test@example.com',
-          mail_only_on_error => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MailOnlyOnError "false";' }
-      end
-    end
-
-    context 'mail_to missing' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_only_on_error => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should_not contain 'Unattended-Upgrade::MailOnlyOnError "true";' }
-      end
-    end
-  end
-
-  context 'remove_unused' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          remove_unused => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Remove-Unused-Dependencies "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          remove_unused => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Remove-Unused-Dependencies "false";' }
-      end
-    end
-  end
-
-  context 'auto_reboot' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_reboot => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Automatic-Reboot "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_reboot => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Automatic-Reboot "false";' }
-      end
-    end
-  end
-
-  context 'dl_limit' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        dl_limit => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Dl-Limit "99"' }
-    end
-  end
-
-  context 'enable' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        enable => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Enable "2"' }
-    end
-  end
-
-  context 'backup_interval' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        backup_interval => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::BackUpArchiveInterval "2";' }
-    end
-  end
-
-  context 'backup_level' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        backup_level => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::BackUpLevel "2";' }
-    end
-  end
-
-  context 'max_age' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        max_age => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MaxAge "2";' }
-    end
-  end
-
-  context 'min_age' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        min_age => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MinAge "2";' }
-    end
-  end
-
-  context 'max_size' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        max_size => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MaxSize "2";' }
-    end
-  end
-
-  context 'download_delta' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        download_delta => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Download-Upgradeable-Packages-Debdelta "2";' }
-    end
-  end
-
-  context 'verbose' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        verbose => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Verbose "2";' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 08dca76b845..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'class apt fails' do
-    pp = <<-EOS
-      class { 'apt': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb
deleted file mode 100644
index 080bc817602..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'spec_helper'
-describe 'apt', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :default_params do
-    {
-      :disable_keys => :undef,
-      :always_apt_update => false,
-      :purge_sources_list => false,
-      :purge_sources_list_d => false,
-    }
-  end
-
-  [{},
-    {
-      :disable_keys => true,
-      :always_apt_update => true,
-      :proxy_host => true,
-      :proxy_port => '3128',
-      :purge_sources_list => true,
-      :purge_sources_list_d => true,
-    },
-    {
-      :disable_keys => false
-    }
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
-      let :param_hash do
-        default_params.merge(param_set)
-      end
-
-      let :params do
-        param_set
-      end
-
-      let :refresh_only_apt_update do
-        if param_hash[:always_apt_update]
-          false
-        else
-          true
-        end
-      end
-
-      it { should contain_class("apt::params") }
-
-      it {
-        if param_hash[:purge_sources_list]
-        should contain_file("sources.list").with({
-            'path'    => "/etc/apt/sources.list",
-            'ensure'  => "present",
-            'owner'   => "root",
-            'group'   => "root",
-            'mode'    => "0644",
-            "content" => "# Repos managed by puppet.\n"
-          })
-        else
-        should contain_file("sources.list").with({
-            'path'    => "/etc/apt/sources.list",
-            'ensure'  => "present",
-            'owner'   => "root",
-            'group'   => "root",
-            'mode'    => "0644",
-            'content' => nil
-          })
-        end
-      }
-      it {
-        if param_hash[:purge_sources_list_d]
-          should create_file("sources.list.d").with({
-            'path'    => "/etc/apt/sources.list.d",
-            'ensure'  => "directory",
-            'owner'   => "root",
-            'group'   => "root",
-            'purge'   => true,
-            'recurse' => true,
-            'notify'  => 'Exec[apt_update]'
-          })
-        else
-          should create_file("sources.list.d").with({
-            'path'    => "/etc/apt/sources.list.d",
-            'ensure'  => "directory",
-            'owner'   => "root",
-            'group'   => "root",
-            'purge'   => false,
-            'recurse' => false,
-            'notify'  => 'Exec[apt_update]'
-          })
-        end
-      }
-
-      it {
-        should contain_exec("apt_update").with({
-          'command'     => "/usr/bin/apt-get update",
-          'refreshonly' => refresh_only_apt_update
-        })
-      }
-
-      it {
-        if param_hash[:disable_keys] == true
-          should create_file("99unauth").with({
-            'content' => "APT::Get::AllowUnauthenticated 1;\n",
-            'ensure'  => "present",
-            'path'    => "/etc/apt/apt.conf.d/99unauth"
-          })
-        elsif param_hash[:disable_keys] == false
-          should create_file("99unauth").with({
-            'ensure' => "absent",
-            'path'   => "/etc/apt/apt.conf.d/99unauth"
-          })
-        elsif param_hash[:disable_keys] != :undef
-          should_not create_file("99unauth").with({
-            'path'   => "/etc/apt/apt.conf.d/99unauth"
-          })
-        end
-      }
-      describe 'when setting a proxy' do
-        it {
-          if param_hash[:proxy_host]
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
-              'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
-              'notify'  => "Exec[apt_update]"
-            )
-          else
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
-              'notify'  => 'Exec[apt_update]',
-              'ensure'  => 'absent'
-            )
-          end
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb
deleted file mode 100644
index 98ad873af54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper'
-describe 'apt::backports', :type => :class do
-
-  describe 'when turning on backports for ubuntu karmic' do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Karmic',
-        'lsbdistid'       => 'Ubuntu'
-      }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => 'http://old-releases.ubuntu.com/ubuntu',
-        'release'    => 'karmic-backports',
-        'repos'      => 'main universe multiverse restricted',
-        'key'        => '437D05B5',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-
-  describe "when turning on backports for debian squeeze" do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Squeeze',
-        'lsbdistid'       => 'Debian',
-      }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => 'http://backports.debian.org/debian-backports',
-        'release'    => 'squeeze-backports',
-        'repos'      => 'main contrib non-free',
-        'key'        => '46925553',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-
-  describe "when turning on backports for debian squeeze but using your own mirror" do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Squeeze',
-        'lsbdistid'       => 'Debian'
-      }
-    end
-
-    let :location do
-      'http://mirrors.example.com/debian-backports'
-    end
-
-    let :params do
-      { 'location' => location }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => location,
-        'release'    => 'squeeze-backports',
-        'repos'      => 'main contrib non-free',
-        'key'        => '46925553',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb
deleted file mode 100644
index 20487333f67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::testing', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  it {
-    should contain_apt__source("debian_testing").with({
-      "location"            => "http://debian.mirror.iweb.ca/debian/",
-      "release"             => "testing",
-      "repos"               => "main contrib non-free",
-      "required_packages"   => "debian-keyring debian-archive-keyring",
-      "key"                 => "46925553",
-      "key_server"          => "subkeys.pgp.net",
-      "pin"                 => "-10"
-    })
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb
deleted file mode 100644
index 70724f90bd0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::unstable', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  it {
-    should contain_apt__source("debian_unstable").with({
-      "location"          => "http://debian.mirror.iweb.ca/debian/",
-      "release"           => "unstable",
-      "repos"             => "main contrib non-free",
-      "required_packages" => "debian-keyring debian-archive-keyring",
-      "key"               => "46925553",
-      "key_server"        => "subkeys.pgp.net",
-      "pin"               => "-10"
-    })
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb
deleted file mode 100644
index 2d3ec3c71aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-describe 'apt::params', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let (:title) { 'my_package' }
-
-  it { should contain_apt__params }
-
-  # There are 4 resources in this class currently
-  # there should not be any more resources because it is a params class
-  # The resources are class[apt::params], class[main], class[settings], stage[main]
-  it "Should not contain any resources" do
-    subject.resources.size.should == 4
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb
deleted file mode 100644
index e43f449d626..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-describe 'apt::release', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let (:title) { 'my_package' }
-
-  let :param_set do
-    { :release_id => 'precise' }
-  end
-
-  let (:params) { param_set }
-
-  it { should contain_class("apt::params") }
-
-  it {
-    should contain_file("/etc/apt/apt.conf.d/01release").with({
-      "mode"    => "0644",
-      "owner"   => "root",
-      "group"   => "root",
-      "content" => "APT::Default-Release \"#{param_set[:release_id]}\";"
-    })
-  }
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb
deleted file mode 100644
index f5cad53a5b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-require 'spec_helper'
-describe 'apt::unattended_upgrades', :type => :class do
-  let(:file_unattended) { '/etc/apt/apt.conf.d/50unattended-upgrades' }
-  let(:file_periodic) { '/etc/apt/apt.conf.d/10periodic' }
-  let(:facts) { { :lsbdistid => 'Debian' } }
-
-  it { should contain_package("unattended-upgrades") }
-
-  it {
-    should create_file("/etc/apt/apt.conf.d/50unattended-upgrades").with({
-      "owner"   => "root",
-      "group"   => "root",
-      "mode"    => "0644",
-      "require" => "Package[unattended-upgrades]",
-    })
-  }
-
-  it {
-    should create_file("/etc/apt/apt.conf.d/10periodic").with({
-      "owner"   => "root",
-      "group"   => "root",
-      "mode"    => "0644",
-      "require" => "Package[unattended-upgrades]",
-    })
-  }
-
-  describe "origins" do
-    describe "with param defaults" do
-      let(:params) {{ }}
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"\$\{distro_id\}:\$\{distro_codename\}-security";\n\};$/) }
-    end
-
-    describe "with origins => ['ubuntu:precise-security']" do
-      let :params do
-        { :origins => ['ubuntu:precise-security'] }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"ubuntu:precise-security";\n\};$/) }
-    end
-  end
-
-  describe "blacklist" do
-    describe "with param defaults" do
-      let(:params) {{ }}
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Package-Blacklist \{\n\};$/) }
-    end
-
-    describe "with blacklist => []" do
-      let :params do
-        { :blacklist => ['libc6', 'libc6-dev'] }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Package-Blacklist \{\n\t"libc6";\n\t"libc6-dev";\n\};$/) }
-    end
-  end
-
-  describe "with update => 2" do
-    let :params do
-      { :update => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Update-Package-Lists "2";$/) }
-  end
-
-  describe "with download => 2" do
-    let :params do
-      { :download => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Download-Upgradeable-Packages "2";$/) }
-  end
-
-  describe "with upgrade => 2" do
-    let :params do
-      { :upgrade => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Unattended-Upgrade "2";$/) }
-  end
-
-  describe "with autoclean => 2" do
-    let :params do
-      { :autoclean => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::AutocleanInterval "2";$/) }
-  end
-
-  describe "with auto_fix => false" do
-    let :params do
-      { :auto_fix => false }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::AutoFixInterruptedDpkg "false";$/) }
-  end
-
-  describe "with minimal_steps => true" do
-    let :params do
-      { :minimal_steps => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::MinimalSteps "true";$/) }
-  end
-
-  describe "with install_on_shutdown => true" do
-    let :params do
-      { :install_on_shutdown => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::InstallOnShutdown "true";$/) }
-  end
-
-  describe "mail_to" do
-    describe "param defaults" do
-      let(:params) {{ }}
-      it { should_not contain_file(file_unattended).with_content(/^Unattended-Upgrade::Mail /) }
-      it { should_not contain_file(file_unattended).with_content(/^Unattended-Upgrade::MailOnlyOnError /) }
-    end
-
-    describe "with mail_to => user@website, mail_only_on_error => true" do
-      let :params do
-        { :mail_to => "user@website",
-          :mail_only_on_error => true }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Mail "user@website";$/) }
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::MailOnlyOnError "true";$/) }
-    end
-  end
-
-  describe "with remove_unused => false" do
-    let :params do
-      { :remove_unused => false }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Remove-Unused-Dependencies "false";$/) }
-  end
-
-  describe "with auto_reboot => true" do
-    let :params do
-      { :auto_reboot => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Automatic-Reboot "true";$/) }
-  end
-
-  describe "dl_limit" do
-    describe "param defaults" do
-      let(:params) {{ }}
-      it { should_not contain_file(file_unattended).with_content(/^Acquire::http::Dl-Limit /) }
-    end
-
-    describe "with dl_limit => 70" do
-      let :params do
-        { :dl_limit => "70" }
-      end
-      it { should contain_file(file_unattended).with_content(/^Acquire::http::Dl-Limit "70";$/) }
-    end
-  end
-
-  describe "with enable => 0" do
-    let :params do
-      { :enable => "0" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Enable "0";$/) }
-  end
-
-  describe "with backup_interval => 1" do
-    let :params do
-      { :backup_interval => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::BackUpArchiveInterval "1";$/) }
-  end
-
-  describe "with backup_level => 0" do
-    let :params do
-      { :backup_level => "0" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::BackUpLevel "0";$/) }
-  end
-
-  describe "with max_age => 1" do
-    let :params do
-      { :max_age => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MaxAge "1";$/) }
-  end
-
-  describe "with min_age => 1" do
-    let :params do
-      { :min_age => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MinAge "1";$/) }
-  end
-
-  describe "with max_size => 1" do
-    let :params do
-      { :max_size => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MaxSize "1";$/) }
-  end
-
-  describe "with download_delta => 2" do
-    let :params do
-      { :download_delta => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Download-Upgradeable-Packages-Debdelta "2";$/) }
-  end
-
-  describe "with verbose => 2" do
-    let :params do
-      { :verbose => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Verbose "2";$/) }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb
deleted file mode 100644
index a0cbaa4cc09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-describe 'apt::builddep', :type => :define do
-
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let(:title) { 'my_package' }
-
-  describe "should require apt-get update" do
-    it { should contain_exec("apt_update").with({
-        'command' => "/usr/bin/apt-get update",
-        'refreshonly' => true
-      })
-    }
-    it { should contain_anchor("apt::builddep::my_package").with({
-        'require' => 'Class[Apt::Update]',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb
deleted file mode 100644
index cda5900c035..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'apt::conf', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    'norecommends'
-  end
-
-  describe "when creating an apt preference" do
-    let :params do
-      {
-        :priority => '00',
-        :content  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      }
-    end
-
-    let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
-    end
-
-    it { should contain_apt__conf('norecommends').with({
-         'priority' => '00',
-         'content'  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      })
-    }
-
-    it { should contain_file(filename).with({
-          'ensure'    => 'present',
-          'content'   => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
-          'owner'     => 'root',
-          'group'     => 'root',
-          'mode'      => '0644',
-        })
-      }
-  end
-
-  describe "when removing an apt preference" do
-    let :params do
-      {
-        :ensure   => 'absent',
-        :priority => '00',
-        :content  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      }
-    end
-
-    let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
-    end
-
-    it { should contain_file(filename).with({
-        'ensure'    => 'absent',
-        'content'   => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
-        'owner'     => 'root',
-        'group'     => 'root',
-        'mode'      => '0644',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb
deleted file mode 100644
index b8665e6dabe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'apt::force', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :pre_condition do
-    'include apt::params'
-  end
-
-  let :title do
-    'my_package'
-  end
-
-  let :default_params do
-    {
-      :release => 'testing',
-      :version => false
-    }
-  end
-
-  describe "when using default parameters" do
-    let :params do
-      default_params
-    end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}").with(
-      :unless => "/usr/bin/test \$(/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1",
-      :timeout => '300'
-    ) }
-  end
-
-  describe "when specifying false release parameter" do
-    let :params do
-      default_params.merge(:release => false)
-    end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}").with(
-      :unless  => "/usr/bin/dpkg -s #{title} | grep -q 'Status: install'"
-    ) }
-  end
-
-  describe "when specifying version parameter" do
-    let :params do
-      default_params.merge(:version => '1')
-    end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}=#{params[:version]}").with(
-      :unless => "/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -q 'Installed: #{params[:version]}'"
-    ) }
-  end
-
-  describe "when specifying false release and version parameters" do
-    let :params do
-      default_params.merge(
-        :release => false,
-        :version => '1'
-      )
-    end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}=1").with(
-      :unless => "/usr/bin/dpkg -s #{title} | grep -q 'Version: #{params[:version]}'"
-    ) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb
deleted file mode 100644
index 4ba7b87eae6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper'
-describe 'apt::key', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    '8347A27F'
-  end
-
-  let :default_params do
-    {
-      :key         => title,
-      :ensure      => 'present',
-      :key_server  => "keyserver.ubuntu.com",
-      :key_source  => false,
-      :key_content => false
-    }
-  end
-
-  [{},
-    {
-      :ensure  => 'absent'
-    },
-    {
-      :ensure  => 'random'
-    },
-    {
-      :key_source => 'ftp://ftp.example.org/key',
-    },
-    {
-      :key_content => 'deadbeef',
-    }
-  ].each do |param_set|
-
-    let :param_hash do
-      param_hash = default_params.merge(param_set)
-      param_hash[:key].upcase! if param_hash[:key]
-      param_hash
-    end
-
-    let :params do
-      param_set
-    end
-
-    let :digest do
-      str = String.new
-      str << param_hash[:key].to_s         << '/'
-      str << param_hash[:key_content].to_s << '/'
-      str << param_hash[:key_source].to_s  << '/'
-      str << param_hash[:key_server].to_s  << '/'
-      Digest::SHA1.hexdigest(str)
-    end
-
-    describe "when #{param_set == {} ? "using default" : "specifying"} define parameters" do
-
-      it {
-        if [:present, 'present', :absent, 'absent'].include? param_hash[:ensure]
-          should contain_apt__params
-        end
-      }
-
-      it {
-        if [:present, 'present'].include? param_hash[:ensure]
-          should_not contain_exec("apt::key #{param_hash[:key]} absent")
-          should contain_anchor("apt::key #{param_hash[:key]} present")
-          should contain_exec(digest).with({
-            "path"    => "/bin:/usr/bin",
-            "unless"  => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'"
-          })
-        elsif [:absent, 'absent'].include? param_hash[:ensure]
-          should_not contain_anchor("apt::key #{param_hash[:key]} present")
-          should contain_exec("apt::key #{param_hash[:key]} absent").with({
-            "path"    => "/bin:/usr/bin",
-            "onlyif"  => "apt-key list | grep '#{param_hash[:key]}'",
-            "command" => "apt-key del '#{param_hash[:key]}'"
-          })
-        else
-          expect { should raise_error(Puppet::Error) }
-        end
-      }
-
-      it {
-        if [:present, 'present'].include? param_hash[:ensure]
-          if param_hash[:key_content]
-            should contain_exec(digest).with({
-              "command" => "echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -"
-            })
-          elsif param_hash[:key_source]
-            should contain_exec(digest).with({
-              "command" => "wget -q '#{param_hash[:key_source]}' -O- | apt-key add -"
-            })
-          elsif param_hash[:key_server]
-            should contain_exec(digest).with({
-              "command" => "apt-key adv --keyserver '#{param_hash[:key_server]}' --recv-keys '#{param_hash[:key]}'"
-            })
-          end
-        end
-      }
-
-    end
-  end
-
-  [{ :ensure => 'present' }, { :ensure => 'absent' }].each do |param_set|
-    describe "should correctly handle duplicate definitions" do
-
-      let :pre_condition do
-        "apt::key { 'duplicate': key => '#{title}'; }"
-      end
-
-      let(:params) { param_set }
-
-      it {
-        if param_set[:ensure] == 'present'
-          should contain_anchor("apt::key #{title} present")
-          should contain_apt__key(title)
-          should contain_apt__key("duplicate")
-        elsif param_set[:ensure] == 'absent'
-          expect { should raise_error(Puppet::Error) }
-        end
-      }
-
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb
deleted file mode 100644
index 78a9b12690b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-require 'spec_helper'
-describe 'apt::pin', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let(:title) { 'my_pin' }
-
-  let :default_params do
-    {
-      :ensure   => 'present',
-      :order    => '',
-      :packages => '*',
-      :priority => '0',
-      :release  => nil
-    }
-  end
-
-  [
-    { :params  => {},
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: *\nPin: release a=my_pin\nPin-Priority: 0\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :order    => 50,
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :ensure   => 'absent',
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1',
-        :release  => 'my_newpin'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_newpin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1',
-        :version  => '2.2.16*'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: version 2.2.16*\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :priority => '1',
-        :origin   => 'ftp.de.debian.org'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: *\nPin: origin ftp.de.debian.org\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages        => 'apache',
-        :priority        => '1',  
-        :release         => 'stable',
-        :codename        => 'wheezy',
-        :release_version => '3.0',
-        :component       => 'main',
-        :originator      => 'Debian',
-        :label           => 'Debian'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=stable, n=wheezy, v=3.0, c=main, o=Debian, l=Debian\nPin-Priority: 1\n"
-    },
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} define parameters" do
-      let :param_hash do
-        default_params.merge(param_set[:params])
-      end
-
-      let :params do
-        param_set[:params]
-      end
-
-      it { should contain_class("apt::params") }
-
-      it { should contain_file("#{title}.pref").with({
-          'ensure'  => param_hash[:ensure],
-          'path'    => "/etc/apt/preferences.d/#{param_hash[:order] == '' ? "" : "#{param_hash[:order]}-"}#{title}.pref",
-          'owner'   => 'root',
-          'group'   => 'root',
-          'mode'    => '0644',
-          'content' => param_set[:content],
-        })
-      }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb
deleted file mode 100644
index 0c3bd75ed77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-require 'spec_helper'
-describe 'apt::ppa', :type => :define do
-  [
-    {
-      :lsbdistrelease  => '11.04',
-      :lsbdistcodename => 'natty',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistid       => 'Ubuntu',
-      :package         => 'python-software-properties'
-    },
-    {
-      :lsbdistrelease  => '12.10',
-      :lsbdistcodename => 'quantal',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistid       => 'Ubuntu',
-      :package         => 'software-properties-common'
-    },
-  ].each do |platform|
-    context "on #{platform[:lsbdistcodename]}" do
-      let :facts do
-        {
-          :lsbdistrelease  => platform[:lsbdistrelease],
-          :lsbdistcodename => platform[:lsbdistcodename],
-          :operatingsystem => platform[:operatingsystem],
-          :lsbdistid       => platform[:lsbdistid],
-        }
-      end
-      let :release do
-        "#{platform[:lsbdistcodename]}"
-      end
-      let :package do
-        "#{platform[:package]}"
-      end
-      let :options do
-        "-y"
-      end
-      ['ppa:dans_ppa', 'dans_ppa','ppa:dans-daily/ubuntu'].each do |t|
-        describe "with title #{t}" do
-          let :pre_condition do
-            'class { "apt": }'
-          end
-          let :title do
-            t
-          end
-          let :filename do
-            t.sub(/^ppa:/,'').gsub('/','-') << "-" << "#{release}.list"
-          end
-
-          it { should contain_package("#{package}") }
-
-          it { should contain_exec("apt_update").with(
-            'command'     => '/usr/bin/apt-get update',
-            'refreshonly' => true
-            )
-          }
-
-          it { should contain_exec("add-apt-repository-#{t}").with(
-            'command' => "/usr/bin/add-apt-repository #{options} #{t}",
-            'unless'  => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-            'require' => ["File[sources.list.d]", "Package[#{package}]"],
-            'notify'  => "Exec[apt_update]"
-            )
-          }
-
-          it { should create_file("/etc/apt/sources.list.d/#{filename}").with(
-            'ensure'  => 'file',
-            'require' => "Exec[add-apt-repository-#{t}]"
-            )
-          }
-        end
-      end
-      describe 'without a proxy defined' do
-        let :title do
-          'rspec_ppa'
-        end
-        let :pre_condition do
-          'class { "apt":
-             proxy_host => false
-          }'
-        end
-        let :filename do
-          "#{title}-#{release}.list"
-        end
-
-        it { should contain_exec("add-apt-repository-#{title}").with(
-          'environment' => [],
-          'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
-          'notify'      => "Exec[apt_update]"
-          )
-        }
-      end
-
-      describe 'behind a proxy' do
-        let :title do
-          'rspec_ppa'
-        end
-        let :pre_condition do
-          'class { "apt":
-            proxy_host => "user:pass@proxy",
-          }'
-        end
-          let :filename do
-            "#{title}-#{release}.list"
-          end
-
-        it { should contain_exec("add-apt-repository-#{title}").with(
-          'environment' => [
-            "http_proxy=http://user:pass@proxy:8080",
-            "https_proxy=http://user:pass@proxy:8080",
-          ],
-          'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
-          'notify'      => "Exec[apt_update]"
-          )
-        }
-      end
-    end
-  end
-
-  [ { :lsbdistcodename => 'natty',
-      :package => 'python-software-properties' },
-    { :lsbdistcodename => 'quantal',
-      :package => 'software-properties-common'},
-  ].each do |platform|
-    context "on #{platform[:lsbdistcodename]}" do
-      describe "it should not error if package['#{platform[:package]}'] is already defined" do
-        let :pre_condition do
-           'class {"apt": }' +
-           'package { "#{platform[:package]}": }->Apt::Ppa["ppa"]'
-        end
-        let :facts do
-          {:lsbdistcodename => '#{platform[:lsbdistcodename]}',
-           :operatingsystem => 'Ubuntu',
-           :lsbdistid => 'Ubuntu'}
-        end
-        let(:title) { "ppa" }
-        let(:release) { "#{platform[:lsbdistcodename]}" }
-        it { should contain_package('#{platform[:package]}') }
-      end
-    end
-  end
-
-  describe "without Class[apt] should raise a Puppet::Error" do
-    let(:release) { "natty" }
-    let(:title) { "ppa" }
-    it { expect { should contain_apt__ppa(title) }.to raise_error(Puppet::Error) }
-  end
-
-  describe "without release should raise a Puppet::Error" do
-    let(:title) { "ppa:" }
-    it { expect { should contain_apt__ppa(:release) }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb
deleted file mode 100644
index 9da8b235fef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-require 'spec_helper'
-describe 'apt::source', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    'my_source'
-  end
-
-  let :default_params do
-    {
-      :ensure             => 'present',
-      :location           => '',
-      :release            => 'karmic',
-      :repos              => 'main',
-      :include_src        => true,
-      :required_packages  => false,
-      :key                => false,
-      :key_server         => 'keyserver.ubuntu.com',
-      :key_content        => false,
-      :key_source         => false,
-      :pin                => false
-    }
-  end
-
-  [{},
-   {
-      :location           => 'http://example.com',
-      :release            => 'precise',
-      :repos              => 'security',
-      :include_src        => false,
-      :required_packages  => 'apache',
-      :key                => 'key_name',
-      :key_server         => 'keyserver.debian.com',
-      :pin                => '600',
-      :key_content        => 'ABCD1234'
-    },
-    {
-      :key                => 'key_name',
-      :key_server         => 'keyserver.debian.com',
-      :key_content        => false,
-    },
-    {
-      :ensure             => 'absent',
-      :location           => 'http://example.com',
-      :release            => 'precise',
-      :repos              => 'security',
-    },
-    {
-      :release            => '',
-    },
-    {
-      :release            => 'custom',
-    },
-    {
-      :architecture       => 'amd64',
-    }
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
-      let :param_hash do
-        default_params.merge(param_set)
-      end
-
-      let :facts do
-        {:lsbdistcodename => 'karmic', :lsbdistid => 'Ubuntu'}
-      end
-
-      let :params do
-        param_set
-      end
-
-      let :filename do
-        "/etc/apt/sources.list.d/#{title}.list"
-      end
-
-      let :content do
-        content = "# #{title}"
-        if param_hash[:architecture]
-          arch = "[arch=#{param_hash[:architecture]}] "
-        end
-        content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
-
-        if param_hash[:include_src]
-          content << "deb-src #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
-        end
-        content
-      end
-
-      it { should contain_apt__params }
-
-      it { should contain_file("#{title}.list").with({
-          'ensure'    => param_hash[:ensure],
-          'path'      => filename,
-          'owner'     => 'root',
-          'group'     => 'root',
-          'mode'      => '0644',
-          'content'   => content,
-        })
-      }
-
-      it {
-        if param_hash[:pin]
-          should contain_apt__pin(title).with({
-            "priority"  => param_hash[:pin],
-            "before"    => "File[#{title}.list]"
-          })
-        else
-          should_not contain_apt__pin(title).with({
-            "priority"  => param_hash[:pin],
-            "before"    => "File[#{title}.list]"
-          })
-        end
-      }
-
-      it {
-        should contain_exec("apt_update").with({
-          "command"     => "/usr/bin/apt-get update",
-          "refreshonly" => true
-        })
-      }
-
-      it {
-        if param_hash[:required_packages]
-          should contain_exec("Required packages: '#{param_hash[:required_packages]}' for #{title}").with({
-            "command" => "/usr/bin/apt-get -y install #{param_hash[:required_packages]}",
-            "subscribe"   => "File[#{title}.list]",
-            "refreshonly" => true,
-            "before"      => 'Exec[apt_update]',
-          })
-        else
-          should_not contain_exec("Required packages: '#{param_hash[:required_packages]}' for #{title}").with({
-            "command"     => "/usr/bin/apt-get -y install #{param_hash[:required_packages]}",
-            "subscribe"   => "File[#{title}.list]",
-            "refreshonly" => true
-          })
-        end
-      }
-
-      it {
-        if param_hash[:key]
-          should contain_apt__key("Add key: #{param_hash[:key]} from Apt::Source #{title}").with({
-            "key"         => param_hash[:key],
-            "ensure"      => :present,
-            "key_server"  => param_hash[:key_server],
-            "key_content" => param_hash[:key_content],
-            "key_source"  => param_hash[:key_source],
-            "before"      => "File[#{title}.list]"
-          })
-        else
-          should_not contain_apt__key("Add key: #{param_hash[:key]} from Apt::Source #{title}").with({
-            "key"         => param_hash[:key],
-            "ensure"      => :present,
-            "key_server"  => param_hash[:key_server],
-            "key_content" => param_hash[:key_content],
-            "key_source"  => param_hash[:key_source],
-            "before"      => "File[#{title}.list]"
-          })
-        end
-      }
-    end
-  end
-  describe "without release should raise a Puppet::Error" do
-    let(:default_params) { Hash.new }
-    let(:facts) { Hash.new }
-    it { expect { should raise_error(Puppet::Error) } }
-    let(:facts) { { :lsbdistcodename => 'lucid', :lsbdistid => 'Ubuntu' } }
-    it { should contain_apt__source(title) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 3352564ce7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'beaker-rspec'
-
-# Install Puppet
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apt')
-    hosts.each do |host|
-      shell('/bin/touch /etc/puppet/hiera.yaml')
-      shell('puppet module install puppetlabs-stdlib --version 2.2.1', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb
deleted file mode 100644
index 5737c9ac29f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-APT::Periodic::Enable "<%= @enable %>";
-APT::Periodic::BackUpArchiveInterval "<%= @backup_interval %>";
-APT::Periodic::BackUpLevel "<%= @backup_level %>";
-APT::Periodic::MaxAge "<%= @max_age %>";
-APT::Periodic::MinAge "<%= @min_age %>";
-APT::Periodic::MaxSize "<%= @max_size %>";
-APT::Periodic::Update-Package-Lists "<%= @update %>";
-APT::Periodic::Download-Upgradeable-Packages "<%= @download %>";
-APT::Periodic::Download-Upgradeable-Packages-Debdelta "<%= @download_delta %>";
-APT::Periodic::Unattended-Upgrade "<%= @upgrade %>";
-APT::Periodic::AutocleanInterval "<%= @autoclean %>";
-APT::Periodic::Verbose "<%= @verbose %>";
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb
deleted file mode 100644
index 4df0f74401f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-// Automatically upgrade packages from these (origin:archive) pairs
-Unattended-Upgrade::Allowed-Origins {
-<% @origins.each do |origin| -%>
-	"<%= origin %>";
-<% end -%>
-};
-
-// List of packages to not update
-Unattended-Upgrade::Package-Blacklist {
-<% @blacklist.each do |package| -%>
-	"<%= package %>";
-<% end -%>
-};
-
-// This option allows you to control if on a unclean dpkg exit
-// unattended-upgrades will automatically run 
-//   dpkg --force-confold --configure -a
-// The default is true, to ensure updates keep getting installed
-Unattended-Upgrade::AutoFixInterruptedDpkg "<%= @auto_fix %>";
-
-// Split the upgrade into the smallest possible chunks so that
-// they can be interrupted with SIGUSR1. This makes the upgrade
-// a bit slower but it has the benefit that shutdown while a upgrade
-// is running is possible (with a small delay)
-Unattended-Upgrade::MinimalSteps "<%= @minimal_steps %>";
-
-// Install all unattended-upgrades when the machine is shuting down
-// instead of doing it in the background while the machine is running
-// This will (obviously) make shutdown slower
-Unattended-Upgrade::InstallOnShutdown "<%= @install_on_shutdown %>";
-
-// Send email to this address for problems or packages upgrades
-// If empty or unset then no email is sent, make sure that you
-// have a working mail setup on your system. A package that provides
-// 'mailx' must be installed.
-<% if @mail_to != "NONE" %>Unattended-Upgrade::Mail "<%= @mail_to %>";<% end %>
-
-// Set this value to "true" to get emails only on errors. Default
-// is to always send a mail if Unattended-Upgrade::Mail is set
-<% if @mail_to != "NONE" %>Unattended-Upgrade::MailOnlyOnError "<%= @mail_only_on_error %>";<% end %>
-
-// Do automatic removal of new unused dependencies after the upgrade
-// (equivalent to apt-get autoremove)
-Unattended-Upgrade::Remove-Unused-Dependencies "<%= @remove_unused %>";
-
-// Automatically reboot *WITHOUT CONFIRMATION* if a 
-// the file /var/run/reboot-required is found after the upgrade 
-Unattended-Upgrade::Automatic-Reboot "<%= @auto_reboot %>";
-
-
-// Use apt bandwidth limit feature, this example limits the download
-// speed to 70kb/sec
-<% if @dl_limit != "NONE" %>Acquire::http::Dl-Limit "<%= @dl_limit %>";<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb
deleted file mode 100644
index eed0c10db67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<%-
-@pin = "release a=#{@name}" # default value
-if @pin_release.length > 0
-  options = []
-  options.push("a=#{@release}") if @release.length > 0
-  options.push("n=#{@codename}") if @codename.length > 0
-  options.push("v=#{@release_version}") if @release_version.length > 0
-  options.push("c=#{@component}") if @component.length > 0
-  options.push("o=#{@originator}") if @originator.length > 0
-  options.push("l=#{@label}") if @label.length > 0
-  @pin = "release #{options.join(', ')}"
-elsif @version.length > 0
-  @pin = "version #{@version}"
-elsif @origin.length > 0
-  @pin = "origin #{@origin}"
-end
--%>
-# <%= @name %>
-Explanation: <%= @explanation %>
-Package: <%= @packages %>
-Pin: <%= @pin %>
-Pin-Priority: <%= @priority %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb
deleted file mode 100644
index 9946966ee53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# <%= @name %>
-deb <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
-<%- if @include_src then -%>
-deb-src <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp
deleted file mode 100644
index 8b4f7964081..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-apt::builddep{ 'glusterfs-server': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp
deleted file mode 100644
index 8245b3a337b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-class { 'apt::debian::testing': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp
deleted file mode 100644
index 86051792951..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-class { 'apt::debian::unstable': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp
deleted file mode 100644
index 59ad8f1b573..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# force.pp
-
-# force a package from a specific release
-apt::force { 'package1':
-  release => 'backports',
-}
-
-# force a package to be a specific version
-apt::force { 'package2':
-  version => '1.0.0-1',
-}
-
-# force a package from a specific release to be a specific version
-apt::force { 'package3':
-  release => 'sid',
-  version => '2.0.0-1',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp
deleted file mode 100644
index abc75afa25a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'apt': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp
deleted file mode 100644
index 79e0e1b749a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# Declare Apt key for apt.puppetlabs.com source
-apt::key { 'puppetlabs':
-  key         => '4BD6EC30',
-  key_server  => 'pgp.mit.edu',
-  key_options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp
deleted file mode 100644
index 5ddf3c65512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apt::params
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp
deleted file mode 100644
index 6a9024c2343..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# pin a release in apt, useful for unstable repositories
-apt::pin { 'foo':
-  packages => '*',
-  priority => 0,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp
deleted file mode 100644
index e728f6f10f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apt': }
-
-# Example declaration of an Apt PPA
-apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp
deleted file mode 100644
index 823f5861fa1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apt': }
-class { 'apt::release':
-  release_id => 'karmic'
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp
deleted file mode 100644
index c20b59662a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Declare the apt class to manage /etc/apt/sources.list and /etc/sources.list.d
-class { 'apt': }
-
-# Install the puppetlabs apt source
-# Release is automatically obtained from lsbdistcodename fact if available.
-apt::source { 'puppetlabs':
-  location   => 'http://apt.puppetlabs.com',
-  repos      => 'main',
-  key        => '4BD6EC30',
-  key_server => 'pgp.mit.edu',
-}
-
-# test two sources with the same key
-apt::source { 'debian_testing':
-  location   => 'http://debian.mirror.iweb.ca/debian/',
-  release    => 'testing',
-  repos      => 'main contrib non-free',
-  key        => '46925553',
-  key_server => 'subkeys.pgp.net',
-  pin        => '-10',
-}
-apt::source { 'debian_unstable':
-  location   => 'http://debian.mirror.iweb.ca/debian/',
-  release    => 'unstable',
-  repos      => 'main contrib non-free',
-  key        => '46925553',
-  key_server => 'subkeys.pgp.net',
-  pin        => '-10',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp
deleted file mode 100644
index 3b9b49eb72a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apt::unattended_upgrades
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml
deleted file mode 100644
index 788946406c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-# life with later versions of ruby gets interesting with 2.6..so lets
-# ignore them for now
-#  - "1.9.2"
-#  - "1.9.3"
-#  - ruby-head ..that doesnt work. would be nice to do "current"
-
-env:
-#find versions here https://rubygems.org/gems/puppet/versions
-# spec_helper pretty much fails on these earlier versions.
-#  - PUPPET_VERSION=0.24.5
-#  - PUPPET_VERSION=0.25.5 
-  - PUPPET_VERSION=2.6.18
-  - PUPPET_VERSION=2.7.21
-  - PUPPET_VERSION=3.1.1
- 
-
-before_script: 
- - cd beanstalkd
- - bundle install
- - bundle show
-
-script: 
- - bundle exec rake
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile
deleted file mode 100644
index c9aabd4b8ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-
-gem 'rake'
-gem 'rspec-expectations'
-gem 'rspec'
-gem 'facter'
-gem 'puppet', puppetversion
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md
deleted file mode 100644
index 6abbcb7fb2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-puppet-beanstalkd
-=================
-[![Build Status](https://travis-ci.org/keen99/puppet-beanstalkd.png?branch=master)](https://travis-ci.org/keen99/puppet-beanstalkd)
-
-puppet module for managing beanstalkd, a simple and fast work queue - https://github.com/kr/beanstalkd
-
-
-## Supported OSes
-
-redhat/centos and debian/ubuntu currently.  Please PR updates for others!  
-
-Requires packages (rpm, etc) with traditional init scripts supported by service{} for your OS.
-
-
-## Basic Usage
-
-Drop the beanstalkd directory into your modules tree and realize the define:
-
-	beanstalkd::config{"my beanstalk install": }
-
-## Optional parameters
-	
-	listenaddress => '0.0.0.0',
-	listenport => '13000',
-	maxjobsize => '65535',
-	maxconnections => '1024',
-	binlogdir => '/var/lib/beanstalkd/binlog',	# set empty ( '' ) to disable binlog
-	binlogfsync => undef,							
-	binlogsize => '10485760',
-	ensure => 'running',		# running, stopped, absent
-	packageversion => 'latest',	# latest, present, or specific version
-	packagename => undef,		# override package name						
-	servicename => undef		# override service name
-
-
-
-
-
-## Tests
-
-To run unit tests, cd into beanstalkd and execute "run-tests.sh"
-
-Requires ruby and bundler, everything else should get installed by the test.
-
-```
-$$ puppet-beanstalkd/beanstalkd# ./run-tests.sh 
-Using rake (10.0.4) 
-Using diff-lcs (1.2.4) 
-Using facter (1.7.0) 
-Using json_pure (1.7.7) 
-Using hiera (1.2.1) 
-Using metaclass (0.0.1) 
-Using mocha (0.13.3) 
-Using puppet (3.1.1) 
-Using rspec-core (2.13.1) 
-Using rspec-expectations (2.13.0) 
-Using rspec-mocks (2.13.1) 
-Using rspec (2.13.0) 
-Using rspec-puppet (0.1.6) 
-Using puppetlabs_spec_helper (0.4.1) 
-Using bundler (1.1.4) 
-Your bundle is complete! Use `bundle show [gemname]` to see where a bundled gem is installed.
-/usr/bin/ruby1.9.1 -S rspec spec/defines/config_spec.rb
-...................
-
-Finished in 0.84772 seconds
-19 examples, 0 failures
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile
deleted file mode 100644
index f6d5a0c4636..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'rake'
-
-require 'rspec/core/rake_task'
-
-task :default => [:spec]
-
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp
deleted file mode 100644
index fc57ab851a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# usage:
-#
-#  beanstalkd::config { name:
-#    listenaddress => '0.0.0.0',
-#    listenport => '13000',
-#    maxjobsize => '65535',
-#    maxconnections => '1024',
-#    binlogdir => '/var/lib/beanstalkd/binlog',
-#    binlogfsync => undef,              
-#    binlogsize => '10485760',
-#    ensure => 'running',         # running, stopped, absent
-#    packageversion => 'latest',  # latest, present, or specific version
-#    packagename => undef,        # override package name
-#    servicename => undef         # override service name
-#  }
-
-
-define beanstalkd::config ( # name
-  $listenaddress  = '0.0.0.0',
-  $listenport     = '13000',
-  $maxjobsize     = '65535',
-  $maxconnections = '1024',                       # results in open file limit
-  $binlogdir      = '/var/lib/beanstalkd/binlog', # set empty ( '' ) to disable binlog
-  $binlogfsync    = undef,                        # unset = no explicit fsync
-  $binlogsize     = '10485760',
-  #
-  $ensure         = 'running',  # running, stopped, absent
-  $packageversion = 'latest',   # latest, present, or specific version
-  $packagename    = undef,      # got your own custom package?  override the default name/service here.
-  $servicename    = undef
-) {
-
-  case $::operatingsystem {
-    ubuntu, debian: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/default/beanstalkd'
-      $configtemplate     = "${module_name}/debian/beanstalkd_default.erb"  # please create me!
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    centos, redhat: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/sysconfig/beanstalkd'
-      $configtemplate     = "${module_name}/redhat/beanstalkd_sysconfig.erb"
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    # TODO: add more OS support!
-    default: {   
-      fail("ERROR [${module_name}]: I don't know how to manage this OS: ${::operatingsystem}")
-    }
-  }
-
-  # simply the users experience for running/stopped/absent, and use ensure to cover those bases
-  case $ensure {
-    absent: {
-      $ourpackageversion  = 'absent'
-      $serviceenable      = 'false'
-      $serviceensure      = 'stopped'
-      $fileensure         = 'absent'
-    }
-    running: {
-      $serviceenable  = 'true'
-      $serviceensure  = 'running'
-      $fileensure     = 'present'
-    }
-    stopped: {
-      $serviceenable  = 'false'
-      $serviceensure  = 'stopped'
-      $fileensure     = 'present'
-    }
-    default: {
-      fail("ERROR [${module_name}]: enable must be one of: running stopped absent")
-    }
-  }
-  
-  # for packageversion, use what's configured unless we're set (which should only be in the absent case..)
-  if ! $ourpackageversion { 
-    $ourpackageversion = $packageversion
-  }
-  
-  # for service and package name - if we've specified one, use it. else use the default
-  if $packagename == undef {
-    $ourpackagename = $defaultpackagename
-  } else {
-    $ourpackagename = $packagename
-  }
-
-  if $servicename == undef {
-    $ourservicename = $defaultservicename
-  } else {
-    $ourservicename = $servicename
-  }
-
-  package { $ourpackagename:
-    ensure => $ourpackageversion
-  }
-
-  service { $ourservicename:
-    enable    => $serviceenable,
-    ensure    => $serviceensure,
-    hasstatus => $hasstatus,
-    restart   => $restart,
-    subscribe => [
-      Package[$ourpackagename],
-      File[$configfile]
-    ],
-  }
-
-  file { $configfile:
-    content => template($configtemplate),
-    owner   => 'root',
-    group   => 'root',
-    mode    => 0644,
-    ensure  => $fileensure,
-    require => Package[$ourpackagename],
-  } 
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh
deleted file mode 100755
index 89896b94fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-bundle="bundle"
-gotbundle=0
-for i in $(echo "$PATH" | tr ":" " ")
- do
-        if [ -e $i/$bundle ]
-         then
-                gotbundle=1
-                break
-        fi
-done
-if [ $gotbundle = 0 ]
- then
-        echo "ERROR: please install 'bundler' for ruby from http://gembundler.com/ and make sure '$bundle' is in your path"
-        exit 1
-fi
-
-$bundle install || exit $?
-$bundle exec rake || exit $?
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb
deleted file mode 100644
index e70c3fe40f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'spec_helper'
-
-
-describe 'beanstalkd::config' do
-  let (:title) {'a title is required'}
-
-  #basic OS support testing
-  context "on Debian" do
-    let (:facts) { { :operatingsystem => 'debian' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on redhat" do
-    let (:facts) { { :operatingsystem => 'debian' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on ubuntu" do
-    let (:facts) { { :operatingsystem => 'ubuntu' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on centos" do
-    let (:facts) { { :operatingsystem => 'centos' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on unsupported OS" do
-    let (:facts) { { :operatingsystem => 'unsupported' } }
-    it { expect { raise_error(Puppet::Error) } }
-  end  
-
-  #now lets test our various parameters - for the most part this shouldn't care what OS it is
-  #if your OS support needs more specific testing, do it!
-
-  #ensure testing - remember this does both service and packages, so test both
-  context "on redhat, ensure absent" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'absent' } }
-    it { should contain_package('beanstalkd').with_ensure('absent') }
-    it { should contain_service('beanstalkd').with_ensure('stopped') }
-  end  
-  context "on redhat, ensure running" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'running' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on redhat, ensure stopped" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'stopped' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('stopped') }
-  end  
-  context "on redhat, ensure broken" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'broken' } }
-    it { expect { raise_error(Puppet::Error) } }
-  end  
-
-  #custom package/service names
-  context "on redhat, servicename testbeans" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :servicename => 'testbeans' } }
-    it { should contain_service('testbeans').with_ensure('running') }
-  end  
-  context "on redhat, packagename testbeans" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :packagename => 'testbeans' } }
-    it { should contain_package('testbeans').with_ensure('latest') }
-  end  
-  #and custom version
-  context "on redhat, package version" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :packageversion => 'testversion' } }
-    it { should contain_package('beanstalkd').with_ensure('testversion') }
-  end  
-
-   
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp
deleted file mode 100644
index fc57ab851a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# usage:
-#
-#  beanstalkd::config { name:
-#    listenaddress => '0.0.0.0',
-#    listenport => '13000',
-#    maxjobsize => '65535',
-#    maxconnections => '1024',
-#    binlogdir => '/var/lib/beanstalkd/binlog',
-#    binlogfsync => undef,              
-#    binlogsize => '10485760',
-#    ensure => 'running',         # running, stopped, absent
-#    packageversion => 'latest',  # latest, present, or specific version
-#    packagename => undef,        # override package name
-#    servicename => undef         # override service name
-#  }
-
-
-define beanstalkd::config ( # name
-  $listenaddress  = '0.0.0.0',
-  $listenport     = '13000',
-  $maxjobsize     = '65535',
-  $maxconnections = '1024',                       # results in open file limit
-  $binlogdir      = '/var/lib/beanstalkd/binlog', # set empty ( '' ) to disable binlog
-  $binlogfsync    = undef,                        # unset = no explicit fsync
-  $binlogsize     = '10485760',
-  #
-  $ensure         = 'running',  # running, stopped, absent
-  $packageversion = 'latest',   # latest, present, or specific version
-  $packagename    = undef,      # got your own custom package?  override the default name/service here.
-  $servicename    = undef
-) {
-
-  case $::operatingsystem {
-    ubuntu, debian: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/default/beanstalkd'
-      $configtemplate     = "${module_name}/debian/beanstalkd_default.erb"  # please create me!
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    centos, redhat: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/sysconfig/beanstalkd'
-      $configtemplate     = "${module_name}/redhat/beanstalkd_sysconfig.erb"
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    # TODO: add more OS support!
-    default: {   
-      fail("ERROR [${module_name}]: I don't know how to manage this OS: ${::operatingsystem}")
-    }
-  }
-
-  # simply the users experience for running/stopped/absent, and use ensure to cover those bases
-  case $ensure {
-    absent: {
-      $ourpackageversion  = 'absent'
-      $serviceenable      = 'false'
-      $serviceensure      = 'stopped'
-      $fileensure         = 'absent'
-    }
-    running: {
-      $serviceenable  = 'true'
-      $serviceensure  = 'running'
-      $fileensure     = 'present'
-    }
-    stopped: {
-      $serviceenable  = 'false'
-      $serviceensure  = 'stopped'
-      $fileensure     = 'present'
-    }
-    default: {
-      fail("ERROR [${module_name}]: enable must be one of: running stopped absent")
-    }
-  }
-  
-  # for packageversion, use what's configured unless we're set (which should only be in the absent case..)
-  if ! $ourpackageversion { 
-    $ourpackageversion = $packageversion
-  }
-  
-  # for service and package name - if we've specified one, use it. else use the default
-  if $packagename == undef {
-    $ourpackagename = $defaultpackagename
-  } else {
-    $ourpackagename = $packagename
-  }
-
-  if $servicename == undef {
-    $ourservicename = $defaultservicename
-  } else {
-    $ourservicename = $servicename
-  }
-
-  package { $ourpackagename:
-    ensure => $ourpackageversion
-  }
-
-  service { $ourservicename:
-    enable    => $serviceenable,
-    ensure    => $serviceensure,
-    hasstatus => $hasstatus,
-    restart   => $restart,
-    subscribe => [
-      Package[$ourpackagename],
-      File[$configfile]
-    ],
-  }
-
-  file { $configfile:
-    content => template($configtemplate),
-    owner   => 'root',
-    group   => 'root',
-    mode    => 0644,
-    ensure  => $fileensure,
-    require => Package[$ourpackagename],
-  } 
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb
deleted file mode 100644
index c532f47bd80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-##based loosely on my sysconfig and initd scripts from centos, but tweaked to work without having to
-##hack up the debian init script.  -keen99 4/2013
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
-
-
-
-##the debian init script leaves everything to be desired.  so lets put our setup logic here.
-
-case "$1" in
-	start|restart|force-reload|reload)
-		exec=$DAEMON
-		[ -x $exec ] || exit 5
-		
-		# if not running, start it up here, usually something like "daemon $exec"
-		options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-		if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
-			options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
-		fi
-		
-		if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
-			if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
-				echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
-				mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
-			fi
-			options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
-			if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
-				options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
-			else
-				options="${options} -F"
-			fi
-			if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
-				options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
-			fi
-		
-			##1.4.6 at least is prone to leave a lock file around after shutting down
-			##this breaks startup after upgrade to 1.5, so work around this
-			##unknown if this happens w/o binlog enabled...
-			#check for stale lock file in binlog
-			if [ -e "${BEANSTALKD_BINLOG_DIR}/lock" ]
-			 then
-				if ! ps xa| grep -v grep | grep -q $exec
-				 then
-					echo "found old lock file and beanstalk isn't running - deleting it"
-					rm -f ${BEANSTALKD_BINLOG_DIR}/lock
-				fi
-			fi
-		fi
-	
-		if [ -n "${BEANSTALKD_MAXCONNECTIONS}" ]; then
-			#increase open files ulimit to support higher concurrent connections
-			echo "increasing open file limit to $BEANSTALKD_MAXCONNECTIONS"
-			ulimit -n $BEANSTALKD_MAXCONNECTIONS
-		fi
-
-		DAEMON_OPTS="-l $BEANSTALKD_LISTEN_ADDR -p $BEANSTALKD_LISTEN_PORT"
-		DAEMON_OPTS="$options"
-
-	;;
-	*)
-		#nothing, please keep moving
-	;;
-esac
-
-
-
-DAEMONUSER=$BEANSTALKD_USER
-
-
-## Uncomment to enable startup during boot.
-START=yes
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
deleted file mode 100644
index 6e3bb422ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-# System configuration for the beanstalkd daemon
-
-# Available options correspond to the options to the
-# beanstalkd commandline.
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb
deleted file mode 100644
index d3923f8306f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rspec-puppet'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-  c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb
deleted file mode 100644
index c532f47bd80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-##based loosely on my sysconfig and initd scripts from centos, but tweaked to work without having to
-##hack up the debian init script.  -keen99 4/2013
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
-
-
-
-##the debian init script leaves everything to be desired.  so lets put our setup logic here.
-
-case "$1" in
-	start|restart|force-reload|reload)
-		exec=$DAEMON
-		[ -x $exec ] || exit 5
-		
-		# if not running, start it up here, usually something like "daemon $exec"
-		options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-		if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
-			options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
-		fi
-		
-		if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
-			if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
-				echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
-				mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
-			fi
-			options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
-			if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
-				options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
-			else
-				options="${options} -F"
-			fi
-			if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
-				options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
-			fi
-		
-			##1.4.6 at least is prone to leave a lock file around after shutting down
-			##this breaks startup after upgrade to 1.5, so work around this
-			##unknown if this happens w/o binlog enabled...
-			#check for stale lock file in binlog
-			if [ -e "${BEANSTALKD_BINLOG_DIR}/lock" ]
-			 then
-				if ! ps xa| grep -v grep | grep -q $exec
-				 then
-					echo "found old lock file and beanstalk isn't running - deleting it"
-					rm -f ${BEANSTALKD_BINLOG_DIR}/lock
-				fi
-			fi
-		fi
-	
-		if [ -n "${BEANSTALKD_MAXCONNECTIONS}" ]; then
-			#increase open files ulimit to support higher concurrent connections
-			echo "increasing open file limit to $BEANSTALKD_MAXCONNECTIONS"
-			ulimit -n $BEANSTALKD_MAXCONNECTIONS
-		fi
-
-		DAEMON_OPTS="-l $BEANSTALKD_LISTEN_ADDR -p $BEANSTALKD_LISTEN_PORT"
-		DAEMON_OPTS="$options"
-
-	;;
-	*)
-		#nothing, please keep moving
-	;;
-esac
-
-
-
-DAEMONUSER=$BEANSTALKD_USER
-
-
-## Uncomment to enable startup during boot.
-START=yes
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
deleted file mode 100644
index 6e3bb422ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-# System configuration for the beanstalkd daemon
-
-# Available options correspond to the options to the
-# beanstalkd commandline.
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml
deleted file mode 100644
index c0123415c78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    git: "git://github.com/puppetlabs/puppetlabs-git"
-  symlinks:
-    composer: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml
deleted file mode 100644
index 033f11dd3da..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-before_script:
-after_script:
-script: "bundle exec rake spec"
-env:
-  - PUPPET_VERSION=2.7.23
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=3.2.4
-  - PUPPET_VERSION=3.3.0
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md
deleted file mode 100644
index bd8105b1274..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md
+++ /dev/null
@@ -1,133 +0,0 @@
-v1.2.1
-======
-f44b7e5 Now also supports Amazon Linux (RedHat)
-
-9341805 Now `suhosin_enabled` parameter is correctly documented.
-
-v1.2.0
-======
-66b071a (HEAD, tag: 1.2.0, master) Bumping version to 1.2.0
-
-166ec87 Updated README.md
-
-626ee43 (origin/master, origin/HEAD) Updated CHANGELOG format
-
-1364058 Moved CHANGELOG to markdown format
-
-6f21dcb Updated LICENSE file
-
-6209eb8 Added CHANGELOG file
-
-6307d5a Add parameter 'php_bin' to override name or path of php binary
-
-9e484e9 (origin/rspec_head_fixes, rspec_head_fixes) just match on errorname, not specific exception
-
-db4176e update specs for latest rspec-puppet 1.0.1+
-
-v1.1.1
-======
-17b2309 (tag: 1.1.1) Update Modulefile
-
-d848038 Used puppetlabs/git >= 0.0.2
-
-0d75cff doc updates for 1.1.0 release
-
-v1.1.0
-======
-3b46e4d (tag: 1.1.0) bumping version to 1.1.0 for refreshonly and user features
-
-5290e8e support setting exec user for project and exec
-
-6af1e25 ignore puppet module package folder
-
-c2106ec Add refreshonly parameter to exec
-
-v1.0.1
-======
-fb1fd04 (tag: 1.0.1) Bumped version to 1.0.1
-
-bf43913 (origin/deprecated_erb_variables) fix deprecated variables in the exec erb template
-
-342b898 (origin/documentation_refactor) document refactor, add spec test information
-
-3677acc adding tests for new suhosin_enable param and Debian family
-
-de86c0d Only run augeas commands if suhosin is enabled
-
-v1.0.0
-======
-f5d214a (tag: 1.0.0) Bumping version to 1.0.0
-
-12589bf fixes for travis-ci building
-
-5279b92 spec testing using rspec-puppet
-
-3069608 documentation updates for composer_home and previous PRs
-
-b5faa45 add a composer_home fact and use it to set up environment
-
-v0.1.1
-======
-dbc0c74 Bumping version to 0.1.1
-
-b4833d6 no-custom-installers is deprecated in favor of no-plugins
-
-acdc73c dry up the composer binary download code
-
-41f3a7b CentOS isn't actually an $::osfamily value
-
-d54c0db PHP binary is provided by php-cli on RHEL systems
-
-v0.1.0
-======
-1e8f9f1 (tag: 0.1.0) Adding License file.
-
-523c28f (igalic/option-names, igalic-option-names) update readme with the new options
-
-3d2ddda double-negating option names is confusing
-
-be518cf (igalic/style, igalic-style) Fix puppet lint complaints
-
-4050077 There's no need for these files to be executable
-
-522e93c Updated temp path.
-
-bf0f9e7 Support centos/redhat
-
-f45e9de Support redhat/centos
-
-920d1ca Support redhat/centos
-
-v0.0.6
-======
-78643ef (tag: 0.0.6) Bumping version to 0.0.6
-
-0fbfb53 Fixing bug where global path is overwritten by local scope.
-
-v0.0.5
-======
-ee4e49b (tag: 0.0.5) Bumping version to 0.0.5
-
-17ca5ee Added varaible composer path to exec calls.
-
-v0.0.4
-======
-e94be5e (tag: 0.0.4) Bumping version to 0.0.4
-
-a27e45f Fixed dry_run parameter
-
-28cfee8 Adding version parameter to project task README
-
-v0.0.3
-======
-4787b24 Bumping version to 0.0.3
-
-4ee9547 (tag: 0.0.3) Fixing type in exec manifest.
-
-v0.0.2
-======
-974d2ad (tag: 0.0.2) Bumping version to 0.0.2
-
-667eb18 Fixed README
-
-925aa97 Fixed Modulefile.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile
deleted file mode 100644
index 992fecaab8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-#ruby=1.9.3@puppet-composer
-
-if ENV.key?('PUPPET_VERSION')
-  puppetversion = "= #{ENV['PUPPET_VERSION']}"
-else
-  puppetversion = ['>= 2.7']
-end
-
-source 'https://rubygems.org'
-
-ruby '1.9.3'
-
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper'
-gem 'rspec-puppet', :github => 'rodjek/rspec-puppet', :ref => '03e94422fb9bbdd950d5a0bec6ead5d76e06616b'
-gem 'mocha'
-gem 'puppet-lint'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE
deleted file mode 100644
index 3cff4803690..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 - 2014 Thomas Ploch
-
-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/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile
deleted file mode 100644
index b1a9c8c49d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'tPl0ch-composer'
-version '1.2.1'
-dependency 'puppetlabs/git', '>= 0.0.2'
-summary "This module provides the 'Composer' PHP dependency manager."
-description "This module installs the 'Composer' PHP dependency manager and provides some custom types to create, update
-    and install projects. Until now the Debian and Redhat OS families are supported."
-project_page "https://github.com/tPl0ch/puppet-composer"
-author "tPl0ch - Thomas Ploch <profiploch@gmail.com>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md
deleted file mode 100644
index c142e258f0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md
+++ /dev/null
@@ -1,155 +0,0 @@
-# Composer Puppet Module
-
-[![Build Status](https://travis-ci.org/tPl0ch/puppet-composer.png?branch=master)](https://travis-ci.org/tPl0ch/puppet-composer)
-
-## Description
-
-The `puppet-composer` module installs the latest version of Composer from http://getcomposer.org. Composer is a dependency manager for PHP.
-
-## Supported Platforms
-
-* `Debian`
-* `Redhat`
-* `Centos`
-* `Amazon Linux`
-
-## Installation
-
-#### Puppet Forge
-We recommend installing using the Puppet Forge as it automatically satisfies dependencies.
-
-    puppet module install --target-dir=/your/path/to/modules tPl0ch-composer
-
-#### Installation via git submodule
-You can also install as a git submodule and handle the dependencies manually. See the [Dependencies](#dependencies) section below.
-
-    git submodule add git://github.com/tPl0ch/puppet-composer.git modules/composer
-
-## Dependencies
-
-This module requires the following Puppet modules:
-
-* [`puppetlabs-git`](https://github.com/puppetlabs/puppetlabs-git/)
-
-And additional (for puppet version lower than 3.0.0) you need:
-
-* [`libaugeas`](http://augeas.net/) (For automatically updating php.ini settings for suhosin patch)
-
-## Usage
-To install the `composer` binary globally in `/usr/local/bin` you only need to declare the `composer` class. We try to set some sane defaults. There are also a number of parameters you can tweak should the defaults not be sufficient.
-
-### Simple Include
-To install the binary with the defaults you just need to include the following in your manifests:
-
-    include composer
-
-### Full Include
-Alternatively, you can set a number of options by declaring the class with parameters:
-
-```puppet
-class { 'composer':
-    target_dir      => '/usr/local/bin',
-    composer_file   => 'composer', # could also be 'composer.phar'
-    download_method => 'curl',     # or 'wget'
-    logoutput       => false,
-    tmp_path        => '/tmp',
-    php_package     => 'php5-cli',
-    curl_package    => 'curl',
-    wget_package    => 'wget',
-    composer_home   => '/root',
-    php_bin         => 'php', # could also i.e. be 'php -d "apc.enable_cli=0"' for more fine grained control
-    suhosin_enabled => true,
-}
-```
-
-### Creating Projects
-
-The `composer::project` definition provides a way to create projects in a target directory.
-
-```puppet
-composer::project { 'silex':
-    project_name   => 'fabpot/silex-skeleton',  # REQUIRED
-    target_dir     => '/vagrant/silex', # REQUIRED
-    version        => '2.1.x-dev', # Some valid version string
-    prefer_source  => true,
-    stability      => 'dev', # Minimum stability setting
-    keep_vcs       => false, # Keep the VCS information
-    dev            => true, # Install dev dependencies
-    repository_url => 'http://repo.example.com', # Custom repository URL
-    user           => undef, # Set the user to run as
-}
-```
-
-#### Updating Packages
-
-The `composer::exec` definition provides a more generic wrapper arround composer `update` and `install` commands. The following example will update the `silex/silex` and `symfony/browser-kit` packages in the `/vagrant/silex` directory. You can omit `packages` to update the entire project.
-
-```puppet
-composer::exec { 'silex-update':
-    cmd                  => 'update',  # REQUIRED
-    cwd                  => '/vagrant/silex', # REQUIRED
-    packages             => ['silex/silex', 'symfony/browser-kit'], # leave empty or omit to update whole project
-    prefer_source        => false, # Only one of prefer_source or prefer_dist can be true
-    prefer_dist          => false, # Only one of prefer_source or prefer_dist can be true
-    dry_run              => false, # Just simulate actions
-    custom_installers    => false, # No custom installers
-    scripts              => false, # No script execution
-    interaction          => false, # No interactive questions
-    optimize             => false, # Optimize autoloader
-    dev                  => false, # Install dev dependencies
-    user                 => undef, # Set the user to run as
-    refreshonly          => false, # Only run on refresh
-}
-```
-
-#### Installing Packages
-
-We support the `install` command in addition to `update`. The install command will ignore the `packages` parameter and the following example is the equivalent to running `composer install` in the `/vagrant/silex` directory.
-
-```puppet
-composer::exec { 'silex-install':
-    cmd                  => 'install',  # REQUIRED
-    cwd                  => '/vagrant/silex', # REQUIRED
-    prefer_source        => false,
-    prefer_dist          => false,
-    dry_run              => false, # Just simulate actions
-    custom_installers    => false, # No custom installers
-    scripts              => false, # No script execution
-    interaction          => false, # No interactive questions
-    optimize             => false, # Optimize autoloader
-    dev                  => false, # Install dev dependencies
-}
-```
-
-## Development
-
-We have `rspec-puppet` and Travis CI setup for the project. To run the spec tests locally you need `bundler` installed:
-
-```
-gem install bundler
-```
-
-Then you can install the required gems:
-
-```
-bundle install
-```
-
-Finally, the tests can be run:
-
-```
-rake spec
-```
-
-## Contributing
-
-We welcome everyone to help develop this module. To contribute:
-
-* Fork this repository
-* Add features and spec tests for them
-* Commit to feature named branch
-* Open a pull request outlining your changes and the reasoning for them
-
-## Todo
-
-* Add a `composer::require` type
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile
deleted file mode 100644
index 1a388518f2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb
deleted file mode 100644
index b815cfa404f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add(:composer_home) do
-  setcode do
-    ENV['HOME']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp
deleted file mode 100644
index 82039e85575..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-# == Type: composer::exec
-#
-# Either installs from composer.json or updates project or specific packages
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-define composer::exec (
-  $cmd,
-  $cwd,
-  $packages          = [],
-  $prefer_source     = false,
-  $prefer_dist       = false,
-  $dry_run           = false,
-  $custom_installers = false,
-  $scripts           = false,
-  $optimize          = false,
-  $interaction       = false,
-  $dev               = false,
-  $logoutput         = false,
-  $verbose           = false,
-  $refreshonly       = false,
-  $user              = undef,
-) {
-  require composer
-  require git
-
-  Exec {
-    path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
-    environment => "COMPOSER_HOME=${composer::composer_home}",
-    user        => $user,
-  }
-
-  if $cmd != 'install' and $cmd != 'update' {
-    fail("Only types 'install' and 'update' are allowed, ${cmd} given")
-  }
-
-  if $prefer_source and $prefer_dist {
-    fail('Only one of \$prefer_source or \$prefer_dist can be true.')
-  }
-
-  $command = "${composer::php_bin} ${composer::target_dir}/${composer::composer_file} ${cmd}"
-
-  exec { "composer_update_${title}":
-    command     => template('composer/exec.erb'),
-    cwd         => $cwd,
-    logoutput   => $logoutput,
-    refreshonly => $refreshonly
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp
deleted file mode 100644
index 5b3a431921c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp
+++ /dev/null
@@ -1,156 +0,0 @@
-# == Class: composer
-#
-# The parameters for the composer class and corresponding definitions
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*target_dir*]
-#   The target dir that composer should be installed to.
-#   Defaults to ```/usr/local/bin```.
-#
-# [*composer_file*]
-#   The name of the composer binary, which will reside in ```target_dir```.
-#
-# [*download_method*]
-#   Either ```curl``` or ```wget```.
-#
-# [*logoutput*]
-#   If the output should be logged. Defaults to FALSE.
-#
-# [*tmp_path*]
-#   Where the composer.phar file should be temporarily put.
-#
-# [*php_package*]
-#   The Package name of tht PHP CLI package.
-#
-# [*curl_package*]
-#   The name of the curl package to override the default set in the
-#   composer::params class.
-#
-# [*wget_package*]
-#   The name of the wget package to override the default set in the
-#   composer::params class.
-#
-# [*composer_home*]
-#   Folder to use as the COMPOSER_HOME environment variable. Default comes
-#   from our composer::params class which derives from our own $composer_home
-#   fact. The fact returns the current users $HOME environment variable.
-#
-# [*php_bin*]
-#   The name or path of the php binary to override the default set in the
-#   composer::params class.
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-class composer(
-  $target_dir      = $composer::params::target_dir,
-  $composer_file   = $composer::params::composer_file,
-  $download_method = $composer::params::download_method,
-  $logoutput       = $composer::params::logoutput,
-  $tmp_path        = $composer::params::tmp_path,
-  $php_package     = $composer::params::php_package,
-  $curl_package    = $composer::params::curl_package,
-  $wget_package    = $composer::params::wget_package,
-  $composer_home   = $composer::params::composer_home,
-  $php_bin         = $composer::params::php_bin,
-  $suhosin_enabled = $composer::params::suhosin_enabled
-) inherits composer::params {
-
-  Exec { path => "/bin:/usr/bin/:/sbin:/usr/sbin:${target_dir}" }
-
-  if defined(Package[$php_package]) == false {
-    package { $php_package: ensure => present, }
-  }
-
-  # download composer
-  case $download_method {
-    'curl': {
-      $download_command = "curl -s http://getcomposer.org/installer | ${composer::php_bin}"
-      $download_require = $suhosin_enabled ? {
-        true  => [ Package['curl', $php_package], Augeas['allow_url_fopen', 'whitelist_phar'] ],
-        false => [ Package['curl', $php_package] ]
-      }
-      $method_package = $curl_package
-    }
-    'wget': {
-      $download_command = 'wget http://getcomposer.org/composer.phar -O composer.phar'
-      $download_require = $suhosin_enabled ? {
-        true  => [ Package['wget', $php_package], Augeas['allow_url_fopen', 'whitelist_phar'] ],
-        false => [ Package['wget', $php_package] ]
-      }
-      $method_package = $wget_package
-    }
-    default: {
-      fail("The param download_method ${download_method} is not valid. Please set download_method to curl or wget.")
-    }
-  }
-
-  if defined(Package[$method_package]) == false {
-    package { $method_package: ensure => present, }
-  }
-
-  exec { 'download_composer':
-    command   => $download_command,
-    cwd       => $tmp_path,
-    require   => $download_require,
-    creates   => "${tmp_path}/composer.phar",
-    logoutput => $logoutput,
-  }
-
-  # check if directory exists
-  file { $target_dir:
-    ensure => directory,
-  }
-
-  # move file to target_dir
-  file { "${target_dir}/${composer_file}":
-    ensure  => present,
-    source  => "${tmp_path}/composer.phar",
-    require => [ Exec['download_composer'], File[$target_dir] ],
-    mode    => 0755,
-  }
-
-  if $suhosin_enabled {
-    case $family {
-
-      'Redhat','Centos': {
-
-        # set /etc/php5/cli/php.ini/suhosin.executor.include.whitelist = phar
-        augeas { 'whitelist_phar':
-          context     => '/files/etc/suhosin.ini/suhosin',
-          changes     => 'set suhosin.executor.include.whitelist phar',
-          require     => Package[$php_package],
-        }
-
-        # set /etc/cli/php.ini/PHP/allow_url_fopen = On
-        augeas{ 'allow_url_fopen':
-          context     => '/files/etc/php.ini/PHP',
-          changes     => 'set allow_url_fopen On',
-          require     => Package[$php_package],
-        }
-
-      }
-     'Debian': {
-
-        # set /etc/php5/cli/php.ini/suhosin.executor.include.whitelist = phar
-        augeas { 'whitelist_phar':
-          context     => '/files/etc/php5/conf.d/suhosin.ini/suhosin',
-          changes     => 'set suhosin.executor.include.whitelist phar',
-          require     => Package[$php_package],
-        }
-
-        # set /etc/php5/cli/php.ini/PHP/allow_url_fopen = On
-        augeas{ 'allow_url_fopen':
-          context     => '/files/etc/php5/cli/php.ini/PHP',
-          changes     => 'set allow_url_fopen On',
-          require     => Package[$php_package],
-        }
-
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp
deleted file mode 100644
index 54f752a43fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# == Class: composer::params
-#
-# The parameters for the composer class and corresponding definitions
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-# Andrew Johnstone <andrew@ajohnstone.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-class composer::params {
-  $composer_home = $::composer_home
-
-  # Support Amazon Linux which is supported by RedHat family
-  if $::osfamily == 'Linux' and $::operatingsystem == 'Amazon' {
-    $family = 'RedHat'
-  } else {
-    $family = $::osfamily
-  }
-
-  case $family {
-    'Debian': {
-      $target_dir      = '/usr/local/bin'
-      $composer_file   = 'composer'
-      $download_method = 'curl'
-      $logoutput       = false
-      $tmp_path        = '/tmp'
-      $php_package     = 'php5-cli'
-      $curl_package    = 'curl'
-      $wget_package    = 'wget'
-      $php_bin         = 'php'
-      $suhosin_enabled = true
-    }
-    'RedHat', 'Centos': {
-      $target_dir      = '/usr/local/bin'
-      $composer_file   = 'composer'
-      $download_method = 'curl'
-      $logoutput       = false
-      $tmp_path        = '/tmp'
-      $php_package     = 'php-cli'
-      $curl_package    = 'curl'
-      $wget_package    = 'wget'
-      $php_bin         = 'php'
-      $suhosin_enabled = true
-    }
-    default: {
-      fail("Unsupported platform: ${family}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp
deleted file mode 100644
index 594f67f1ba1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp
+++ /dev/null
@@ -1,96 +0,0 @@
-# == Type: composer::project
-#
-# Installs a given project with composer create-project
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*target_dir*]
-#   The target dir that composer should be installed to.
-#   Defaults to ```/usr/local/bin```.
-#
-# [*composer_file*]
-#   The name of the composer binary, which will reside in ```target_dir```.
-#
-# [*download_method*]
-#   Either ```curl``` or ```wget```.
-#
-# [*logoutput*]
-#   If the output should be logged. Defaults to FALSE.
-#
-# [*tmp_path*]
-#   Where the composer.phar file should be temporarily put.
-#
-# [*php_package*]
-#   The Package name of the PHP CLI package.
-#
-# [*user*]
-#   The user name to exec the composer commands as. Default is undefined.
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-define composer::project(
-  $project_name,
-  $target_dir,
-  $version        = undef,
-  $dev            = false,
-  $prefer_source  = false,
-  $stability      = 'dev',
-  $repository_url = undef,
-  $keep_vcs       = false,
-  $tries          = 3,
-  $timeout        = 1200,
-  $user           = undef,
-) {
-  require git
-  require composer
-
-  Exec {
-    path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
-    environment => "COMPOSER_HOME=${composer::composer_home}",
-    user        => $user,
-  }
-
-  $exec_name    = "composer_create_project_${title}"
-  $base_command = "${composer::php_bin} ${composer::target_dir}/${composer::composer_file} --stability=${stability}"
-  $end_command  = "${project_name} ${target_dir}"
-
-  $dev_arg = $dev ? {
-    true    => ' --dev',
-    default => '',
-  }
-
-  $vcs = $keep_vcs? {
-    true    => ' --keep-vcs',
-    default => '',
-  }
-
-  $repo = $repository_url? {
-    undef   => '',
-    default => " --repository-url=${repository_url}",
-  }
-
-  $pref_src = $prefer_source? {
-    true  => ' --prefer-source',
-    false => ''
-  }
-
-  $v = $version? {
-    undef   => '',
-    default => " ${version}",
-  }
-
-  exec { $exec_name:
-    command => "${base_command}${dev_arg}${repo}${pref_src}${vcs} create-project ${end_command}${v}",
-    tries   => $tries,
-    timeout => $timeout,
-    creates => $target_dir,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb
deleted file mode 100644
index 914de7111fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::params' do
-  ['RedHat', 'Debian', 'Linux'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-        :osfamily        => osfamily,
-        :operatingsystem => 'Amazon',
-      } }
-
-      it { should compile }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb
deleted file mode 100644
index a34e335e7a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe 'composer' do
-  ['RedHat', 'Debian', 'Linux'].each do |osfamily|
-    case osfamily
-    when 'RedHat'
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    when 'Linux'
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    when 'Debian'
-      php_package = 'php5-cli'
-      php_context = '/files/etc/php5/cli/php.ini/PHP'
-      suhosin_context = '/files/etc/php5/conf.d/suhosin.ini/suhosin'
-    else
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    end
-
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-          :osfamily        => osfamily,
-          :operatingsystem => 'Amazon'
-      } }
-
-      it { should contain_class('composer::params') }
-
-      it {
-        should contain_exec('download_composer').with({
-          :command     => 'curl -s http://getcomposer.org/installer | php',
-          :cwd         => '/tmp',
-          :creates     => '/tmp/composer.phar',
-          :logoutput   => false,
-        })
-      }
-
-      it {
-        should contain_augeas('whitelist_phar').with({
-          :context     => suhosin_context,
-          :changes     => 'set suhosin.executor.include.whitelist phar',
-        })
-      }
-
-      it {
-        should contain_augeas('allow_url_fopen').with({
-          :context    => php_context,
-          :changes    => 'set allow_url_fopen On',
-        })
-      }
-
-      context 'with default parameters' do
-        it 'should compile' do
-          compile
-        end
-
-        it { should contain_package(php_package).with_ensure('present') }
-        it { should contain_package('curl').with_ensure('present') }
-        it { should contain_file('/usr/local/bin').with_ensure('directory') }
-
-        it {
-          should contain_file('/usr/local/bin/composer').with({
-            :source => 'present',
-            :source => '/tmp/composer.phar',
-            :mode   => '0755',
-          })
-        }
-      end
-
-      context "on invalid operating system family" do
-        let(:facts) { {
-          :osfamily        => 'Invalid',
-          :operatingsystem => 'Amazon'
-        } }
-
-        it 'should not compile' do
-          expect { should compile }.to raise_error(/Unsupported platform: Invalid/)
-        end
-      end
-
-      context 'with custom parameters' do
-        let(:params) { {
-          :target_dir      => '/you_sir/lowcal/been',
-          :php_package     => 'php8-cli',
-          :composer_file   => 'compozah',
-          :curl_package    => 'kerl',
-          :php_bin         => 'pehpe',
-          :suhosin_enabled => false,
-        } }
-
-        it 'should compile' do
-          compile
-        end
-
-        it { should contain_package('php8-cli').with_ensure('present') }
-        it { should contain_package('kerl').with_ensure('present') }
-        it { should contain_file('/you_sir/lowcal/been').with_ensure('directory') }
-
-        it {
-          should contain_file('/you_sir/lowcal/been/compozah').with({
-            :source => 'present',
-            :source => '/tmp/composer.phar',
-            :mode   => '0755',
-          })
-        }
-
-        it { should_not contain_augeas('whitelist_phar') }
-        it { should_not contain_augeas('allow_url_fopen') }
-
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb
deleted file mode 100644
index 36a062f4069..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::exec' do
-  ['RedHat', 'Debian'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-          :osfamily => osfamily,
-      } }
-
-      context 'using install command' do
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        let(:title) { 'myproject' }
-        let(:params) { {
-          :cmd  => 'install',
-          :cwd  => '/my/awesome/project',
-          :user => 'linus',
-        } }
-
-        it {
-          should contain_exec('composer_update_myproject').with({
-            :command       => %r{php /usr/local/bin/composer install --no-plugins --no-scripts --no-interaction},
-            :cwd       => '/my/awesome/project',
-            :user      => 'linus',
-            :logoutput => false,
-          })
-        }
-      end
-
-      context 'using update command' do
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        let(:title) { 'yourpr0ject' }
-        let(:params) { {
-          :cmd       => 'update',
-          :cwd       => '/just/in/time',
-          :packages  => ['package1', 'packageinf'],
-          :logoutput => true,
-        } }
-
-        it {
-          should contain_exec('composer_update_yourpr0ject').without_user.with({
-            :command   => %r{php /usr/local/bin/composer update --no-plugins --no-scripts --no-interaction             package1             packageinf},
-            :cwd       => '/just/in/time',
-            :logoutput => true,
-          })
-        }
-      end
-    end
-  end
-
-  context 'on unsupported operating system family' do
-    let(:facts) { {
-      :osfamily => 'Darwin',
-    } }
-
-    let(:title) { 'someproject' }
-
-    it 'should not compile' do
-      expect { should compile }.to raise_error(/Unsupported platform: Darwin/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb
deleted file mode 100644
index 624f9111566..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::project' do
-  ['RedHat', 'Debian'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-            :osfamily => osfamily,
-        } }
-
-      context 'with default params' do
-        let(:title) { 'myproject' }
-        let(:params) { {
-          :project_name => 'projectzzz',
-          :target_dir   => '/my/subpar/project',
-        } }
-
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        it {
-          should contain_exec('composer_create_project_myproject').without_user.with({
-            :command => "php /usr/local/bin/composer --stability=dev create-project projectzzz /my/subpar/project",
-            :tries   => 3,
-            :timeout => 1200,
-            :creates => '/my/subpar/project',
-          })
-        }
-      end
-
-      context 'with all custom params' do
-        let(:title) { 'whoadawg' }
-        let(:params) { {
-          :project_name   => 'whoadawg99',
-          :target_dir     => '/my/mediocre/project',
-          :version        => '0.0.8',
-          :dev            => true,
-          :prefer_source  => true,
-          :stability      => 'dev',
-          :repository_url => 'git@github.com:trollface/whoadawg.git',
-          :keep_vcs       => true,
-          :tries          => 2,
-          :timeout        => 600,
-          :user           => 'mrploch',
-        } }
-
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        it {
-          should contain_exec('composer_create_project_whoadawg').with({
-            :command => %r{php /usr/local/bin/composer --stability=dev --dev --repository-url=git@github.com:trollface/whoadawg.git --prefer-source --keep-vcs create-project whoadawg99 /my/mediocre/project 0.0.8},
-            :tries   => 2,
-            :timeout => 600,
-            :creates => '/my/mediocre/project',
-            :user    => 'mrploch',
-          })
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp
deleted file mode 100644
index d669ee3889c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-node default {
-  include composer
-
-  composer::exec {'ohai':
-    cmd => 'install',
-    cwd => '/some/cool/dir',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts
deleted file mode 100644
index 22420e39c64..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb
deleted file mode 100644
index 960002f94c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= @command -%>
-<% if @prefer_source %> --prefer-source<% end -%>
-<% if @prefer_dist %> --prefer-dist<% end -%>
-<% unless @custom_installers %> --no-plugins<% end -%>
-<% unless @scripts %> --no-scripts<% end -%>
-<% unless @interaction %> --no-interaction<% end -%>
-<% if @dev %> --dev<% end -%>
-<% if @verbose %> -v<% end -%>
-<% if @dry_run %> --dry-run<% end -%>
-<% if @cmd == 'update' -%>
-    <%- if @packages -%>
-        <%- @packages.each do |package| -%>
-            <%= ' ' + package -%>
-        <%- end -%>
-    <%- end -%>
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp
deleted file mode 100644
index 36afe85fa20..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation errors
-# and view a log of events) or by fully applying the test in a virtual environment
-# (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-include composer
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp
deleted file mode 100644
index 6208a5eeded..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation errors
-# and view a log of events) or by fully applying the test in a virtual environment
-# (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-
-composer::project { 'my_first_test':
-  project_name => 'fabpot/silex-skeleton',
-  target_dir   => '/tmp/first_test',
-}
-
-composer::project { 'my_second_test':
-  project_name  => 'fabpot/silex-skeleton',
-  target_dir    => '/tmp/second_test',
-  prefer_source => true,
-  stability     => 'dev',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml
deleted file mode 100644
index dc6b41f836c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fixtures:
-  repositories:
-    'stdlib':
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.0.0'
-  symlinks:
-    'concat': '#{source_dir}'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes
deleted file mode 100644
index 2e05fd47ded..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.sh  eol=lf
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml
deleted file mode 100644
index 4e72cd4cf9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-# work around RubyGems 2.2.0 breaking ruby 1.8.7
-# https://github.com/rubygems/rubygems/pull/763
-# https://github.com/freerange/mocha/commit/66bab2a8f4e7cd8734bf88e6f32157c0d5153125
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG
deleted file mode 100644
index c66b922d44c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG
+++ /dev/null
@@ -1,127 +0,0 @@
-2014-05-14 1.1.0
-
-Summary
-
-This release is primarily a bugfix release since 1.1.0-rc1.
-
-Features:
-- Improved testing, with tests moved to beaker
-
-Bugfixes:
-- No longer attempts to set fragment owner and mode on Windows
-- Fix numeric sorting
-- Fix incorrect quoting
-- Fix newlines
-
-2014-01-03 1.1.0-rc1
-
-Summary:
-
-This release of concat was 90% written by Joshua Hoblitt, and the module team
-would like to thank him for the huge amount of work he put into this release.
-
-This module deprecates a bunch of old parameters and usage patterns, modernizes
-much of the manifest code, simplifies a whole bunch of logic and makes
-improvements to almost all parts of the module.
-
-The other major feature is windows support, courtesy of luisfdez, with an
-alternative version of the concat bash script in ruby.  We've attempted to
-ensure that there are no backwards incompatible changes, all users of 1.0.0
-should be able to use 1.1.0 without any failures, but you may find deprecation
-warnings and we'll be aggressively moving for a 2.0 to remove those too.
-
-For further information on deprecations, please read:
-https://github.com/puppetlabs/puppetlabs-concat/blob/master/README.md#api-deprecations
-
-Removed:
-- Puppet 0.24 support.
-- Filebucket backup of all file resources except the target concatenated file.
-- Default owner/user/group values.
-- Purging of long unused /usr/local/bin/concatfragments.sh
-
-Features:
-- Windows support via a ruby version of the concat bash script.
-- Huge amount of acceptance testing work added.
-- Documentation (README) completely rewritten.
-- New parameters in concat:
- - `ensure`: Controls if the file should be present/absent at all.
-- Remove requirement to include concat::setup in manifests.
-- Made `gnu` parameter deprecated.
-- Added parameter validation.
-
-Bugfixes:
-- Ensure concat::setup runs before concat::fragment in all cases.
-- Pluginsync references updated for modern Puppet.
-- Fix incorrect group parameter.
-- Use $owner instead of $id to avoid confusion with $::id
-- Compatibility fixes for Puppet 2.7/ruby 1.8.7
-- Use LC_ALL=C instead of LANG=C
-- Always exec the concatfragments script as root when running as root.
-- Syntax and other cleanup changes.
-
-2013-08-09 1.0.0
-
-Summary:
-
-Many new features and bugfixes in this release, and if you're a heavy concat
-user you should test carefully before upgrading.  The features should all be
-backwards compatible but only light testing has been done from our side before
-this release.
-
-Features:
-- New parameters in concat:
- - `replace`: specify if concat should replace existing files.
- - `ensure_newline`: controls if fragments should contain a newline at the end.
-- Improved README documentation.
-- Add rspec:system tests (rake spec:system to test concat)
-
-Bugfixes
-- Gracefully handle \n in a fragment resource name.
-- Adding more helpful message for 'pluginsync = true'
-- Allow passing `source` and `content` directly to file resource, rather than
-defining resource defaults.
-- Added -r flag to read so that filenames with \ will be read correctly.
-- sort always uses LANG=C.
-- Allow WARNMSG to contain/start with '#'.
-- Replace while-read pattern with for-do in order to support Solaris.
-
-CHANGELOG:
-- 2010/02/19 - initial release
-- 2010/03/12 - add support for 0.24.8 and newer
-             - make the location of sort configurable
-             - add the ability to add shell comment based warnings to
-               top of files
-             - add the ablity to create empty files
-- 2010/04/05 - fix parsing of WARN and change code style to match rest
-               of the code
-             - Better and safer boolean handling for warn and force
-             - Don't use hard coded paths in the shell script, set PATH
-               top of the script
-             - Use file{} to copy the result and make all fragments owned
-               by root.  This means we can chnage the ownership/group of the
-               resulting file at any time.
-             - You can specify ensure => "/some/other/file" in concat::fragment
-               to include the contents of a symlink into the final file.
-- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name
-- 2010/05/22 - Improve documentation and show the use of ensure =>
-- 2010/07/14 - Add support for setting the filebucket behavior of files
-- 2010/10/04 - Make the warning message configurable
-- 2010/12/03 - Add flags to make concat work better on Solaris - thanks Jonathan Boyett
-- 2011/02/03 - Make the shell script more portable and add a config option for root group
-- 2011/06/21 - Make base dir root readable only for security
-- 2011/06/23 - Set base directory using a fact instead of hardcoding it
-- 2011/06/23 - Support operating as non privileged user
-- 2011/06/23 - Support dash instead of bash or sh
-- 2011/07/11 - Better solaris support
-- 2011/12/05 - Use fully qualified variables
-- 2011/12/13 - Improve Nexenta support
-- 2012/04/11 - Do not use any GNU specific extensions in the shell script
-- 2012/03/24 - Comply to community style guides
-- 2012/05/23 - Better errors when basedir isnt set
-- 2012/05/31 - Add spec tests
-- 2012/07/11 - Include concat::setup in concat improving UX
-- 2012/08/14 - Puppet Lint improvements
-- 2012/08/30 - The target path can be different from the $name
-- 2012/08/30 - More Puppet Lint cleanup
-- 2012/09/04 - RELEASE 0.2.0
-- 2012/12/12 - Added (file) $replace parameter to concat
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile
deleted file mode 100644
index 56b977598c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'pry',                     :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE
deleted file mode 100644
index 6a9e9a194b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-   Copyright 2012 R.I.Pienaar
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile
deleted file mode 100644
index ea9ef2c3e30..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'puppetlabs-concat'
-version '1.1.0'
-source 'git://github.com/puppetlabs/puppetlabs-concat.git'
-author 'Puppetlabs'
-license 'Apache 2.0'
-summary 'Concat module'
-description 'Concat module'
-project_page 'http://github.com/puppetlabs/puppetlabs-concat'
-dependency 'puppetlabs/stdlib', '>= 4.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md
deleted file mode 100644
index 60eca383002..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md
+++ /dev/null
@@ -1,441 +0,0 @@
-#Concat
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-concat.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-concat)
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with concat](#setup)
-    * [What concat affects](#what-concat-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with concat](#beginning-with-concat)
-4. [Usage - Configuration options and additional functionality](#usage)
-    * [API _deprecations_](#api-deprecations)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-This module constructs files from multiple fragments in an ordered way.
-
-##Module Description
-
-This module lets you use many concat::fragment{} resources throughout
-your modules to construct a single file at the end.  It does this through
-a shell (or ruby) script and a temporary holding space for the fragments.
-
-##Setup
-
-###What concat affects
-
-* Installs concatfragments.[sh|rb] based on platform.
-* Adds a concat/ directory into Puppets `vardir`.
-
-###Beginning with concat
-
-To start using concat you need to create:
-
-* A concat{} resource for the final file.
-* One or more concat::fragment{}'s. 
-
-A minimal example might be:
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-}
-
-concat::fragment { 'tmpfile':
-  target  => '/tmp/file'
-  content => 'test contents',
-  order   => '01'
-}
-```
-
-##Usage
-
-Please be aware that there have been a number of [API
-_deprecations_](#api-deprecations).
-
-If you wanted a /etc/motd file that listed all the major modules
-on the machine.  And that would be maintained automatically even
-if you just remove the include lines for other modules you could
-use code like below, a sample /etc/motd would be:
-
-<pre>
-Puppet modules on this server:
-
-    -- Apache
-    -- MySQL
-</pre>
-
-Local sysadmins can also append to the file by just editing /etc/motd.local
-their changes will be incorporated into the puppet managed motd.
-
-```puppet
-class motd {
-  $motd = '/etc/motd'
-
-  concat { $motd:
-    owner => 'root',
-    group => 'root',
-    mode  => '0644'
-  }
-
-  concat::fragment{ 'motd_header':
-    target  => $motd,
-    content => "\nPuppet modules on this server:\n\n",
-    order   => '01'
-  }
-
-  # local users on the machine can append to motd by just creating
-  # /etc/motd.local
-  concat::fragment{ 'motd_local':
-    target => $motd,
-    source => '/etc/motd.local',
-    order  => '15'
-  }
-}
-
-# used by other modules to register themselves in the motd
-define motd::register($content="", $order=10) {
-  if $content == "" {
-    $body = $name
-  } else {
-    $body = $content
-  }
-
-  concat::fragment{ "motd_fragment_$name":
-    target  => '/etc/motd',
-    order   => $order,
-    content => "    -- $body\n"
-  }
-}
-```
-
-To use this you'd then do something like:
-
-```puppet
-class apache {
-  include apache::install, apache::config, apache::service
-
-  motd::register{ 'Apache': }
-}
-```
-
-##Reference
-
-###Classes
-
-####Public classes
-
-####Private classes
-* `concat::setup`: Sets up the concat script/directories.
-
-###Parameters
-
-###Defines
-
-####concat
-
-#####`ensure`
-Controls if the combined file is present or absent.
-
-######Example
-- ensure => present
-- ensure => absent
-
-#####`path`
-Controls the destination of the file to create.
-
-######Example
-- path => '/tmp/filename'
-
-#####`owner`
-Set the owner of the combined file.
-
-######Example
-- owner => 'root'
-
-#####`group`
-Set the group of the combined file.
-
-######Example
-- group => 'root'
-
-#####`mode`
-Set the mode of the combined file.
-
-######Example
-- mode => '0644'
-
-#####`warn`
-Determine if a warning message should be added at the top of the file to let
-users know it was autogenerated by Puppet.
-
-######Example
-- warn => true
-- warn => false
-
-#####`warn_message`
-Set the contents of the warning message.
-
-######Example
-- warn_message => 'This file is autogenerated!'
-
-#####`force`
-Determine if empty files are allowed when no fragments were added.
-
-######Example
-- force => true
-- force => false
-
-#####`backup`
-Controls the filebucket behavior used for the file.
-
-######Example
-- backup => 'puppet'
-
-#####`replace`
-Controls if Puppet should replace the destination file if it already exists.
-
-######Example
-- replace => true
-- replace => false
-
-#####`order`
-Controls the way in which the shell script chooses to sort the files.  It's
-rare you'll need to adjust this.
-
-######Allowed Values
-- order => 'alpha'
-- order => 'numeric'
-
-#####`ensure_newline`
-Ensure there's a newline at the end of the fragments.
-
-######Example
-- ensure_newline => true
-- ensure_newline => false
-
-####concat::fragment
-
-#####`target`
-Choose the destination file of the fragment.
-
-######Example
-- target => '/tmp/testfile'
-
-#####`content`
-Create the content of the fragment.
-
-######Example
-- content => 'test file contents'
-
-#####`source`
-Find the sources within Puppet of the fragment.
-
-######Example
-- source => 'puppet:///modules/test/testfile'
-- source => ['puppet:///modules/test/1', 'puppet:///modules/test/2']
-
-#####`order`
-Order the fragments.
-
-######Example
-- order => '01'
-
-#####`ensure`
-Control the file of fragment created.
-
-######Example
-- ensure => 'present'
-- ensure => 'absent'
-- ensure => 'file'
-- ensure => 'directory'
-
-#####`mode`
-Set the mode of the fragment.
-
-######Example
-- mode => '0644'
-
-#####`owner`
-Set the owner of the fragment.
-
-######Example
-- owner => 'root'
-
-#####`group`
-Set the group of the fragment.
-
-######Example
-- group => 'root'
-
-#####`backup`
-Control the filebucket behavior for the fragment.
-
-######Example
-- backup => 'puppet'
-
-### API _deprecations_
-
-#### Since version `1.0.0`
-
-##### `concat{}` `warn` parameter
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-  warn   => 'true',  # generates stringified boolean value warning
-}
-```
-
-Using stringified Boolean values as the `warn` parameter to `concat` is
-deprecated, generates a catalog compile time warning, and will be silently
-treated as the concatenated file header/warning message in a future release.
-
-The following strings are considered a stringified Boolean value:
-
- * `'true'`
- * `'yes'`
- * `'on'`
- * `'false'`
- * `'no'`
- * `'off'`
-
-Please migrate to using the Puppet DSL's native [Boolean data
-type](http://docs.puppetlabs.com/puppet/3/reference/lang_datatypes.html#booleans).
-
-##### `concat{}` `gnu` parameter
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-  gnu    => $foo,    # generates deprecation warning
-}
-```
-
-The `gnu` parameter to `concat` is deprecated, generates a catalog compile time
-warning, and has no effect.  This parameter will be removed in a future
-release.
-
-Note that this parameter was silently ignored in the `1.0.0` release.
-
-##### `concat::fragment{}` `ensure` parameter
-
-```puppet
-concat::fragment { 'cpuinfo':
-  ensure => '/proc/cpuinfo', # generates deprecation warning
-  target => '/tmp/file',
-}
-```
-
-Passing a value other than `'present'` or `'absent'` as the `ensure` parameter
-to `concat::fragment` is deprecated and generates a catalog compile time
-warning.  The warning will become a catalog compilation failure in a future
-release.
-
-This type emulates the Puppet core `file` type's disfavored [`ensure`
-semantics](http://docs.puppetlabs.com/references/latest/type.html#file-attribute-ensure)
-of treating a file path as a directive to create a symlink.  This feature is
-problematic in several ways.  It copies an API semantic of another type that is
-both frowned upon and not generally well known.  It's behavior may be
-surprising in that the target concatenated file will not be a symlink nor is
-there any common file system that has a concept of a section of a plain file
-being symbolically linked to another file.  Additionally, the behavior is
-generally inconsistent with most Puppet types in that a missing source file
-will be silently ignored.
-
-If you want to use the content of a file as a fragment please use the `source`
-parameter.
-
-##### `concat::fragment{}` `mode/owner/group` parameters
-
-```puppet
-concat::fragment { 'foo':
-  target  => '/tmp/file',
-  content => 'foo',
-  mode    => $mode,       # generates deprecation warning
-  owner   => $owner,      # generates deprecation warning
-  group   => $group,      # generates deprecation warning
-}
-```
-
-The `mode` parameter to `concat::fragment` is deprecated, generates a catalog compile time warning, and has no effect.
-
-The `owner` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.
-
-The `group` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.
-
-These parameters had no user visible effect in version `1.0.0` and will be
-removed in a future release.
-
-##### `concat::fragment{}` `backup` parameter
-
-```puppet
-concat::fragment { 'foo':
-  target  => '/tmp/file',
-  content => 'foo',
-  backup  => 'bar',       # generates deprecation warning
-}
-```
-
-The `backup` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.  It will be removed in a future
-release.
-
-In the `1.0.0` release this parameter controlled file bucketing of the file
-fragment.  Bucketting the fragment(s) is redundant with bucketting the final
-concatenated file and this feature has been removed.
-
-##### `class { 'concat::setup': }`
-
-```puppet
-include concat::setup     # generates deprecation warning
-
-class { 'concat::setup: } # generates deprecation warning
-```
-
-The `concat::setup` class is deprecated as a public API of this module and
-should no longer be directly included in the manifest.  This class may be
-removed in a future release.
-
-##### Parameter validation
-
-While not an API depreciation, users should be aware that all public parameters
-in this module are now validated for at least variable type.  This may cause
-validation errors in a manifest that was previously silently misbehaving.
-
-##Limitations
-
-This module has been tested on:
-
-* RedHat Enterprise Linux (and Centos) 5/6
-* Debian 6/7
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-#Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Contributors
-
-The list of contributors can be found at:
-
-https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile
deleted file mode 100644
index 23aea87de25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_quoted_booleans')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb
deleted file mode 100755
index 73fd7f9b2d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# Script to concat files to a config file.
-#
-# Given a directory like this:
-# /path/to/conf.d
-# |-- fragments
-# |   |-- 00_named.conf
-# |   |-- 10_domain.net
-# |   `-- zz_footer
-#
-# The script supports a test option that will build the concat file to a temp location and
-# use /usr/bin/cmp to verify if it should be run or not.  This would result in the concat happening
-# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds.
-#
-# Without the test option and the unless combo your services that depend on the final file would end up
-# restarting on each run, or in other manifest models some changes might get missed.
-#
-# OPTIONS:
-#  -o	The file to create from the sources
-#  -d	The directory where the fragments are kept
-#  -t	Test to find out if a build is needed, basically concats the files to a temp
-#       location and compare with what's in the final location, return codes are designed
-#       for use with unless on an exec resource
-#  -w   Add a shell style comment at the top of the created file to warn users that it
-#       is generated by puppet
-#  -f   Enables the creation of empty output files when no fragments are found
-#  -n	Sort the output numerically rather than the default alpha sort
-#
-# the command:
-#
-#   concatfragments.rb -o /path/to/conffile.cfg -d /path/to/conf.d
-#
-# creates /path/to/conf.d/fragments.concat and copies the resulting
-# file to /path/to/conffile.cfg.  The files will be sorted alphabetically
-# pass the -n switch to sort numerically.
-#
-# The script does error checking on the various dirs and files to make
-# sure things don't fail.
-require 'optparse'
-require 'fileutils'
-
-settings = {
-  :outfile => "",
-  :workdir => "",
-  :test    => false,
-  :force   => false,
-  :warn    => "",
-  :sortarg => ""
-}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options]"
-  opts.separator "Specific options:"
-
-  opts.on("-o", "--outfile OUTFILE", String, "The file to create from the sources") do |o|
-    settings[:outfile] = o
-  end
-
-  opts.on("-d", "--workdir WORKDIR", String, "The directory where the fragments are kept") do |d|
-    settings[:workdir] = d
-  end
-
-  opts.on("-t", "--test", "Test to find out if a build is needed") do
-    settings[:test] = true
-  end
-
-  opts.separator "Other options:"
-  opts.on("-w", "--warn WARNMSG", String,
-          "Add a shell style comment at the top of the created file to warn users that it is generated by puppet") do |w|
-    settings[:warn] = w
-  end
-
-  opts.on("-f", "--force", "Enables the creation of empty output files when no fragments are found") do
-    settings[:force] = true
-  end
-
-  opts.on("-n", "--sort", "Sort the output numerically rather than the default alpha sort") do
-    settings[:sortarg] = "-n"
-  end
-end.parse!
-
-# do we have -o?
-raise 'Please specify an output file with -o' unless !settings[:outfile].empty?
-
-# do we have -d?
-raise 'Please specify fragments directory with -d' unless !settings[:workdir].empty?
-
-# can we write to -o?
-if File.file?(settings[:outfile])
-  if !File.writable?(settings[:outfile])
-    raise "Cannot write to #{settings[:outfile]}"
-  end
-else
-  if !File.writable?(File.dirname(settings[:outfile]))
-    raise "Cannot write to dirname #{File.dirname(settings[:outfile])} to create #{settings[:outfile]}"
-  end
-end
-
-# do we have a fragments subdir inside the work dir?
-if !File.directory?(File.join(settings[:workdir], "fragments")) && !File.executable?(File.join(settings[:workdir], "fragments"))
-  raise "Cannot access the fragments directory"
-end
-
-# are there actually any fragments?
-if (Dir.entries(File.join(settings[:workdir], "fragments")) - %w{ . .. }).empty?
-  if !settings[:force]
-    raise "The fragments directory is empty, cowardly refusing to make empty config files"
-  end
-end
-
-Dir.chdir(settings[:workdir])
-
-if settings[:warn].empty?
-  File.open("fragments.concat", 'w') {|f| f.write("") }
-else
-  File.open("fragments.concat", 'w') {|f| f.write("#{settings[:warn]}\n") }
-end
-
-# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
-open('fragments.concat', 'a') do |f|
-  Dir.entries("fragments").sort.each{ |entry|
-    if File.file?(File.join("fragments", entry))
-	  f << File.read(File.join("fragments", entry))
-    end
-  }
-end
-
-if !settings[:test]
-  # This is a real run, copy the file to outfile
-  FileUtils.cp 'fragments.concat', settings[:outfile]
-else
-  # Just compare the result to outfile to help the exec decide
-  if FileUtils.cmp 'fragments.concat', settings[:outfile]
-    exit 0
-  else
-    exit 1
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh
deleted file mode 100755
index 7e6b0f5c565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-# Script to concat files to a config file.
-#
-# Given a directory like this:
-# /path/to/conf.d
-# |-- fragments
-# |   |-- 00_named.conf
-# |   |-- 10_domain.net
-# |   `-- zz_footer
-#
-# The script supports a test option that will build the concat file to a temp location and 
-# use /usr/bin/cmp to verify if it should be run or not.  This would result in the concat happening
-# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds.
-# 
-# Without the test option and the unless combo your services that depend on the final file would end up 
-# restarting on each run, or in other manifest models some changes might get missed.
-#
-# OPTIONS:
-#  -o	The file to create from the sources
-#  -d	The directory where the fragments are kept
-#  -t	Test to find out if a build is needed, basically concats the files to a temp
-#       location and compare with what's in the final location, return codes are designed
-#       for use with unless on an exec resource
-#  -w   Add a shell style comment at the top of the created file to warn users that it 
-#       is generated by puppet
-#  -f   Enables the creation of empty output files when no fragments are found
-#  -n	Sort the output numerically rather than the default alpha sort
-#
-# the command: 
-#
-#   concatfragments.sh -o /path/to/conffile.cfg -d /path/to/conf.d
-#
-# creates /path/to/conf.d/fragments.concat and copies the resulting 
-# file to /path/to/conffile.cfg.  The files will be sorted alphabetically
-# pass the -n switch to sort numerically.
-# 
-# The script does error checking on the various dirs and files to make
-# sure things don't fail.
-
-OUTFILE=""
-WORKDIR=""
-TEST=""
-FORCE=""
-WARN=""
-SORTARG=""
-ENSURE_NEWLINE=""
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-## Well, if there's ever a bad way to do things, Nexenta has it.
-## http://nexenta.org/projects/site/wiki/Personalities
-unset SUN_PERSONALITY
-
-while getopts "o:s:d:tnw:fl" options; do
-	case $options in
-		o ) OUTFILE=$OPTARG;;
-		d ) WORKDIR=$OPTARG;;
-		n ) SORTARG="-n";;
-		w ) WARNMSG="$OPTARG";;
-		f ) FORCE="true";;
-		t ) TEST="true";;
-		l ) ENSURE_NEWLINE="true";;
-		* ) echo "Specify output file with -o and fragments directory with -d"
-		    exit 1;;
-	esac
-done
-
-# do we have -o?
-if [ "x${OUTFILE}" = "x" ]; then
-	echo "Please specify an output file with -o"
-	exit 1
-fi
-
-# do we have -d?
-if [ "x${WORKDIR}" = "x" ]; then
-	echo "Please fragments directory with -d"
-	exit 1
-fi
-
-# can we write to -o?
-if [ -f "${OUTFILE}" ]; then
-	if [ ! -w "${OUTFILE}" ]; then
-		echo "Cannot write to ${OUTFILE}"
-		exit 1
-	fi
-else
-	if [ ! -w `dirname "${OUTFILE}"` ]; then
-		echo "Cannot write to `dirname \"${OUTFILE}\"` to create ${OUTFILE}"
-		exit 1
-	fi
-fi
-
-# do we have a fragments subdir inside the work dir?
-if [ ! -d "${WORKDIR}/fragments" ]  && [ ! -x "${WORKDIR}/fragments" ]; then
-	echo "Cannot access the fragments directory"
-	exit 1
-fi
-
-# are there actually any fragments?
-if [ ! "$(ls -A """${WORKDIR}/fragments""")" ]; then
-	if [ "x${FORCE}" = "x" ]; then
-		echo "The fragments directory is empty, cowardly refusing to make empty config files"
-		exit 1
-	fi
-fi
-
-cd "${WORKDIR}"
-
-if [ "x${WARNMSG}" = "x" ]; then
-	: > "fragments.concat"
-else
-	printf '%s\n' "$WARNMSG" > "fragments.concat"
-fi
-
-# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
-IFS_BACKUP=$IFS
-IFS='
-'
-for fragfile in `find fragments/ -type f -follow -print0 | xargs -0 -n1 basename | LC_ALL=C sort ${SORTARG}`
-do
-    cat "fragments/$fragfile" >> "fragments.concat"
-    # Handle newlines.
-    if [ "x${ENSURE_NEWLINE}" != "x" ]; then
-      echo >> "fragments.concat"
-    fi
-done
-IFS=$IFS_BACKUP
-
-if [ "x${TEST}" = "x" ]; then
-	# This is a real run, copy the file to outfile
-	cp fragments.concat "${OUTFILE}"
-	RETVAL=$?
-else
-	# Just compare the result to outfile to help the exec decide
-	cmp "${OUTFILE}" fragments.concat
-	RETVAL=$?
-fi
-
-exit $RETVAL
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb
deleted file mode 100644
index bfac07102de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# == Fact: concat_basedir
-#
-# A custom fact that sets the default location for fragments
-#
-# "${::vardir}/concat/"
-#
-Facter.add("concat_basedir") do
-  setcode do
-    File.join(Puppet[:vardir],"concat")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp
deleted file mode 100644
index 40baadd2348..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-# == Define: concat::fragment
-#
-# Puts a file fragment into a directory previous setup using concat
-#
-# === Options:
-#
-# [*target*]
-#   The file that these fragments belong to
-# [*content*]
-#   If present puts the content into the file
-# [*source*]
-#   If content was not specified, use the source
-# [*order*]
-#   By default all files gets a 10_ prefix in the directory you can set it to
-#   anything else using this to influence the order of the content in the file
-# [*ensure*]
-#   Present/Absent or destination to a file to include another file
-# [*mode*]
-#   Deprecated
-# [*owner*]
-#   Deprecated
-# [*group*]
-#   Deprecated
-# [*backup*]
-#   Deprecated
-#
-define concat::fragment(
-    $target,
-    $content = undef,
-    $source  = undef,
-    $order   = 10,
-    $ensure  = undef,
-    $mode    = undef,
-    $owner   = undef,
-    $group   = undef,
-    $backup  = undef
-) {
-  validate_string($target)
-  validate_string($content)
-  if !(is_string($source) or is_array($source)) {
-    fail('$source is not a string or an Array.')
-  }
-  validate_string($order)
-  if $mode {
-    warning('The $mode parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $owner {
-    warning('The $owner parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $group {
-    warning('The $group parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $backup {
-    warning('The $backup parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $ensure == undef {
-    $_ensure = getparam(Concat[$target], 'ensure')
-  } else {
-    if ! ($ensure in [ 'present', 'absent' ]) {
-      warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.')
-    }
-    $_ensure = $ensure
-  }
-
-  include concat::setup
-
-  $safe_name        = regsubst($name, '[/:\n]', '_', 'GM')
-  $safe_target_name = regsubst($target, '[/:\n]', '_', 'GM')
-  $concatdir        = $concat::setup::concatdir
-  $fragdir          = "${concatdir}/${safe_target_name}"
-  $fragowner            = $concat::setup::fragment_owner
-  $fragmode             = $concat::setup::fragment_mode
-
-  # The file type's semantics are problematic in that ensure => present will
-  # not over write a pre-existing symlink.  We are attempting to provide
-  # backwards compatiblity with previous concat::fragment versions that
-  # supported the file type's ensure => /target syntax
-
-  # be paranoid and only allow the fragment's file resource's ensure param to
-  # be file, absent, or a file target
-  $safe_ensure = $_ensure ? {
-    ''        => 'file',
-    undef     => 'file',
-    'file'    => 'file',
-    'present' => 'file',
-    'absent'  => 'absent',
-    default   => $_ensure,
-  }
-
-  # if it looks line ensure => /target syntax was used, fish that out
-  if ! ($_ensure in ['', 'present', 'absent', 'file' ]) {
-    $ensure_target = $_ensure
-  } else {
-    $ensure_target = undef
-  }
-
-  # the file type's semantics only allows one of: ensure => /target, content,
-  # or source
-  if ($ensure_target and $source) or
-    ($ensure_target and $content) or
-    ($source and $content) {
-    fail('You cannot specify more than one of $content, $source, $ensure => /target')
-  }
-
-  if ! ($content or $source or $ensure_target) {
-    crit('No content, source or symlink specified')
-  }
-
-  # punt on group ownership until some point in the distant future when $::gid
-  # can be relied on to be present
-  file { "${fragdir}/fragments/${order}_${safe_name}":
-    ensure  => $safe_ensure,
-    owner   => $fragowner,
-    mode    => $fragmode,
-    source  => $source,
-    content => $content,
-    backup  => false,
-    alias   => "concat_fragment_${name}",
-    notify  => Exec["concat_${target}"]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp
deleted file mode 100644
index 91d82ebd3e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp
+++ /dev/null
@@ -1,232 +0,0 @@
-# == Define: concat
-#
-# Sets up so that you can use fragments to build a final config file,
-#
-# === Options:
-#
-# [*ensure*]
-#   Present/Absent
-# [*path*]
-#   The path to the final file. Use this in case you want to differentiate
-#   between the name of a resource and the file path.  Note: Use the name you
-#   provided in the target of your fragments.
-# [*owner*]
-#   Who will own the file
-# [*group*]
-#   Who will own the file
-# [*mode*]
-#   The mode of the final file
-# [*force*]
-#   Enables creating empty files if no fragments are present
-# [*warn*]
-#   Adds a normal shell style comment top of the file indicating that it is
-#   built by puppet
-# [*force*]
-# [*backup*]
-#   Controls the filebucketing behavior of the final file and see File type
-#   reference for its use.  Defaults to 'puppet'
-# [*replace*]
-#   Whether to replace a file that already exists on the local system
-# [*order*]
-# [*ensure_newline*]
-# [*gnu*]
-#   Deprecated
-#
-# === Actions:
-# * Creates fragment directories if it didn't exist already
-# * Executes the concatfragments.sh script to build the final file, this
-#   script will create directory/fragments.concat.   Execution happens only
-#   when:
-#   * The directory changes
-#   * fragments.concat != final destination, this means rebuilds will happen
-#     whenever someone changes or deletes the final file.  Checking is done
-#     using /usr/bin/cmp.
-#   * The Exec gets notified by something else - like the concat::fragment
-#     define
-# * Copies the file over to the final destination using a file resource
-#
-# === Aliases:
-#
-# * The exec can notified using Exec["concat_/path/to/file"] or
-#   Exec["concat_/path/to/directory"]
-# * The final file can be referenced as File["/path/to/file"] or
-#   File["concat_/path/to/file"]
-#
-define concat(
-  $ensure         = 'present',
-  $path           = $name,
-  $owner          = undef,
-  $group          = undef,
-  $mode           = '0644',
-  $warn           = false,
-  $force          = false,
-  $backup         = 'puppet',
-  $replace        = true,
-  $order          = 'alpha',
-  $ensure_newline = false,
-  $gnu            = undef
-) {
-  validate_re($ensure, '^present$|^absent$')
-  validate_absolute_path($path)
-  validate_string($owner)
-  validate_string($group)
-  validate_string($mode)
-  if ! (is_string($warn) or $warn == true or $warn == false) {
-    fail('$warn is not a string or boolean')
-  }
-  validate_bool($force)
-  validate_string($backup)
-  validate_bool($replace)
-  validate_re($order, '^alpha$|^numeric$')
-  validate_bool($ensure_newline)
-  if $gnu {
-    warning('The $gnu parameter to concat is deprecated and has no effect')
-  }
-
-  include concat::setup
-
-  $safe_name            = regsubst($name, '[/:]', '_', 'G')
-  $concatdir            = $concat::setup::concatdir
-  $fragdir              = "${concatdir}/${safe_name}"
-  $concat_name          = 'fragments.concat.out'
-  $script_command       = $concat::setup::script_command
-  $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
-  $bool_warn_message    = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-  case $warn {
-    true: {
-      $warn_message = $default_warn_message
-    }
-    'true', 'yes', 'on': {
-      warning($bool_warn_message)
-      $warn_message = $default_warn_message
-    }
-    false: {
-      $warn_message = ''
-    }
-    'false', 'no', 'off': {
-      warning($bool_warn_message)
-      $warn_message = ''
-    }
-    default: {
-      $warn_message = $warn
-    }
-  }
-
-  $warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G')
-  $warnflag = $warnmsg_escaped ? {
-    ''      => '',
-    default => "-w '${warnmsg_escaped}'"
-  }
-
-  $forceflag = $force ? {
-    true  => '-f',
-    false => '',
-  }
-
-  $orderflag = $order ? {
-    'numeric' => '-n',
-    'alpha'   => '',
-  }
-
-  $newlineflag = $ensure_newline ? {
-    true  => '-l',
-    false => '',
-  }
-
-  File {
-    backup  => false,
-  }
-
-  if $ensure == 'present' {
-    file { $fragdir:
-      ensure => directory,
-      mode   => '0750',
-    }
-
-    file { "${fragdir}/fragments":
-      ensure  => directory,
-      mode    => '0750',
-      force   => true,
-      ignore  => ['.svn', '.git', '.gitignore'],
-      notify  => Exec["concat_${name}"],
-      purge   => true,
-      recurse => true,
-    }
-
-    file { "${fragdir}/fragments.concat":
-      ensure => present,
-      mode   => '0640',
-    }
-
-    file { "${fragdir}/${concat_name}":
-      ensure => present,
-      mode   => '0640',
-    }
-
-    file { $name:
-      ensure  => present,
-      owner   => $owner,
-      group   => $group,
-      mode    => $mode,
-      replace => $replace,
-      path    => $path,
-      alias   => "concat_${name}",
-      source  => "${fragdir}/${concat_name}",
-      backup  => $backup,
-    }
-
-    # remove extra whitespace from string interpolation to make testing easier
-    $command = strip(regsubst("${script_command} -o \"${fragdir}/${concat_name}\" -d \"${fragdir}\" ${warnflag} ${forceflag} ${orderflag} ${newlineflag}", '\s+', ' ', 'G'))
-
-    # if puppet is running as root, this exec should also run as root to allow
-    # the concatfragments.sh script to potentially be installed in path that
-    # may not be accessible by a target non-root owner.
-    exec { "concat_${name}":
-      alias     => "concat_${fragdir}",
-      command   => $command,
-      notify    => File[$name],
-      subscribe => File[$fragdir],
-      unless    => "${command} -t",
-      path      => $::path,
-      require   => [
-        File[$fragdir],
-        File["${fragdir}/fragments"],
-        File["${fragdir}/fragments.concat"],
-      ],
-    }
-  } else {
-    file { [
-      $fragdir,
-      "${fragdir}/fragments",
-      "${fragdir}/fragments.concat",
-      "${fragdir}/${concat_name}"
-    ]:
-      ensure => absent,
-      force  => true,
-    }
-
-    file { $path:
-      ensure => absent,
-      backup => $backup,
-    }
-
-    $absent_exec_command = $::kernel ? {
-      'windows' => 'cmd.exe /c exit 0',
-      default   => 'true',
-    }
-
-    $absent_exec_path = $::kernel ? {
-      'windows' => $::path,
-      default   => '/bin:/usr/bin',
-    }
-
-    exec { "concat_${name}":
-      alias   => "concat_${fragdir}",
-      command => $absent_exec_command,
-      path    => $absent_exec_path
-    }
-  }
-}
-
-# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp
deleted file mode 100644
index 17674003cef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-# === Class: concat::setup
-#
-# Sets up the concat system. This is a private class.
-#
-# [$concatdir]
-#   is where the fragments live and is set on the fact concat_basedir.
-#   Since puppet should always manage files in $concatdir and they should
-#   not be deleted ever, /tmp is not an option.
-#
-# It also copies out the concatfragments.sh file to ${concatdir}/bin
-#
-class concat::setup {
-  if $caller_module_name != $module_name {
-    warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
-  }
-
-  if $::concat_basedir {
-    $concatdir = $::concat_basedir
-  } else {
-    fail ('$concat_basedir not defined. Try running again with pluginsync=true on the [master] and/or [main] section of your node\'s \'/etc/puppet/puppet.conf\'.')
-  }
-  
-  # owner and mode of fragment files (on windows owner and access rights should be inherited from concatdir and not explicitly set to avoid problems)
-  $fragment_owner = $osfamily ? { 'windows' => undef, default => $::id }
-  $fragment_mode  = $osfamily ? { 'windows' => undef, default => '0640' }
-
-  $script_name = $::kernel ? {
-    'windows' => 'concatfragments.rb',
-    default   => 'concatfragments.sh'
-  }
-
-  $script_path = "${concatdir}/bin/${script_name}"
-
-  $script_owner = $osfamily ? { 'windows' => undef, default => $::id }
-
-  $script_mode = $osfamily ? { 'windows' => undef, default => '0755' }
-
-  $script_command   = $::kernel ? {
-    'windows' => "ruby.exe ${script_path}",
-    default   => $script_path
-  }
-
-  File {
-    backup => false,
-  }
-
-  file { $script_path:
-    ensure => file,
-    owner  => $script_owner,
-    mode   => $script_mode,
-    source => "puppet:///modules/concat/${script_name}",
-  }
-
-  file { [ $concatdir, "${concatdir}/bin" ]:
-    ensure => directory,
-    mode   => '0755',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb
deleted file mode 100644
index 7b2858d8e90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat backup parameter' do
-  context '=> puppet' do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => 'puppet',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-        expect(r.stdout).to match(/Filebucketed \/tmp\/concat\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents'
-      end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-  end
-
-  context '=> .backup' do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => '.backup',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    # XXX Puppet doesn't mention anything about filebucketing with a given
-    # extension like .backup
-    it 'applies the manifest twice  no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-    describe file('/tmp/concat/file.backup') do
-      it { should be_file }
-      it { should contain 'old contents' }
-    end
-  end
-
-  # XXX The backup parameter uses validate_string() and thus can't be the
-  # boolean false value, but the string 'false' has the same effect in Puppet 3
-  context "=> 'false'" do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => '.backup',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-        expect(r.stdout).to_not match(/Filebucketed/)
-      end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb
deleted file mode 100644
index 89919cc53b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'basic concat test' do
-
-  shared_examples 'successfully_applied' do |pp|
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file("#{default['puppetvardir']}/concat") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/bin") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/bin/concatfragments.sh") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      #it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 750 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 750 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments.concat") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments.concat.out") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-  end
-
-  context 'owner/group root' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        owner => 'root',
-        group => 'root',
-        mode  => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it_behaves_like 'successfully_applied', pp
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 644 }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/01_1") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/02_2") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-  end
-
-  context 'owner/group non-root' do
-    before(:all) do
-      shell "groupadd -g 64444 bob"
-      shell "useradd -u 42 -g 64444 bob"
-    end
-    after(:all) do
-      shell "userdel bob"
-    end
-
-    pp="
-      concat { '/tmp/concat/file':
-        owner => 'bob',
-        group => 'bob',
-        mode  => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    "
-
-    it_behaves_like 'successfully_applied', pp
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should be_owned_by 'bob' }
-      it { should be_grouped_into 'bob' }
-      it { should be_mode 644 }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/01_1") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-      it { should contain '1' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/02_2") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-      it { should contain '2' }
-    end
-  end
-
-  context 'ensure' do
-    context 'works when set to present with path set' do
-      pp="
-        concat { 'file':
-          ensure => present,
-          path   => '/tmp/concat/file',
-          mode   => '0644',
-        }
-        concat::fragment { '1':
-          target  => 'file',
-          content => '1',
-          order   => '01',
-        }
-      "
-
-      it_behaves_like 'successfully_applied', pp
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should be_mode 644 }
-        it { should contain '1' }
-      end
-    end
-    context 'works when set to absent with path set' do
-      pp="
-        concat { 'file':
-          ensure => absent,
-          path   => '/tmp/concat/file',
-          mode   => '0644',
-        }
-        concat::fragment { '1':
-          target  => 'file',
-          content => '1',
-          order   => '01',
-        }
-      "
-
-      # Can't used shared examples as this will always trigger the exec when
-      # absent is set.
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should_not be_file }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
deleted file mode 100644
index f139d818c6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'deprecation warnings' do
-
-  shared_examples 'has_warning'do |pp, w|
-    it 'applies the manifest twice with a stderr regex' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m)
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m)
-    end
-  end
-
-  context 'concat gnu parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        gnu => 'foo',
-      }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-      }
-    EOS
-    w = 'The $gnu parameter to concat is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat warn parameter =>' do
-    ['true', 'yes', 'on'].each do |warn|
-      context warn do
-        pp = <<-EOS
-          concat { '/tmp/concat/file':
-            warn => '#{warn}',
-          }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'bar',
-          }
-        EOS
-        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-        it_behaves_like 'has_warning', pp, w
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
-          it { should contain 'bar' }
-        end
-      end
-    end
-
-    ['false', 'no', 'off'].each do |warn|
-      context warn do
-        pp = <<-EOS
-          concat { '/tmp/concat/file':
-            warn => '#{warn}',
-          }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'bar',
-          }
-        EOS
-        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-        it_behaves_like 'has_warning', pp, w
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
-          it { should contain 'bar' }
-        end
-      end
-    end
-  end
-
-  context 'concat::fragment ensure parameter' do
-    context 'target file exists' do
-      before(:all) do
-        shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      end
-      after(:all) do
-        # XXX this test may leave behind a symlink in the fragment directory
-        # which could cause warnings and/or breakage from the subsequent tests
-        # unless we clean it up. 
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-        shell('mkdir -p /tmp/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-        concat::fragment { 'foo':
-          target => '/tmp/concat/file',
-          ensure => '/tmp/concat/file1',
-        }
-      EOS
-      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
-
-      it_behaves_like 'has_warning', pp, w
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain 'file1 contents' }
-      end
-
-      describe 'the fragment can be changed from a symlink to a plain file' do
-        pp = <<-EOS
-          concat { '/tmp/concat/file': }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'new content',
-          }
-        EOS
-
-        it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-        end
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain 'new content' }
-          it { should_not contain 'file1 contents' }
-        end
-      end
-    end # target file exists
-
-    context 'target does not exist' do
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-        concat::fragment { 'foo':
-          target => '/tmp/concat/file',
-          ensure => '/tmp/concat/file1',
-        }
-      EOS
-      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
-
-      it_behaves_like 'has_warning', pp, w
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-      end
-
-      describe 'the fragment can be changed from a symlink to a plain file' do
-        pp = <<-EOS
-          concat { '/tmp/concat/file': }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'new content',
-          }
-        EOS
-
-        it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-        end
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain 'new content' }
-        end
-      end
-    end # target file exists
-
-  end # concat::fragment ensure parameter
-
-  context 'concat::fragment mode parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        mode    => 'bar',
-      }
-    EOS
-    w = 'The $mode parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment owner parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        owner   => 'bar',
-      }
-    EOS
-    w = 'The $owner parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment group parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        group   => 'bar',
-      }
-    EOS
-    w = 'The $group parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment backup parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        backup  => 'bar',
-      }
-    EOS
-    w = 'The $backup parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'include concat::setup' do
-    pp = <<-EOS
-      include concat::setup
-    EOS
-    w = 'concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb
deleted file mode 100644
index 09995282a33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat force empty parameter' do
-  context 'should run successfully' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        owner => root,
-        group => root,
-        mode  => '0644',
-        force => true,
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should_not contain '1\n2' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
deleted file mode 100644
index 3afd53430db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat::fragment source' do
-  context 'should read file fragments from local system' do
-    before(:all) do
-      shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      shell("/bin/echo 'file2 contents' > /tmp/concat/file2")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        source  => '/tmp/concat/file1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string1 contents',
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        source  => '/tmp/concat/file2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should contain 'string1 contents' }
-      it { should contain 'file2 contents' }
-    end
-  end # should read file fragments from local system
-
-  context 'should create files containing first match only.' do
-    before(:all) do
-      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      shell("/bin/echo 'file2 contents' > /tmp/concat/file2")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/result_file1':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-      concat { '/tmp/concat/result_file2':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-      concat { '/tmp/concat/result_file3':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/result_file1',
-        source => [ '/tmp/concat/file1', '/tmp/concat/file2' ],
-        order   => '01',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/result_file2',
-        source => [ '/tmp/concat/file2', '/tmp/concat/file1' ],
-        order   => '01',
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/result_file3',
-        source => [ '/tmp/concat/file1', '/tmp/concat/file2' ],
-        order   => '01',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-    describe file('/tmp/concat/result_file1') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should_not contain 'file2 contents' }
-    end
-    describe file('/tmp/concat/result_file2') do
-      it { should be_file }
-      it { should contain 'file2 contents' }
-      it { should_not contain 'file1 contents' }
-    end
-    describe file('/tmp/concat/result_file3') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should_not contain 'file2 contents' }
-    end
-  end
-
-  context 'should fail if no match on source.' do
-    before(:all) do
-      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      shell('mkdir -p /tmp/concat')
-      shell('/bin/rm -rf /tmp/concat/fail_no_source /tmp/concat/nofilehere /tmp/concat/nothereeither')
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/fail_no_source':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/fail_no_source',
-        source => [ '/tmp/concat/nofilehere', '/tmp/concat/nothereeither' ],
-        order   => '01',
-      }
-    EOS
-
-    it 'applies the manifest with resource failures' do
-      apply_manifest(pp, :expect_failures => true)
-    end
-    describe file('/tmp/concat/fail_no_source') do
-      #FIXME: Serverspec::Type::File doesn't support exists? for some reason. so... hack.
-      it { should_not be_file }
-      it { should_not be_directory }
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb
deleted file mode 100644
index 1e989df2ab1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat ensure_newline parameter' do
-  context '=> false' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        ensure_newline => false,
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '12' }
-    end
-  end
-
-  context '=> true' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        ensure_newline => true,
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes  => true).stderr).to eq("")
-      #XXX ensure_newline => true causes changes on every run because the files
-      #are modified in place.
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain "1\n2\n" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
deleted file mode 100644
index f0ae87a5c82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  pe-aix-71-acceptance:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-      - default
-    platform: aix-7.1-power
-    hypervisor: aix
-    ip: pe-aix-71-acceptance.delivery.puppetlabs.net
-CONFIG:
-  type: pe
-  nfs_server: NONE
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 19181c123d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index 3e6a3a9dddf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-x64.localhost:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ae812b0aef9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64.localdomain:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index 554c37a505c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index cba1cd04c25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb
deleted file mode 100644
index 8bcb7131ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat order' do
-  before(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-    shell('mkdir -p /tmp/concat')
-  end
-
-  context '=> alpha' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo':
-        order => 'alpha'
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-      }
-      concat::fragment { '10':
-        target  => '/tmp/concat/foo',
-        content => 'string10',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string10\nstring1\nsring2" }
-    end
-  end
-
-  context '=> numeric' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo':
-        order => 'numeric'
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-      }
-      concat::fragment { '10':
-        target  => '/tmp/concat/foo',
-        content => 'string10',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string1\nstring2\nsring10" }
-    end
-  end
-end # concat order
-
-describe 'concat::fragment order' do
-  before(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-    shell('mkdir -p /tmp/concat')
-  end
-
-  context '=> reverse order' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-        order   => '15',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-        # default order 10
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        content => 'string3',
-        order   => '1',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string3\nstring2\nsring1" }
-    end
-  end
-
-  context '=> normal order' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-        order   => '01',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-        order   => '02'
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        content => 'string3',
-        order   => '03',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string1\nstring2\nsring3" }
-    end
-  end
-end # concat::fragment order
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
deleted file mode 100644
index af352efce83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'quoted paths' do
-  before(:all) do
-    shell('rm -rf "/tmp/concat test" /var/lib/puppet/concat')
-    shell('mkdir -p "/tmp/concat test"')
-  end
-
-  context 'path with blanks' do
-    pp = <<-EOS
-      concat { '/tmp/concat test/foo':
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat test/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat test/foo',
-        content => 'string2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat test/foo') do
-      it { should be_file }
-      it { should contain "string1\nsring2" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb
deleted file mode 100644
index 7b31e09c440..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'replacement of' do
-  context 'file' do
-    context 'should not succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('echo "file exists" > /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => false,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain 'file exists' }
-        it { should_not contain '1' }
-        it { should_not contain '2' }
-      end
-    end
-
-    context 'should succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('echo "file exists" > /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should_not contain 'file exists' }
-        it { should contain '1' }
-        it { should contain '2' }
-      end
-    end
-  end # file
-
-  context 'symlink' do
-    context 'should not succeed' do
-      # XXX the core puppet file type will replace a symlink with a plain file
-      # when using ensure => present and source => ... but it will not when using
-      # ensure => present and content => ...; this is somewhat confusing behavior
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('ln -s /tmp/concat/dangling /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => false,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_linked_to '/tmp/concat/dangling' }
-      end
-
-      describe file('/tmp/concat/dangling') do
-        # XXX serverspec does not have a matcher for 'exists'
-        it { should_not be_file }
-        it { should_not be_directory }
-      end
-    end
-
-    context 'should succeed' do
-      # XXX the core puppet file type will replace a symlink with a plain file
-      # when using ensure => present and source => ... but it will not when using
-      # ensure => present and content => ...; this is somewhat confusing behavior
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('ln -s /tmp/concat/dangling /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain '1' }
-        it { should contain '2' }
-      end
-    end
-  end # symlink
-
-  context 'directory' do
-    context 'should not succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with stderr for changing to file' do
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_directory }
-      end
-    end
-
-    # XXX concat's force param currently enables the creation of empty files
-    # when there are no fragments, and the replace param will only replace
-    # files and symlinks, not directories.  The semantics either need to be
-    # changed, extended, or a new param introduced to control directory
-    # replacement.
-    context 'should succeed', :pending => 'not yet implemented' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          force => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain '1' }
-      end
-    end
-  end # directory
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
deleted file mode 100644
index 7267f5e6b43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'symbolic name' do
-  pp = <<-EOS
-    concat { 'not_abs_path':
-      path => '/tmp/concat/file',
-    }
-
-    concat::fragment { '1':
-      target  => 'not_abs_path',
-      content => '1',
-      order   => '01',
-    }
-
-    concat::fragment { '2':
-      target  => 'not_abs_path',
-      content => '2',
-      order   => '02',
-    }
-  EOS
-
-  it 'applies the manifest twice with no stderr' do
-    expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-    expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-  end
-
-  describe file('/tmp/concat/file') do
-    it { should be_file }
-    it { should contain '1' }
-    it { should contain '2' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb
deleted file mode 100644
index cb0b7430dc8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat warn =>' do
-  context 'true should enable default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => true,
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-  context 'false should not enable default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => false,
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-  context '# foo should overide default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => '# foo',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '# foo' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 22bd72f06a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on hosts, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'concat')
-    hosts.each do |host|
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-
-  c.before(:all) do
-    shell('mkdir -p /tmp/concat')
-  end
-  c.after(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-  end
-
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
deleted file mode 100644
index bba455ab91d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'concat::setup', :type => :class do
-
-  shared_examples 'setup' do |concatdir|
-    concatdir = '/foo' if concatdir.nil?
-
-    let(:facts) {{ :concat_basedir => concatdir }}
-
-    it do
-      should contain_file("#{concatdir}/bin/concatfragments.sh").with({
-        :mode   => '0755',
-        :source => 'puppet:///modules/concat/concatfragments.sh',
-        :backup => false,
-      })
-    end
-
-    [concatdir, "#{concatdir}/bin"].each do |file|
-      it do
-        should contain_file(file).with({
-          :ensure => 'directory',
-          :mode   => '0755',
-          :backup => false,
-        })
-      end
-    end
-  end
-
-  context 'facts' do
-    context 'concat_basedir =>' do
-      context '/foo' do
-        it_behaves_like 'setup', '/foo'
-      end
-    end
-  end # facts
-
-  context 'deprecated as a public class' do
-    it 'should create a warning' do
-      pending('rspec-puppet support for testing warning()')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
deleted file mode 100644
index 3b5269e8d56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-require 'spec_helper'
-
-describe 'concat::fragment', :type => :define do
-
-  shared_examples 'fragment' do |title, params|
-    params = {} if params.nil?
-
-    p = {
-      :content => nil,
-      :source  => nil,
-      :order   => 10,
-      :ensure  => 'present',
-    }.merge(params)
-
-    safe_name        = title.gsub(/[\/\n]/, '_')
-    safe_target_name = p[:target].gsub(/[\/\n]/, '_')
-    concatdir        = '/var/lib/puppet/concat'
-    fragdir          = "#{concatdir}/#{safe_target_name}"
-    id               = 'root'
-    if p[:ensure] == 'absent'
-      safe_ensure = p[:ensure] 
-    else
-      safe_ensure = 'file'
-    end
-
-    let(:title) { title }
-    let(:facts) {{ :concat_basedir => concatdir, :id => id }}
-    let(:params) { params }
-    let(:pre_condition) do
-      "concat{ '#{p[:target]}': }"
-    end
-
-    it do
-      should contain_class('concat::setup')
-      should contain_concat(p[:target])
-      should contain_file("#{fragdir}/fragments/#{p[:order]}_#{safe_name}").with({
-        :ensure  => safe_ensure,
-        :owner   => id,
-        :mode    => '0640',
-        :source  => p[:source],
-        :content => p[:content],
-        :alias   => "concat_fragment_#{title}",
-        :backup  => false,
-      })
-    end
-  end
-
-  context 'title' do
-    ['0', '1', 'a', 'z'].each do |title|
-      it_behaves_like 'fragment', title, {
-        :target  => '/etc/motd',
-      }
-    end
-  end # title
-
-  context 'target =>' do
-    ['./etc/motd', 'etc/motd', 'motd_header'].each do |target|
-      context target do
-        it_behaves_like 'fragment', target, {
-          :target  => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :target => false }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # target =>
-
-  context 'ensure =>' do
-    ['present', 'absent'].each do |ens|
-      context ens do
-        it_behaves_like 'fragment', 'motd_header', {
-          :ensure => ens,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'any value other than \'present\' or \'absent\'' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :ensure => 'invalid', :target => '/etc/motd' }}
-
-      it 'should create a warning' do
-        pending('rspec-puppet support for testing warning()')
-      end
-    end
-  end # ensure =>
-
-  context 'content =>' do
-    ['', 'ashp is our hero'].each do |content|
-      context content do
-        it_behaves_like 'fragment', 'motd_header', {
-          :content => content,
-          :target  => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :content => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # content =>
-
-  context 'source =>' do
-    ['', '/foo/bar', ['/foo/bar', '/foo/baz']].each do |source|
-      context source do
-        it_behaves_like 'fragment', 'motd_header', {
-          :source => source,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :source => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string or an Array/)
-      end
-    end
-  end # source =>
-
-  context 'order =>' do
-    ['', '42', 'a', 'z'].each do |order|
-      context '\'\'' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :order  => order,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :order => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # order =>
-
-  context 'more than one content source' do
-    error_msg = 'You cannot specify more than one of $content, $source, $ensure => /target'
-
-    context 'ensure => target and source' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target  => '/etc/motd',
-          :ensure  => '/foo',
-          :source  => '/bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-    context 'ensure => target and content' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target  => '/etc/motd',
-          :ensure  => '/foo',
-          :content => 'bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-    context 'source and content' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target => '/etc/motd',
-          :source => '/foo',
-          :content => 'bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-  end # more than one content source
-
-  describe 'deprecated parameter' do
-    context 'mode =>' do
-      context '1755' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :mode   => '1755',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # mode =>
-
-    context 'owner =>' do
-      context 'apenny' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :owner  => 'apenny',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # owner =>
-
-    context 'group =>' do
-      context 'apenny' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :group  => 'apenny',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # group =>
-
-    context 'backup =>' do
-      context 'foo' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :backup => 'foo',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # backup =>
-  end # deprecated params
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb
deleted file mode 100644
index 9fdd7b26f12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-require 'spec_helper'
-
-describe 'concat', :type => :define do
-
-  shared_examples 'concat' do |title, params, id| 
-    params = {} if params.nil?
-    id = 'root' if id.nil?
-
-    # default param values
-    p = {
-      :ensure         => 'present',
-      :path           => title,
-      :owner          => nil,
-      :group          => nil,
-      :mode           => '0644',
-      :warn           => false,
-      :force          => false,
-      :backup         => 'puppet',
-      :replace        => true,
-      :order          => 'alpha',
-      :ensure_newline => false,
-    }.merge(params)
-
-    safe_name            = title.gsub('/', '_')
-    concatdir            = '/var/lib/puppet/concat'
-    fragdir              = "#{concatdir}/#{safe_name}"
-    concat_name          = 'fragments.concat.out'
-    default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
-
-    file_defaults = {
-      :backup  => false,
-    }
-
-    let(:title) { title }
-    let(:params) { params }
-    let(:facts) {{ :concat_basedir => concatdir, :id => id }}
-
-    if p[:ensure] == 'present'
-      it do
-        should contain_file(fragdir).with(file_defaults.merge({
-          :ensure => 'directory',
-          :mode   => '0750',
-        }))
-      end
-
-      it do
-        should contain_file("#{fragdir}/fragments").with(file_defaults.merge({
-          :ensure  => 'directory',
-          :mode    => '0750',
-          :force   => true,
-          :ignore  => ['.svn', '.git', '.gitignore'],
-          :purge   => true,
-          :recurse => true,
-        }))
-      end
-
-      [
-        "#{fragdir}/fragments.concat",
-        "#{fragdir}/#{concat_name}",
-      ].each do |file|
-        it do
-          should contain_file(file).with(file_defaults.merge({
-            :ensure => 'present',
-            :mode   => '0640',
-          }))
-        end
-      end
-
-      it do
-        should contain_file(title).with(file_defaults.merge({
-          :ensure  => 'present',
-          :owner   => p[:owner],
-          :group   => p[:group],
-          :mode    => p[:mode],
-          :replace => p[:replace],
-          :path    => p[:path],
-          :alias   => "concat_#{title}",
-          :source  => "#{fragdir}/#{concat_name}",
-          :backup  => p[:backup],
-        }))
-      end
-
-      cmd = "#{concatdir}/bin/concatfragments.sh " +
-            "-o \"#{concatdir}/#{safe_name}/fragments.concat.out\" " +
-            "-d \"#{concatdir}/#{safe_name}\""
-
-      # flag order: fragdir, warnflag, forceflag, orderflag, newlineflag 
-      if p.has_key?(:warn)
-        case p[:warn]
-        when TrueClass
-          message = default_warn_message
-        when 'true', 'yes', 'on'
-          # should generate a stringified boolean warning
-          message = default_warn_message
-        when FalseClass
-          message = nil
-        when 'false', 'no', 'off'
-          # should generate a stringified boolean warning
-          message = nil
-        else
-          message = p[:warn]
-        end
-
-        unless message.nil?
-          cmd += " -w \'#{message}\'"
-        end
-      end
-
-      cmd += " -f" if p[:force]
-      cmd += " -n" if p[:order] == 'numeric'
-      cmd += " -l" if p[:ensure_newline] == true
-
-      it do
-        should contain_exec("concat_#{title}").with({
-          :alias   => "concat_#{fragdir}",
-          :command => cmd,
-          :unless  => "#{cmd} -t",
-        })
-      end
-    else
-      [
-        fragdir,
-        "#{fragdir}/fragments",
-        "#{fragdir}/fragments.concat",
-        "#{fragdir}/#{concat_name}",
-      ].each do |file|
-        it do
-          should contain_file(file).with(file_defaults.merge({
-            :ensure => 'absent',
-            :backup => false,
-            :force  => true,
-          }))
-        end
-      end
-
-      it do
-        should contain_file(title).with(file_defaults.merge({
-          :ensure => 'absent',
-          :backup => p[:backup],
-        }))
-      end
-
-      it do
-        should contain_exec("concat_#{title}").with({
-          :alias   => "concat_#{fragdir}",
-          :command => 'true',
-          :path    => '/bin:/usr/bin',
-        })
-      end
-    end
-  end
-
-  context 'title' do
-    context 'without path param' do
-      # title/name is the default value for the path param. therefore, the
-      # title must be an absolute path unless path is specified
-      ['/foo', '/foo/bar', '/foo/bar/baz'].each do |title|
-        context title do
-          it_behaves_like 'concat', '/etc/foo.bar'
-        end
-      end
-
-      ['./foo', 'foo', 'foo/bar'].each do |title|
-        context title do
-          let(:title) { title }
-          it 'should fail' do
-            expect { should }.to raise_error(Puppet::Error, /is not an absolute path/)
-          end
-        end
-      end
-    end
-
-    context 'with path param' do
-      ['./foo', 'foo', 'foo/bar'].each do |title|
-        context title do
-          it_behaves_like 'concat', title, { :path => '/etc/foo.bar' }
-        end
-      end
-    end
-  end # title =>
-
-  context 'as non-root user' do
-    it_behaves_like 'concat', '/etc/foo.bar', {}, 'bob'
-  end
-
-  context 'ensure =>' do
-    ['present', 'absent'].each do |ens|
-      context ens do
-        it_behaves_like 'concat', '/etc/foo.bar', { :ensure => ens }
-      end
-    end
-
-    context 'invalid' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :ensure => 'invalid' }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^present$|^absent$"')}/)
-      end
-    end
-  end # ensure =>
-
-  context 'path =>' do
-    context '/foo' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :path => '/foo' }
-    end
-
-    ['./foo', 'foo', 'foo/bar', false].each do |path|
-      context path do
-        let(:title) { '/etc/foo.bar' }
-        let(:params) {{ :path => path }}
-        it 'should fail' do
-          expect { should }.to raise_error(Puppet::Error, /is not an absolute path/)
-        end
-      end
-    end
-  end # path =>
-
-  context 'owner =>' do
-    context 'apenney' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :owner => 'apenny' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :owner => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # owner =>
-
-  context 'group =>' do
-    context 'apenney' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :group => 'apenny' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :group => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # group =>
-
-  context 'mode =>' do
-    context '1755' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :mode => '1755' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :mode => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # mode =>
-
-  context 'warn =>' do
-    [true, false, '# foo'].each do |warn|
-      context warn do
-        it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
-      end
-    end
-
-    context '(stringified boolean)' do
-      ['true', 'yes', 'on', 'false', 'no', 'off'].each do |warn|
-        context warn do
-          it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
-
-          it 'should create a warning' do
-            pending('rspec-puppet support for testing warning()')
-          end
-        end
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :warn => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string or boolean/)
-      end
-    end
-  end # warn =>
-
-  context 'force =>' do
-    [true, false].each do |force|
-      context force do
-        it_behaves_like 'concat', '/etc/foo.bar', { :force => force }
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :force => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # force =>
-
-  context 'backup =>' do
-    context 'reverse' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :backup => 'reverse' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :backup => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # backup =>
-
-  context 'replace =>' do
-    [true, false].each do |replace|
-      context replace do
-        it_behaves_like 'concat', '/etc/foo.bar', { :replace => replace }
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :replace => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # replace =>
-
-  context 'order =>' do
-    ['alpha', 'numeric'].each do |order|
-      context order do
-        it_behaves_like 'concat', '/etc/foo.bar', { :order => order }
-      end
-    end
-
-    context 'invalid' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :order => 'invalid' }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^alpha$|^numeric$"')}/)
-      end
-    end
-  end # order =>
-
-  context 'ensure_newline =>' do
-    [true, false].each do |ensure_newline|
-      context 'true' do
-        it_behaves_like 'concat', '/etc/foo.bar', { :ensure_newline => ensure_newline}
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :ensure_newline => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # ensure_newline =>
-
-  describe 'deprecated parameter' do
-    context 'gnu =>' do
-      context 'foo' do
-        it_behaves_like 'concat', '/etc/foo.bar', { :gnu => 'foo'}
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end
-  end
-
-end
-
-# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
deleted file mode 100644
index 41bc90f1594..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'concat_basedir', :type => :fact do
-  before(:each) { Facter.clear }
-
-  context 'Puppet[:vardir] ==' do
-    it '/var/lib/puppet' do
-      Puppet.stubs(:[]).with(:vardir).returns('/var/lib/puppet')
-      Facter.fact(:concat_basedir).value.should == '/var/lib/puppet/concat'
-    end
-
-    it '/home/apenny/.puppet/var' do
-      Puppet.stubs(:[]).with(:vardir).returns('/home/apenny/.puppet/var')
-      Facter.fact(:concat_basedir).value.should == '/home/apenny/.puppet/var/concat'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp
deleted file mode 100644
index a2dfaca2905..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-concat { 'testconcat':
-  ensure => present,
-  path   => '/tmp/concat',
-  owner  => 'root',
-  group  => 'root',
-  mode   => '0664',
-}
-
-concat::fragment { '1':
-  target  => 'testconcat',
-  content => '1',
-  order   => '01',
-}
-
-concat::fragment { '2':
-  target  => 'testconcat',
-  content => '2',
-  order   => '02',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp
deleted file mode 100644
index fd21427180f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-concat { '/tmp/concat':
-  ensure => present,
-  force  => true,
-  owner  => 'root',
-  group  => 'root',
-  mode   => '0644',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile
deleted file mode 100644
index 42968dff1bf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile
+++ /dev/null
@@ -1,6 +0,0 @@
-forge "http://forge.puppetlabs.com"
-
-mod 'php', :git => 'https://github.com/puphpet/puppet-php.git'
-mod 'composer', :git => 'https://github.com/puphpet/puppet-composer.git'
-mod 'puphpet', :git => 'https://github.com/puphpet/puppet-puphpet.git'
-mod 'puppi', :git => 'https://github.com/puphpet/puppi.git'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README
deleted file mode 100644
index d546e570ab3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README
+++ /dev/null
@@ -1,226 +0,0 @@
-DRUSH PUPPET MODULE
-===================
-
-This module manages Drush, a command line shell and scripting interface for
-Drupal.
-
-It can install and upgrade Drush from Debian packages or source, as well as
-download, enable and disable Drupal modules and themes, build codebases from
-Drush makefiles, run arbitrary Drush commands and optionally log its output.
-
-
-DEPENDENCIES
-------------
-
-None.
-
-
-REQUIREMENTS
-------------
-
-The Drush Puppet module is designed to work on Debian GNU/Linux systems and
-derivatives. It provides rudimentary support for apt-get, but defaults to
-letting the OS's default packaging system handle installation. As such, it
-should work with other *nix systems, assuming Drush is available for install
-in the OS's packaging system, or Drush is installed from source using the
-provided 'drush::git' class.
-
-
-INSTALLATION
-------------
-
-To use this module, follow these directions:
-
-1. Your modules directory will need all the files included in this
-   repository placed under a directory called "drush".
-
-2. To install Drush, add one of these entries to your manifests (such as in
-   manifests/nodes.pp):
-
-       include drush
-
-   or
-
-       class {'drush':
-         ensure => latest,
-       }
-
-  The following parameters are available:
-
-    api: The major version of Drush to install. Currently supports '4' or '5'.
-    dist: The Debian distribution from which to install via apt-get. Defaults
-        to 'stable'. Set to false to suppres adding custom sources for install
-        via apt-get.
-    ensure: What state the package should be in. Valid values are 'present'
-        (also called 'installed'), 'absent', 'purged', 'held', of 'latest'.
-
-2a. To install Drush from source, add one of these entries to your manifests:
-
-       include drush::git::drush
-
-   or
-
-       class {'drush::git::drush':
-         git_branch => '8.x-6.x',
-         update     => true,
-       }
-
-
-  The following parameters are available:
-
-    git_branch: The git branch to track.
-    git_tag: The git tag to check out.
-    git_url: The git URL from which to clone the repository.
-    update: Whether to update to the latest code with each Puppet run.
-        Defaults to false.
-
-
-USAGE
------
-
-1. To run a Drush command, use the drush::run defined type like so:
-
-       drush::run { '@dev uli --uid=42': }
-
-  The following parameters are all optional:
-
-    command: The command to run. Defaults to the name of the resource.
-    site_alias: The alias against which to run the command.
-    options: Options to pass to Drush.
-    arguments: Arguments to pass to the command.
-    site_path: The path to the site or code-base in which to run the command.
-    drush_user: The user under which to execute the command.
-    drush_home: Set the drush_user's home directory, for alias search paths.
-    log: Path to the logfile in which to log all Drush output.
-    creates, unless, onlyif, refreshonly: Control whether the command is
-        executed at each Puppet run. Identical to these paramaters on the
-        built-in 'exec' resource.
-    timeout: The maximum time the command should take, specified in seconds.
-        Defaults to 300 seconds. Disable the timeout by setting to 0.
-    paths: provide alternative paths to search for your Drush executable.
-
-2. To download projects from drupal.org to a site, add lines such as the
-   following to your manifests:
-
-       drush::dl {'token':
-         site_path => '/var/aegir/platforms/drupal/sites/example.com',
-         log       => '/var/aegir/drush.log',
-       }
-
-  The following parameters are all optional:
-
-    type: The type of package to download. Defaults to 'module'.
-    version: The version of the package to download.
-    site_path: Operates the same as for drush::run. Set this parameter to avoid
-        having a package downloaded repeatedly, as it will allow Puppet to see
-        whether it already exists. Alternatively, do not set this parameter to
-        have the package continuously updated.
-    site_alias, options, arguments, drush_user, drush_home, log: All operate
-        the same as for drush::run.
-
-3. To enable or disable projects on a Drupal site, add lines such as the following to your
-   manifests:
-
-       drush::en {'token':
-         site_alias => '@www.example.com',
-       }
-
-       drush::dis {'@prod devel, devel-generate':}
-
-  The following parameters are all optional:
-
-    site_alias, options, arguments, site_path, drush_user, drush_home, log: All
-        operate the same as for drush::run.
-
-4. To display the status of a site in your Puppet log, add lines such as the
-   following to your manifests:
-
-       drush::dis {'@prod status':
-         options => '--full',
-       }
-
-  The following parameters are all optional:
-
-    site_alias, options, arguments, site_path, drush_user, drush_home, log: All
-        operate the same as for drush::run.
-
-
-5. To build a Drupal code-base using Drush Make, add lines such as the following to your
-   manifests:
-
-       drush::make {'/var/aegir/platform/Drupal7':
-         makefile => '/var/aegir/makefiles/drupal7.make',
-       }
-
-  There is one required parameter:
-
-    makefile: The path to the makefile to use in building the code-base.
-
-  The following parameters are all optional:
-
-    make_path: The path to build the code-base. Defaults to the name of the
-        resource.
-    options, drush_user, drush_home, log: All operate the same as for
-        drush::run.
-
-
-6. The module also provides a simple way to clone git repos and keep them up-
-   to-date:
-
-       drush::git { 'git://git.drupal.org:project/provision':
-         path => '/var/aegir/.drush',
-       }
-
-  There is one required parameter:
-
-    path: Where to clone the git repo.
-
-  The following parameters are all optional:
-
-    git_branch: The git branch to checkout. 
-    git_tag: The git tag to check out. Overrides 'branch' if also specified.
-    git_repo: The git repository to clone. Defaults to the resource name.
-    dir_name: The name of the directory in which to clone the git repo.
-    update: Run 'git pull -r' in this repo on every Puppet run.
-    paths: Alternative search paths for your git binary.
-
-
-DEVELOPING
-----------
-
-The drush::run defined type provides a basis on which to build pretty much any
-Drush command imagineable. The other provided commands build upon it to provide
-convenience resources for common use-cases. While quite simple, they should
-form a good basis for creating your own custom defined types.
-
-For more complex examples, take a look at the puppet-aegir module, which
-extends this API further in the context of the Aegir Hosting System. It can be
-found at:
-
-    https://drupal.org/project/puppet-aegir
-
-Along similar lines, Skynet takes this way too far:
-
-    https://drupal.org/project/skynet
-
-The drush::git resource is a minimalist general-purpose function to allow
-cloning and updating git repositories. It is not intended to be a full-featured
-git class/resource. It will not attempt to install git for you either, but this
-should be sufficient:
-
-    package {'git':}
-
-This Puppet module is published under the GNU GPLv2 (General Public License,
-Version 2), and as such is, and will always remain, Free Software. Engagement
-in the development process by users and other developers is very much appreci-
-ated. So, please feel free to post to the issue queue, submit bug reports and
-feature requests, and ask questions about how to use or extend it.
-
-
--------------------------------------------------------------------------------
-Current maintainers: Christopher Gervais (mailto:chris@praxis.coop)
-                     Guillaume Boudrias (mailto:gboudrias@praxis.coop)
-Original authors: Christopher Gervais (mailto:chris@koumbit.org)
-                  Antoine Beaupré (mailto:anarcat@koumbit.org)
-Copyright:: Copyright (c) 2011-2013 Réseau Koumbit Networks
-License::   GPLv2 or later
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp
deleted file mode 100644
index 8d7ff585614..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-class drush::apt ( $dist = false, $backports = false) {
-
-  if $backports {
-    file { "/etc/apt/preferences.d/drush-${backports}.pref":
-      ensure  => 'present',
-      content => "Package: drush\nPin: release a=${backports}-backports\nPin-Priority: 1001\n",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-    }
-    file { "/etc/apt/sources.list.d/drush-${backports}-backports.list" :
-      ensure  => 'present',
-      content => "deb http://backports.debian.org/debian-backports ${backports}-backports main",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-    }
-  }
-  else {
-    file { [
-      "/etc/apt/preferences.d/drush-${backports}.pref",
-      "/etc/apt/sources.list.d/drush-${backports}-backports.list",
-    ]:
-      ensure => 'absent',
-      notify  => Exec['drush_update_apt'],
-    }
-  }
-
-  if $dist {
-    file { "/etc/apt/sources.list.d/drush-${dist}.list" :
-      ensure  => 'present',
-      content => "deb http://ftp.debian.org/debian ${dist} main",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-      before  => Exec['drush_apt_update'],
-    }
-  }
-
-  exec { 'drush_update_apt':
-    command     => 'apt-get update & sleep 1',
-    path        => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
-    refreshonly => true,
-  }
-
-  exec { 'drush_apt_update':
-    command  => 'apt-get update && /usr/bin/apt-get autoclean',
-    path     => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
-    schedule => daily,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp
deleted file mode 100644
index 9cbf1bcaabc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-define drush::dis (
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = $name }
-
-  drush::run {"drush-dis:${name}":
-    command    => 'pm-disable',
-    site_alias => $site_alias,
-    options    => $options,
-    arguments  => $real_args,
-    site_path  => $site_path,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp
deleted file mode 100644
index 89a9a290599..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-define drush::dl (
-  $type       = 'module',
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = "${name}" }
-
-  # Always download drush extensions without a site alias.
-  if $type == 'extension' { $real_alias = '@none' }
-  else { $real_alias = "${site_alias}" }
-
-  drush::run {"drush-dl:${name}":
-    command    => 'pm-download',
-    site_alias => $real_alias,
-    options    => $options,
-    arguments  => $real_args,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-  # Add an 'unless' argument depending on the project type.
-  case $type {
-    'module', 'theme': {
-      Drush::Run["drush-dl:${name}"] {
-        unless => "drush ${site_alias} pm-list | grep ${name}",
-      }
-    }
-    'extension': {
-      Drush::Run["drush-dl:${name}"] {
-        unless => "[ -d '${drush_home}/.drush/${name}' ]",
-      }
-    }
-  }
-
-  if defined(Drush::Run["drush-en:${name}"]) {
-    Drush::Run["drush-dl:${name}"] {
-      before +> Exec["drush-en:${name}"],
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp
deleted file mode 100644
index 036074968f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-define drush::en (
-  $site_alias  = $drush::params::site_alias,
-  $options     = $drush::params::options,
-  $arguments   = $drush::params::arguments,
-  $drush_user  = $drush::params::drush_user,
-  $drush_home  = $drush::params::drush_home,
-  $log         = $drush::params::log,
-  $refreshonly = false
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = $name }
-
-  drush::run {"drush-en:${name}":
-    command     => 'pm-enable',
-    site_alias  => $site_alias,
-    options     => $options,
-    arguments   => $real_args,
-    drush_user  => $drush_user,
-    drush_home  => $drush_home,
-    refreshonly => $refreshonly,
-    log         => $log,
-    unless      => "drush ${site_alias} pm-list --status=enabled | grep ${name}",
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp
deleted file mode 100644
index dc0598121bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-define drush::git (
-  $path,
-  $git_branch = '',
-  $git_tag    = '',
-  $git_repo   = false,
-  $dir_name   = false,
-  $update     = false,
-  $paths      = $drush::params::paths,
-  $user       = 'root',
-  ) {
-
-  # Default to the resource name if no explicit git repo is provided.
-  if $git_repo { $real_git_repo = $git_repo }
-  else         { $real_git_repo = $name }
-
-  # Figure out the path and directory name.
-  if $dir_name {
-    $real_path = "${path}/${dir_name}"
-    $real_dir  = $dir_name
-  }
-  else {
-    # Figure out the name of the cloned into directory from the git repo.
-    $repo_array   = split($real_git_repo, '[/]')
-    $last_element = $repo_array[-1]
-    $real_dir     = regsubst($last_element, '\.git$', '')
-    $real_path    = "${path}/${real_dir}"
-  }
-
-  exec {"drush-clone-repo:${name}":
-    command => "git clone ${real_git_repo} ${real_dir}",
-    creates => $real_path,
-    cwd     => $path,
-    user    => $user,
-    path    => $paths,
-    timeout => 0,
-  }
-
-  # The specific (tag) overrides the general (branch).
-  if $git_tag { $git_ref = $git_tag }
-  else        { $git_ref = $git_branch }
-
-  if $git_ref {
-    exec {"drush-checkout-ref:${name}":
-      command => "git checkout ${git_ref}",
-      cwd     => $real_path,
-      path    => $paths,
-      require => Exec["drush-clone-repo:${name}"],
-    }
-  }
-
-  if $update {
-    exec {"drush-update-repo:${name}":
-      command => 'git pull -r',
-      cwd     => $real_path,
-      path    => $paths,
-      require => Exec["drush-clone-repo:${name}"],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp
deleted file mode 100644
index 36680c63f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-class drush::git::drush (
-  $git_branch = '',
-  $git_tag    = '',
-  $git_repo   = 'https://github.com/drush-ops/drush.git',
-  $update     = false
-  ) inherits drush::params {
-
-  include php::params
-
-  Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/usr/share'], }
-
-  if ! defined(Package['git']) {
-    package { 'git':
-      ensure => present,
-      before => Drush::Git[$git_repo]
-    }
-  }
-
-  if ! defined(Class['composer']) {
-    class { 'composer':
-      target_dir      => '/usr/local/bin',
-      composer_file   => 'composer',
-      download_method => 'curl',
-      logoutput       => false,
-      tmp_path        => '/tmp',
-      php_package     => "${php::params::module_prefix}cli",
-      curl_package    => 'curl',
-      suhosin_enabled => false,
-    }
-  }
-
-  drush::git { $git_repo :
-    path       => '/usr/share',
-    git_branch => $git_branch,
-    git_tag    => $git_tag,
-    update     => $update,
-  }
-
-  composer::exec { 'drush':
-    cmd     => 'install',
-    cwd     => '/usr/share/drush',
-    require => Drush::Git[$git_repo],
-    notify  => File['symlink drush'],
-  }
-
-  file { 'symlink drush':
-    ensure  => link,
-    path    => '/usr/bin/drush',
-    target  => '/usr/share/drush/drush',
-    require => Composer::Exec['drush'],
-    notify  => Exec['first drush run'],
-  }
-
-  # Needed to download a Pear library
-  exec { 'first drush run':
-    command     => 'drush cache-clear drush',
-    refreshonly => true,
-    require     => File['symlink drush'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp
deleted file mode 100644
index 53325d537a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-class drush (
-  $api    = $drush::params::api,
-  $dist   = $drush::params::dist,
-  $ensure = $drush::params::ensure
-  ) inherits drush::params {
-
-  include drush::params
-
-  package { 'drush':
-    ensure  => $ensure,
-  }
-
-  case $operatingsystem {
-    /^(Debian|Ubuntu)$/: {
-      include drush::apt
-      Package['drush'] { require => Exec['drush_update_apt'] }
-    }
-  }
-
-  if $dist {
-
-    Package['drush'] { require => Class['drush::apt'] }
-
-    if $api == 4 { $backports = 'squeeze' }
-    else { $backports = '' }
-
-    class {'drush::apt':
-      dist => $dist,
-      backports => $backports,
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp
deleted file mode 100644
index e09efdfbb57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-define drush::make (
-  $makefile,
-  $make_path  = false,
-  $options    = $drush::params::options,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $make_path { $real_make_path = $make_path }
-  else { $real_make_path = $name }
-  $arguments = "${makefile} ${real_make_path}"
-
-  drush::run {"drush-make:${name}":
-    command    => 'make',
-    creates    => $make_path,
-    options    => $options,
-    arguments  => $arguments,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-    timeout    => 0,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp
deleted file mode 100644
index 1af2e4ae7cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class drush::params {
-
-  case $::operatingsystem {
-    'centos', 'redhat': {
-      $php_cli_package = 'php-cli'
-    }
-    'ubuntu', 'debian': {
-      $php_cli_package = 'php5-cli'
-    }
-    default: {
-      fail('The puppet-drush module only supports RHEL and Debian systems')
-    }
-  }
-
-  $drush_user = 'root'
-  $drush_home = '/root'
-  $site_alias = '@none'
-  $options    = ''
-  $arguments  = ''
-  $api        = 5
-  $dist       = false
-  $ensure     = 'present'
-  $site_path  = false
-  $log        = false
-  $creates    = false
-  $paths      = [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ]
-
-  if defined(Class['drush::git::drush']) {
-    $installed = Class['drush::git::drush']
-  }
-  else {
-    $installed = Class['drush']
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp
deleted file mode 100644
index 2b6c1d255ed..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-define drush::run (
-  $command     = false,
-  $site_alias  = $drush::params::site_alias,
-  $options     = $drush::params::options,
-  $arguments   = $drush::params::arguments,
-  $site_path   = $drush::params::site_path,
-  $drush_user  = $drush::params::drush_user,
-  $drush_home  = $drush::params::drush_home,
-  $log         = $drush::params::log,
-  $installed   = $drush::params::installed,
-  $creates     = $drush::params::creates,
-  $paths       = $drush::params::paths,
-  $timeout     = false,
-  $unless      = false,
-  $onlyif      = false,
-  $refreshonly = false
-  ) {
-
-  if $log { $log_output = " >> ${log} 2>&1" }
-
-  if $command { $real_command = $command }
-  else { $real_command = $name}
-
-  exec {"drush-run:${name}":
-    command     => "drush ${site_alias} --yes ${options} ${real_command} ${arguments} ${log_output}",
-    user        => $drush_user,
-    group       => $drush_user,
-    path        => $paths,
-    environment => "HOME=${drush_home}",
-    require     => $installed,
-  }
-
-  if $site_path {
-    Exec["drush-run:${name}"] { cwd => $site_path }
-  }
-
-  if $creates {
-    Exec["drush-run:${name}"] { creates => $creates }
-  }
-
-  if $timeout {
-    Exec["drush-run:${name}"] { timeout => $timeout }
-  }
-
-  if $unless {
-    Exec["drush-run:${name}"] { unless => $unless }
-  }
-
-  if $onlyif {
-    Exec["drush-run:${name}"] { onlyif => $onlyif }
-  }
-
-  if $refreshonly {
-    Exec["drush-run:${name}"] { refreshonly => $refreshonly }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp
deleted file mode 100644
index 3f7784bd4b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-define drush::status (
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  drush::run {"drush-status:${name}":
-    command    => 'core-status',
-    site_alias => $site_alias,
-    options    => $options,
-    arguments  => $arguments,
-    site_path  => $site_path,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module
deleted file mode 100644
index e430fc6c1d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module
+++ /dev/null
@@ -1 +0,0 @@
-drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile
deleted file mode 100644
index 6bb52efe911..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant::Config.run do |config|
-  config.vm.box = "Debian 6.0.7 x64"
-  config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210.box"
-
-  config.vm.provision :shell,
-    :path => "./tests/.ci/vagrant_test.sh"
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh
deleted file mode 100644
index 55ab628039f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-echo "Creating test environment..."
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e $SCRIPT_DIR/.module ]
-then
-  MODULE=`cat $SCRIPT_DIR/.module`
-else
-  echo "ERROR: The test script expects the name of the module to be in a file"
-  echo "       called '.module', in the same directory as the test script."
-  echo $SCRIPT_DIR
-  exit 1
-fi
-cd $SCRIPT_DIR
-cd ../..
-if [ -e manifests/init.pp ]
-then
-  MODULE_DIR=`pwd`
-else
-  echo "ERROR: The test script expects to be in <module_dir>/tests/.ci/, but"
-  echo "       cannot find the module's 'init.pp', from its current location."
-  echo $SCRIPT_DIR
-  exit 1
-fi
-rm -rf /tmp/$MODULE
-cp $MODULE_DIR /tmp/$MODULE -r
-cd /tmp/$MODULE
-wget http://ansi-color.googlecode.com/svn/tags/0.6/ansi-color/color >> /dev/null 2>&1
-mv ./color /usr/local/bin
-chmod a+x /usr/local/bin/color
-
-echo "Scanning for tests in '$MODULE' module..."
-FILES=`find /tmp/$MODULE/tests -name *.pp`
-COUNT=${#FILES[@]}
-PASSED=0
-FAILED=0
-TOTAL=0
-
-echo "Running tests..."
-for f in $FILES
-do
-  NAME=`basename $f`
-  echo "Running '$NAME' test..."
-  OUTPUT=`puppet apply --noop --modulepath=/tmp/ --color=ansi $f 2>&1`
-  STATUS=$?
-  if [ $STATUS -ne 0 ]
-  then
-    color red
-    echo "///////////////////////////////////////////////////////"
-    echo
-    echo "    ERROR in '$NAME' test."
-    echo "    Output from failed test:"
-    echo
-    echo $OUTPUT
-    echo
-    echo "///////////////////////////////////////////////////////"
-    color off
-    let FAILED++
-    let TOTAL++
-  else
-    color green
-    echo "'$NAME' test passed."
-    color off
-    let PASSED++
-    let TOTAL++
-  fi
-done
-
-echo "Total tests run: $TOTAL"
-color green
-echo "Tests passed: $PASSED"
-color red
-echo "Tests failed: $FAILED"
-color off
-
-rm -rf /tmp/$MODULE
-rm /usr/local/bin/color
-exit $FAILED
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh
deleted file mode 100644
index 162b7041737..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd /vagrant
-chmod a+x tests/.ci/test.sh
-./tests/.ci/test.sh
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp
deleted file mode 100644
index 4e5fa184044..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'drush::apt' : 
-  dist      => 'squeeze',
-  backports => 'squeeze',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp
deleted file mode 100644
index da0c41ab8bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush::defaults
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp
deleted file mode 100644
index 8b6519724dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-include drush
-
-drush::dis { 'devel': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp
deleted file mode 100644
index 4a7d19897aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::dl { 'token': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp
deleted file mode 100644
index c43afe3826f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::en { 'views': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp
deleted file mode 100644
index d33d4a68940..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include drush
-drush::git { 'git://git.drupal.org:project/provision.git' :
-  path => '/var/aegir/.drush',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp
deleted file mode 100644
index 6acc7e34d3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush::git::drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp
deleted file mode 100644
index 86f0b12cf02..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp
deleted file mode 100644
index 8df88a52532..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include drush
-drush::make { '/var/aegir/platforms/drupal7' :
-  makefile => '/var/aegir/makefiles/drupal7.make',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp
deleted file mode 100644
index b6f37a633d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::run { '@hostmaster hosting-dispatch' : }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp
deleted file mode 100644
index 9e562fa6bbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::status { '@none' : }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml
deleted file mode 100644
index e16c4080a12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
-  symlinks:
-    elasticsearch: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml
deleted file mode 100644
index c4a322e03f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-script:
-  - "rake lint"
-  - "rake parser_validate"
-  - "rake template_verify"
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
-gemfile: Gemfile
-notifications:
-  email:
-    recipients:
-      - richard.pijnenburg@elasticsearch.com
-    on_success: change
-    on_failure: always
-  hipchat:
-    rooms:
-      secure: "gFaED3lu9MRrmoojO2iagrfOaKAbCeQSqVZ9TsIo+qkqem8hwOsMuxsYQ9evPbPbanXQoVNALXTd4fgQW16+hfg/ClqI3nDtVZZJSy0W+U0yVZtz9TXFpi9Q/Z4TwK5TMdNMjemt0l2idY2SE3leHBZEeaIAGfLf0v38tCsNI84="
-    template:
-       - '@electrical %{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} %{build_url}'
-    on_success: change
-    on_failure: always
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG
deleted file mode 100644
index 90a59fc9308..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG
+++ /dev/null
@@ -1,91 +0,0 @@
-0.2.2 ( Jan 23, 2014 )
-  Ensure exec names are unique. This caused issues when using our logstash module
-  Add spec tests for plugin define
-
-0.2.1 ( Jan 22, 2014 )
-  Simplify the management of the defaults file ( PR #64 )
-  Doc improvements for the plugin define ( PR #66 )
-  Allow creation of data directory ( PR #68 )
-  Fail early when package version and package_url are defined
-
-0.2.0 ( Nov 19, 2013 )
-  Large rewrite of the entire module described below
-  Make the core more dynamic for different service providers and multi instance capable
-  Add better testing and devided into different files
-  Fix template function. Replace of template is now only done when the file is changed
-  Add different ways to install the package except from the repository ( puppet/http/https/ftp/file )
-  Update java class to install openjdk 1.7
-  Add tests for python function
-  Update config file template to fix scoping issue ( from PR #57 )
-  Add validation of templates
-  Small changes for preperation for system tests
-  Update readme for new functionality
-  Added more test scenario's
-  Added puppet parser validate task for added checking
-  Ensure we don't add stuff when removing the module
-  Update python client define
-  Add ruby client define
-  Add tests for ruby clients and update python client tests
-
-0.1.3 ( Sep 06, 2013 )
-  Exec path settings has been updated to fix warnings ( PR #37, #47 )
-  Adding define to install python bindings ( PR #43 )
-  Scope deprecation fixes ( PR #41 )
-  feature to install plugins ( PR #40 )
-
-0.1.2 ( Jun 21, 2013 )
-  Update rake file to ignore the param inherit
-  Added missing documentation to the template define
-  Fix for template define to allow multiple templates ( PR #36 by Bruce Morrison )
-
-0.1.1 ( Jun 14, 2013 )
-  Add Oracle Linux to the OS list ( PR #25 by Stas Alekseev )
-  Respect the restart_on_change on the defaults ( PR #29 by Simon Effenberg )
-  Make sure the config can be empty as advertised in the readme
-  Remove dependency cycle when the defaults file is updated ( PR #31 by Bruce Morrison )
-  Enable retry on the template insert in case ES isn't started yet ( PR #32 by Bruce Morrison )
-  Update templates to avoid deprecation notice with Puppet 3.2.x
-  Update template define to avoid auto insert issue with ES
-  Update spec tests to reflect changes to template define
-
-0.1.0 ( May 09, 2013 )
-  Populate .gitignore ( PR #19 by Igor Galić )
-  Add ability to install initfile ( PR #20 by Justin Lambert )
-  Add ability to manage default file* service parameters ( PR #21 by Mathieu Bornoz )
-  Providing complete containment of the module ( PR #24 by Brian Lalor )
-  Add ability to specify package version ( PR #25 by Justin Lambert )
-  Adding license file
-
-0.0.7 ( Mar 23, 2013 )
-  Ensure config directory is created and managed ( PR #13 by Martin Seener )
-  Dont backup package if it changes
-  Create explicit dependency on template directory ( PR #16 by Igor Galić )
-  Make the config directory variable ( PR #17 by Igor Galić and PR #18 by Vincent Janelle )
-  Fixing template define
-
-0.0.6 ( Mar 05, 2013 )
-  Fixing issue with configuration not printing out arrays
-  New feature to write the config hash shorter
-  Updated readme to reflect the new feature
-  Adding spec tests for config file generation
-
-0.0.5 ( Mar 03, 2013 )
-  Option to disable restart on config file change ( PR #10 by Chris Boulton )
-
-0.0.4 ( Mar 02, 2013 )
-  Fixed a major issue with the config template ( Issue #9 )
-
-0.0.3 ( Mar 02, 2013 )
-  Adding spec tests
-  Fixed init issue on Ubuntu ( Issue #6 by Marcus Furlong )
-  Fixed config template problem ( Issue #8 by surfchris )
-  New feature to manage templates
-
-0.0.2 ( Feb 16, 2013 )
-  Feature to supply a package instead of being dependent on the repository
-  Feature to install java in case one doesn't manage it externally
-  Adding RedHat and Amazon as Operating systems
-  fixed a typo - its a shard not a shared :) ( PR #5 by Martin Seener )
-
-0.0.1 ( Jan 13, 2013 )
-  Initial release of the module
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md
deleted file mode 100644
index 13f29e3307b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-If you have a bugfix or new feature that you would like to contribute to this puppet module, please find or open an issue about it first. Talk about what you would like to do. It may be that somebody is already working on it, or that there are particular issues that you should know about before implementing the change.
-
-We enjoy working with contributors to get their code accepted. There are many approaches to fixing a problem and it is important to find the best approach before writing too much code.
-
-The process for contributing to any of the Elasticsearch repositories is similar.
-
-1. Sign the contributor license agreement  
-Please make sure you have signed the [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
-
-2. Run the rspec tests and ensure it completes without errors with your changes.
-
-3. Rebase your changes
-Update your local repository with the most recent code from the main this puppet module repository, and rebase your branch on top of the latest master branch. We prefer your changes to be squashed into a single commit.
-
-4. Submit a pull request
-Push your local changes to your forked copy of the repository and submit a pull request. In the pull request, describe what your changes do and mention the number of the issue where discussion has taken place, eg “Closes #123″.
-
-Then sit back and wait. There will probably be discussion about the pull request and, if any changes are needed, we would love to work with you to get your pull request merged into this puppet module.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS
deleted file mode 100644
index ad0eb76c4d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS
+++ /dev/null
@@ -1,20 +0,0 @@
-The following is a list of people who have contributed ideas, code, bug
-reports, or in general have helped this puppet module along its way.
-
-Project Owner
-* Richard Pijnenburg (electrical)
-
-Contributors:
-Martin Seener (martinseener)
-Marcus Furlong (furlongm)
-Chris Boulton (chrisboulton)
-Igor Galić (igalic)
-Vincent Janelle (vjanelle)
-Mathieu Bornoz (mbornoz)
-Justin Lambert (jlambert121)
-Brian Lalor (blalor)
-Stas Alekseev (salekseev)
-Simon Effenberg (Savar)
-Bruce Morrison (brucem)
-deanmalmgren
-Matteo Sessa (msessa-cotd)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile
deleted file mode 100644
index 95b8d66d8f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE
deleted file mode 100644
index f8b711d55df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2012-2014 Elasticsearch <http://www.elasticsearch.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile
deleted file mode 100644
index 44aae1c8bda..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'elasticsearch-elasticsearch'
-version '0.2.2'
-source 'https://github.com/elasticsearch/puppet-elasticsearch'
-author 'elasticsearch'
-license 'Apache License, Version 2.0'
-summary 'Module for managing and configuring Elasticsearch nodes'
-description 'Module for managing and configuring Elasticsearch nodes'
-project_page 'https://github.com/elasticsearch/puppet-elasticsearch'
-dependency 'puppetlabs/stdlib', '>= 3.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md
deleted file mode 100644
index 12a12759d94..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# puppet-elasticsearch
-
-A puppet module for managing elasticsearch nodes
-
-http://www.elasticsearch.org/
-
-[![Build Status](https://travis-ci.org/elasticsearch/puppet-elasticsearch.png?branch=master)](https://travis-ci.org/elasticsearch/puppet-elasticsearch)
-
-## Usage
-
-Installation, make sure service is running and will be started at boot time:
-
-     class { 'elasticsearch': }
-
-Install a certain version:
-
-     class { 'elasticsearch':
-       version => '0.90.3'
-     }
-
-This assumes an elasticsearch package is already available to your distribution's package manager. To install it in a different way:
-
-To download from http/https/ftp source:
-
-     class { 'elasticsearch':
-       package_url => 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.7.deb'
-     }
-
-To download from a puppet:// source:
-
-     class { 'elasticsearch':
-       package_url => 'puppet:///path/to/elasticsearch-0.90.7.deb'
-     }
-
-Or use a local file source:
-
-     class { 'elasticsearch':
-       package_url => 'file:/path/to/elasticsearch-0.90.7.deb'
-     }
-
-Automatic upgrade of the software ( default set to false ):
-
-     class { 'elasticsearch':
-       autoupgrade => true
-     }
-
-Removal/decommissioning:
-
-     class { 'elasticsearch':
-       ensure => 'absent'
-     }
-
-Install everything but disable service(s) afterwards:
-
-     class { 'elasticsearch':
-       status => 'disabled'
-     }
-
-Disable automated restart of Elasticsearch on config file change:
-
-     class { 'elasticsearch':
-       restart_on_change => false
-     }
-
-For the config variable a hash needs to be passed:
-
-     class { 'elasticsearch':
-       config                   => {
-         'node'                 => {
-           'name'               => 'elasticsearch001'
-         },
-         'index'                => {
-           'number_of_replicas' => '0',
-           'number_of_shards'   => '5'
-         },
-         'network'              => {
-           'host'               => $::ipaddress
-         }
-       }
-     }
-
-Short write up of the config hash is also possible.
-
-Instead of writing the full hash representation:
-
-     class { 'elasticsearch':
-       config                 => {
-         'cluster'            => {
-           'name'             => 'ClusterName',
-           'routing'          => {
-             'allocation'     => {
-               'awareness'    => {
-                 'attributes' => 'rack'
-               }
-             }
-           }
-         }
-       }
-     }
-
-You can write the dotted key naming:
-
-     class { 'elasticsearch':
-       config => {
-         'cluster' => {
-           'name' => 'ClusterName',
-           'routing.allocation.awareness.attributes' => 'rack'
-         }
-       }
-     }
-
-
-## Manage templates
-
-### Add a new template
-
-This will install and/or replace the template in Elasticearch
-
-     elasticsearch::template { 'templatename':
-       file => 'puppet:///path/to/template.json'
-     }
-
-### Delete a template
-
-     elasticsearch::template { 'templatename':
-       ensure => 'absent'
-     }
-
-### Host
-
-  Default it uses localhost:9200 as host. you can change this with the 'host' and 'port' variables
-
-     elasticsearch::template { 'templatename':
-       host => $::ipaddress,
-       port => 9200
-     }
-
-## Bindings / clients
-
-Install a variety of [clients/bindings](http://www.elasticsearch.org/guide/clients/):
-
-### Python
-
-     elasticsearch::python { 'rawes': }
-
-### Ruby
-
-     elasticsearch::ruby { 'elasticsearch': }
-
-## Plugins
-
-Install [a variety of plugins](http://www.elasticsearch.org/guide/clients/):
-
-### From official repository:
-
-     elasticsearch::plugin{'mobz/elasticsearch-head':
-       module_dir => 'head'
-     }
-
-### From custom url:
-
-     elasticsearch::plugin{ 'elasticsearch-jetty':
-       module_dir => 'jetty',
-       url        => 'https://oss-es-plugins.s3.amazonaws.com/elasticsearch-jetty/elasticsearch-jetty-0.90.0.zip'
-     }
-
-## Java install
-
-For those that have no separate module for installation of java:
-
-     class { 'elasticsearch':
-       java_install => true
-     }
-
-If you want a specific java package/version:
-
-     class { 'elasticsearch':
-       java_install => true,
-       java_package => 'packagename'
-     }
-
-## Service providers
-
-Currently only the 'init' service provider is supported but others can be implemented quite easy.
-
-### init
-
-#### Defaults file
-
-You can populate the defaults file ( /etc/defaults/elasticsearch or /etc/sysconfig/elasticsearch )
-
-##### hash representation
-
-     class { 'elasticsearch':
-       init_defaults => { 'ES_USER' => 'elasticsearch', 'ES_GROUP' => 'elasticsearch' }
-     }
-
-##### file source
-
-     class { 'elasticsearch':
-       init_defaults_file => 'puppet:///path/to/defaults'
-     }
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile
deleted file mode 100644
index 425e032920f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-require './spec/lib/template_check_task.rb'
-require './spec/lib/parser_validate_task.rb'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send("disable_class_inherits_from_params_class")
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp
deleted file mode 100644
index a26886d4f00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp
+++ /dev/null
@@ -1,90 +0,0 @@
-# == Class: elasticsearch::config
-#
-# This class exists to coordinate all configuration related actions,
-# functionality and logical units in a central place.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::config': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::config {
-
-  #### Configuration
-
-  File {
-    owner => $elasticsearch::elasticsearch_user,
-    group => $elasticsearch::elasticsearch_group
-  }
-
-  Exec {
-    path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd  => '/',
-  }
-
-  if ( $elasticsearch::ensure == 'present' ) {
-
-    $notify_service = $elasticsearch::restart_on_change ? {
-      true  => Class['elasticsearch::service'],
-      false => undef,
-    }
-
-    file { $elasticsearch::confdir:
-      ensure => directory,
-      mode   => '0644',
-      purge  => $elasticsearch::purge_confdir,
-      force  => $elasticsearch::purge_confdir
-    }
-
-    file { "${elasticsearch::confdir}/elasticsearch.yml":
-      ensure  => file,
-      content => template("${module_name}/etc/elasticsearch/elasticsearch.yml.erb"),
-      mode    => '0644',
-      notify  => $notify_service
-    }
-
-    exec { 'mkdir_templates_elasticsearch':
-      command => "mkdir -p ${elasticsearch::confdir}/templates_import",
-      creates => "${elasticsearch::confdir}/templates_import"
-    }
-
-    file { "${elasticsearch::confdir}/templates_import":
-      ensure  => 'directory',
-      mode    => '0644',
-      require => Exec['mkdir_templates_elasticsearch']
-    }
-
-    if ( $elasticsearch::datadir != undef ) {
-      file { $elasticsearch::datadir:
-        ensure  => 'directory',
-        owner   => $elasticsearch::elasticsearch_user,
-        group   => $elasticsearch::elasticsearch_group,
-        mode    => '0770',
-      }
-    }
-
-  } elsif ( $elasticsearch::ensure == 'absent' ) {
-
-    file { $elasticsearch::confdir:
-      ensure  => 'absent',
-      recurse => true,
-      force   => true
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp
deleted file mode 100644
index fabfd78867e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp
+++ /dev/null
@@ -1,208 +0,0 @@
-# == Class: elasticsearch
-#
-# This class is able to install or remove elasticsearch on a node.
-# It manages the status of the related service.
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-#
-# [*autoupgrade*]
-#   Boolean. If set to <tt>true</tt>, any managed package gets upgraded
-#   on each Puppet run when the package provider is able to find a newer
-#   version than the present one. The exact behavior is provider dependent.
-#   Q.v.:
-#   * Puppet type reference: {package, "upgradeable"}[http://j.mp/xbxmNP]
-#   * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   Defaults to <tt>false</tt>.
-#
-# [*status*]
-#   String to define the status of the service. Possible values:
-#   * <tt>enabled</tt>: Service is running and will be started at boot time.
-#   * <tt>disabled</tt>: Service is stopped and will not be started at boot
-#     time.
-#   * <tt>running</tt>: Service is running but will not be started at boot time.
-#     You can use this to start a service on the first Puppet run instead of
-#     the system startup.
-#   * <tt>unmanaged</tt>: Service will not be started at boot time and Puppet
-#     does not care whether the service is running or not. For example, this may
-#     be useful if a cluster management software is used to decide when to start
-#     the service plus assuring it is running on the desired node.
-#   Defaults to <tt>enabled</tt>. The singular form ("service") is used for the
-#   sake of convenience. Of course, the defined status affects all services if
-#   more than one is managed (see <tt>service.pp</tt> to check if this is the
-#   case).
-#
-# [*version*]
-#   String to set the specific version you want to install.
-#   Defaults to <tt>false</tt>.
-#
-# [*restart_on_change*]
-#   Boolean that determines if the application should be automatically restarted
-#   whenever the configuration changes. Disabling automatic restarts on config
-#   changes may be desired in an environment where you need to ensure restarts
-#   occur in a controlled/rolling manner rather than during a Puppet run.
-#
-#   Defaults to <tt>true</tt>, which will restart the application on any config
-#   change. Setting to <tt>false</tt> disables the automatic restart.
-#
-# [*confdir*]
-#   Path to directory containing the elasticsearch configuration.
-#   Use this setting if your packages deviate from the norm (/etc/elasticsearch)
-#
-# [*plugindir*]
-#   Path to directory containing the elasticsearch plugins
-#   Use this setting if your packages deviate from the norm (/usr/share/elasticsearch/plugins)
-#
-# [*plugintool*]
-#   Path to directory containing the elasticsearch plugin installation script
-#   Use this setting if your packages deviate from the norm (/usr/share/elasticsearch/bin/plugin)
-#
-# The default values for the parameters are set in elasticsearch::params. Have
-# a look at the corresponding <tt>params.pp</tt> manifest file if you need more
-# technical information about them.
-#
-# === Examples
-#
-# * Installation, make sure service is running and will be started at boot time:
-#     class { 'elasticsearch': }
-#
-# * Removal/decommissioning:
-#     class { 'elasticsearch':
-#       ensure => 'absent',
-#     }
-#
-# * Install everything but disable service(s) afterwards
-#     class { 'elasticsearch':
-#       status => 'disabled',
-#     }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch(
-  $ensure              = $elasticsearch::params::ensure,
-  $status              = $elasticsearch::params::status,
-  $restart_on_change   = $elasticsearch::params::restart_on_change,
-  $autoupgrade         = $elasticsearch::params::autoupgrade,
-  $version             = false,
-  $package_provider    = 'package',
-  $package_url         = undef,
-  $package_dir         = $elasticsearch::params::package_dir,
-  $purge_package_dir   = $elasticsearch::params::purge_package_dir,
-  $elasticsearch_user  = $elasticsearch::params::elasticsearch_user,
-  $elasticsearch_group = $elasticsearch::params::elasticsearch_group,
-  $purge_confdir       = $elasticsearch::params::purge_confdir,
-  $service_provider    = 'init',
-  $init_defaults       = undef,
-  $init_defaults_file  = undef,
-  $init_template       = undef,
-  $config              = {},
-  $confdir             = $elasticsearch::params::confdir,
-  $datadir             = undef,
-  $plugindir           = $elasticsearch::params::plugindir,
-  $plugintool          = $elasticsearch::params::plugintool,
-  $java_install        = false,
-  $java_package        = undef
-) inherits elasticsearch::params {
-
-  anchor {'elasticsearch::begin': }
-  anchor {'elasticsearch::end': }
-
-
-  #### Validate parameters
-
-  # ensure
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # autoupgrade
-  validate_bool($autoupgrade)
-
-  # service status
-  if ! ($status in [ 'enabled', 'disabled', 'running', 'unmanaged' ]) {
-    fail("\"${status}\" is not a valid status parameter value")
-  }
-
-  # restart on change
-  validate_bool($restart_on_change)
-
-  # purge conf dir
-  validate_bool($purge_confdir)
-
-  if ! ($service_provider in $elasticsearch::params::service_providers) {
-    fail("\"${service_provider}\" is not a valid provider for \"${::operatingsystem}\"")
-  }
-
-  if ($package_url != undef and $version != false) {
-    fail('Unable to set the version number when using package_url option.')
-  }
-
-  # validate config hash
-  validate_hash($config)
-
-  # java install validation
-  validate_bool($java_install)
-
-  #### Manage actions
-
-  # package(s)
-  class { 'elasticsearch::package': }
-
-  # configuration
-  class { 'elasticsearch::config': }
-
-  # service(s)
-  class { 'elasticsearch::service': }
-
-  if $java_install == true {
-    # Install java
-    class { 'elasticsearch::java': }
-
-    # ensure we first java java and then manage the service
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::java']
-    -> Class['elasticsearch::service']
-  }
-
-  #### Manage relationships
-
-  if $ensure == 'present' {
-
-    # we need the software before configuring it
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::package']
-    -> Class['elasticsearch::config']
-
-    # we need the software and a working configuration before running a service
-    Class['elasticsearch::package'] -> Class['elasticsearch::service']
-    Class['elasticsearch::config']  -> Class['elasticsearch::service']
-
-    Class['elasticsearch::service'] -> Anchor['elasticsearch::end']
-
-  } else {
-
-    # make sure all services are getting stopped before software removal
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::service']
-    -> Class['elasticsearch::package']
-    -> Anchor['elasticsearch::end']
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp
deleted file mode 100644
index 8d5149d381b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# == Class: elasticsearch::java
-#
-# This class exists to install java if its not managed from an other module
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::java': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::java {
-
-  if $elasticsearch::java_package == undef {
-    # Default Java package
-    case $::operatingsystem {
-      'CentOS', 'Fedora', 'Scientific', 'RedHat', 'Amazon', 'OracleLinux': {
-        $package = 'java-1.7.0-openjdk'
-      }
-      'Debian', 'Ubuntu': {
-        $package = 'openjdk-7-jre-headless'
-      }
-      default: {
-        fail("\"${module_name}\" provides no java package
-              for \"${::operatingsystem}\"")
-      }
-    }
-  } else {
-    $package = $elasticsearch::java_package
-  }
-
-  ## Install the java package unless already specified somewhere else
-  if !defined(Package[$package]) {
-    package { $package:
-      ensure => present
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp
deleted file mode 100644
index 1cb5295d47c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp
+++ /dev/null
@@ -1,145 +0,0 @@
-# == Class: elasticsearch::package
-#
-# This class exists to coordinate all software package management related
-# actions, functionality and logical units in a central place.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::package': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::package {
-
-
-  #### Package management
-
-  # set params: in operation
-  if $elasticsearch::ensure == 'present' {
-
-    # Check if we want to install a specific version or not
-    if $elasticsearch::version == false {
-
-      $package_ensure = $elasticsearch::autoupgrade ? {
-        true  => 'latest',
-        false => 'present',
-      }
-
-    } else {
-
-      # install specific version
-      $package_ensure = $elasticsearch::version
-
-    }
-
-    # action
-    if ($elasticsearch::package_url != undef) {
-
-      $package_dir = $elasticsearch::package_dir
-
-      # Create directory to place the package file
-      exec { 'create_package_dir_elasticsearch':
-        cwd     => '/',
-        path    => ['/usr/bin', '/bin'],
-        command => "mkdir -p ${elasticsearch::package_dir}",
-        creates => $elasticsearch::package_dir;
-      }
-
-      file { $package_dir:
-        ensure  => 'directory',
-        purge   => $elasticsearch::purge_package_dir,
-        force   => $elasticsearch::purge_package_dir,
-        require => Exec['create_package_dir_elasticsearch'],
-      }
-
-      $filenameArray = split($elasticsearch::package_url, '/')
-      $basefilename = $filenameArray[-1]
-
-      $sourceArray = split($elasticsearch::package_url, ':')
-      $protocol_type = $sourceArray[0]
-
-      $extArray = split($basefilename, '\.')
-      $ext = $extArray[-1]
-
-      case $protocol_type {
-
-        puppet: {
-
-          file { "${package_dir}/${basefilename}":
-            ensure  => present,
-            source  => $elasticsearch::package_url,
-            require => File[$package_dir],
-            backup  => false,
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        ftp, https, http: {
-
-          exec { 'download_package_elasticsearch':
-            command => "${elasticsearch::params::dlcmd} ${package_dir}/${basefilename} ${elasticsearch::package_url} 2> /dev/null",
-            path    => ['/usr/bin', '/bin'],
-            creates => "${package_dir}/${basefilename}",
-            require => File[$package_dir],
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        file: {
-
-          $source_path = $sourceArray[1]
-          file { "${package_dir}/${basefilename}":
-            ensure  => present,
-            source  => $source_path,
-            require => File[$package_dir],
-            backup  => false,
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        default: {
-          fail("Protocol must be puppet, file, http, https, or ftp. You have given \"${protocol_type}\"")
-        }
-      }
-
-      case $ext {
-        'deb':   { $pkg_provider = 'dpkg' }
-        'rpm':   { $pkg_provider = 'rpm'  }
-        default: { fail("Unknown file extention \"${ext}\".") }
-      }
-
-      $pkg_source = "${package_dir}/${basefilename}"
-
-    } else {
-      $pkg_source = undef
-      $pkg_provider = undef
-    }
-
-  # Package removal
-  } else {
-
-    $pkg_source = undef
-    $pkg_provider = undef
-    $package_ensure = 'purged'
-  }
-
-  package { $elasticsearch::params::package:
-    ensure   => $package_ensure,
-    source   => $pkg_source,
-    provider => $pkg_provider
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp
deleted file mode 100644
index aea527f1b6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp
+++ /dev/null
@@ -1,122 +0,0 @@
-# == Class: elasticsearch::params
-#
-# This class exists to
-# 1. Declutter the default value assignment for class parameters.
-# 2. Manage internally used module variables in a central place.
-#
-# Therefore, many operating system dependent differences (names, paths, ...)
-# are addressed in here.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class is not intended to be used directly.
-#
-#
-# === Links
-#
-# * {Puppet Docs: Using Parameterized Classes}[http://j.mp/nVpyWY]
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::params {
-
-  #### Default values for the parameters of the main module class, init.pp
-
-  # ensure
-  $ensure = 'present'
-
-  # autoupgrade
-  $autoupgrade = false
-
-  # service status
-  $status = 'enabled'
-
-  # restart on configuration change?
-  $restart_on_change = true
-
-  # Package dir. Temporary place to download the package to for installation
-  $package_dir = '/var/lib/elasticsearch'
-
-  # User and Group for the files and user to run the service as.
-  $elasticsearch_user  = 'elasticsearch'
-  $elasticsearch_group = 'elasticsearch'
-
-  # Purge configuration directory
-  $purge_confdir = true
-
-  ## init service provider
-
-  # configuration directory
-  $confdir = '/etc/elasticsearch'
-
-  # plugins directory
-  $plugindir = '/usr/share/elasticsearch/plugins'
-
-  # plugins helper binary
-  $plugintool = '/usr/share/elasticsearch/bin/plugin'
-
-  # Download tool
-  $dlcmd = 'wget -O'
-
-  $purge_package_dir = false
-
-  #### Internal module values
-
-  # packages
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      # main application
-      $package = [ 'elasticsearch' ]
-    }
-    'Debian', 'Ubuntu': {
-      # main application
-      $package = [ 'elasticsearch' ]
-    }
-    default: {
-      fail("\"${module_name}\" provides no package default value
-            for \"${::operatingsystem}\"")
-    }
-  }
-
-  # service parameters
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      $service_name       = 'elasticsearch'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'init' ]
-      $defaults_location  = '/etc/sysconfig'
-    }
-    'Debian', 'Ubuntu': {
-      $service_name       = 'elasticsearch'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'init' ]
-      $defaults_location  = '/etc/default'
-    }
-    'Darwin': {
-      $service_name       = 'FIXME/TODO'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'launchd' ]
-      $defaults_location  = false
-    }
-    default: {
-      fail("\"${module_name}\" provides no service parameters
-            for \"${::operatingsystem}\"")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp
deleted file mode 100644
index 025c3023324..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp
+++ /dev/null
@@ -1,96 +0,0 @@
-# == Define: elasticsearch::plugin
-#
-# This define allows you to install arbitrary Elasticsearch plugins
-# either by using the default repositories or by specifying an URL
-#
-# All default values are defined in the elasticsearch::params class.
-#
-#
-# === Parameters
-#
-# [*module_dir*]
-#   Directory name where the module will be installed
-#   Value type is string
-#   Default value: None
-#   This variable is required
-#
-# [*ensure*]
-#   Whether the plugin will be installed or removed.
-#   Set to 'absent' to ensure a plugin is not installed
-#   Value type is string
-#   Default value: present
-#   This variable is optional
-#
-# [*url*]
-#   Specify an URL where to download the plugin from.
-#   Value type is string
-#   Default value: None
-#   This variable is optional
-#
-#
-# === Examples
-#
-# # From official repository
-# elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head'}
-#
-# # From custom url
-# elasticsearch::plugin{ 'elasticsearch-jetty':
-#  module_dir => 'elasticsearch-jetty',
-#  url        => 'https://oss-es-plugins.s3.amazonaws.com/elasticsearch-jetty/elasticsearch-jetty-0.90.0.zip',
-# }
-#
-# === Authors
-#
-# * Matteo Sessa <mailto:matteo.sessa@catchoftheday.com.au>
-# * Dennis Konert <mailto:dkonert@gmail.com>
-#
-define elasticsearch::plugin(
-    $module_dir,
-    $ensure      = 'present',
-    $url         = ''
-) {
-
-  Exec {
-    path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd  => '/',
-  }
-
-  $notify_service = $elasticsearch::restart_on_change ? {
-    false   => undef,
-    default => Service['elasticsearch'],
-  }
-
-  if ($module_dir != '') {
-      validate_string($module_dir)
-  } else {
-      fail("module_dir undefined for plugin ${name}")
-  }
-
-  if ($url != '') {
-    validate_string($url)
-    $install_cmd = "${elasticsearch::plugintool} -install ${name} -url ${url}"
-    $exec_rets = [0,1]
-  } else {
-    $install_cmd = "${elasticsearch::plugintool} -install ${name}"
-    $exec_rets = [0,]
-  }
-
-  case $ensure {
-    'installed', 'present': {
-      exec {"install_plugin_${name}":
-        command  => $install_cmd,
-        creates  => "${elasticsearch::plugindir}/${module_dir}",
-        returns  => $exec_rets,
-        notify   => $notify_service,
-        require  => Class['elasticsearch::package']
-      }
-    }
-    default: {
-      exec {"remove_plugin_${name}":
-        command => "${elasticsearch::plugintool} --remove ${module_dir}",
-        onlyif  => "test -d ${elasticsearch::plugindir}/${module_dir}",
-        notify  => $notify_service,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp
deleted file mode 100644
index e1d91a9aba6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# == Define: elasticsearch::python
-#
-# there are many python bindings for elasticsearch. This provides all
-# the ones we know about http://www.elasticsearch.org/guide/clients/
-#
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-
-#
-#
-# === Examples
-#
-# elasticsearch::python { 'pyes':; }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::python (
-  $ensure = 'present'
-) {
-
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # make sure the package name is valid and setup the provider as
-  # necessary
-  case $name {
-    'pyes': {
-      $provider = 'pip'
-    }
-    'rawes': {
-      $provider = 'pip'
-    }
-    'pyelasticsearch': {
-      $provider = 'pip'
-    }
-    'ESClient': {
-      $provider = 'pip'
-    }
-    'elasticutils': {
-      $provider = 'pip'
-    }
-    'elasticsearch': {
-      $provider = 'pip'
-    }
-    default: {
-      fail("unknown python binding package '${name}'")
-    }
-  }
-
-  package { $name:
-    ensure   => $ensure,
-    provider => $provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp
deleted file mode 100644
index 3e35f416f24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp
+++ /dev/null
@@ -1,67 +0,0 @@
-# == Define: elasticsearch::ruby
-#
-# there are many ruby bindings for elasticsearch. This provides all
-# the ones we know about http://www.elasticsearch.org/guide/clients/
-#
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-
-#
-#
-# === Examples
-#
-# elasticsearch::ruby { 'elasticsearch':; }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::ruby (
-  $ensure = 'present'
-) {
-
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # make sure the package name is valid and setup the provider as
-  # necessary
-  case $name {
-    'tire': {
-      $provider = 'gem'
-    }
-    'stretcher': {
-      $provider = 'gem'
-    }
-    'elastic_searchable': {
-      $provider = 'gem'
-    }
-    'elasticsearch': {
-      $provider = 'gem'
-    }
-    default: {
-      fail("unknown ruby client package '${name}'")
-    }
-  }
-
-  package { $name:
-    ensure   => $ensure,
-    provider => $provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp
deleted file mode 100644
index 891f5597994..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: elasticsearch::service
-#
-# This class exists to coordinate all service management related actions,
-# functionality and logical units in a central place.
-#
-# <b>Note:</b> "service" is the Puppet term and type for background processes
-# in general and is used in a platform-independent way. E.g. "service" means
-# "daemon" in relation to Unix-like systems.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::service': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::service {
-
-  case $elasticsearch::service_provider {
-
-    init: {
-      elasticsearch::service::init { 'elasticsearch': }
-    }
-
-    default: {
-      fail("Unknown service provider ${elasticsearch::service_provider}")
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp
deleted file mode 100644
index 2db645c8de7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp
+++ /dev/null
@@ -1,132 +0,0 @@
-# == Define: elasticsearch::service::init
-#
-# This class exists to coordinate all service management related actions,
-# functionality and logical units in a central place.
-#
-# <b>Note:</b> "service" is the Puppet term and type for background processes
-# in general and is used in a platform-independent way. E.g. "service" means
-# "daemon" in relation to Unix-like systems.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::service::init{
-
-  #### Service management
-
-  # set params: in operation
-  if $elasticsearch::ensure == 'present' {
-
-    case $elasticsearch::status {
-      # make sure service is currently running, start it on boot
-      'enabled': {
-        $service_ensure = 'running'
-        $service_enable = true
-      }
-      # make sure service is currently stopped, do not start it on boot
-      'disabled': {
-        $service_ensure = 'stopped'
-        $service_enable = false
-      }
-      # make sure service is currently running, do not start it on boot
-      'running': {
-        $service_ensure = 'running'
-        $service_enable = false
-      }
-      # do not start service on boot, do not care whether currently running
-      # or not
-      'unmanaged': {
-        $service_ensure = undef
-        $service_enable = false
-      }
-      # unknown status
-      # note: don't forget to update the parameter check in init.pp if you
-      #       add a new or change an existing status.
-      default: {
-        fail("\"${elasticsearch::status}\" is an unknown service status value")
-      }
-    }
-
-  # set params: removal
-  } else {
-
-    # make sure the service is stopped and disabled (the removal itself will be
-    # done by package.pp)
-    $service_ensure = 'stopped'
-    $service_enable = false
-
-  }
-
-  $notify_service = $elasticsearch::restart_on_change ? {
-    true  => Service[$name],
-    false => undef,
-  }
-
-
-  if ( $elasticsearch::status != 'unmanaged' ) {
-
-    # defaults file content. Either from a hash or file
-    if ($elasticsearch::init_defaults_file != undef) {
-      $defaults_content = undef
-      $defaults_source  = $elasticsearch::init_defaults_file
-    } elsif ($elasticsearch::init_defaults != undef and is_hash($elasticsearch::init_defaults) ) {
-      $defaults_content = template("${module_name}/etc/sysconfig/defaults.erb")
-      $defaults_source  = undef
-    } else {
-      $defaults_content = undef
-      $defaults_source  = undef
-    }
-
-    # Check if we are going to manage the defaults file.
-    if ( $defaults_content != undef or $defaults_source != undef ) {
-
-      file { "${elasticsearch::params::defaults_location}/${name}":
-        ensure  => $elasticsearch::ensure,
-        source  => $defaults_source,
-        content => $defaults_content,
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0644',
-        before  => Service[$name],
-        notify  => $notify_service
-      }
-
-    }
-
-    # init file from template
-    if ($elasticsearch::init_template != undef) {
-
-      file { "/etc/init.d/${name}":
-        ensure  => $elasticsearch::ensure,
-        content => template($elasticsearch::init_template),
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0755',
-        before  => Service[$name],
-        notify  => $notify_service
-      }
-
-    }
-
-  }
-
-  # action
-  service { $name:
-    ensure     => $service_ensure,
-    enable     => $service_enable,
-    name       => $elasticsearch::params::service_name,
-    hasstatus  => $elasticsearch::params::service_hasstatus,
-    hasrestart => $elasticsearch::params::service_hasrestart,
-    pattern    => $elasticsearch::params::service_pattern,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp
deleted file mode 100644
index b8ab2a61512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp
+++ /dev/null
@@ -1,114 +0,0 @@
-# == Define: elasticsearch::template
-#
-#  This define allows you to insert, update or delete templates that are used within Elasticsearch for the indexes
-#
-# === Parameters
-#
-# [*file*]
-#   File path of the template ( json file )
-#   Value type is string
-#   Default value: undef
-#   This variable is optional
-#
-# [*replace*]
-#   Set to 'true' if you intend to replace the existing template
-#   Value type is boolean
-#   Default value: false
-#   This variable is optional
-#
-# [*delete*]
-#   Set to 'true' if you intend to delete the existing template
-#   Value type is boolean
-#   Default value: false
-#   This variable is optional
-#
-# [*host*]
-#   Host name or IP address of the ES instance to connect to
-#   Value type is string
-#   Default value: localhost
-#   This variable is optional
-#
-# [*port*]
-#   Port number of the ES instance to connect to
-#   Value type is number
-#   Default value: 9200
-#   This variable is optional
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::template(
-  $ensure  = 'present',
-  $file    = undef,
-  $host    = 'localhost',
-  $port    = 9200
-) {
-
-  require elasticsearch
-
-  # ensure
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  if ! is_integer($port) {
-    fail("\"${port}\" is not an integer")
-  }
-
-  Exec {
-    path      => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd       => '/',
-    tries     => 3,
-    try_sleep => 10
-  }
-
-  # Build up the url
-  $es_url = "http://${host}:${port}/_template/${name}"
-
-  # Can't do a replace and delete at the same time
-
-  if ($ensure == 'present') {
-
-    # Fail when no file is supplied
-    if $file == undef {
-      fail('The variable "file" cannot be empty when inserting or updating a template')
-
-    } else { # we are good to go. notify to insert in case we deleted
-      $insert_notify = Exec[ "insert_template_${name}" ]
-    }
-
-  } else {
-
-    $insert_notify = undef
-
-  }
-
-  # Delete the existing template
-  # First check if it exists of course
-  exec { "delete_template_${name}":
-    command     => "curl -s -XDELETE ${es_url}",
-    onlyif      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
-    notify      => $insert_notify,
-    refreshonly => true
-  }
-
-  if ($ensure == 'present') {
-
-    # place the template file
-    file { "${elasticsearch::confdir}/templates_import/elasticsearch-template-${name}.json":
-      ensure  => 'present',
-      source  => $file,
-      notify  => Exec[ "delete_template_${name}" ],
-      require => Exec[ 'mkdir_templates' ],
-    }
-
-    exec { "insert_template_${name}":
-      command     => "curl -s -XPUT ${es_url} -d @${elasticsearch::confdir}/templates_import/elasticsearch-template-${name}.json",
-      unless      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
-      refreshonly => true
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb
deleted file mode 100644
index dd4b5c1d206..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  [ 'Debian', 'Ubuntu'].each do |distro|
-
-    context "on #{distro} OS" do
-
-      let :facts do {
-        :operatingsystem => distro
-      } end
-
-      context 'main class tests' do
-
-        # init.pp
-        it { should contain_class('elasticsearch::package') }
-        it { should contain_class('elasticsearch::config') }
-        it { should contain_class('elasticsearch::service') }
-
-      end
-
-      context 'package installation' do
-        
-        context 'via repository' do
-
-          context 'with default settings' do
-            
-           it { should contain_package('elasticsearch').with(:ensure => 'present') }
-
-          end
-
-          context 'with specified version' do
-
-            let :params do {
-              :version => '1.0'
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => '1.0') }
-          end
-
-          context 'with auto upgrade enabled' do
-
-            let :params do {
-              :autoupgrade => true
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => 'latest') }
-          end
-
-        end
-
-        context 'when setting package version and package_url' do
-
-          let :params do {
-            :version     => '0.90.10',
-            :package_url => 'puppet:///path/to/some/elasticsearch-0.90.10.deb'
-          } end
-
-          it { expect { should raise_error(Puppet::Error) } }
-
-        end
-
-        context 'via package_url setting' do
-
-          context 'using puppet:/// schema' do
-
-            let :params do {
-              :package_url => 'puppet:///path/to/package.deb'
-            } end
-
-            it { should contain_file('/var/lib/elasticsearch/package.deb').with(:source => 'puppet:///path/to/package.deb', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using http:// schema' do
-
-            let :params do {
-              :package_url => 'http://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => "Exec[create_package_dir_elasticsearch]") }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb http://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using https:// schema' do
-
-            let :params do {
-              :package_url => 'https://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb https://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using ftp:// schema' do
-
-            let :params do {
-              :package_url => 'ftp://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb ftp://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using file:// schema' do
-
-            let :params do {
-              :package_url => 'file:/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_file('/var/lib/elasticsearch/package.deb').with(:source => '/path/to/package.deb', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-        end
-
-      end # package
-
-      context 'service setup' do
-
-        context 'with provider \'init\'' do
-
-          context 'and default settings' do
-
-            it { should contain_service('elasticsearch').with(:ensure => 'running') }
-
-          end
-
-          context 'and set defaults via hash param' do
-
-            let :params do {
-              :init_defaults => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' }
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n", :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'and set defaults via file param' do
-
-            let :params do {
-              :init_defaults_file => 'puppet:///path/to/elasticsearch.defaults'
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:source => 'puppet:///path/to/elasticsearch.defaults', :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'no service restart when defaults change' do
-
-           let :params do {
-              :init_defaults     => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' },
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n").without_notify }
-
-          end 
-
-          context 'and set init file via template' do
-
-            let :params do {
-              :init_template => "elasticsearch/etc/init.d/elasticsearch.Debian.erb"
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').with(:notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'No service restart when restart_on_change is false' do
-
-            let :params do {
-              :init_template     => "elasticsearch/etc/init.d/elasticsearch.Debian.erb",
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').without_notify }
-
-          end
-
-          context 'when its unmanaged do nothing with it' do
-
-            let :params do {
-              :status => 'unmanaged'
-            } end
-
-            it { should contain_service('elasticsearch').with(:ensure => nil, :enable => false) }
-
-          end
-
-        end # provider init
-
-      end # Services
-
-      context 'when setting the module to absent' do
-
-         let :params do {
-           :ensure => 'absent'
-         } end
-
-         it { should contain_file('/etc/elasticsearch').with(:ensure => 'absent', :force => true, :recurse => true) }
-         it { should contain_package('elasticsearch').with(:ensure => 'purged') }
-         it { should contain_service('elasticsearch').with(:ensure => 'stopped', :enable => false) }
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb
deleted file mode 100644
index 9151b20e6ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  [ 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux' ].each do |distro|
-
-    context "on #{distro} OS" do
-
-      let :facts do {
-        :operatingsystem => distro
-      } end
-
-      context 'Main class' do
-
-        # init.pp
-        it { should contain_class('elasticsearch::package') }
-        it { should contain_class('elasticsearch::config') }
-        it { should contain_class('elasticsearch::service') }
-
-      end
-
-      context 'package installation' do
-        
-        context 'via repository' do
-
-          context 'with default settings' do
-            
-           it { should contain_package('elasticsearch').with(:ensure => 'present') }
-
-          end
-
-          context 'with specified version' do
-
-            let :params do {
-              :version => '1.0'
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => '1.0') }
-          end
-
-          context 'with auto upgrade enabled' do
-
-            let :params do {
-              :autoupgrade => true
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => 'latest') }
-          end
-
-        end
-
-        context 'when setting package version and package_url' do
-
-          let :params do {
-            :version     => '0.90.10',
-            :package_url => 'puppet:///path/to/some/elasticsearch-0.90.10.rpm'
-          } end
-
-          it { expect { should raise_error(Puppet::Error) } }
-
-        end
-
-        context 'via package_url setting' do
-
-          context 'using puppet:/// schema' do
-
-            let :params do {
-              :package_url => 'puppet:///path/to/package.rpm'
-            } end
-
-            it { should contain_file('/var/lib/elasticsearch/package.rpm').with(:source => 'puppet:///path/to/package.rpm', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using http:// schema' do
-
-            let :params do {
-              :package_url => 'http://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => "Exec[create_package_dir_elasticsearch]") }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm http://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using https:// schema' do
-
-            let :params do {
-              :package_url => 'https://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm https://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using ftp:// schema' do
-
-            let :params do {
-              :package_url => 'ftp://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm ftp://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using file:// schema' do
-
-            let :params do {
-              :package_url => 'file:/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_file('/var/lib/elasticsearch/package.rpm').with(:source => '/path/to/package.rpm', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-        end
-
-      end # package
-
-      context 'service setup' do
-
-        context 'with provider \'init\'' do
-
-          context 'and default settings' do
-
-            it { should contain_service('elasticsearch').with(:ensure => 'running') }
-
-          end
-
-          context 'and set defaults via hash param' do
-
-            let :params do {
-              :init_defaults => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' }
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n", :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'and set defaults via file param' do
-
-            let :params do {
-              :init_defaults_file => 'puppet:///path/to/elasticsearch.defaults'
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:source => 'puppet:///path/to/elasticsearch.defaults', :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'no service restart when defaults change' do
-
-            let :params do {
-              :init_defaults     => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' },
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n").without_notify }
-
-          end
-
-          context 'and set init file via template' do
-
-            let :params do {
-              :init_template => "elasticsearch/etc/init.d/elasticsearch.RedHat.erb"
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').with(:notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'No service restart when restart_on_change is false' do
-
-            let :params do {
-              :init_template     => "elasticsearch/etc/init.d/elasticsearch.RedHat.erb",
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').without_notify }
-
-          end
-
-          context 'when its unmanaged do nothing with it' do
-
-            let :params do {
-              :status => 'unmanaged'
-            } end
-
-            it { should contain_service('elasticsearch').with(:ensure => nil, :enable => false) }
-
-          end
-
-        end
-
-      end # Services
-
-      context 'when setting the module to absent' do
-
-         let :params do {
-           :ensure => 'absent'
-         } end
-
-         it { should contain_file('/etc/elasticsearch').with(:ensure => 'absent', :force => true, :recurse => true) }
-         it { should contain_package('elasticsearch').with(:ensure => 'purged') }
-         it { should contain_service('elasticsearch').with(:ensure => 'stopped', :enable => false) }
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb
deleted file mode 100644
index 12bce8fef8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  context "on an unknown OS" do
-
-    context "it should fail" do
-      let :facts do {
-        :operatingsystem => 'Windows'
-      } end
- 
-      it { expect { should raise_error(Puppet::Error) } }
-
-    end
-
-  end
- 
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb
deleted file mode 100644
index 2f01fb5b29d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  let :facts do {
-    :operatingsystem => 'CentOS'
-  } end
-
-  context "config file content" do
-
-    context "with nothing set" do
-
-      let :params do {
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n") }
-
-    end
-
-    context "set a value" do
-
-      let :params do {
-        :config => { 'node' => { 'name' => 'test' }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  name: test\n") }
-
-    end
-
-    context "set a value to true" do
-
-      let :params do {
-        :config => { 'node' => { 'master' => true }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  master: true\n") }
-
-    end
-
-    context "set a value to false" do
-
-      let :params do {
-        :config => { 'node' => { 'data' => false }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  data: false\n") }
-
-    end
-
-    context "deeper hash and multiple keys" do
-
-      let :params do {
-        :config => { 'index' => { 'routing' => { 'allocation' => { 'include' => 'tag1', 'exclude' => [ 'tag2', 'tag3' ] } } }, 'node' => { 'name' => 'somename' } }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nindex: \n  routing: \n    allocation: \n      exclude: \n             - tag2\n             - tag3\n      include: tag1\nnode: \n  name: somename\n") }
-
-    end
-
-    context "Combination of full hash and shorted write up keys" do
-
-      let :params do {
-        :config => { 'node' => { 'name' => 'NodeName', 'rack' => 46 }, 'boostrap.mlockall' => true, 'cluster' => { 'name' => 'ClusterName', 'routing.allocation.awareness.attributes' => 'rack' }, 'discovery.zen' => { 'ping.unicast.hosts'=> [ "host1", "host2" ], 'minimum_master_nodes' => 3, 'ping.multicast.enabled' => false }, 'gateway' => { 'expected_nodes' => 4, 'recover_after_nodes' => 3 }, 'network.host' => '123.123.123.123' }
-       } end
-
-       it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nboostrap: \n  mlockall: true\ncluster: \n  name: ClusterName\n  routing: \n    allocation: \n      awareness: \n        attributes: rack\ndiscovery: \n  zen: \n    minimum_master_nodes: 3\n    ping: \n      multicast: \n        enabled: false\n      unicast: \n        hosts: \n             - host1\n             - host2\ngateway: \n  expected_nodes: 4\n  recover_after_nodes: 3\nnetwork: \n  host: 123.123.123.123\nnode: \n  name: NodeName\n  rack: 46\n") }
-
-     end
-
-  end
-
-  context "service restarts" do
-
-   let :facts do {
-     :operatingsystem => 'CentOS'
-    } end
-
-    context "does not restart when restart_on_change is false" do
-      let :params do {
-        :config            => { 'node' => { 'name' => 'test' }  },
-        :restart_on_change => false,
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').without_notify }
-    end
-
-    context "should happen restart_on_change is true (default)" do
-      let :params do {
-        :config            => { 'node' => { 'name' => 'test' }  },
-        :restart_on_change => true,
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:notify => "Class[Elasticsearch::Service]") }
-    end
-
-  end
-
-  context 'data directory' do
-    let(:facts) do {
-      :operatingsystem => 'CentOS'
-    } end
-
-    context 'should allow creating datadir' do
-      let(:params) do {
-        :datadir => '/foo'
-      } end
-
-      it { should contain_file('/foo').with(:ensure => 'directory') }
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb
deleted file mode 100644
index d51108746d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  context "install java" do
-
-    let :params do {
-      :java_install => true,
-      :config => { 'node' => { 'name' => 'test' }  }
-    } end
-
-    context "On Debian OS" do
-
-      let :facts do {
-        :operatingsystem => 'Debian'
-      } end
-
-      it { should contain_package('openjdk-7-jre-headless') }
-
-    end
-
-    context "On Ubuntu OS" do
-
-      let :facts do {
-        :operatingsystem => 'Ubuntu'
-      } end
-
-      it { should contain_package('openjdk-7-jre-headless') }
-
-    end
-
-    context "On CentOS OS " do
-
-      let :facts do {
-        :operatingsystem => 'CentOS'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On RedHat OS " do
-
-      let :facts do {
-        :operatingsystem => 'Redhat'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Fedora OS " do
-
-      let :facts do {
-        :operatingsystem => 'Fedora'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Scientific OS " do
-
-      let :facts do {
-        :operatingsystem => 'Scientific'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Amazon OS " do
-
-      let :facts do {
-        :operatingsystem => 'Amazon'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On OracleLinux OS " do
-
-      let :facts do {
-        :operatingsystem => 'OracleLinux'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On an unknown OS" do
-
-      let :facts do {
-        :operatingsystem => 'Windows'
-      } end
-
-      it { expect { should raise_error(Puppet::Error) } }
-
-    end
-
-    context "Custom java package" do
-
-      let :facts do {
-        :operatingsystem => 'CentOS'
-      } end
-
-      let :params do {
-        :java_install => true,
-        :java_package => 'java-1.6.0-openjdk',
-        :config => { 'node' => { 'name' => 'test' }  }
-      } end
-
-      it { should contain_package('java-1.6.0-openjdk') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb
deleted file mode 100644
index 56d0428067a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::python', :type => 'define' do
-
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-
-  [ 'pyes', 'rawes', 'pyelasticsearch', 'ESClient', 'elasticutils', 'elasticsearch' ].each do |pythonlib|
-
-    context "installation of library #{pythonlib}" do
-
-      let(:title) { pythonlib }
-
-      it { should contain_package(pythonlib).with(:provider => 'pip') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb
deleted file mode 100644
index 6de94f76b2c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::ruby', :type => 'define' do
-
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-
-  [ 'tire', 'stretcher', 'elastic_searchable', 'elasticsearch'].each do |rubylib|
-
-    context "installation of library #{rubylib}" do
-
-      let(:title) { rubylib }
-
-      it { should contain_package(rubylib).with(:provider => 'gem') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb
deleted file mode 100644
index 527fb118f0b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::template', :type => 'define' do
-
-  let(:title) { 'foo' }
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-  let(:pre_condition) { 'class {"elasticsearch": config => { "node" => {"name" => "test" }}}'}
-
-  context "Add a template" do
-
-    let :params do {
-      :ensure => 'present',
-      :file   => 'puppet:///path/to/foo.json',
-    } end
-
-    it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json', :notify => "Exec[delete_template_foo]", :require => "Exec[mkdir_templates]") }
-    it { should contain_exec('insert_template_foo').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
-  end
-
-  context "Delete a template" do
-
-    let :params do {
-      :ensure => 'absent'
-    } end
-
-    it { should_not contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should_not contain_exec('insert_template_foo') }
-    it { should contain_exec('delete_template_foo').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => nil, :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
-  end
-
-  context "Add template with alternative host and port" do
-
-    let :params do {
-      :file => 'puppet:///path/to/foo.json',
-      :host => 'otherhost',
-      :port => '9201'
-    } end
-
-    it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should contain_exec('insert_template_foo').with(:command => 'curl -s -XPUT http://otherhost:9201/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://otherhost:9201/_template/foo?pretty=true\' | wc -l) -gt 1') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb
deleted file mode 100644
index dcf2170ea70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::plugin', :type => 'define' do
-
-  let(:title) { 'mobz/elasticsearch-head' }
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-  let(:pre_condition) { 'class {"elasticsearch": config => { "node" => {"name" => "test" }}}'}
-
-  context "Add a plugin" do
-
-    let :params do {
-      :ensure     => 'present',
-      :module_dir => 'head',
-    } end
-
-    it { should contain_exec('install_plugin_mobz/elasticsearch-head').with(:command => '/usr/share/elasticsearch/bin/plugin -install mobz/elasticsearch-head', :creates => '/usr/share/elasticsearch/plugins/head') }
-  end
-
-  context "Remove a plugin" do
-
-    let :params do {
-      :ensure     => 'absent',
-      :module_dir => 'head'
-    } end
-
-    it { should contain_exec('remove_plugin_mobz/elasticsearch-head').with(:command => '/usr/share/elasticsearch/bin/plugin --remove head', :onlyif => 'test -d /usr/share/elasticsearch/plugins/head') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb
deleted file mode 100644
index 27ab76450a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'find'
-require 'pathname'
-require 'rake'
-require 'rspec/core/rake_task'
-
-desc "run Puppet parser validate"
-task :parser_validate do
-
-  pwd = ENV["PWD"]
-  puppet_file_paths = []
-  Find.find(pwd) do |path|
-    puppet_file_paths << path if path =~ /.*\.pp$/
-  end
-
-  exit_code = 0
-  puppet_file_paths.each do |puppetfile|
-
-    pwdpath = Pathname.new(pwd)
-    pn = Pathname.new(puppetfile)
-    rel_path = pn.relative_path_from(pwdpath)
-
-    print "Validating #{rel_path}....  "
-    $stdout.flush
-
-    result = `puppet parser validate #{puppetfile}`
-    if $?.exitstatus == 0
-      res = 'OK'
-    else
-      res = 'ERR'
-    end
-
-    puts "#{res}"
-
-    if $?.exitstatus != 0
-      exit_code = 1
-    end
-  end
-  exit exit_code
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb
deleted file mode 100644
index f4748236fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'find'
-require 'pathname'
-require 'rake'
-require 'rspec/core/rake_task'
-
-desc "Verify puppet templates"
-task :template_verify do
-
-  pwd = ENV["PWD"]
-  erb_file_paths = []
-  Find.find(pwd) do |path|
-    erb_file_paths << path if path =~ /.*\.erb$/
-  end
-
-  exit_code = 0
-  erb_file_paths.each do |erbfile|
-
-    pwdpath = Pathname.new(pwd)
-    pn = Pathname.new(erbfile)
-    rel_path = pn.relative_path_from(pwdpath)
-
-    result = `erb -P -x -T '-' #{erbfile} | ruby -c`
-    puts "Verifying #{rel_path}.... #{result}"
-
-    if $?.exitstatus != 0
-      exit_code = 1
-    end
-  end
-  exit exit_code
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
deleted file mode 100644
index b93ccdcb219..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<%-
-
-  # Function to make a structured and sorted yaml representation out of a hash
-  def recursive_hash_to_yml_string(hash, depth=0)
-    spacer = ""
-    depth.times { spacer += "  "}
-    hash.keys.sort.each do |sorted_key|
-      @yml_string += spacer + sorted_key + ": "
-      if hash[sorted_key].is_a?(Array)
-         keyspacer = ""
-         sorted_key.length.times { keyspacer += " " }
-         @yml_string += "\n"
-         hash[sorted_key].each do |item|
-           @yml_string += spacer + keyspacer + "- " + item +"\n"
-         end
-      elsif hash[sorted_key].is_a?(Hash)
-        @yml_string += "\n"
-        recursive_hash_to_yml_string(hash[sorted_key], depth+1)
-      else
-        @yml_string += "#{hash[sorted_key].to_s}\n"
-      end
-    end
-  end
-
-  # Function to transform shorted write up of the keys into full hash representation
-  def transform(hash)
-  return_vals = []
-
-  hash.each do |key,val|
-    if m = /^([^.]+)\.(.*)$/.match(key)
-      temp = { m[1] => { m[2] => val } }
-      transform(temp).each do |stuff|
-        return_vals << stuff
-      end
-    else
-      if val.is_a?(Hash)
-        transform(val).each do |stuff|
-          return_vals << { key => stuff }
-        end
-      else
-        return_vals << { key => val }
-      end
-    end
-  end
-
-  return_vals
-  end
-
-  # Function to deep merge hashes with same keys
-  class ::Hash
-    def deep_merge_with_array_values_concatenated(hash)
-    target = dup
-
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge_with_array_values_concatenated(hash[key])
-        next
-      end
-
-      if hash[key].is_a?(Array) && target[key].is_a?(Array)
-        target[key] = target[key] + hash[key]
-      else
-        target[key] = hash[key]
-      end
-    end
-
-    target
-    end
-  end
-
-  # initial string
-  @yml_string = "### MANAGED BY PUPPET ###\n"
-
-  if !scope.lookupvar('elasticsearch::config').empty?
-
-    @yml_string += "---\n"
-
-    ## Transform shorted keys into full write up
-    transformed_config = transform(scope.lookupvar('elasticsearch::config'))
-
-    # Merge it back into a hash
-    tmphash = { }
-    transformed_config.each do |subhash|
-      tmphash = tmphash.deep_merge_with_array_values_concatenated(subhash)
-    end
-
-    # Transform it into yaml
-    recursive_hash_to_yml_string(tmphash)
-
-  end
-
--%>
-<%= @yml_string -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb
deleted file mode 100644
index 220c2f80b7d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/elasticsearch -- startup script for Elasticsearch
-#
-# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-# Modified for Debian GNU/Linux	by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-# Modified for Tomcat by Stefan Gybas <sgybas@debian.org>.
-# Modified for Tomcat6 by Thierry Carrez <thierry.carrez@ubuntu.com>.
-# Additional improvements by Jason Brittain <jason.brittain@mulesoft.com>.
-# Modified by Nicolas Huray for ElasticSearch <nicolas.huray@gmail.com>.
-#
-### BEGIN INIT INFO
-# Provides:          elasticsearch
-# Required-Start:    $network $remote_fs $named
-# Required-Stop:     $network $remote_fs $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts elasticsearch
-# Description:       Starts elasticsearch using start-stop-daemon
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=elasticsearch
-DESC="ElasticSearch Server"
-DEFAULT=/etc/default/$NAME
-
-if [ `id -u` -ne 0 ]; then
-	echo "You need root privileges to run this script"
-	exit 1
-fi
-
-
-. /lib/lsb/init-functions
-
-if [ -r /etc/default/rcS ]; then
-	. /etc/default/rcS
-fi
-
-
-# The following variables can be overwritten in $DEFAULT
-
-# Run ElasticSearch as this user ID and group ID
-ES_USER=elasticsearch
-ES_GROUP=elasticsearch
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-openjdk-armhf /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/default-java"
-
-# Look for the right JVM to use
-for jdir in $JDK_DIRS; do
-    if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-        JAVA_HOME="$jdir"
-    fi
-done
-export JAVA_HOME
-
-# Directory where the ElasticSearch binary distribution resides
-ES_HOME=/usr/share/$NAME
-
-# Heap Size (defaults to 256m min, 1g max)
-#ES_HEAP_SIZE=2g
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# max direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-# Maximum number of open files
-MAX_OPEN_FILES=65535
-
-# Maximum amount of locked memory
-#MAX_LOCKED_MEMORY=
-
-# ElasticSearch log directory
-LOG_DIR=/var/log/$NAME
-
-# ElasticSearch data directory
-DATA_DIR=/var/lib/$NAME
-
-# ElasticSearch work directory
-WORK_DIR=/tmp/$NAME
-
-# ElasticSearch configuration directory
-CONF_DIR=/etc/$NAME
-
-# ElasticSearch configuration file (elasticsearch.yml)
-CONF_FILE=$CONF_DIR/elasticsearch.yml
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
-	. "$DEFAULT"
-fi
-
-# Define other required variables
-PID_FILE=/var/run/$NAME.pid
-DAEMON=$ES_HOME/bin/elasticsearch
-DAEMON_OPTS="-p $PID_FILE -Des.default.config=$CONF_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR"
-
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_JAVA_OPTS
-
-# Check DAEMON exists
-test -x $DAEMON || exit 0
-
-checkJava() {
-	if [ -x "$JAVA_HOME/bin/java" ]; then
-		JAVA="$JAVA_HOME/bin/java"
-	else
-		JAVA=`which java`
-	fi
-
-	if [ ! -x "$JAVA" ]; then
-		echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
-		exit 1
-	fi
-}
-
-case "$1" in
-  start)
-	checkJava
-
-	if [ -n "$MAX_LOCKED_MEMORY" -a -z "$ES_HEAP_SIZE" ]; then
-		log_failure_msg "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
-		exit 1
-	fi
-
-	log_daemon_msg "Starting $DESC"
-
-	pid=`pidofproc -p $PID_FILE elasticsearch`
-	if [ -n "$pid" ] ; then
-		log_begin_msg "Already running."
-		log_end_msg 0
-		exit 0
-	fi
-
-	# Prepare environment
-	mkdir -p "$LOG_DIR" "$DATA_DIR" "$WORK_DIR" && chown "$ES_USER":"$ES_GROUP" "$LOG_DIR" "$DATA_DIR" "$WORK_DIR"
-	touch "$PID_FILE" && chown "$ES_USER":"$ES_GROUP" "$PID_FILE"
-
-	if [ -n "$MAX_OPEN_FILES" ]; then
-		ulimit -n $MAX_OPEN_FILES
-	fi
-
-	if [ -n "$MAX_LOCKED_MEMORY" ]; then
-		ulimit -l $MAX_LOCKED_MEMORY
-	fi
-
-	# Start Daemon
-	start-stop-daemon --start -b --user "$ES_USER" -c "$ES_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
-	log_end_msg $?
-	;;		
-  stop)
-	log_daemon_msg "Stopping $DESC"
-
-	if [ -f "$PID_FILE" ]; then 
-		start-stop-daemon --stop --pidfile "$PID_FILE" \
-			--user "$ES_USER" \
-			--retry=TERM/20/KILL/5 >/dev/null
-		if [ $? -eq 1 ]; then
-			log_progress_msg "$DESC is not running but pid file exists, cleaning up"
-		elif [ $? -eq 3 ]; then
-			PID="`cat $PID_FILE`"
-			log_failure_msg "Failed to stop $DESC (pid $PID)"
-			exit 1
-		fi
-		rm -f "$PID_FILE"
-	else
-		log_progress_msg "(not running)"
-	fi
-	log_end_msg 0
-	;;
-  status)
-	status_of_proc -p $PID_FILE elasticsearch elasticsearch && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-	if [ -f "$PID_FILE" ]; then
-		$0 stop
-		sleep 1
-	fi
-	$0 start
-	;;
-  *)
-	log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb
deleted file mode 100644
index 8d611514a11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-#
-# elasticsearch <summary>
-#
-# chkconfig:   2345 80 20
-# description: Starts and stops a single elasticsearch instance on this system 
-#
-
-### BEGIN INIT INFO
-# Provides: Elasticsearch
-# Required-Start: $network $named
-# Required-Stop: $network $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: This service manages the elasticsearch daemon
-# Description: Elasticsearch is a very scalable, schema-free and high-performance search solution supporting multi-tenancy and near realtime search.
-### END INIT INFO
-
-#
-# init.d / servicectl compatibility (openSUSE)
-#
-if [ -f /etc/rc.status ]; then
-    . /etc/rc.status
-    rc_reset
-fi
-
-#
-# Source function library.
-#
-if [ -f /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
-
-exec="/usr/share/elasticsearch/bin/elasticsearch"
-prog="elasticsearch"
-pidfile=/var/run/elasticsearch/${prog}.pid
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_JAVA_OPTS
-
-lockfile=/var/lock/subsys/$prog
-
-# backwards compatibility for old config sysconfig files, pre 0.90.1
-if [ -n $USER ] && [ -z $ES_USER ] ; then 
-   ES_USER=$USER
-fi
-
-checkJava() {
-    if [ -x "$JAVA_HOME/bin/java" ]; then
-        JAVA="$JAVA_HOME/bin/java"
-    else
-        JAVA=$(which java)
-    fi
-
-    if [ ! -x "$JAVA" ]; then
-        echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
-        exit 1
-    fi
-}
-
-start() {
-    checkJava
-    [ -x $exec ] || exit 5
-    [ -f $CONF_FILE ] || exit 6
-    if [ -n "$MAX_LOCKED_MEMORY" -a -z "$ES_HEAP_SIZE" ]; then
-        echo "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
-        return 7
-    fi
-    if [ -n "$MAX_OPEN_FILES" ]; then
-        ulimit -n $MAX_OPEN_FILES
-    fi
-    if [ -n "$MAX_LOCKED_MEMORY" ]; then
-        ulimit -l $MAX_LOCKED_MEMORY
-    fi
-    if [ -n "$WORK_DIR" ]; then
-        mkdir -p "$WORK_DIR"
-        chown "$ES_USER":"$ES_GROUP" "$WORK_DIR"
-    fi
-    echo -n $"Starting $prog: "
-    # if not running, start it up here, usually something like "daemon $exec"
-    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    # stop it here, often "killproc $prog"
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status -p $pidfile $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb
deleted file mode 100644
index b4e8af62dce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-### MANAGED BY PUPPET ###
-
-<% scope.lookupvar('elasticsearch::init_defaults').sort.map do |key, value| -%>
-<%= key %>=<%= value %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Gemfile
deleted file mode 100644
index 95c7a5dd0b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake', :require => false
-  gem 'rspec-puppet', :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', :require => false
-  gem 'rspec-system-puppet', '~>2.0.0'
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/LICENSE
deleted file mode 100644
index 009b66b6cc2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2012-2014 Michael Stahnke
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Modulefile
deleted file mode 100644
index 237d164011a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name    'stahnma-epel'
-version '0.1.0'
-source 'http://github.com/stahnma/puppet-module-epel'
-author 'stahnma'
-license 'Apache License, Version 2.0'
-summary 'Setup the EPEL package repo'
-description 'Setup the EPEL package repo on Centos/RHEL et all'
-project_page 'http://github.com/stahnma/puppet-module-epel'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/README.md
deleted file mode 100644
index 33b87278574..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Configure EPEL (Extra Repository for Enterprise Linux)
-
-# About
-This module basically just mimics the epel-release rpm. The same repos are
-enabled/disabled and the GPG key is imported.  In the end you will end up with
-the EPEL repos configured.
-
-The following Repos will be setup and enabled by default:
-
-  * epel
-
-Other repositories that will setup but disabled (as per the epel-release setup)
-
-  * epel-debuginfo
-  * epel-source
-  * epel-testing
-  * epel-testing-debuginfo
-  * epel-testing-source
-
-# Proxy
-If you have an http proxy required to access the internet, you can use either
-a class parameter in the _epel_ class, or edit the $proxy variable in the
-params.pp file. By default no proxy is assumed.
-
-# Why?
-I am a big fan of EPEL. I actually was one of the people who helped get it
-going. I am also the owner of the epel-release package, so in general this
-module should stay fairly up to date with the official upstream package.
-
-I just got sick of coding Puppet modules and basically having an assumption
-that EPEL was setup or installed.  I can now depend on this module instead.
-
-I realize it is fairly trivial to get EPEL setup. Every now-and-then however
-the path to epel-release changes because something changes in the package (mass
-rebuild, rpm build macros updates, etc).  This  module will bypass the changing
-URL and just setup the package mirrors.
-
-This does mean that if you are looking for RPM macros that are normally
-included with EPEL release, this will not have them.
-
-# Futher Information
-
-* [EPEL Wiki](http://fedoraproject.org/wiki/EPEL)
-* [epel-release package information](http://mirrors.servercentral.net/fedora/epel/6/i386/repoview/epel-release.html)
-
-# Testing
-
-* This is commonly used on Puppet Enterprise 3.x
-* This was tested using Puppet 3.3.0 on Centos5/6
-* This was tested using Puppet 3.1.1 on Amazon's AWS Linux
-* I assume it will work on any RHEL variant (Amazon Linux is debatable as a variant)
-
-# Lifecycle
-* No functionality has been introduced that should break Puppet 2.6 or 2.7, but I am no longer testing these versions of Puppet as they are end-of-lifed from Puppet Labs.
-
-## Unit tests
-
-Install the necessary gems
-
-    bundle install
-
-Run the RSpec and puppet-lint tests
-
-    bundle exec rake ci
-
-## System tests
-
-If you have Vagrant >=1.1.0 you can also run system tests:
-
-    RSPEC_SET=centos-64-x64 bundle exec rake spec:system
-
-Available RSPEC_SET options are in .nodeset.yml
-
-# License
-Apache Software License 2.0
-
-# Author/Contributors
-  *  Chad Metcalf <metcalfc@gmail.com>
-  *  Joseph Swick <joseph.swick@meltwater.com>
-  *  Matthaus Owens <mlitteken@gmail.com>
-  *  Michael Stahnke <stahnma@puppetlabs.com>
-  *  Michael Stahnke <stahnma@websages.com>
-  *  Pro Cabales <proletaryo@gmail.com>
-  *  Proletaryo Cabales <proletaryo@gmail.com>
-  *  Stefan Goethals <stefan@zipkid.eu>
-  *  Tim Rupp <caphrim007@gmail.com>
-  *  Trey Dockendorf <treydock@gmail.com>
-  *  Troy Bollinger <troy@us.ibm.com>
-  *  Vlastimil Holer <holer@ics.muni.cz>
-  *  Ewoud Kohl van Wijngaarden <e.kohlvanwijngaarden@oxilion.nl>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Rakefile
deleted file mode 100644
index 5a71d17767d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Rakefile
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'rspec-system/rake_task'
-
-task :default do
-  sh %{rake -T}
-end
-
-# Disable specific puppet-lint checks
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send("disable_class_inherits_from_params_class")
-
-desc "Run rspec-puppet and puppet-lint tasks"
-task :ci => [
-  :lint,
-  :spec,
-]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7
deleted file mode 100644
index f205ede4637..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB
-OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm
-jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP
-vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM
-jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5
-S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ
-n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB
-9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95
-T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj
-GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf
-uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB
-tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk
-5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q
-ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu
-MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re
-9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax
-CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv
-HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB
-VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q
-thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc
-ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4
-vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
-RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
-=hdPa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb
deleted file mode 100644
index ba5cb84043e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is a simple fact to get the Major version of an OS without having to
-# have the entire LSB suite installed.  LSB seems to pull in about 300 megs of
-# stuff I often don't require. This fact is quick to load so it shouldn't be
-# much of an issue.
-
-Facter.add(:os_maj_version) do
-  setcode do
-    v = Facter.value(:operatingsystemrelease)
-    v.split('.')[0].strip
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/init.pp
deleted file mode 100644
index f9f4be114a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/init.pp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Class epel
-#
-# Actions:
-#   Configure the proper repositories and import GPG keys
-#
-# Reqiures:
-#   You should probably be on an Enterprise Linux variant. (Centos, RHEL,
-#   Scientific, Oracle, Ascendos, et al)
-#
-# Sample Usage:
-#  include epel
-#
-class epel (
-  $epel_mirrorlist                        = $epel::params::epel_mirrorlist,
-  $epel_baseurl                           = $epel::params::epel_baseurl,
-  $epel_failovermethod                    = $epel::params::epel_failovermethod,
-  $epel_proxy                             = $epel::params::epel_proxy,
-  $epel_enabled                           = $epel::params::epel_enabled,
-  $epel_gpgcheck                          = $epel::params::epel_gpgcheck,
-  $epel_testing_baseurl                   = $epel::params::epel_testing_baseurl,
-  $epel_testing_failovermethod            = $epel::params::epel_testing_failovermethod,
-  $epel_testing_proxy                     = $epel::params::epel_testing_proxy,
-  $epel_testing_enabled                   = $epel::params::epel_testing_enabled,
-  $epel_testing_gpgcheck                  = $epel::params::epel_testing_gpgcheck,
-  $epel_source_mirrorlist                 = $epel::params::epel_source_mirrorlist,
-  $epel_source_baseurl                    = $epel::params::epel_source_baseurl,
-  $epel_source_failovermethod             = $epel::params::epel_source_failovermethod,
-  $epel_source_proxy                      = $epel::params::epel_source_proxy,
-  $epel_source_enabled                    = $epel::params::epel_source_enabled,
-  $epel_source_gpgcheck                   = $epel::params::epel_source_gpgcheck,
-  $epel_debuginfo_mirrorlist              = $epel::params::epel_debuginfo_mirrorlist,
-  $epel_debuginfo_baseurl                 = $epel::params::epel_debuginfo_baseurl,
-  $epel_debuginfo_failovermethod          = $epel::params::epel_debuginfo_failovermethod,
-  $epel_debuginfo_proxy                   = $epel::params::epel_debuginfo_proxy,
-  $epel_debuginfo_enabled                 = $epel::params::epel_debuginfo_enabled,
-  $epel_debuginfo_gpgcheck                = $epel::params::epel_debuginfo_gpgcheck,
-  $epel_testing_source_baseurl            = $epel::params::epel_testing_source_baseurl,
-  $epel_testing_source_failovermethod     = $epel::params::epel_testing_source_failovermethod,
-  $epel_testing_source_proxy              = $epel::params::epel_testing_source_proxy,
-  $epel_testing_source_enabled            = $epel::params::epel_testing_source_enabled,
-  $epel_testing_source_gpgcheck           = $epel::params::epel_testing_source_gpgcheck,
-  $epel_testing_debuginfo_baseurl         = $epel::params::epel_testing_debuginfo_baseurl,
-  $epel_testing_debuginfo_failovermethod  = $epel::params::epel_testing_debuginfo_failovermethod,
-  $epel_testing_debuginfo_proxy           = $epel::params::epel_testing_debuginfo_proxy,
-  $epel_testing_debuginfo_enabled         = $epel::params::epel_testing_debuginfo_enabled,
-  $epel_testing_debuginfo_gpgcheck        = $epel::params::epel_testing_debuginfo_gpgcheck
-) inherits epel::params {
-
-  if $::osfamily == 'RedHat' and $::operatingsystem !~ /Fedora|Amazon/ {
-    yumrepo { 'epel-testing':
-      baseurl        => $epel_testing_baseurl,
-      failovermethod => $epel_testing_failovermethod,
-      proxy          => $epel_testing_proxy,
-      enabled        => $epel_testing_enabled,
-      gpgcheck       => $epel_testing_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - Testing - \$basearch ",
-    }
-
-    yumrepo { 'epel-testing-debuginfo':
-      baseurl        => $epel_testing_debuginfo_baseurl,
-      failovermethod => $epel_testing_debuginfo_failovermethod,
-      proxy          => $epel_testing_debuginfo_proxy,
-      enabled        => $epel_testing_debuginfo_enabled,
-      gpgcheck       => $epel_testing_debuginfo_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - Testing - \$basearch - Debug",
-    }
-
-    yumrepo { 'epel-testing-source':
-      baseurl        => $epel_testing_source_baseurl,
-      failovermethod => $epel_testing_source_failovermethod,
-      proxy          => $epel_testing_source_proxy,
-      enabled        => $epel_testing_source_enabled,
-      gpgcheck       => $epel_testing_source_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - Testing - \$basearch - Source",
-    }
-
-    yumrepo { 'epel':
-      mirrorlist     => $epel_mirrorlist,
-      baseurl        => $epel_baseurl,
-      failovermethod => $epel_failovermethod,
-      proxy          => $epel_proxy,
-      enabled        => $epel_enabled,
-      gpgcheck       => $epel_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - \$basearch",
-    }
-
-    yumrepo { 'epel-debuginfo':
-      mirrorlist     => $epel_debuginfo_mirrorlist,
-      baseurl        => $epel_debuginfo_baseurl,
-      failovermethod => $epel_debuginfo_failovermethod,
-      proxy          => $epel_debuginfo_proxy,
-      enabled        => $epel_debuginfo_enabled,
-      gpgcheck       => $epel_debuginfo_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - \$basearch - Debug",
-    }
-
-    yumrepo { 'epel-source':
-      mirrorlist     => $epel_source_mirrorlist,
-      baseurl        => $epel_source_baseurl,
-      failovermethod => $epel_source_failovermethod,
-      proxy          => $epel_source_proxy,
-      enabled        => $epel_source_enabled,
-      gpgcheck       => $epel_source_gpgcheck,
-      gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      descr          => "Extra Packages for Enterprise Linux ${::os_maj_version} - \$basearch - Source",
-    }
-
-    file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}":
-      ensure => present,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0644',
-      source => "puppet:///modules/epel/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-    }
-
-    epel::rpm_gpg_key{ "EPEL-${::os_maj_version}":
-      path    => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::os_maj_version}",
-      before  => Yumrepo['epel','epel-source','epel-debuginfo','epel-testing','epel-testing-source','epel-testing-debuginfo'],
-    }
-
-  } elsif $::osfamily == 'RedHat' and $::operatingsystem == 'Amazon' {
-    yumrepo { 'epel':
-      enabled   => $epel_enabled,
-      gpgcheck  => $epel_gpgcheck,
-    }
-  } else {
-    notice ("Your operating system ${::operatingsystem} will not have the EPEL repository applied")
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/params.pp
deleted file mode 100644
index 0939de9045a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/params.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Optional parameters in setting up EPEL
-class epel::params {
-  # Setting to 'absent' will fall back to the yum.conf
-  # Setting proxy here will be the default for all repos.
-  #
-  #  If you wish to set a proxy for an individual set of repos,
-  #   you can declare $proxy in that class, and should scope to
-  #   the most specific declaration of proxy.
-  $proxy = 'absent'
-
-  $epel_mirrorlist                        = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${::os_maj_version}&arch=\$basearch"
-  $epel_baseurl                           = 'absent'
-  $epel_failovermethod                    = 'priority'
-  $epel_proxy                             = $proxy
-  $epel_enabled                           = '1'
-  $epel_gpgcheck                          = '1'
-  $epel_testing_baseurl                   = "http://download.fedoraproject.org/pub/epel/testing/${::os_maj_version}/\$basearch"
-  $epel_testing_failovermethod            = 'priority'
-  $epel_testing_proxy                     = $proxy
-  $epel_testing_enabled                   = '0'
-  $epel_testing_gpgcheck                  = '1'
-  $epel_source_mirrorlist                 = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-${::os_maj_version}&arch=\$basearch"
-  $epel_source_baseurl                    = 'absent'
-  $epel_source_failovermethod             = 'priority'
-  $epel_source_proxy                      = $proxy
-  $epel_source_enabled                    = '0'
-  $epel_source_gpgcheck                   = '1'
-  $epel_debuginfo_mirrorlist              = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-${::os_maj_version}&arch=\$basearch"
-  $epel_debuginfo_baseurl                 = 'absent'
-  $epel_debuginfo_failovermethod          = 'priority'
-  $epel_debuginfo_proxy                   = $proxy
-  $epel_debuginfo_enabled                 = '0'
-  $epel_debuginfo_gpgcheck                = '1'
-  $epel_testing_source_baseurl            = "http://download.fedoraproject.org/pub/epel/testing/${::os_maj_version}/SRPMS"
-  $epel_testing_source_failovermethod     = 'priority'
-  $epel_testing_source_proxy              = $proxy
-  $epel_testing_source_enabled            = '0'
-  $epel_testing_source_gpgcheck           = '1'
-  $epel_testing_debuginfo_baseurl         = "http://download.fedoraproject.org/pub/epel/testing/${::os_maj_version}/\$basearch/debug"
-  $epel_testing_debuginfo_failovermethod  = 'priority'
-  $epel_testing_debuginfo_proxy           = $proxy
-  $epel_testing_debuginfo_enabled         = '0'
-  $epel_testing_debuginfo_gpgcheck        = '1'
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp
deleted file mode 100644
index ee0604dbbf9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Define epel::rpm_gpg_key
-#
-# Actions:
-#   Import a RPM gpg key
-#
-# Parameters:
-#
-# [*path*]
-#   Path of the RPM GPG key to import
-#
-# Reqiures:
-#   You should probably be on an Enterprise Linux variant. (Centos, RHEL, Scientific, Oracle, Ascendos, et al)
-#
-# Sample Usage:
-#  epel::rpm_gpg_key{ "EPEL-6":
-#    path => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6"
-#  }
-#
-define epel::rpm_gpg_key($path) {
-  # Given the path to a key, see if it is imported, if not, import it
-  exec {  "import-${name}":
-    path      => '/bin:/usr/bin:/sbin:/usr/sbin',
-    command   => "rpm --import ${path}",
-    unless    => "rpm -q gpg-pubkey-$(echo $(gpg --throw-keyids < ${path}) | cut --characters=11-18 | tr '[A-Z]' '[a-z]')",
-    require   => File[$path],
-    logoutput => 'on_failure',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/metadata.json
deleted file mode 100644
index ba8770e8b69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/metadata.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "stahnma-epel",
-  "version": "0.1.0",
-  "source": "http://github.com/stahnma/puppet-module-epel",
-  "author": "stahnma",
-  "license": "Apache License, Version 2.0",
-  "summary": "Setup the EPEL package repo",
-  "description": "Setup the EPEL package repo on Centos/RHEL et all",
-  "project_page": "http://github.com/stahnma/puppet-module-epel",
-  "dependencies": [
-
-  ],
-  "types": [
-
-  ],
-  "checksums": {
-    "Gemfile": "3189476f30a99858b367d955298fe469",
-    "LICENSE": "94f0b1430ad7e59227ccabf8232f81d5",
-    "Modulefile": "250a4370b189d3f2e68ffd359ee02bb5",
-    "README.md": "6b4c4d2e7f0f9c1b6197529fa1120c88",
-    "Rakefile": "946eced163d7f8e0da85bda4baa7fa9c",
-    "files/RPM-GPG-KEY-EPEL-5": "0466c259781def56dafe0a2cdc9de0c5",
-    "files/RPM-GPG-KEY-EPEL-6": "d865e6b948a74cb03bc3401c0b01b785",
-    "files/RPM-GPG-KEY-EPEL-7": "58fa8ae27c89f37b08429f04fd4a88cc",
-    "lib/facter/os_maj_version.rb": "806fb856251b605df379e973c716a41c",
-    "manifests/init.pp": "61856de8db1eb00700e0a9a93aea506f",
-    "manifests/params.pp": "4fb2e283b4ba6e41abd7a914bdd001b8",
-    "manifests/rpm_gpg_key.pp": "69086f12752a14b200e462afaa59a93c",
-    "spec/classes/epel_spec.rb": "7e8e5973fdccb866e91ed00a3fd0af4c",
-    "spec/classes/shared_base.rb": "a6a46eb7225a1814b9343f32190ba75b",
-    "spec/classes/shared_debuginfo.rb": "1bd23934bc1f7d14d2491c7741f10299",
-    "spec/classes/shared_gpgkey.rb": "38a62fe24acfc9cc8d740d242c9f1c85",
-    "spec/classes/shared_source.rb": "6581989ed1ca2edd589ed98ecb08bdfa",
-    "spec/classes/shared_testing.rb": "50e936b9cf241c9849cf551961492532",
-    "spec/classes/shared_testing_debuginfo.rb": "41e8a2215d347246ff241f1b3a819c91",
-    "spec/classes/shared_testing_source.rb": "8cd827b2cb0b08b1633d70784417f946",
-    "spec/defines/rpm_gpg_key_spec.rb": "489fa716eaa2aba013089a6cf552c5a6",
-    "spec/spec_helper.rb": "a5ad64bd67aa3fe2512fa7ba505c8e8b",
-    "spec/spec_helper_system.rb": "d24a7ffdf4b67dbbd3ef5687292f51cf",
-    "spec/system/basic_spec.rb": "bc475b95f390134b31d905590bf8b039",
-    "spec/system/usage_spec.rb": "04506df5627ecbe975acd1fd0407ae40",
-    "spec/unit/facter/os_maj_version_spec.rb": "67ab2730991d4a8430f1115aad46bcea",
-    "tests/init.pp": "7c69b7adf2ba141cb62cfc9e0704d59e"
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb
deleted file mode 100644
index 5d95a61a5f7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'spec_helper'
-require 'classes/shared_gpgkey'
-require 'classes/shared_base'
-require 'classes/shared_source'
-require 'classes/shared_debuginfo'
-require 'classes/shared_testing'
-require 'classes/shared_testing_source'
-require 'classes/shared_testing_debuginfo'
-
-describe 'epel' do
-  it { should create_class('epel') }
-  it { should contain_class('epel::params') }
-
-  context "operatingsystem => #{default_facts[:operatingsystem]}" do
-    context 'os_maj_version => 6' do
-      include_context :base_6
-      include_context :gpgkey_6
-      include_context :epel_source_6
-      include_context :epel_debuginfo_6
-      include_context :epel_testing_6
-      include_context :epel_testing_source_6
-      include_context :epel_testing_debuginfo_6
-
-      let :facts do
-        default_facts.merge({
-          :operatingsystemrelease => '6.4',
-          :os_maj_version         => '6',
-        })
-      end
-
-      context 'epel_baseurl => http://example.com/epel/6/x86_64' do
-        let(:params) {{ :epel_baseurl => "http://example.com/epel/6/x86_64" }}
-        it { should contain_yumrepo('epel').with('baseurl'  => 'http://example.com/epel/6/x86_64') }
-      end
-      
-      context 'epel_mirrorlist => absent' do
-        let(:params) {{ :epel_mirrorlist => 'absent' }}
-        it { should contain_yumrepo('epel').with('mirrorlist'  => 'absent') }
-      end
-    end
-
-    context 'os_maj_version => 5' do
-      include_context :base_5
-      include_context :gpgkey_5
-      include_context :epel_source_5
-      include_context :epel_debuginfo_5
-      include_context :epel_testing_5
-      include_context :epel_testing_source_5
-      include_context :epel_testing_debuginfo_5
-
-      let :facts do
-        default_facts.merge({
-          :operatingsystemrelease => '5.9',
-          :os_maj_version         => '5',
-        })
-      end
-    end
-  end
-
-  context 'operatingsystem => Amazon' do    
-    let :facts do
-      default_facts.merge({
-        :operatingsystem  => 'Amazon',
-      })
-    end
-
-    it { should_not contain_yumrepo('epel-testing') }
-    it { should_not contain_yumrepo('epel-testing-debuginfo') }
-    it { should_not contain_yumrepo('epel-testing-source') }
-    it { should_not contain_yumrepo('epel-debuginfo') }
-    it { should_not contain_yumrepo('epel-source') }
-
-    it do
-      should contain_yumrepo('epel').with({
-        'enabled'   => '1',
-        'gpgcheck'  => '1',
-      })
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_base.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_base.rb
deleted file mode 100644
index 89b3c58cca7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_base.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :base do
-  it do
-    should contain_yumrepo('epel').with({
-      'failovermethod' => 'priority',
-      'proxy'          => 'absent',
-      'enabled'        => '1',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :base_6 do
-  include_context :base
-
-  it do
-    should contain_yumrepo('epel').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - $basearch",
-    })
-  end
-end
-
-shared_context :base_5 do
-  include_context :base
-
-  it do
-    should contain_yumrepo('epel').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - $basearch",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb
deleted file mode 100644
index d47934d1425..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :epel_debuginfo do
-  it do
-    should contain_yumrepo('epel-debuginfo').with({
-      'proxy'          => 'absent',
-      'failovermethod' => 'priority',
-      'enabled'        => '0',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :epel_debuginfo_6 do
-  include_context :epel_debuginfo
-
-  it do
-    should contain_yumrepo('epel-debuginfo').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - $basearch - Debug",
-    })
-  end
-end
-
-shared_context :epel_debuginfo_5 do
-  include_context :epel_debuginfo
-
-  it do
-    should contain_yumrepo('epel-debuginfo').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - $basearch - Debug",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb
deleted file mode 100644
index 8b79c8cdd7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-shared_context :gpgkey_6 do
-  it do
-    should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6").with({
-      'ensure' => 'present',
-      'owner'  => 'root',
-      'group'  => 'root',
-      'mode'   => '0644',
-      'source' => "puppet:///modules/epel/RPM-GPG-KEY-EPEL-6",
-    })
-  end
-
-  it do
-    should contain_epel__rpm_gpg_key("EPEL-6").with({
-      'path' => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6"
-    })
-  end
-end
-
-shared_context :gpgkey_5 do
-  it do
-    should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5").with({
-      'ensure' => 'present',
-      'owner'  => 'root',
-      'group'  => 'root',
-      'mode'   => '0644',
-      'source' => "puppet:///modules/epel/RPM-GPG-KEY-EPEL-5",
-    })
-  end
-
-  it do
-    should contain_epel__rpm_gpg_key("EPEL-5").with({
-      'path' => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5"
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_source.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_source.rb
deleted file mode 100644
index c371465ba91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_source.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :epel_source do
-  it do
-    should contain_yumrepo('epel-source').with({
-      'proxy'          => 'absent',
-      'failovermethod' => 'priority',
-      'enabled'        => '0',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :epel_source_6 do
-  include_context :epel_source
-
-  it do
-    should contain_yumrepo('epel-source').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - $basearch - Source",
-    })
-  end
-end
-
-shared_context :epel_source_5 do
-  include_context :epel_source
-
-  it do
-    should contain_yumrepo('epel-source').with({
-      'mirrorlist'     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-5&arch=$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - $basearch - Source",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb
deleted file mode 100644
index d560edb6e0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :epel_testing do
-  it do
-    should contain_yumrepo('epel-testing').with({
-      'failovermethod' => 'priority',
-      'proxy'          => 'absent',
-      'enabled'        => '0',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :epel_testing_6 do
-  include_context :epel_testing
-
-  it do
-    should contain_yumrepo('epel-testing').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/6/$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - Testing - $basearch ",
-    })
-  end
-end
-
-shared_context :epel_testing_5 do
-  include_context :epel_testing
-
-  it do
-    should contain_yumrepo('epel-testing').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/5/$basearch",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - Testing - $basearch ",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb
deleted file mode 100644
index 62f647d3790..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :epel_testing_debuginfo do
-  it do
-    should contain_yumrepo('epel-testing-debuginfo').with({
-      'failovermethod' => 'priority',
-      'proxy'          => 'absent',
-      'enabled'        => '0',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :epel_testing_debuginfo_6 do
-  include_context :epel_testing_debuginfo
-
-  it do
-    should contain_yumrepo('epel-testing-debuginfo').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/6/$basearch/debug",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug",
-    })
-  end
-end
-
-shared_context :epel_testing_debuginfo_5 do
-  include_context :epel_testing_debuginfo
-
-  it do
-    should contain_yumrepo('epel-testing-debuginfo').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/5/$basearch/debug",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - Testing - $basearch - Debug",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb
deleted file mode 100644
index 1a7e0a6ae83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-shared_context :epel_testing_source do
-  it do
-    should contain_yumrepo('epel-testing-source').with({
-      'failovermethod' => 'priority',
-      'proxy'          => 'absent',
-      'enabled'        => '0',
-      'gpgcheck'       => '1',
-    })
-  end
-end
-
-shared_context :epel_testing_source_6 do
-  include_context :epel_testing_source
-
-  it do
-    should contain_yumrepo('epel-testing-source').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/6/SRPMS",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
-      'descr'          => "Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source",
-    })
-  end
-end
-
-shared_context :epel_testing_source_5 do
-  include_context :epel_testing_source
-
-  it do
-    should contain_yumrepo('epel-testing-source').with({
-      'baseurl'        => "http://download.fedoraproject.org/pub/epel/testing/5/SRPMS",
-      'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5",
-      'descr'          => "Extra Packages for Enterprise Linux 5 - Testing - $basearch - Source",
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb
deleted file mode 100644
index 63cfe08ff94..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe 'epel::rpm_gpg_key' do
-  context 'os_maj_version => 6' do
-    let :facts do
-      default_facts.merge({
-        :operatingsystemrelease => '6.4',
-        :os_maj_version         => '6',
-      })
-    end
-    
-    let :title do
-      'EPEL-6'
-    end
-  
-    let :params do
-      { :path => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6" }
-    end
-
-    it do
-      should contain_exec("import-#{title}").with({
-        'path'      => '/bin:/usr/bin:/sbin:/usr/sbin',
-        'command'   => "rpm --import #{params[:path]}",
-        'unless'    => "rpm -q gpg-pubkey-$(echo $(gpg --throw-keyids < #{params[:path]}) | cut --characters=11-18 | tr '[A-Z]' '[a-z]')",
-        'require'   => "File[#{params[:path]}]",
-        'logoutput' => 'on_failure',
-      })
-    end
-  end
-
-  context 'os_maj_version => 5' do
-    let :facts do
-      default_facts.merge({
-        :operatingsystemrelease => '5.9',
-        :os_maj_version         => '5',
-      })
-    end
-    
-    let :title do
-      'EPEL-5'
-    end
-  
-    let :params do
-      { :path => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-5" }
-    end
-
-    it do
-      should contain_exec("import-#{title}").with({
-        'path'      => '/bin:/usr/bin:/sbin:/usr/sbin',
-        'command'   => "rpm --import #{params[:path]}",
-        'unless'    => "rpm -q gpg-pubkey-$(echo $(gpg --throw-keyids < #{params[:path]}) | cut --characters=11-18 | tr '[A-Z]' '[a-z]')",
-        'require'   => "File[#{params[:path]}]",
-        'logoutput' => 'on_failure',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper.rb
deleted file mode 100644
index eafe6b60012..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-def default_facts
-  {
-    :osfamily               => 'RedHat',
-    :operatingsystem        => 'CentOS',
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper_system.rb
deleted file mode 100644
index cf680367b94..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root for the this module's code
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour in Jenkins
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-    puppet_master_install
-
-    puppet_module_install(:source => proj_root, :module_name => 'epel')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/basic_spec.rb
deleted file mode 100644
index 569e12d3737..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/basic_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_system'
-
-describe 'epel class:' do
-  context puppet_agent do
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should_not == 1 }
-  end
-
-  # Verify the os_maj_version fact is working
-  context shell 'facter --puppet os_maj_version' do
-    its(:stdout) { should_not be_empty }
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should be_zero }
-  end
-
-  pp = "class { 'epel': }"
-
-  context puppet_apply pp do
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should_not == 1 }
-    its(:refresh) { should be_nil }
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should be_zero }
-  end
-
-  context 'test EPEL repo presence' do
-    facts = node.facts
-
-    # Only test for EPEL's presence if not Fedora
-    if facts['operatingsystem'] !~ /Fedora/
-      context shell '/usr/bin/yum-config-manager epel | grep -q "\[epel\]"' do
-        its(:exit_code) { should be_zero }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/usage_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/usage_spec.rb
deleted file mode 100644
index 2b0d8f36e28..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/usage_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'spec_helper_system'
-
-describe 'standage usage tests:' do
-  context 'test epel baseurl and mirrorlist' do
-    facts = node.facts
-    os_maj_version = facts['operatingsystemrelease'].split('.')[0]
-    pp = <<-EOS
-      class { 'epel':
-        epel_baseurl    => 'http://dl.fedoraproject.org/pub/epel/#{os_maj_version}/x86_64/',
-        epel_mirrorlist => 'absent',
-      }
-    EOS
-
-    context puppet_apply pp do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-
-    # Only test for EPEL's presence if not Fedora
-    if facts['operatingsystem'] !~ /Fedora/
-      # Test the yum config to ensure mirrorlist was emptied
-      context shell '/usr/bin/yum-config-manager epel | egrep "^mirrorlist ="' do
-        its(:stdout) { should =~ /mirrorlist =\s+/ }
-      end
-
-      # Test the yum config to ensure baseurl was defined
-      context shell '/usr/bin/yum-config-manager epel | egrep "^baseurl ="' do
-        its(:stdout) { should =~ /baseurl = http:\/\/dl.fedoraproject.org\/pub\/epel\/#{os_maj_version}\/x86_64\// }
-      end
-    end
-  end
-
-  context 'test epel-testing is enabled' do
-    facts = node.facts
-    pp = <<-EOS
-      class { 'epel':
-        epel_testing_enabled    => '1',
-      }
-    EOS
-
-    context puppet_apply pp do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-
-    # Only test for EPEL's presence if not Fedora
-    if facts['operatingsystem'] !~ /Fedora/
-      # Test the yum config to ensure epel-testing was enabled
-      context shell '/usr/bin/yum-config-manager epel-testing | grep -q "enabled = True"' do
-        its(:exit_code) { should be_zero }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb
deleted file mode 100644
index 83bcdffd2c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe 'os_maj_version fact' do
-  before :each do
-    Facter.clear
-  end
-
-  context "on 5.9 operatingsystemrelease" do
-    it "should have os_maj_version => 5" do
-      Facter.fact(:operatingsystemrelease).stubs(:value).returns("5.9")
-      Facter.fact(:os_maj_version).value.should == "5"
-    end
-  end
-
-  context "on 6.4 operatingsystemrelease" do
-    it "should have os_maj_version => 6" do
-      Facter.fact(:operatingsystemrelease).stubs(:value).returns("6.4")
-      Facter.fact(:os_maj_version).value.should == "6"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/tests/init.pp
deleted file mode 100644
index c2e61d42989..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/tests/init.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-# And by test, I mean, run this thing for me using Puppet apply and I'll check
-# it out.
-include 'epel'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.fixtures.yml
deleted file mode 100644
index 8968df1f459..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.fixtures.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fixtures:
-  repositories:
-    apt: git://github.com/puppetlabs/puppetlabs-apt.git
-    stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
-    epel: git://github.com/stahnma/puppet-module-epel.git
-  symlinks:
-    erlang: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.nodeset.yml
deleted file mode 100644
index cbd0d57b83d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.nodeset.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.rspec b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.rspec
deleted file mode 100644
index 49d5710b3ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.rspec
+++ /dev/null
@@ -1 +0,0 @@
---format documentation
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.travis.yml
deleted file mode 100644
index cd412bfd344..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-language: ruby
-bundler_args: --without development
-before_install: rm Gemfile.lock || true
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-script: bundle exec rake test
-env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
-matrix:
-  exclude:
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile
deleted file mode 100644
index 39ba7f9f63a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source "http://rubygems.org"
-
-
-gem "rake"
-gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.2.0'
-gem "puppet-lint"
-gem "rspec-puppet", '~> 1.0.0'
-gem "puppetlabs_spec_helper"
-gem "rspec-system-puppet"
-gem "vagrant-wrapper"
-gem "puppet-syntax"
-
-group :development do
-  gem "puppet-blacksmith"
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile.lock b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile.lock
deleted file mode 100644
index d719aa97918..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile.lock
+++ /dev/null
@@ -1,94 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    excon (0.31.0)
-    facter (1.7.5)
-    fog (1.20.0)
-      builder
-      excon (~> 0.31.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (>= 1.5.11)
-    formatador (0.2.4)
-    hiera (1.3.2)
-      json_pure
-    json_pure (1.8.1)
-    kwalify (0.7.2)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.4)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    nokogiri (1.5.11)
-    puppet (3.2.4)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    puppet-blacksmith (2.0.2)
-      nokogiri
-      puppet (>= 2.7.16)
-      rest-client
-    puppet-lint (0.3.2)
-    puppet-syntax (1.1.0)
-      puppet (>= 2.7.0)
-      rake
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
-      rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.1)
-    rbvmomi (1.8.1)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-system (2.8.0)
-      fog (~> 1.18)
-      kwalify (~> 0.7.2)
-      mime-types (~> 1.16)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.7)
-      nokogiri (~> 1.5.10)
-      rbvmomi (~> 1.6)
-      rspec (~> 2.14)
-      systemu (~> 2.5)
-    rspec-system-puppet (2.2.1)
-      rspec-system (~> 2.0)
-    systemu (2.6.3)
-    trollop (2.0)
-    vagrant-wrapper (1.2.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  puppet (~> 3.2.0)
-  puppet-blacksmith
-  puppet-lint
-  puppet-syntax
-  puppetlabs_spec_helper
-  rake
-  rspec-puppet (~> 1.0.0)
-  rspec-system-puppet
-  vagrant-wrapper
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/LICENSE
deleted file mode 100644
index bf023233a1f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/LICENSE
+++ /dev/null
@@ -1,207 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction, and
-    distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by the
-    copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all other
-    entities that control, are controlled by, or are under common control with
-    that entity. For the purposes of this definition, "control" means (i) the
-    power, direct or indirect, to cause the direction or management of such
-    entity, whether by contract or otherwise, or (ii) ownership of
-    fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
-    ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity exercising
-    permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation source,
-    and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical transformation
-    or translation of a Source form, including but not limited to compiled
-    object code, generated documentation, and conversions to
-    other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or Object
-    form, made available under the License, as indicated by a copyright notice
-    that is included in or attached to the work (an example is provided in the
-    Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object form,
-    that is based on (or derived from) the Work and for which the editorial
-    revisions, annotations, elaborations, or other modifications represent,
-    as a whole, an original work of authorship. For the purposes of this
-    License, Derivative Works shall not include works that remain separable
-    from, or merely link (or bind by name) to the interfaces of, the Work and
-    Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including the original
-    version of the Work and any modifications or additions to that Work or
-    Derivative Works thereof, that is intentionally submitted to Licensor for
-    inclusion in the Work by the copyright owner or by an individual or
-    Legal Entity authorized to submit on behalf of the copyright owner.
-    For the purposes of this definition, "submitted" means any form of
-    electronic, verbal, or written communication sent to the Licensor or its
-    representatives, including but not limited to communication on electronic
-    mailing lists, source code control systems, and issue tracking systems
-    that are managed by, or on behalf of, the Licensor for the purpose of
-    discussing and improving the Work, but excluding communication that is
-    conspicuously marked or otherwise designated in writing by the copyright
-    owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity on
-    behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-    Subject to the terms and conditions of this License, each Contributor
-    hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-    royalty-free, irrevocable copyright license to reproduce, prepare
-    Derivative Works of, publicly display, publicly perform, sublicense,
-    and distribute the Work and such Derivative Works in
-    Source or Object form.
-
-3. Grant of Patent License.
-
-    Subject to the terms and conditions of this License, each Contributor
-    hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-    royalty-free, irrevocable (except as stated in this section) patent
-    license to make, have made, use, offer to sell, sell, import, and
-    otherwise transfer the Work, where such license applies only to those
-    patent claims licensable by such Contributor that are necessarily
-    infringed by their Contribution(s) alone or by combination of their
-    Contribution(s) with the Work to which such Contribution(s) was submitted.
-    If You institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-    Contribution incorporated within the Work constitutes direct or
-    contributory patent infringement, then any patent licenses granted to
-    You under this License for that Work shall terminate as of the date such
-    litigation is filed.
-
-4. Redistribution.
-
-    You may reproduce and distribute copies of the Work or Derivative Works
-    thereof in any medium, with or without modifications, and in Source or
-    Object form, provided that You meet the following conditions:
-
-    1. You must give any other recipients of the Work or Derivative Works a
-    copy of this License; and
-
-    2. You must cause any modified files to carry prominent notices stating
-    that You changed the files; and
-
-    3. You must retain, in the Source form of any Derivative Works that You
-    distribute, all copyright, patent, trademark, and attribution notices from
-    the Source form of the Work, excluding those notices that do not pertain
-    to any part of the Derivative Works; and
-
-    4. If the Work includes a "NOTICE" text file as part of its distribution,
-    then any Derivative Works that You distribute must include a readable copy
-    of the attribution notices contained within such NOTICE file, excluding
-    those notices that do not pertain to any part of the Derivative Works,
-    in at least one of the following places: within a NOTICE text file
-    distributed as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or, within a
-    display generated by the Derivative Works, if and wherever such
-    third-party notices normally appear. The contents of the NOTICE file are
-    for informational purposes only and do not modify the License.
-    You may add Your own attribution notices within Derivative Works that You
-    distribute, alongside or as an addendum to the NOTICE text from the Work,
-    provided that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and may
-    provide additional or different license terms and conditions for use,
-    reproduction, or distribution of Your modifications, or for any such
-    Derivative Works as a whole, provided Your use, reproduction, and
-    distribution of the Work otherwise complies with the conditions
-    stated in this License.
-
-5. Submission of Contributions.
-
-    Unless You explicitly state otherwise, any Contribution intentionally
-    submitted for inclusion in the Work by You to the Licensor shall be under
-    the terms and conditions of this License, without any additional
-    terms or conditions. Notwithstanding the above, nothing herein shall
-    supersede or modify the terms of any separate license agreement you may
-    have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-    This License does not grant permission to use the trade names, trademarks,
-    service marks, or product names of the Licensor, except as required for
-    reasonable and customary use in describing the origin of the Work and
-    reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-    Unless required by applicable law or agreed to in writing, Licensor
-    provides the Work (and each Contributor provides its Contributions)
-    on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-    either express or implied, including, without limitation, any warranties
-    or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS
-    FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any risks
-    associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-    In no event and under no legal theory, whether in tort
-    (including negligence), contract, or otherwise, unless required by
-    applicable law (such as deliberate and grossly negligent acts) or agreed
-    to in writing, shall any Contributor be liable to You for damages,
-    including any direct, indirect, special, incidental, or consequential
-    damages of any character arising as a result of this License or out of
-    the use or inability to use the Work (including but not limited to damages
-    for loss of goodwill, work stoppage, computer failure or malfunction,
-    or any and all other commercial damages or losses), even if such
-    Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-    While redistributing the Work or Derivative Works thereof, You may choose
-    to offer, and charge a fee for, acceptance of support, warranty,
-    indemnity, or other liability obligations and/or rights consistent with
-    this License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf of any
-    other Contributor, and only if You agree to indemnify, defend, and hold
-    each Contributor harmless for any liability incurred by, or claims
-    asserted against, such Contributor by reason of your accepting any such
-    warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-    To apply the Apache License to your work, attach the following boilerplate
-    notice, with the fields enclosed by brackets "[]" replaced with your own
-    identifying information. (Don't include the brackets!) The text should be
-    enclosed in the appropriate comment syntax for the file format. We also
-    recommend that a file or class name and description of purpose be included
-    on the same "printed page" as the copyright notice for easier
-    identification within third-party archives.
-
-        Copyright 2013 Gareth Rushgrove
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-        or implied. See the License for the specific language governing
-        permissions and limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Modulefile
deleted file mode 100644
index 9ca1ef70427..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Modulefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name        'garethr-erlang'
-version     '0.3.0'
-source      'git://github.com/garethr/garethr-erlang.git'
-author      'Gareth Rushgrove'
-summary     'Module for installing erlang from official repos'
-description 'Install one of the official erlang packages'
-license     'Apache License, Version 2.0'
-dependency  'puppetlabs/apt'
-dependency  'puppetlabs/stdlib'
-dependency  'stahnma/epel'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/README.md
deleted file mode 100644
index a1959740bc6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Puppet module for installing Erlang from alternative repositories.
-
-On debian it will use the official repositories
-mentioned on the [Erlang
-docs](https://www.erlang-solutions.com/downloads/download-erlang-otp).
-
-On Redhat 5 it'll use an additional EPEL repository hosted by
-[Redhat](http://repos.fedorapeople.org/repos/peter/erlang/epel-erlang.repo).
-
-On Redhat 6 it'll require EPEL.
-
-On SUSE it'll use the official repos.
-
-On Archlinux it'll use community repos.
-
-This module is also available on the [Puppet
-Forge](https://forge.puppetlabs.com/garethr/erlang)
-
-[![Build
-Status](https://secure.travis-ci.org/garethr/garethr-erlang.png)](http://travis-ci.org/garethr/garethr-erlang)
-
-## Usage
-
-The module includes a single class:
-
-    include 'erlang'
-
-By default this sets up the repository and installs the erlang package.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Rakefile
deleted file mode 100644
index d45aa3d5741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Rakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'rspec-system/rake_task'
-
-begin
-    require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-end
-
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
-PuppetLint.configuration.fail_on_warnings = true
-
-# Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
-# http://puppet-lint.com/checks/class_parameter_defaults/
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-# http://puppet-lint.com/checks/class_inherits_from_params_class/
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-# http://puppet-lint.com/checks/80chars/
-PuppetLint.configuration.send("disable_80chars")
-
-exclude_paths = [
-  "pkg/**/*",
-  "vendor/**/*",
-  "spec/**/*",
-]
-PuppetLint.configuration.ignore_paths = exclude_paths
-PuppetSyntax.exclude_paths = exclude_paths
-
-desc "Run syntax, lint, and spec tests."
-task :test => [
-  :syntax,
-  :lint,
-  :spec,
-]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/init.pp
deleted file mode 100644
index 045bada9474..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/init.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# == Class: erlang
-#
-# Module to install an up-to-date version of Erlang from the
-# official repositories
-#
-# === Parameters
-# [*version*]
-#   The package version to install, passed to ensure.
-#   Defaults to present.
-#
-class erlang (
-  $epel_enable              = $erlang::params::epel_enable,
-  $key_signature            = $erlang::params::key_signature,
-  $local_repo_location      = $erlang::params::local_repo_location,
-  $package_name             = $erlang::params::package_name,
-  $remote_repo_location     = $erlang::params::remote_repo_location,
-  $remote_repo_key_location = $erlang::params::remote_repo_key_location,
-  $repos                    = $erlang::params::repos,
-  $version                  = 'present',
-) inherits erlang::params {
-  validate_string($version)
-
-  case $::osfamily {
-    'Debian' : {
-      include '::apt'
-      include '::erlang::repo::apt'
-    }
-    'RedHat' : {
-      if $epel_enable {
-        # Include epel as this is a requirement for erlang in RHEL6.
-        include '::epel'
-        Class['epel'] -> Package[$package_name]
-      }
-
-      # This is only needed on RHEL5, RHEL6 has erlang in EPEL.
-      if $::operatingsystemrelease =~ /^5/ {
-        include '::erlang::repo::yum'
-      }
-    }
-    default : {
-    }
-  }
-
-  package { $package_name: ensure => $version, }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/params.pp
deleted file mode 100644
index 9358326cd94..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/params.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# == Class: erlang::params
-#
-# Default paramaters setting repository details for different
-# operating systems
-#
-class erlang::params {
-  $epel_enable = false
-
-  case $::osfamily {
-    'Debian' : {
-      $key_signature            = 'D208507CA14F4FCA'
-      $package_name             = 'erlang-nox'
-      $remote_repo_key_location = 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc'
-      $remote_repo_location     = 'http://packages.erlang-solutions.com/debian'
-      $repos                    = 'contrib'
-    }
-    'RedHat', 'SUSE', 'Archlinux' : {
-      $package_name = 'erlang'
-
-      if $::operatingsystemrelease =~ /^5/ {
-        $local_repo_location  = '/etc/yum.repos.d/epel-erlang.repo'
-        $remote_repo_location = 'http://repos.fedorapeople.org/repos/peter/erlang/epel-erlang.repo'
-      }
-    }
-    default : {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/apt.pp
deleted file mode 100644
index dc5dbc9c4fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/apt.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# == Class: erlang::repo::apt
-#
-# Install an apt package repository containing Erlang.
-# All parameters have sane default values in erlang::params.
-#
-# === Parameters
-# [*key_signature*]
-#   The signature for the key used to sign packages in the repository.
-#
-# [*package_name*]
-#   Name of the Erlang package in the specified repository.
-#
-# [*remote_repo_key_location*]
-#   URL of the public key for the remote repository.
-#
-# [*remote_repo_location*]
-#   URL of the remote debian repository.
-#
-# [*repos*]
-#   Which of the standard repositories to install from the
-#   remote repo. For instance main, contrib, restricted.
-#
-class erlang::repo::apt(
-  $key_signature            = $erlang::key_signature,
-  $package_name             = $erlang::package_name,
-  $remote_repo_key_location = $erlang::remote_repo_key_location,
-  $remote_repo_location     = $erlang::remote_repo_location,
-  $repos                    = $erlang::repos,
-) {
-
-  Class['erlang::repo::apt'] -> Package<| title == $package_name |>
-
-  apt::source { 'erlang':
-    include_src => false,
-    key         => $key_signature,
-    key_source  => $remote_repo_key_location,
-    location    => $remote_repo_location,
-    repos       => $repos,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/yum.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/yum.pp
deleted file mode 100644
index 702e65220b9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/yum.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# == Class: erlang::repo::yum
-#
-# Install a yum package repository containing Erlang.
-# All parameters have sane default values in erlang::params.
-#
-# === Parameters
-# [*local_repo_location*]
-#   File system location to store the repository details
-#
-# [*package_name*]
-#   Name of the Erlang package in the specified repository
-#
-# [*remote_repo_location*]
-#   URL of the remote repository
-#
-class erlang::repo::yum (
-  $local_repo_location  = $erlang::local_repo_location,
-  $package_name         = $erlang::package_name,
-  $remote_repo_location = $erlang::remote_repo_location,
-) inherits erlang {
-
-  Class['erlang::repo::yum'] -> Package<| title == $package_name |>
-
-  exec { 'erlang-repo-download':
-    command => "curl -o ${local_repo_location} ${remote_repo_location}",
-    path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-    creates => $local_repo_location,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb
deleted file mode 100644
index 8708eb1afe8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'spec_helper'
-
-describe 'erlang', :type => :class do
-
-
-  context 'on Debian' do
-    let(:facts) { {
-      :osfamily => 'Debian',
-      :lsbdistid => 'debian',
-      :lsbdistcodename => 'squeeze'
-    }}
-
-    context 'with no parameters' do
-      it { should compile.with_all_deps }
-      it { should contain_package('erlang-nox').with_ensure('present') }
-      it { should contain_apt__source('erlang').with(
-        'key_source' => 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc',
-        'key'        => 'D208507CA14F4FCA'
-        ) }
-    end
-
-    context 'with a custom version' do
-      let(:params) { {'version' => 'absent' } }
-      it { should contain_package('erlang-nox').with_ensure('absent') }
-    end
-
-    context 'with a custom package name' do
-      let(:params) { {'package_name' => 'not-erlang' } }
-      it { should contain_package('not-erlang').with_ensure('present') }
-    end
-
-    context 'with custom repository details' do
-      let(:params) { {
-          'key_signature'            => '1234ABCD',
-          'repos'                    => 'main',
-          'remote_repo_location'     => 'http://example.com/debian',
-          'remote_repo_key_location' => 'http://example.com/debian/key.asc',
-        } }
-      it { should contain_apt__source('erlang').with(
-        'location'   => 'http://example.com/debian',
-        'key_source' => 'http://example.com/debian/key.asc',
-        'key'        => '1234ABCD',
-        'repos'      => 'main'
-        ) }
-    end
-
-  end
-
-  context 'on RedHat 5' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystemrelease => '5.9' } }
-
-    context "epel enabled" do
-      let(:params) {{ :epel_enable => true }}
-      it { should contain_class('epel') }
-    end
-
-    context "epel disabled" do
-      let(:params) {{ :epel_enable => false }}
-      it { should_not contain_class('epel') }
-    end
-
-    context 'with no parameters' do
-      it { should contain_package('erlang').with_ensure('present') }
-      it { should contain_exec('erlang-repo-download').with(
-        'command' => 'curl -o /etc/yum.repos.d/epel-erlang.repo http://repos.fedorapeople.org/repos/peter/erlang/epel-erlang.repo',
-        'path'    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
-        )
-      }
-    end
-
-    context 'with a custom repository' do
-      let(:params) { {
-          'local_repo_location'  => '/tmp/yum.repos.d/tmp.repo',
-          'remote_repo_location' => 'http://example.com/fake.repo',
-        } }
-
-      it { should contain_exec('erlang-repo-download').with(
-        'command' => 'curl -o /tmp/yum.repos.d/tmp.repo http://example.com/fake.repo'
-        )
-      }
-    end
-
-    context 'with a custom version' do
-      let(:params) { {'version' => 'absent' } }
-      it { should contain_package('erlang').with_ensure('absent') }
-    end
-  end
-
-  context 'on RedHat 6' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystemrelease => '6.4' } }
-
-    context "epel enabled" do
-      let(:params) {{ :epel_enable => true }}
-      it { should contain_class('epel') }
-    end
-
-    context "epel disabled" do
-      let(:params) {{ :epel_enable => false }}
-      it { should_not contain_class('epel') }
-    end
-
-    context 'with no parameters' do
-      it { should contain_package('erlang').with_ensure('present') }
-    end
-
-    context 'with a custom version' do
-      let(:params) { {'version' => 'absent' } }
-      it { should contain_package('erlang').with_ensure('absent') }
-    end
-  end
-
-  context 'on SUSE' do
-    let(:facts) {{ :osfamily => 'SUSE', }}
-
-    context 'with no parameters' do
-      it { should contain_package('erlang').with_ensure('present') }
-    end
-
-    context 'with a custom version' do
-      let(:params) { {'version' => 'absent' } }
-      it { should contain_package('erlang').with_ensure('absent') }
-    end
-  end
-
-  context 'on Archlinux' do
-    let(:facts) {{ :osfamily => 'Archlinux', }}
-
-    context 'with no parameters' do
-      it { should contain_package('erlang').with_ensure('present') }
-    end
-
-    context 'with a custom version' do
-      let(:params) { {'version' => 'absent' } }
-      it { should contain_package('erlang').with_ensure('absent') }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb
deleted file mode 100644
index 5c370248560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  c.tty = true
-  c.include RSpecSystemPuppet::Helpers
-
-  c.before :suite do
-    puppet_install
-    puppet_module_install(:source => proj_root, :module_name => 'erlang')
-    shell('puppet module install puppetlabs-apt')
-    shell('puppet module install stahnma-epel')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb
deleted file mode 100644
index 4d5772fa59a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper_system'
-
-describe 'The erlang puppet module' do
-  it 'should run without errors' do
-    pp = <<-EOS
-      class { 'erlang':
-        epel_enable => true
-      }
-    EOS
-
-    puppet_apply(pp) do |r|
-      r.exit_code.should == 2
-      r.refresh
-      r.exit_code.should be_zero
-    end
-  end
-
-  it 'should install the erl binary into /usr/bin' do
-    shell 'which erl' do |r|
-      r.stdout.should =~ /\/usr\/bin\/erl/
-      r.stderr.should be_empty
-      r.exit_code.should be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml
deleted file mode 100644
index 0d10d5cec14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-fixtures:
-  symlinks:
-    "firewall": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml
deleted file mode 100644
index 0e94c2876c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake ci SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md
deleted file mode 100644
index daf390e98d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md
+++ /dev/null
@@ -1,432 +0,0 @@
-## 2014-05-16 Release 1.1.1
-###Summary
-
-This release reverts the alphabetical ordering of 1.1.0.  We found this caused
-a regression in the Openstack modules so in the interest of safety we have
-removed this for now.
-
-## 2014-05-13 Release 1.1.0
-###Summary
-
-This release has a significant change from previous releases; we now apply the
-firewall resources alphabetically by default, removing the need to create pre
-and post classes just to enforce ordering.  It only effects default ordering
-and further information can be found in the README about this.  Please test
-this in development before rolling into production out of an abundance of
-caution.
-
-We've also added `mask` which is required for --recent in recent (no pun
-intended) versions of iptables, as well as connlimit and connmark.  This
-release has been validated against Ubuntu 14.04 and RHEL7 and should be fully
-working on those platforms.
-
-####Features
-
-- Apply firewall resources alphabetically. 
-- Add support for connlimit and connmark.
-- Add `mask` as a parameter. (Used exclusively with the recent parameter).
-
-####Bugfixes
-
-- Add systemd support for RHEL7.
-- Replace &&'s with the correct and in manifests.
-- Fix tests on Trusty and RHEL7
-- Fix for Fedora Rawhide.
-- Fix boolean flag tests.
-- Fix DNAT->SNAT typo in an error message.
-
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
-
-## 2014-03-04 Supported Release 1.0.2
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
-### Supported release - 2014-03-04 1.0.1
-
-####Summary
-
-An important bugfix was made to the offset calculation for unmanaged rules
-to handle rules with 9000+ in the name.
-
-####Features
-
-####Bugfixes
-- Offset calculations assumed unmanaged rules were numbered 9000+.
-- Gracefully fail to manage ip6tables on iptables 1.3.x
-
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
----
-### 1.0.0 - 2014-02-11
-
-No changes, just renumbering to 1.0.0.
-
----
-### 0.5.0 - 2014-02-10
-
-##### Summary:
-This is a bigger release that brings in "recent" connection limiting (think
-"port knocking"), firewall chain purging on a per-chain/per-table basis, and
-support for a few other use cases. This release also fixes a major bug which
-could cause modifications to the wrong rules when unmanaged rules are present.
-
-##### New Features:
-* Add "recent" limiting via parameters `rdest`, `reap`, `recent`, `rhitcount`,
-  `rname`, `rseconds`, `rsource`, and `rttl`
-* Add negation support for source and destination
-* Add per-chain/table purging support to `firewallchain`
-* IPv4 specific
-  * Add random port forwarding support
-  * Add ipsec policy matching via `ipsec_dir` and `ipsec_policy`
-* IPv6 specific
-  * Add support for hop limiting via `hop_limit` parameter
-  * Add fragmentation matchers via `ishasmorefrags`, `islastfrag`, and `isfirstfrag`
-  * Add support for conntrack stateful firewall matching via `ctstate`
-
-##### Bugfixes:
-- Boolean fixups allowing false values
-- Better detection of unmanaged rules
-- Fix multiport rule detection
-- Fix sport/dport rule detection
-- Make INPUT, OUTPUT, and FORWARD not autorequired for firewall chain filter
-- Allow INPUT with the nat table
-- Fix `src_range` & `dst_range` order detection
-- Documentation clarifications
-- Fixes to spec tests
-
----------------------------------------
-
-### 0.4.2 - 2013-09-10
-
-Another attempt to fix the packaging issue.  We think we understand exactly
-what is failing and this should work properly for the first time.
-
----------------------------------------
-
-### 0.4.1 - 2013-08-09
-
-Bugfix release to fix a packaging issue that may have caused puppet module
-install commands to fail.
-
----------------------------------------
-
-### 0.4.0 - 2013-07-11
-
-This release adds support for address type, src/dest ip ranges, and adds
-additional testing and bugfixes.
-
-#### Features
-* Add `src_type` and `dst_type` attributes (Nick Stenning)
-* Add `src_range` and `dst_range` attributes (Lei Zhang)
-* Add SL and SLC operatingsystems as supported (Steve Traylen)
-
-#### Bugfixes
-* Fix parser for bursts other than 5 (Chris Rutter)
-* Fix parser for -f in --comment (Georg Koester)
-* Add doc headers to class files (Dan Carley)
-* Fix lint warnings/errors (Wolf Noble)
-
----------------------------------------
-
-### 0.3.1 - 2013/6/10
-
-This minor release provides some bugfixes and additional tests.
-
-#### Changes
-
-* Update tests for rspec-system-puppet 2 (Ken Barber)
-* Update rspec-system tests for rspec-system-puppet 1.5 (Ken Barber)
-* Ensure all services have 'hasstatus => true' for Puppet 2.6 (Ken Barber)
-* Accept pre-existing rule with invalid name (Joe Julian)
-* Swap log_prefix and log_level order to match the way it's saved (Ken Barber)
-* Fix log test to replicate bug #182 (Ken Barber)
-* Split argments while maintaining quoted strings (Joe Julian)
-* Add more log param tests (Ken Barber)
-* Add extra tests for logging parameters (Ken Barber)
-* Clarify OS support (Ken Barber)
-
----------------------------------------
-
-### 0.3.0 - 2013/4/25
-
-This release introduces support for Arch Linux and extends support for Fedora 15 and up. There are also lots of bugs fixed and improved testing to prevent regressions.
-
-##### Changes
-
-* Fix error reporting for insane hostnames (Tomas Doran)
-* Support systemd on Fedora 15 and up (Eduardo Gutierrez)
-* Move examples to docs (Ken Barber)
-* Add support for Arch Linux platform (Ingmar Steen)
-* Add match rule for fragments (Georg Koester)
-* Fix boolean rules being recognized as changed (Georg Koester)
-* Same rules now get deleted (Anastasis Andronidis)
-* Socket params test (Ken Barber)
-* Ensure parameter can disable firewall (Marc Tardif)
-
----------------------------------------
-
-### 0.2.1 - 2012/3/13
-
-This maintenance release introduces the new README layout, and fixes a bug with iptables_persistent_version.
-
-##### Changes
-
-* (GH-139) Throw away STDERR from dpkg-query in Fact
-* Update README to be consistent with module documentation template
-* Fix failing spec tests due to dpkg change in iptables_persistent_version
-
----------------------------------------
-
-### 0.2.0 - 2012/3/3
-
-This release introduces automatic persistence, removing the need for the previous manual dependency requirement for persistent the running rules to the OS persistence file.
-
-Previously you would have required the following in your site.pp (or some other global location):
-
-    # Always persist firewall rules
-    exec { 'persist-firewall':
-      command     => $operatingsystem ? {
-        'debian'          => '/sbin/iptables-save > /etc/iptables/rules.v4',
-        /(RedHat|CentOS)/ => '/sbin/iptables-save > /etc/sysconfig/iptables',
-      },
-      refreshonly => true,
-    }
-    Firewall {
-      notify  => Exec['persist-firewall'],
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    Firewallchain {
-      notify  => Exec['persist-firewall'],
-    }
-    resources { "firewall":
-      purge => true
-    }
-
-You only need:
-
-    class { 'firewall': }
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-
-To install pre-requisites and to create dependencies on your pre & post rules. Consult the README for more information.
-
-##### Changes
-
-* Firewall class manifests (Dan Carley)
-* Firewall and firewallchain persistence (Dan Carley)
-* (GH-134) Autorequire iptables related packages (Dan Carley)
-* Typo in #persist_iptables OS normalisation (Dan Carley)
-* Tests for #persist_iptables (Dan Carley)
-* (GH-129) Replace errant return in autoreq block (Dan Carley)
-
----------------------------------------
-
-### 0.1.1 - 2012/2/28
-
-This release primarily fixes changing parameters in 3.x
-
-##### Changes
-
-* (GH-128) Change method_missing usage to define_method for 3.x compatibility
-* Update travis.yml gem specifications to actually test 2.6
-* Change source in Gemfile to use a specific URL for Ruby 2.0.0 compatibility
-
----------------------------------------
-
-### 0.1.0 - 2012/2/24
-
-This release is somewhat belated, so no summary as there are far too many changes this time around. Hopefully we won't fall this far behind again :-).
-
-##### Changes
-
-* Add support for MARK target and set-mark property (Johan Huysmans)
-* Fix broken call to super for ruby-1.9.2 in munge (Ken Barber)
-* simple fix of the error message for allowed values of the jump property (Daniel Black)
-* Adding OSPF(v3) protocol to puppetlabs-firewall (Arnoud Vermeer)
-* Display multi-value: port, sport, dport and state command seperated (Daniel Black)
-* Require jump=>LOG for log params (Daniel Black)
-* Reject and document icmp => "any" (Dan Carley)
-* add firewallchain type and iptables_chain provider (Daniel Black)
-* Various fixes for firewallchain resource (Ken Barber)
-* Modify firewallchain name to be chain:table:protocol (Ken Barber)
-* Fix allvalidchain iteration (Ken Barber)
-* Firewall autorequire Firewallchains (Dan Carley)
-* Tests and docstring for chain autorequire (Dan Carley)
-* Fix README so setup instructions actually work (Ken Barber)
-* Support vlan interfaces (interface containing ".") (Johan Huysmans)
-* Add tests for VLAN support for iniface/outiface (Ken Barber)
-* Add the table when deleting rules (Johan Huysmans)
-* Fix tests since we are now prefixing -t)
-* Changed 'jump' to 'action', commands to lower case (Jason Short)
-* Support interface names containing "+" (Simon Deziel)
-* Fix for when iptables-save spews out "FATAL" errors (Sharif Nassar)
-* Fix for incorrect limit command arguments for ip6tables provider (Michael Hsu)
-* Document Util::Firewall.host_to_ip (Dan Carley)
-* Nullify addresses with zero prefixlen (Dan Carley)
-* Add support for --tcp-flags (Thomas Vander Stichele)
-* Make tcp_flags support a feature (Ken Barber)
-* OUTPUT is a valid chain for the mangle table (Adam Gibbins)
-* Enable travis-ci support (Ken Barber)
-* Convert an existing test to CIDR (Dan Carley)
-* Normalise iptables-save to CIDR (Dan Carley)
-* be clearer about what distributions we support (Ken Barber)
-* add gre protocol to list of acceptable protocols (Jason Hancock)
-* Added pkttype property (Ashley Penney)
-* Fix mark to not repeat rules with iptables 1.4.1+ (Sharif Nassar)
-* Stub iptables_version for now so tests run on non-Linux hosts (Ken Barber)
-* Stub iptables facts for set_mark tests (Dan Carley)
-* Update formatting of README to meet Puppet Labs best practices (Will Hopper)
-* Support for ICMP6 type code resolutions (Dan Carley)
-* Insert order hash included chains from different tables (Ken Barber)
-* rspec 2.11 compatibility (Jonathan Boyett)
-* Add missing class declaration in README (sfozz)
-* array_matching is contraindicated (Sharif Nassar)
-* Convert port Fixnum into strings (Sharif Nassar)
-* Update test framework to the modern age (Ken Barber)
-* working with ip6tables support (wuwx)
-* Remove gemfile.lock and add to gitignore (William Van Hevelingen)
-* Update travis and gemfile to be like stdlib travis files (William Van Hevelingen)
-* Add support for -m socket option (Ken Barber)
-* Add support for single --sport and --dport parsing (Ken Barber)
-* Fix tests for Ruby 1.9.3 from 3e13bf3 (Dan Carley)
-* Mock Resolv.getaddress in #host_to_ip (Dan Carley)
-* Update docs for source and dest - they are not arrays (Ken Barber)
-
----------------------------------------
-
-### 0.0.4 - 2011/12/05
-
-This release adds two new parameters, 'uid' and 'gid'. As a part of the owner module, these params allow you to specify a uid, username, gid, or group got a match:
-
-    firewall { '497 match uid':
-      port => '123',
-      proto => 'mangle',
-      chain => 'OUTPUT',
-      action => 'drop'
-      uid => '123'
-    }
-
-This release also adds value munging for the 'log_level', 'source', and 'destination' parameters. The 'source' and 'destination' now support hostnames:
-
-    firewall { '498 accept from puppetlabs.com':
-      port => '123',
-      proto => 'tcp',
-      source => 'puppetlabs.com',
-      action => 'accept'
-    }
-
-
-The 'log_level' parameter now supports using log level names, such as 'warn', 'debug', and 'panic':
-
-    firewall { '499 logging':
-      port => '123',
-      proto => 'udp',
-      log_level => 'debug',
-      action => 'drop'
-    }
-
-Additional changes include iptables and ip6tables version facts, general whitespace cleanup, and adding additional unit tests.
-
-##### Changes
-
-* (#10957) add iptables_version and ip6tables_version facts
-* (#11093) Improve log_level property so it converts names to numbers
-* (#10723) Munge hostnames and IPs to IPs with CIDR
-* (#10718) Add owner-match support
-* (#10997) Add fixtures for ipencap
-* (#11034) Whitespace cleanup
-* (#10690) add port property support to ip6tables
-
----------------------------------------
-
-### 0.0.3 - 2011/11/12
-
-This release introduces a new parameter 'port' which allows you to set both
-source and destination ports for a match:
-
-    firewall { "500 allow NTP requests":
-      port => "123",
-      proto => "udp",
-      action => "accept",
-    }
-
-We also have the limit parameter finally working:
-
-    firewall { "500 limit HTTP requests":
-      dport => 80,
-      proto => tcp,
-      limit => "60/sec",
-      burst => 30,
-      action => accept,
-    }
-
-State ordering has been fixed now, and more characters are allowed in the
-namevar:
-
-* Alphabetical
-* Numbers
-* Punctuation
-* Whitespace
-
-##### Changes
-
-* (#10693) Ensure -m limit is added for iptables when using 'limit' param
-* (#10690) Create new port property
-* (#10700) allow additional characters in comment string
-* (#9082) Sort iptables --state option values internally to keep it consistent across runs
-* (#10324) Remove extraneous whitespace from iptables rule line in spec tests
-
----------------------------------------
-
-### 0.0.2 - 2011/10/26
-
-This is largely a maintanence and cleanup release, but includes the ability to
-specify ranges of ports in the sport/dport parameter:
-
-    firewall { "500 allow port range":
-      dport => ["3000-3030","5000-5050"],
-      sport => ["1024-65535"],
-      action => "accept",
-    }
-
-##### Changes
-
-* (#10295) Work around bug #4248 whereby the puppet/util paths are not being loaded correctly on the puppetmaster
-* (#10002) Change to dport and sport to handle ranges, and fix handling of name to name to port
-* (#10263) Fix tests on Puppet 2.6.x
-* (#10163) Cleanup some of the inline documentation and README file to align with general forge usage
-
----------------------------------------
-
-### 0.0.1 - 2011/10/18
-
-Initial release.
-
-##### Changes
-
-* (#9362) Create action property and perform transformation for accept, drop, reject value for iptables jump parameter
-* (#10088) Provide a customised version of CONTRIBUTING.md
-* (#10026) Re-arrange provider and type spec files to align with Puppet
-* (#10026) Add aliases for test,specs,tests to Rakefile and provide -T as default
-* (#9439) fix parsing and deleting existing rules
-* (#9583) Fix provider detection for gentoo and unsupported linuxes for the iptables provider
-* (#9576) Stub provider so it works properly outside of Linux
-* (#9576) Align spec framework with Puppet core
-* and lots of other earlier development tasks ...
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md
deleted file mode 100644
index 630ba8581eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# How to contribute
-
-Third-party patches are essential for keeping puppet great. We simply can't
-access the huge number of platforms and myriad configurations for running
-puppet. We want to keep it as easy as possible to contribute changes that
-get things working in your environment. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
-
-## Making Changes
-
-* Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
-    `master` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (MODULES-1234) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-
-## Making Trivial Changes
-
-### Documentation
-
-For changes of a trivial nature to comments and documentation, it is not
-always necessary to create a new ticket in Jira. In this case, it is
-appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number. 
-
-````
-    (doc) Add documentation commit example to CONTRIBUTING
-
-    There is no example for contributing a documentation commit
-    to the Puppet repository. This is a problem because the contributor
-    is left to assume how a commit of this nature may appear.
-
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a 
-    non-documentation related commit. The body describes the nature of
-    the new documentation or comments added.
-````
-
-## Submitting Changes
-
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the puppetlabs organization.
-* Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
-  * Include a link to the pull request in the ticket.
-
-# Additional Resources
-
-* [More information on contributing](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppetlabs.com/cla)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #puppet-dev IRC channel on freenode.org
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile
deleted file mode 100644
index 9e6eaa54163..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet',           :require => false
-  gem 'serverspec',             :require => false
-  gem 'beaker-rspec',           :require => false
-  gem 'puppet-lint',            :require => false
-  gem 'pry',                    :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE
deleted file mode 100644
index 1d196fc30c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Puppet Firewall Module - Puppet module for managing Firewalls
-
-Copyright (C) 2011-2013 Puppet Labs, Inc.
-Copyright (C) 2011 Jonathan Boyett
-Copyright (C) 2011 Media Temple, Inc.
-
-Some of the iptables code was taken from puppet-iptables which was:
-
-Copyright (C) 2011 Bob.sh Limited
-Copyright (C) 2008 Camptocamp Association
-Copyright (C) 2007 Dmitri Priimak
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile
deleted file mode 100644
index 975614762f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'puppetlabs-firewall'
-version '1.1.1'
-source 'git://github.com/puppetlabs/puppetlabs-firewall.git'
-author 'puppetlabs'
-license 'ASL 2.0'
-summary 'Firewall Module'
-description 'Manages Firewalls such as iptables'
-project_page 'http://forge.puppetlabs.com/puppetlabs/firewall'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown
deleted file mode 100644
index 24705149e78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown
+++ /dev/null
@@ -1,429 +0,0 @@
-#firewall
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-firewall.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-firewall)
-
-####Table of Contents
-
-1. [Overview - What is the Firewall module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with Firewall](#setup)
-    * [What Firewall affects](#what-firewall-affects)
-    * [Setup Requirements](#setup-requirements)
-    * [Beginning with Firewall](#beginning-with-firewall)
-    * [Upgrading](#upgrading)
-4. [Usage - Configuration and customization options](#usage)
-    * [Default rules - Setting up general configurations for all firewalls](#default-rules)
-    * [Application-specific rules - Options for configuring and managing firewalls across applications](#application-specific-rules)
-    * [Other Rules](#other-rules)
-5. [Reference - An under-the-hood peek at what the module is doing](#reference)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-    * [Tests - Testing your configuration](#tests)
-
-##Overview
-
-The Firewall module lets you manage firewall rules with Puppet.
-
-##Module Description
-
-PuppetLabs' Firewall introduces the resource `firewall`, which is used to manage and configure firewall rules from within the Puppet DSL. This module offers support for iptables, ip6tables, and ebtables.
-
-The module also introduces the resource `firewallchain`, which allows you to manage chains or firewall lists. At the moment, only iptables and ip6tables chains are supported.
-
-##Setup
-
-###What Firewall affects:
-
-* every node running a firewall
-* system's firewall settings
-* connection settings for managed nodes
-* unmanaged resources (get purged)
-* site.pp
-
-###Setup Requirements
-
-Firewall uses Ruby-based providers, so you must have [pluginsync enabled](http://docs.puppetlabs.com/guides/plugins_in_modules.html#enabling-pluginsync).
-
-###Beginning with Firewall
-
-To begin, you need to provide some initial top-scope configuration to ensure your firewall configurations are ordered properly and you do not lock yourself out of your box or lose any configuration.
-
-Persistence of rules between reboots is handled automatically, although there are known issues with ip6tables on older Debian/Ubuntu, as well as known issues with ebtables.
-
-In your `site.pp` (or some similarly top-scope file), set up a metatype to purge unmanaged firewall resources. This will clear any existing rules and make sure that only rules defined in Puppet exist on the machine.
-
-    resources { "firewall":
-      purge => true
-    }
-
-Next, set up the default parameters for all of the firewall rules you will be establishing later. These defaults will ensure that the pre and post classes (you will be setting up in just a moment) are run in the correct order to avoid locking you out of your box during the first puppet run.
-
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-
-You also need to declare the `my_fw::pre` & `my_fw::post` classes so that dependencies are satisfied. This can be achieved using an External Node Classifier or the following
-
-    class { ['my_fw::pre', 'my_fw::post']: }
-
-Finally, you should include the `firewall` class to ensure the correct packages are installed.
-
-    class { 'firewall': }
-
-Now to create the `my_fw::pre` and `my_fw::post` classes. Firewall acts on your running firewall, making immediate changes as the catalog executes. Defining default pre and post rules allows you provide global defaults for your hosts before and after any custom rules; it is also required to avoid locking yourself out of your own boxes when Puppet runs. This approach employs a whitelist setup, so you can define what rules you want and everything else is ignored rather than removed.
-
-The `pre` class should be located in `my_fw/manifests/pre.pp` and should contain any default rules to be applied first.
-
-    class my_fw::pre {
-      Firewall {
-        require => undef,
-      }
-
-      # Default firewall rules
-      firewall { '000 accept all icmp':
-        proto   => 'icmp',
-        action  => 'accept',
-      }->
-      firewall { '001 accept all to lo interface':
-        proto   => 'all',
-        iniface => 'lo',
-        action  => 'accept',
-      }->
-      firewall { '002 accept related established rules':
-        proto   => 'all',
-        state => ['RELATED', 'ESTABLISHED'],
-        action  => 'accept',
-      }
-    }
-
-The rules in `pre` should allow basic networking (such as ICMP and TCP), as well as ensure that existing connections are not closed.
-
-The `post` class should be located in `my_fw/manifests/post.pp` and include any default rules to be applied last.
-
-    class my_fw::post {
-      firewall { '999 drop all':
-        proto   => 'all',
-        action  => 'drop',
-        before  => undef,
-      }
-    }
-
-To put it all together: the `require` parameter in `Firewall {}` ensures `my_fw::pre` is run before any other rules and the `before` parameter ensures `my_fw::post` is run after any other rules. So the run order is:
-
-* run the rules in `my_fw::pre`
-* run your rules (defined in code)
-* run the rules in `my_fw::post`
-
-###Upgrading
-
-####Upgrading from version 0.2.0 and newer
-
-Upgrade the module with the puppet module tool as normal:
-
-    puppet module upgrade puppetlabs/firewall
-
-####Upgrading from version 0.1.1 and older
-
-Start by upgrading the module using the puppet module tool:
-
-    puppet module upgrade puppetlabs/firewall
-
-Previously, you would have required the following in your `site.pp` (or some other global location):
-
-    # Always persist firewall rules
-    exec { 'persist-firewall':
-      command     => $operatingsystem ? {
-        'debian'          => '/sbin/iptables-save > /etc/iptables/rules.v4',
-        /(RedHat|CentOS)/ => '/sbin/iptables-save > /etc/sysconfig/iptables',
-      },
-      refreshonly => true,
-    }
-    Firewall {
-      notify  => Exec['persist-firewall'],
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    Firewallchain {
-      notify  => Exec['persist-firewall'],
-    }
-    resources { "firewall":
-      purge => true
-    }
-
-With the latest version, we now have in-built persistence, so this is no longer needed. However, you will still need some basic setup to define pre & post rules.
-
-    resources { "firewall":
-      purge => true
-    }
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    class { ['my_fw::pre', 'my_fw::post']: }
-    class { 'firewall': }
-
-Consult the the documentation below for more details around the classes `my_fw::pre` and `my_fw::post`.
-
-##Usage
-
-There are two kinds of firewall rules you can use with Firewall: default rules and application-specific rules. Default rules apply to general firewall settings, whereas application-specific rules manage firewall settings of a specific application, node, etc.
-
-All rules employ a numbering system in the resource's title that is used for ordering. When titling your rules, make sure you prefix the rule with a number.
-
-      000 this runs first
-      999 this runs last
-
-###Default rules
-
-You can place default rules in either `my_fw::pre` or `my_fw::post`, depending on when you would like them to run. Rules placed in the `pre` class will run first, rules in the `post` class, last.
-
-Depending on the provider, the title of the rule can be stored using the comment feature of the underlying firewall subsystem. Values can match `/^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/`.
-
-####Examples of default rules
-
-Basic accept ICMP request example:
-
-    firewall { "000 accept all icmp requests":
-      proto  => "icmp",
-      action => "accept",
-    }
-
-Drop all:
-
-    firewall { "999 drop all other requests":
-      action => "drop",
-    }
-
-###Application-specific rules
-
-Puppet doesn't care where you define rules, and this means that you can place
-your firewall resources as close to the applications and services that you
-manage as you wish.  If you use the [roles and profiles
-pattern](https://puppetlabs.com/learn/roles-profiles-introduction) then it
-would make sense to create your firewall rules in the profiles, so that they
-remain close to the services managed by the profile.
-
-An example of this might be:
-
-```puppet
-class profile::apache {
-  include apache
-  apache::vhost { 'mysite': ensure => present }
-
-  firewall { '100 allow http and https access':
-    port   => [80, 443],
-    proto  => tcp,
-    action => accept,
-  }
-}
-```
-
-
-However, if you're not using that pattern then you can place them directly into
-the individual module that manages a service, such as:
-
-```puppet
-class apache {
-  firewall { '100 allow http and https access':
-    port   => [80, 443],
-    proto  => tcp,
-    action => accept,
-  }
-  # ... the rest of your code ...
-}
-```
-
-This means if someone includes either the profile:
-
-```puppet
-include profile::apache
-```
-
-Or the module, if you're not using roles and profiles:
-
-```puppet
-  include ::apache
-```
-
-Then they would automatically get appropriate firewall rules.
-
-###Other rules
-
-You can also apply firewall rules to specific nodes. Usually, you will want to put the firewall rule in another class and apply that class to a node. But you can apply a rule to a node.
-
-    node 'foo.bar.com' {
-      firewall { '111 open port 111':
-        dport => 111
-      }
-    }
-
-You can also do more complex things with the `firewall` resource. Here we are doing some NAT configuration.
-
-    firewall { '100 snat for network foo2':
-      chain    => 'POSTROUTING',
-      jump     => 'MASQUERADE',
-      proto    => 'all',
-      outiface => "eth0",
-      source   => '10.1.2.0/24',
-      table    => 'nat',
-    }
-
-In the below example, we are creating a new chain and forwarding any port 5000 access to it.
-
-    firewall { '100 forward to MY_CHAIN':
-      chain   => 'INPUT',
-      jump    => 'MY_CHAIN',
-    }
-    # The namevar here is in the format chain_name:table:protocol
-    firewallchain { 'MY_CHAIN:filter:IPv4':
-      ensure  => present,
-    }
-    firewall { '100 my rule':
-      chain   => 'MY_CHAIN',
-      action  => 'accept',
-      proto   => 'tcp',
-      dport   => 5000,
-    }
-
-###Additional Information
-
-You can access the inline documentation:
-
-    puppet describe firewall
-
-Or
-
-    puppet doc -r type
-    (and search for firewall)
-
-##Reference
-
-Classes:
-
-* [firewall](#class-firewall)
-
-Types:
-
-* [firewall](#type-firewall)
-* [firewallchain](#type-firewallchain)
-
-Facts:
-
-* [ip6tables_version](#fact-ip6tablesversion)
-* [iptables_version](#fact-iptablesversion)
-* [iptables_persistent_version](#fact-iptablespersistentversion)
-
-###Class: firewall
-
-This class is provided to do the basic setup tasks required for using the firewall resources.
-
-At the moment this takes care of:
-
-* iptables-persistent package installation
-
-You should include the class for nodes that need to use the resources in this module. For example
-
-    class { 'firewall': }
-
-####`ensure`
-
-Indicates the state of `iptables` on your system, allowing you to disable `iptables` if desired.
-
-Can either be `running` or `stopped`. Default to `running`.
-
-###Type: firewall
-
-This type provides the capability to manage firewall rules within puppet.
-
-For more documentation on the type, access the 'Types' tab on the Puppet Labs Forge:
-
-<http://forge.puppetlabs.com/puppetlabs/firewall#types>
-
-###Type:: firewallchain
-
-This type provides the capability to manage rule chains for firewalls.
-
-For more documentation on the type, access the 'Types' tab on the Puppet Labs Forge:
-
-<http://forge.puppetlabs.com/puppetlabs/firewall#types>
-
-###Fact: ip6tables_version
-
-The module provides a Facter fact that can be used to determine what the default version of ip6tables is for your operating system/distribution.
-
-###Fact: iptables_version
-
-The module provides a Facter fact that can be used to determine what the default version of iptables is for your operating system/distribution.
-
-###Fact: iptables_persistent_version
-
-Retrieves the version of iptables-persistent from your OS. This is a Debian/Ubuntu specific fact.
-
-##Limitations
-
-###SLES
-
-The `socket` parameter is not supported on SLES.  In this release it will cause
-the catalog to fail with iptables failures, rather than correctly warn you that
-the features are unusable.
-
-###Oracle Enterprise Linux
-
-The `socket` and `owner` parameters are unsupported on Oracle Enterprise Linux
-when the "Unbreakable" kernel is used. These may function correctly when using
-the stock RedHat kernel instead. Declaring either of these parameters on an
-unsupported system will result in iptable rules failing to apply.
-
-###Other
-
-Bugs can be reported using JIRA issues
-
-<http://tickets.puppetlabs.com>
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-For this particular module, please also read CONTRIBUTING.md before contributing.
-
-Currently we support:
-
-* iptables
-* ip6tables
-* ebtables (chains only)
-
-But plans are to support lots of other firewall implementations:
-
-* FreeBSD (ipf)
-* Mac OS X (ipfw)
-* OpenBSD (pf)
-* Cisco (ASA and basic access lists)
-
-If you have knowledge in these technologies, know how to code, and wish to contribute to this project, we would welcome the help.
-
-###Testing
-
-Make sure you have:
-
-* rake
-* bundler
-
-Install the necessary gems:
-
-    bundle install
-
-And run the tests from the root of the source code:
-
-    rake test
-
-If you have a copy of Vagrant 1.1.0 you can also run the system tests:
-
-    RSPEC_SET=debian-606-x64 rake spec:system
-    RSPEC_SET=centos-58-x64 rake spec:system
-
-*Note:* system testing is fairly alpha at this point, your mileage may vary.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile
deleted file mode 100644
index 8b12070304c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.ignore_paths = ['vendor/**/*.pp']
-
-task :default do
-  sh %{rake -T}
-end
-
-desc 'Run reasonably quick tests for CI'
-task :ci => [
-  :lint,
-  :spec,
-]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb
deleted file mode 100644
index 3dce27f70cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:ip6tables_version) do
-  confine :kernel => :linux
-  setcode do
-    version = Facter::Util::Resolution.exec('ip6tables --version')
-    if version
-      version.match(/\d+\.\d+\.\d+/).to_s
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
deleted file mode 100644
index 80bf9dea1a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Facter.add(:iptables_persistent_version) do
-  confine :operatingsystem => %w{Debian Ubuntu}
-  setcode do
-    # Throw away STDERR because dpkg >= 1.16.7 will make some noise if the
-    # package isn't currently installed.
-    cmd = "dpkg-query -Wf '${Version}' iptables-persistent 2>/dev/null"
-    version = Facter::Util::Resolution.exec(cmd)
-
-    if version.nil? or !version.match(/\d+\.\d+/)
-      nil
-    else
-      version
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb
deleted file mode 100644
index 6f7ae564740..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:iptables_version) do
-  confine :kernel => :linux
-  setcode do
-    version = Facter::Util::Resolution.exec('iptables --version')
-    if version
-      version.match(/\d+\.\d+\.\d+/).to_s
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb
deleted file mode 100644
index c6b0b10bb13..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class Puppet::Provider::Firewall < Puppet::Provider
-
-  # Prefetch our rule list. This is ran once every time before any other
-  # action (besides initialization of each object).
-  def self.prefetch(resources)
-    debug("[prefetch(resources)]")
-    instances.each do |prov|
-      if resource = resources[prov.name] || resources[prov.name.downcase]
-        resource.provider = prov
-      end
-    end
-  end
-
-  # Look up the current status. This allows us to conventiently look up
-  # existing status with properties[:foo].
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-      @property_hash[:ensure] = :absent if @property_hash.empty?
-    end
-    @property_hash.dup
-  end
-
-  # Pull the current state of the list from the full list.  We're
-  # getting some double entendre here....
-  def query
-    self.class.instances.each do |instance|
-      if instance.name == self.name or instance.name.downcase == self.name
-        return instance.properties
-      end
-    end
-    nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb
deleted file mode 100644
index e1ce01af6ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source => :iptables do
-  @doc = "Ip6tables type provider"
-
-  has_feature :iptables
-  has_feature :connection_limiting
-  has_feature :hop_limiting
-  has_feature :rate_limiting
-  has_feature :recent_limiting
-  has_feature :snat
-  has_feature :dnat
-  has_feature :interface_match
-  has_feature :icmp_match
-  has_feature :owner
-  has_feature :state_match
-  has_feature :reject_type
-  has_feature :log_level
-  has_feature :log_prefix
-  has_feature :mark
-  has_feature :tcp_flags
-  has_feature :pkttype
-  has_feature :ishasmorefrags
-  has_feature :islastfrag
-  has_feature :isfirstfrag
-
-  optional_commands({
-    :ip6tables      => 'ip6tables',
-    :ip6tables_save => 'ip6tables-save',
-  })
-
-  def initialize(*args)
-    if Facter.fact('ip6tables_version').value.match /1\.3\.\d/
-      raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables'
-    else
-      super
-    end
-  end
-
-  def self.iptables(*args)
-    ip6tables(*args)
-  end
-
-  def self.iptables_save(*args)
-    ip6tables_save(*args)
-  end
-
-  @protocol = "IPv6"
-
-  @resource_map = {
-    :burst => "--limit-burst",
-    :connlimit_above => "-m connlimit --connlimit-above",
-    :connlimit_mask => "--connlimit-mask",
-    :connmark => "-m connmark --mark",
-    :ctstate => "-m conntrack --ctstate",
-    :destination => "-d",
-    :dport => "-m multiport --dports",
-    :gid => "-m owner --gid-owner",
-    :icmp => "-m icmp6 --icmpv6-type",
-    :iniface => "-i",
-    :jump => "-j",
-    :hop_limit => "-m hl --hl-eq",
-    :limit => "-m limit --limit",
-    :log_level => "--log-level",
-    :log_prefix => "--log-prefix",
-    :name => "-m comment --comment",
-    :outiface => "-o",
-    :port => '-m multiport --ports',
-    :proto => "-p",
-    :rdest => "--rdest",
-    :reap => "--reap",
-    :recent => "-m recent",
-    :reject => "--reject-with",
-    :rhitcount => "--hitcount",
-    :rname => "--name",
-    :rseconds => "--seconds",
-    :rsource => "--rsource",
-    :rttl => "--rttl",
-    :source => "-s",
-    :state => "-m state --state",
-    :sport => "-m multiport --sports",
-    :table => "-t",
-    :todest => "--to-destination",
-    :toports => "--to-ports",
-    :tosource => "--to-source",
-    :uid => "-m owner --uid-owner",
-    :pkttype => "-m pkttype --pkt-type",
-    :ishasmorefrags => "-m frag --fragid 0 --fragmore",
-    :islastfrag => "-m frag --fragid 0 --fraglast",
-    :isfirstfrag => "-m frag --fragid 0 --fragfirst",
-  }
-
-  # These are known booleans that do not take a value, but we want to munge
-  # to true if they exist.
-  @known_booleans = [:ishasmorefrags, :islastfrag, :isfirstfrag, :rsource, :rdest, :reap, :rttl]
-
-  # Create property methods dynamically
-  (@resource_map.keys << :chain << :table << :action).each do |property|
-    if @known_booleans.include?(property) then
-      # The boolean properties default to '' which should be read as false
-      define_method "#{property}" do
-        @property_hash[property] = :false if @property_hash[property] == nil
-        @property_hash[property.to_sym]
-      end
-    else
-      define_method "#{property}" do
-        @property_hash[property.to_sym]
-      end
-    end
-
-    if property == :chain
-      define_method "#{property}=" do |value|
-        if @property_hash[:chain] != value
-          raise ArgumentError, "Modifying the chain for existing rules is not supported."
-        end
-      end
-    else
-      define_method "#{property}=" do |value|
-        @property_hash[:needs_change] = true
-      end
-    end
-  end
-
-  # This is the order of resources as they appear in iptables-save output,
-  # we need it to properly parse and apply rules, if the order of resource
-  # changes between puppet runs, the changed rules will be re-applied again.
-  # This order can be determined by going through iptables source code or just tweaking and trying manually
-  # (Note: on my CentOS 6.4 ip6tables-save returns -m frag on the place
-  # I put it when calling the command. So compability with manual changes
-  # not provided with current parser [georg.koester])
-  @resource_list = [:table, :source, :destination, :iniface, :outiface,
-    :proto, :ishasmorefrags, :islastfrag, :isfirstfrag, :gid, :uid, :sport, :dport,
-    :port, :pkttype, :name, :state, :ctstate, :icmp, :hop_limit, :limit, :burst,
-    :recent, :rseconds, :reap, :rhitcount, :rttl, :rname, :rsource, :rdest,
-    :jump, :todest, :tosource, :toports, :log_level, :log_prefix, :reject,
-    :connlimit_above, :connlimit_mask, :connmark]
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb
deleted file mode 100644
index 5ad10125d7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb
+++ /dev/null
@@ -1,501 +0,0 @@
-require 'puppet/provider/firewall'
-require 'digest/md5'
-
-Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Firewall do
-  include Puppet::Util::Firewall
-
-  @doc = "Iptables type provider"
-
-  has_feature :iptables
-  has_feature :connection_limiting
-  has_feature :rate_limiting
-  has_feature :recent_limiting
-  has_feature :snat
-  has_feature :dnat
-  has_feature :interface_match
-  has_feature :icmp_match
-  has_feature :owner
-  has_feature :state_match
-  has_feature :reject_type
-  has_feature :log_level
-  has_feature :log_prefix
-  has_feature :mark
-  has_feature :tcp_flags
-  has_feature :pkttype
-  has_feature :isfragment
-  has_feature :socket
-  has_feature :address_type
-  has_feature :iprange
-  has_feature :ipsec_dir
-  has_feature :ipsec_policy
-  has_feature :mask
-
-  optional_commands({
-    :iptables => 'iptables',
-    :iptables_save => 'iptables-save',
-  })
-
-  defaultfor :kernel => :linux
-
-  iptables_version = Facter.fact('iptables_version').value
-  if (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') < 0)
-    mark_flag = '--set-mark'
-  else
-    mark_flag = '--set-xmark'
-  end
-
-  @protocol = "IPv4"
-
-  @resource_map = {
-    :burst           => "--limit-burst",
-    :connlimit_above => "-m connlimit --connlimit-above",
-    :connlimit_mask  => "--connlimit-mask",
-    :connmark        => "-m connmark --mark",
-    :ctstate         => "-m conntrack --ctstate",
-    :destination     => "-d",
-    :dst_type        => "-m addrtype --dst-type",
-    :dst_range       => "-m iprange --dst-range",
-    :dport           => ["-m multiport --dports", "--dport"],
-    :gid             => "-m owner --gid-owner",
-    :icmp            => "-m icmp --icmp-type",
-    :iniface         => "-i",
-    :jump            => "-j",
-    :limit           => "-m limit --limit",
-    :log_level       => "--log-level",
-    :log_prefix      => "--log-prefix",
-    :name            => "-m comment --comment",
-    :outiface        => "-o",
-    :port            => '-m multiport --ports',
-    :proto           => "-p",
-    :random          => "--random",
-    :rdest           => "--rdest",
-    :reap            => "--reap",
-    :recent          => "-m recent",
-    :reject          => "--reject-with",
-    :rhitcount       => "--hitcount",
-    :rname           => "--name",
-    :rseconds        => "--seconds",
-    :rsource         => "--rsource",
-    :rttl            => "--rttl",
-    :set_mark        => mark_flag,
-    :socket          => "-m socket",
-    :source          => "-s",
-    :src_type        => "-m addrtype --src-type",
-    :src_range       => "-m iprange --src-range",
-    :sport           => ["-m multiport --sports", "--sport"],
-    :state           => "-m state --state",
-    :table           => "-t",
-    :tcp_flags       => "-m tcp --tcp-flags",
-    :todest          => "--to-destination",
-    :toports         => "--to-ports",
-    :tosource        => "--to-source",
-    :uid             => "-m owner --uid-owner",
-    :pkttype         => "-m pkttype --pkt-type",
-    :isfragment      => "-f",
-    :ipsec_dir       => "-m policy --dir",
-    :ipsec_policy    => "--pol",
-    :mask            => '--mask',
-  }
-
-  # These are known booleans that do not take a value, but we want to munge
-  # to true if they exist.
-  @known_booleans = [
-    :isfragment,
-    :random,
-    :rdest,
-    :reap,
-    :rsource,
-    :rttl,
-    :socket
-  ]
-
-
-  # Create property methods dynamically
-  (@resource_map.keys << :chain << :table << :action).each do |property|
-    if @known_booleans.include?(property) then
-      # The boolean properties default to '' which should be read as false
-      define_method "#{property}" do
-        @property_hash[property] = :false if @property_hash[property] == nil
-        @property_hash[property.to_sym]
-      end
-    else
-      define_method "#{property}" do
-        @property_hash[property.to_sym]
-      end
-    end
-
-    if property == :chain
-      define_method "#{property}=" do |value|
-        if @property_hash[:chain] != value
-          raise ArgumentError, "Modifying the chain for existing rules is not supported."
-        end
-      end
-    else
-      define_method "#{property}=" do |value|
-        @property_hash[:needs_change] = true
-      end
-    end
-  end
-
-  # This is the order of resources as they appear in iptables-save output,
-  # we need it to properly parse and apply rules, if the order of resource
-  # changes between puppet runs, the changed rules will be re-applied again.
-  # This order can be determined by going through iptables source code or just tweaking and trying manually
-  @resource_list = [
-    :table, :source, :destination, :iniface, :outiface, :proto, :isfragment,
-    :src_range, :dst_range, :tcp_flags, :gid, :uid, :sport, :dport, :port,
-    :dst_type, :src_type, :socket, :pkttype, :name, :ipsec_dir, :ipsec_policy,
-    :state, :ctstate, :icmp, :limit, :burst, :recent, :rseconds, :reap,
-    :rhitcount, :rttl, :rname, :mask, :rsource, :rdest, :jump, :todest,
-    :tosource, :toports, :random, :log_prefix, :log_level, :reject, :set_mark,
-    :connlimit_above, :connlimit_mask, :connmark
-  ]
-
-  def insert
-    debug 'Inserting rule %s' % resource[:name]
-    iptables insert_args
-  end
-
-  def update
-    debug 'Updating rule %s' % resource[:name]
-    iptables update_args
-  end
-
-  def delete
-    debug 'Deleting rule %s' % resource[:name]
-    iptables delete_args
-  end
-
-  def exists?
-    properties[:ensure] != :absent
-  end
-
-  # Flush the property hash once done.
-  def flush
-    debug("[flush]")
-    if @property_hash.delete(:needs_change)
-      notice("Properties changed - updating rule")
-      update
-    end
-    persist_iptables(self.class.instance_variable_get(:@protocol))
-    @property_hash.clear
-  end
-
-  def self.instances
-    debug "[instances]"
-    table = nil
-    rules = []
-    counter = 1
-
-    # String#lines would be nice, but we need to support Ruby 1.8.5
-    iptables_save.split("\n").each do |line|
-      unless line =~ /^\#\s+|^\:\S+|^COMMIT|^FATAL/
-        if line =~ /^\*/
-          table = line.sub(/\*/, "")
-        else
-          if hash = rule_to_hash(line, table, counter)
-            rules << new(hash)
-            counter += 1
-          end
-        end
-      end
-    end
-    rules
-  end
-
-  def self.rule_to_hash(line, table, counter)
-    hash = {}
-    keys = []
-    values = line.dup
-
-    ####################
-    # PRE-PARSE CLUDGING
-    ####################
-
-    # --tcp-flags takes two values; we cheat by adding " around it
-    # so it behaves like --comment
-    values = values.sub(/--tcp-flags (\S*) (\S*)/, '--tcp-flags "\1 \2"')
-    # we do a similar thing for negated address masks (source and destination).
-    values = values.sub(/(-\S+) (!)\s?(\S*)/,'\1 "\2 \3"')
-    # the actual rule will have the ! mark before the option.
-    values = values.sub(/(!)\s*(-\S+)\s*(\S*)/, '\2 "\1 \3"')
-    # The match extension for tcp & udp are optional and throws off the @resource_map.
-    values = values.sub(/-m (tcp|udp) (--(s|d)port|-m multiport)/, '\2')
-
-    # Trick the system for booleans
-    @known_booleans.each do |bool|
-      # append "true" because all params are expected to have values
-      if bool == :isfragment then
-        # -f requires special matching:
-        # only replace those -f that are not followed by an l to
-        # distinguish between -f and the '-f' inside of --tcp-flags.
-        values = values.sub(/-f(?!l)(?=.*--comment)/, '-f true')
-      else
-        values = values.sub(/#{@resource_map[bool]}/, "#{@resource_map[bool]} true")
-      end
-    end
-
-    ############
-    # Populate parser_list with used value, in the correct order
-    ############
-    map_index={}
-    @resource_map.each_pair do |map_k,map_v|
-      [map_v].flatten.each do |v|
-        ind=values.index(/\s#{v}/)
-        next unless ind
-        map_index[map_k]=ind
-     end
-    end
-    # Generate parser_list based on the index of the found option
-    parser_list=[]
-    map_index.sort_by{|k,v| v}.each{|mapi| parser_list << mapi.first }
-
-    ############
-    # MAIN PARSE
-    ############
-
-    # Here we iterate across our values to generate an array of keys
-    parser_list.reverse.each do |k|
-      resource_map_key = @resource_map[k]
-      [resource_map_key].flatten.each do |opt|
-        if values.slice!(/\s#{opt}/)
-          keys << k
-          break
-        end
-      end
-    end
-
-    # Manually remove chain
-    values.slice!('-A')
-    keys << :chain
-
-    # Here we generate the main hash
-    keys.zip(values.scan(/"[^"]*"|\S+/).reverse) { |f, v| hash[f] = v.gsub(/"/, '') }
-
-    #####################
-    # POST PARSE CLUDGING
-    #####################
-
-    # Normalise all rules to CIDR notation.
-    [:source, :destination].each do |prop|
-      next if hash[prop].nil?
-      m = hash[prop].match(/(!?)\s?(.*)/)
-      neg = "! " if m[1] == "!"
-      hash[prop] = "#{neg}#{Puppet::Util::IPCidr.new(m[2]).cidr}"
-    end
-
-    [:dport, :sport, :port, :state, :ctstate].each do |prop|
-      hash[prop] = hash[prop].split(',') if ! hash[prop].nil?
-    end
-
-    # Convert booleans removing the previous cludge we did
-    @known_booleans.each do |bool|
-      if hash[bool] != nil then
-        if hash[bool] != "true" then
-          raise "Parser error: #{bool} was meant to be a boolean but received value: #{hash[bool]}."
-        end
-      end
-    end
-
-    # Our type prefers hyphens over colons for ranges so ...
-    # Iterate across all ports replacing colons with hyphens so that ranges match
-    # the types expectations.
-    [:dport, :sport, :port].each do |prop|
-      next unless hash[prop]
-      hash[prop] = hash[prop].collect do |elem|
-        elem.gsub(/:/,'-')
-      end
-    end
-
-    # States should always be sorted. This ensures that the output from
-    # iptables-save and user supplied resources is consistent.
-    hash[:state]   = hash[:state].sort   unless hash[:state].nil?
-    hash[:ctstate] = hash[:ctstate].sort unless hash[:ctstate].nil?
-
-    # This forces all existing, commentless rules or rules with invalid comments to be moved 
-    # to the bottom of the stack.
-    # Puppet-firewall requires that all rules have comments (resource names) and match this 
-    # regex and will fail if a rule in iptables does not have a comment. We get around this 
-    # by appending a high level
-    if ! hash[:name]
-      num = 9000 + counter
-      hash[:name] = "#{num} #{Digest::MD5.hexdigest(line)}"
-    elsif not /^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/ =~ hash[:name]
-      num = 9000 + counter
-      hash[:name] = "#{num} #{/([[:alpha:][:digit:][:punct:][:space:]]+)/.match(hash[:name])[1]}"
-    end
-
-    # Iptables defaults to log_level '4', so it is omitted from the output of iptables-save.
-    # If the :jump value is LOG and you don't have a log-level set, we assume it to be '4'.
-    if hash[:jump] == 'LOG' && ! hash[:log_level]
-      hash[:log_level] = '4'
-    end
-
-    # Iptables defaults to burst '5', so it is ommitted from the output of iptables-save.
-    # If the :limit value is set and you don't have a burst set, we assume it to be '5'.
-    if hash[:limit] && ! hash[:burst]
-      hash[:burst] = '5'
-    end
-
-    hash[:line] = line
-    hash[:provider] = self.name.to_s
-    hash[:table] = table
-    hash[:ensure] = :present
-
-    # Munge some vars here ...
-
-    # Proto should equal 'all' if undefined
-    hash[:proto] = "all" if !hash.include?(:proto)
-
-    # If the jump parameter is set to one of: ACCEPT, REJECT or DROP then
-    # we should set the action parameter instead.
-    if ['ACCEPT','REJECT','DROP'].include?(hash[:jump]) then
-      hash[:action] = hash[:jump].downcase
-      hash.delete(:jump)
-    end
-
-    hash
-  end
-
-  def insert_args
-    args = []
-    args << ["-I", resource[:chain], insert_order]
-    args << general_args
-    args
-  end
-
-  def update_args
-    args = []
-    args << ["-R", resource[:chain], insert_order]
-    args << general_args
-    args
-  end
-
-  def delete_args
-    # Split into arguments
-    line = properties[:line].gsub(/\-A/, '-D').split(/\s(?=(?:[^"]|"[^"]*")*$)/).map{|v| v.gsub(/"/, '')}
-    line.unshift("-t", properties[:table])
-  end
-
-  # This method takes the resource, and attempts to generate the command line
-  # arguments for iptables.
-  def general_args
-    debug "Current resource: %s" % resource.class
-
-    args = []
-    resource_list = self.class.instance_variable_get('@resource_list')
-    resource_map = self.class.instance_variable_get('@resource_map')
-    known_booleans = self.class.instance_variable_get('@known_booleans')
-
-    resource_list.each do |res|
-      resource_value = nil
-      if (resource[res]) then
-        resource_value = resource[res]
-        # If socket is true then do not add the value as -m socket is standalone
-        if known_booleans.include?(res) then
-          if resource[res] == :true then
-            resource_value = nil
-          else
-            # If the property is not :true then we don't want to add the value
-            # to the args list
-            next
-          end
-        end
-      elsif res == :jump and resource[:action] then
-        # In this case, we are substituting jump for action
-        resource_value = resource[:action].to_s.upcase
-      else
-        next
-      end
-
-      args << [resource_map[res]].flatten.first.split(' ')
-
-      # On negations, the '!' has to be before the option (eg: "! -d 1.2.3.4")
-      if resource_value.is_a?(String) and resource_value.sub!(/^!\s*/, '') then
-        # we do this after adding the 'dash' argument because of ones like "-m multiport --dports", where we want it before the "--dports" but after "-m multiport".
-        # so we insert before whatever the last argument is
-        args.insert(-2, '!')
-      end
-
-
-      # For sport and dport, convert hyphens to colons since the type
-      # expects hyphens for ranges of ports.
-      if [:sport, :dport, :port].include?(res) then
-        resource_value = resource_value.collect do |elem|
-          elem.gsub(/-/, ':')
-        end
-      end
-
-      # our tcp_flags takes a single string with comma lists separated
-      # by space
-      # --tcp-flags expects two arguments
-      if res == :tcp_flags
-        one, two = resource_value.split(' ')
-        args << one
-        args << two
-      elsif resource_value.is_a?(Array)
-        args << resource_value.join(',')
-      elsif !resource_value.nil?
-        args << resource_value
-      end
-    end
-
-    args
-  end
-
-  def insert_order
-    debug("[insert_order]")
-    rules = []
-
-    # Find list of current rules based on chain and table
-    self.class.instances.each do |rule|
-      if rule.chain == resource[:chain].to_s and rule.table == resource[:table].to_s
-        rules << rule.name
-      end
-    end
-
-    # No rules at all? Just bail now.
-    return 1 if rules.empty?
-
-    # Add our rule to the end of the array of known rules
-    my_rule = resource[:name].to_s
-    rules << my_rule
-
-    unmanaged_rule_regex = /^9[0-9]{3}\s[a-f0-9]{32}$/
-    # Find if this is a new rule or an existing rule, then find how many
-    # unmanaged rules preceed it.
-    if rules.length == rules.uniq.length
-      # This is a new rule so find its ordered location.
-      new_rule_location = rules.sort.uniq.index(my_rule)
-      if new_rule_location == 0
-        # The rule will be the first rule in the chain because nothing came
-        # before it.
-        offset_rule = rules[0]
-      else
-        # This rule will come after other managed rules, so find the rule
-        # immediately preceeding it.
-        offset_rule = rules.sort.uniq[new_rule_location - 1]
-      end
-    else
-      # This is a pre-existing rule, so find the offset from the original
-      # ordering.
-      offset_rule = my_rule
-    end
-    # Count how many unmanaged rules are ahead of the target rule so we know
-    # how much to add to the insert order
-    unnamed_offset = rules[0..rules.index(offset_rule)].inject(0) do |sum,rule|
-      # This regex matches the names given to unmanaged rules (a number
-      # 9000-9999 followed by an MD5 hash).
-      sum + (rule.match(unmanaged_rule_regex) ? 1 : 0)
-    end
-
-    # We want our rule to come before unmanaged rules if it's not a 9-rule
-    if offset_rule.match(unmanaged_rule_regex) and ! my_rule.match(/^9/)
-      unnamed_offset -= 1
-    end
-
-    # Insert our new or updated rule in the correct order of named rules, but
-    # offset for unnamed rules.
-    rules.reject{|r|r.match(unmanaged_rule_regex)}.sort.index(my_rule) + 1 + unnamed_offset
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb
deleted file mode 100644
index 29fbc1f6b89..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-Puppet::Type.type(:firewallchain).provide :iptables_chain do
-  include Puppet::Util::Firewall
-
-  @doc = "Iptables chain provider"
-
-  has_feature :iptables_chain
-  has_feature :policy
-
-  optional_commands({
-    :iptables       => 'iptables',
-    :iptables_save  => 'iptables-save',
-    :ip6tables      => 'ip6tables',
-    :ip6tables_save => 'ip6tables-save',
-    :ebtables       => 'ebtables',
-    :ebtables_save  => 'ebtables-save',
-  })
-
-  defaultfor :kernel => :linux
-
-  # chain name is greedy so we anchor from the end.
-  # [\d+:\d+] doesn't exist on ebtables
-  Mapping = {
-    :IPv4 => {
-      :tables => method(:iptables),
-      :save   => method(:iptables_save),
-      :re     => /^:(.+)\s(\S+)\s\[\d+:\d+\]$/,
-    },
-    :IPv6 => {
-      :tables => method(:ip6tables),
-      :save   => method(:ip6tables_save),
-      :re     => /^:(.+)\s(\S+)\s\[\d+:\d+\]$/,
-    },
-    :ethernet => {
-      :tables => method(:ebtables),
-      :save   => method(:ebtables_save),
-      :re     => /^:(.+)\s(\S+)$/,
-    }
-  }
-  InternalChains = /^(PREROUTING|POSTROUTING|BROUTING|INPUT|FORWARD|OUTPUT)$/
-  Tables = 'nat|mangle|filter|raw|rawpost|broute'
-  Nameformat = /^(.+):(#{Tables}):(IP(v[46])?|ethernet)$/
-
-  def create
-    allvalidchains do |t, chain, table, protocol|
-      if chain =~ InternalChains
-        # can't create internal chains
-        warning "Attempting to create internal chain #{@resource[:name]}"
-      end
-      if properties[:ensure] == protocol
-        debug "Skipping Inserting chain #{chain} on table #{table} (#{protocol}) already exists"
-      else
-        debug "Inserting chain #{chain} on table #{table} (#{protocol}) using #{t}"
-        t.call ['-t',table,'-N',chain]
-        unless @resource[:policy].nil?
-          t.call ['-t',table,'-P',chain,@resource[:policy].to_s.upcase]
-        end
-      end
-    end
-  end
-
-  def destroy
-    allvalidchains do |t, chain, table|
-      if chain =~ InternalChains
-        # can't delete internal chains
-        warning "Attempting to destroy internal chain #{@resource[:name]}"
-      end
-      debug "Deleting chain #{chain} on table #{table}"
-      t.call ['-t',table,'-X',chain]
-    end
-  end
-
-  def exists?
-    allvalidchains do |t, chain|
-      if chain =~ InternalChains
-        # If the chain isn't present, it's likely because the module isn't loaded.
-        # If this is true, then we fall into 2 cases
-        # 1) It'll be loaded on demand
-        # 2) It won't be loaded on demand, and we throw an error
-        #    This is the intended behavior as it's not the provider's job to load kernel modules
-        # So we pretend it exists...
-        return true
-      end
-    end
-    properties[:ensure] == :present
-  end
-
-  def policy=(value)
-    return if value == :empty
-    allvalidchains do |t, chain, table|
-      p = ['-t',table,'-P',chain,value.to_s.upcase]
-      debug "[set policy] #{t} #{p}"
-      t.call p
-    end
-  end
-
-  def policy
-    debug "[get policy] #{@resource[:name]} =#{@property_hash[:policy].to_s.downcase}"
-    return @property_hash[:policy].to_s.downcase
-  end
-
-  def self.prefetch(resources)
-    debug("[prefetch(resources)]")
-    instances.each do |prov|
-      if resource = resources[prov.name]
-        resource.provider = prov
-      end
-    end
-  end
-
-  def flush
-    debug("[flush]")
-    persist_iptables(@resource[:name].match(Nameformat)[3])
-    # Clear the property hash so we re-initialize with updated values
-    @property_hash.clear
-  end
-
-  # Look up the current status. This allows us to conventiently look up
-  # existing status with properties[:foo].
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-    end
-    @property_hash.dup
-  end
-
-  # Pull the current state of the list from the full list.
-  def query
-    self.class.instances.each do |instance|
-      if instance.name == self.name
-        debug "query found #{self.name}" % instance.properties.inspect
-        return instance.properties
-      end
-    end
-    nil
-  end
-
-  def self.instances
-    debug "[instances]"
-    table = nil
-    chains = []
-
-    Mapping.each { |p, c|
-      begin
-        c[:save].call.each_line do |line|
-          if line =~ c[:re] then
-            name = $1 + ':' + (table == 'filter' ? 'filter' : table) + ':' + p.to_s
-            policy = $2 == '-' ? nil : $2.downcase.to_sym
-
-            chains << new({
-              :name   => name,
-              :policy => policy,
-              :ensure => :present,
-            })
-
-            debug "[instance] '#{name}' #{policy}"
-          elsif line =~ /^\*(\S+)/
-            table = $1
-          else
-            next
-          end
-        end
-      rescue Puppet::Error
-        # ignore command not found for ebtables or anything that doesn't exist
-      end
-    }
-
-    chains
-  end
-
-  def allvalidchains
-    @resource[:name].match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-    yield Mapping[protocol.to_sym][:tables],chain,table,protocol.to_sym
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb
deleted file mode 100644
index 22afbd21e2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb
+++ /dev/null
@@ -1,1077 +0,0 @@
-# See: #10295 for more details.
-#
-# This is a workaround for bug: #4248 whereby ruby files outside of the normal
-# provider/type path do not load until pluginsync has occured on the puppetmaster
-#
-# In this case I'm trying the relative path first, then falling back to normal
-# mechanisms. This should be fixed in future versions of puppet but it looks
-# like we'll need to maintain this for some time perhaps.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..",".."))
-require 'puppet/util/firewall'
-
-Puppet::Type.newtype(:firewall) do
-  include Puppet::Util::Firewall
-
-  @doc = <<-EOS
-    This type provides the capability to manage firewall rules within
-    puppet.
-
-    **Autorequires:**
-
-    If Puppet is managing the iptables or ip6tables chains specified in the
-    `chain` or `jump` parameters, the firewall resource will autorequire
-    those firewallchain resources.
-
-    If Puppet is managing the iptables or iptables-persistent packages, and
-    the provider is iptables or ip6tables, the firewall resource will
-    autorequire those packages to ensure that any required binaries are
-    installed.
-  EOS
-
-  feature :connection_limiting, "Connection limiting features."
-  feature :hop_limiting, "Hop limiting features."
-  feature :rate_limiting, "Rate limiting features."
-  feature :recent_limiting, "The netfilter recent module"
-  feature :snat, "Source NATing"
-  feature :dnat, "Destination NATing"
-  feature :interface_match, "Interface matching"
-  feature :icmp_match, "Matching ICMP types"
-  feature :owner, "Matching owners"
-  feature :state_match, "Matching stateful firewall states"
-  feature :reject_type, "The ability to control reject messages"
-  feature :log_level, "The ability to control the log level"
-  feature :log_prefix, "The ability to add prefixes to log messages"
-  feature :mark, "Match or Set the netfilter mark value associated with the packet"
-  feature :tcp_flags, "The ability to match on particular TCP flag settings"
-  feature :pkttype, "Match a packet type"
-  feature :socket, "Match open sockets"
-  feature :isfragment, "Match fragments"
-  feature :address_type, "The ability match on source or destination address type"
-  feature :iprange, "The ability match on source or destination IP range "
-  feature :ishasmorefrags, "Match a non-last fragment of a fragmented ipv6 packet - might be first"
-  feature :islastfrag, "Match the last fragment of an ipv6 packet"
-  feature :isfirstfrag, "Match the first fragment of a fragmented ipv6 packet"
-  feature :ipsec_policy, "Match IPsec policy"
-  feature :ipsec_dir, "Match IPsec policy direction"
-
-  # provider specific features
-  feature :iptables, "The provider provides iptables features."
-
-  ensurable do
-    desc <<-EOS
-      Manage the state of this rule. The default action is *present*.
-    EOS
-
-    newvalue(:present) do
-      provider.insert
-    end
-
-    newvalue(:absent) do
-      provider.delete
-    end
-
-    defaultto :present
-  end
-
-  newparam(:name) do
-    desc <<-EOS
-      The canonical name of the rule. This name is also used for ordering
-      so make sure you prefix the rule with a number:
-
-          000 this runs first
-          999 this runs last
-
-      Depending on the provider, the name of the rule can be stored using
-      the comment feature of the underlying firewall subsystem.
-    EOS
-    isnamevar
-
-    # Keep rule names simple - they must start with a number
-    newvalues(/^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/)
-  end
-
-  newproperty(:action) do
-    desc <<-EOS
-      This is the action to perform on a match. Can be one of:
-
-      * accept - the packet is accepted
-      * reject - the packet is rejected with a suitable ICMP response
-      * drop - the packet is dropped
-
-      If you specify no value it will simply match the rule but perform no
-      action unless you provide a provider specific parameter (such as *jump*).
-    EOS
-    newvalues(:accept, :reject, :drop)
-  end
-
-  # Generic matching properties
-  newproperty(:source) do
-    desc <<-EOS
-      The source address. For example:
-
-          source => '192.168.2.0/24'
-
-      You can also negate a mask by putting ! in front. For example:
-
-          source => '! 192.168.2.0/24'
-
-      The source can also be an IPv6 address if your provider supports it.
-    EOS
-
-    munge do |value|
-      begin
-        @resource.host_to_mask(value)
-      rescue Exception => e
-        self.fail("host_to_ip failed for #{value}, exception #{e}")
-      end
-    end
-  end
-
-  # Source IP range
-  newproperty(:src_range, :required_features => :iprange) do
-    desc <<-EOS
-      The source IP range. For example:
-
-          src_range => '192.168.1.1-192.168.1.10'
-
-      The source IP range is must in 'IP1-IP2' format.
-    EOS
-
-    newvalues(/^((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)-((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)/)
-  end
-
-  newproperty(:destination) do
-    desc <<-EOS
-      The destination address to match. For example:
-
-          destination => '192.168.1.0/24'
-
-      You can also negate a mask by putting ! in front. For example:
-
-          destination  => '! 192.168.2.0/24'
-
-      The destination can also be an IPv6 address if your provider supports it.
-    EOS
-
-    munge do |value|
-      begin
-        @resource.host_to_mask(value)
-      rescue Exception => e
-        self.fail("host_to_ip failed for #{value}, exception #{e}")
-      end
-    end
-  end
-
-  # Destination IP range
-  newproperty(:dst_range, :required_features => :iprange) do
-    desc <<-EOS
-      The destination IP range. For example:
-
-          dst_range => '192.168.1.1-192.168.1.10'
-
-      The destination IP range is must in 'IP1-IP2' format.
-    EOS
-
-    newvalues(/^((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)-((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)/)
-  end
-
-  newproperty(:sport, :array_matching => :all) do
-    desc <<-EOS
-      The source port to match for this filter (if the protocol supports
-      ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:dport, :array_matching => :all) do
-    desc <<-EOS
-      The destination port to match for this filter (if the protocol supports
-      ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:port, :array_matching => :all) do
-    desc <<-EOS
-      The destination or source port to match for this filter (if the protocol
-      supports ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:dst_type, :required_features => :address_type) do
-    desc <<-EOS
-      The destination address type. For example:
-
-          dst_type => 'LOCAL'
-
-      Can be one of:
-
-      * UNSPEC - an unspecified address
-      * UNICAST - a unicast address
-      * LOCAL - a local address
-      * BROADCAST - a broadcast address
-      * ANYCAST - an anycast packet
-      * MULTICAST - a multicast address
-      * BLACKHOLE - a blackhole address
-      * UNREACHABLE - an unreachable address
-      * PROHIBIT - a prohibited address
-      * THROW - undocumented
-      * NAT - undocumented
-      * XRESOLVE - undocumented
-    EOS
-
-    newvalues(:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST,
-              :BLACKHOLE, :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE)
-  end
-
-  newproperty(:src_type, :required_features => :address_type) do
-    desc <<-EOS
-      The source address type. For example:
-
-          src_type => 'LOCAL'
-
-      Can be one of:
-
-      * UNSPEC - an unspecified address
-      * UNICAST - a unicast address
-      * LOCAL - a local address
-      * BROADCAST - a broadcast address
-      * ANYCAST - an anycast packet
-      * MULTICAST - a multicast address
-      * BLACKHOLE - a blackhole address
-      * UNREACHABLE - an unreachable address
-      * PROHIBIT - a prohibited address
-      * THROW - undocumented
-      * NAT - undocumented
-      * XRESOLVE - undocumented
-    EOS
-
-    newvalues(:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST,
-              :BLACKHOLE, :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE)
-  end
-
-  newproperty(:proto) do
-    desc <<-EOS
-      The specific protocol to match for this rule. By default this is
-      *tcp*.
-    EOS
-
-    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all)
-    defaultto "tcp"
-  end
-
-  # tcp-specific
-  newproperty(:tcp_flags, :required_features => :tcp_flags) do
-    desc <<-EOS
-      Match when the TCP flags are as specified.
-      Is a string with a list of comma-separated flag names for the mask,
-      then a space, then a comma-separated list of flags that should be set.
-      The flags are: SYN ACK FIN RST URG PSH ALL NONE
-      Note that you specify them in the order that iptables --list-rules
-      would list them to avoid having puppet think you changed the flags.
-      Example: FIN,SYN,RST,ACK SYN matches packets with the SYN bit set and the
-	       ACK,RST and FIN bits cleared.  Such packets are used to request
-               TCP  connection initiation.
-    EOS
-  end
-
-
-  # Iptables specific
-  newproperty(:chain, :required_features => :iptables) do
-    desc <<-EOS
-      Name of the chain to use. Can be one of the built-ins:
-
-      * INPUT
-      * FORWARD
-      * OUTPUT
-      * PREROUTING
-      * POSTROUTING
-
-      Or you can provide a user-based chain.
-
-      The default value is 'INPUT'.
-    EOS
-
-    defaultto "INPUT"
-    newvalue(/^[a-zA-Z0-9\-_]+$/)
-  end
-
-  newproperty(:table, :required_features => :iptables) do
-    desc <<-EOS
-      Table to use. Can be one of:
-
-      * nat
-      * mangle
-      * filter
-      * raw
-      * rawpost
-
-      By default the setting is 'filter'.
-    EOS
-
-    newvalues(:nat, :mangle, :filter, :raw, :rawpost)
-    defaultto "filter"
-  end
-
-  newproperty(:jump, :required_features => :iptables) do
-    desc <<-EOS
-      The value for the iptables --jump parameter. Normal values are:
-
-      * QUEUE
-      * RETURN
-      * DNAT
-      * SNAT
-      * LOG
-      * MASQUERADE
-      * REDIRECT
-      * MARK
-
-      But any valid chain name is allowed.
-
-      For the values ACCEPT, DROP and REJECT you must use the generic
-      'action' parameter. This is to enfore the use of generic parameters where
-      possible for maximum cross-platform modelling.
-
-      If you set both 'accept' and 'jump' parameters, you will get an error as
-      only one of the options should be set.
-    EOS
-
-    validate do |value|
-      unless value =~ /^[a-zA-Z0-9\-_]+$/
-        raise ArgumentError, <<-EOS
-          Jump destination must consist of alphanumeric characters, an
-          underscore or a yphen.
-        EOS
-      end
-
-      if ["accept","reject","drop"].include?(value.downcase)
-        raise ArgumentError, <<-EOS
-          Jump destination should not be one of ACCEPT, REJECT or DROP. Use
-          the action property instead.
-        EOS
-      end
-
-    end
-  end
-
-  # Interface specific matching properties
-  newproperty(:iniface, :required_features => :interface_match) do
-    desc <<-EOS
-      Input interface to filter on.
-    EOS
-    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
-  end
-
-  newproperty(:outiface, :required_features => :interface_match) do
-    desc <<-EOS
-      Output interface to filter on.
-    EOS
-    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
-  end
-
-  # NAT specific properties
-  newproperty(:tosource, :required_features => :snat) do
-    desc <<-EOS
-      When using jump => "SNAT" you can specify the new source address using
-      this parameter.
-    EOS
-  end
-
-  newproperty(:todest, :required_features => :dnat) do
-    desc <<-EOS
-      When using jump => "DNAT" you can specify the new destination address
-      using this paramter.
-    EOS
-  end
-
-  newproperty(:toports, :required_features => :dnat) do
-    desc <<-EOS
-      For DNAT this is the port that will replace the destination port.
-    EOS
-  end
-
-  newproperty(:random, :required_features => :dnat) do
-    desc <<-EOS
-      When using a jump value of "MASQUERADE", "DNAT", "REDIRECT", or "SNAT"
-      this boolean will enable randomized port mapping.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  # Reject ICMP type
-  newproperty(:reject, :required_features => :reject_type) do
-    desc <<-EOS
-      When combined with jump => "REJECT" you can specify a different icmp
-      response to be sent back to the packet sender.
-    EOS
-  end
-
-  # Logging properties
-  newproperty(:log_level, :required_features => :log_level) do
-    desc <<-EOS
-      When combined with jump => "LOG" specifies the system log level to log
-      to.
-    EOS
-
-    munge do |value|
-      if value.kind_of?(String)
-        value = @resource.log_level_name_to_number(value)
-      else
-        value
-      end
-
-      if value == nil && value != ""
-        self.fail("Unable to determine log level")
-      end
-      value
-    end
-  end
-
-  newproperty(:log_prefix, :required_features => :log_prefix) do
-    desc <<-EOS
-      When combined with jump => "LOG" specifies the log prefix to use when
-      logging.
-    EOS
-  end
-
-  # ICMP matching property
-  newproperty(:icmp, :required_features => :icmp_match) do
-    desc <<-EOS
-      When matching ICMP packets, this is the type of ICMP packet to match.
-
-      A value of "any" is not supported. To achieve this behaviour the
-      parameter should simply be omitted or undefined.
-    EOS
-
-    validate do |value|
-      if value == "any"
-        raise ArgumentError,
-          "Value 'any' is not valid. This behaviour should be achieved " \
-          "by omitting or undefining the ICMP parameter."
-      end
-    end
-
-    munge do |value|
-      if value.kind_of?(String)
-        # ICMP codes differ between IPv4 and IPv6.
-        case @resource[:provider]
-        when :iptables
-          protocol = 'inet'
-        when :ip6tables
-          protocol = 'inet6'
-        else
-          self.fail("cannot work out protocol family")
-        end
-
-        value = @resource.icmp_name_to_number(value, protocol)
-      else
-        value
-      end
-
-      if value == nil && value != ""
-        self.fail("cannot work out icmp type")
-      end
-      value
-    end
-  end
-
-  newproperty(:state, :array_matching => :all, :required_features =>
-    :state_match) do
-
-    desc <<-EOS
-      Matches a packet based on its state in the firewall stateful inspection
-      table. Values can be:
-
-      * INVALID
-      * ESTABLISHED
-      * NEW
-      * RELATED
-    EOS
-
-    newvalues(:INVALID,:ESTABLISHED,:NEW,:RELATED)
-
-    # States should always be sorted. This normalizes the resource states to
-    # keep it consistent with the sorted result from iptables-save.
-    def should=(values)
-      @should = super(values).sort_by {|sym| sym.to_s}
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:ctstate, :array_matching => :all, :required_features =>
-    :state_match) do
-
-    desc <<-EOS
-      Matches a packet based on its state in the firewall stateful inspection
-      table, using the conntrack module. Values can be:
-
-      * INVALID
-      * ESTABLISHED
-      * NEW
-      * RELATED
-    EOS
-
-    newvalues(:INVALID,:ESTABLISHED,:NEW,:RELATED)
-
-    # States should always be sorted. This normalizes the resource states to
-    # keep it consistent with the sorted result from iptables-save.
-    def should=(values)
-      @should = super(values).sort_by {|sym| sym.to_s}
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-
-  # Connection mark
-  newproperty(:connmark, :required_features => :mark) do
-    desc <<-EOS
-      Match the Netfilter mark value associated with the packet.  Accepts either of:
-      mark/mask or mark.  These will be converted to hex if they are not already.
-    EOS
-    munge do |value|
-      int_or_hex = '[a-fA-F0-9x]'
-      match = value.to_s.match("(#{int_or_hex}+)(/)?(#{int_or_hex}+)?")
-      mark = @resource.to_hex32(match[1])
-
-      # Values that can't be converted to hex.
-      # Or contain a trailing slash with no mask.
-      if mark.nil? or (mark and match[2] and match[3].nil?)
-        raise ArgumentError, "MARK value must be integer or hex between 0 and 0xffffffff"
-      end
-
-      # There should not be a mask on connmark
-      unless match[3].nil?
-        raise ArgumentError, "iptables does not support masks on MARK match rules"
-      end
-      value = mark
-
-      value
-    end
-  end
-
-  # Connection limiting properties
-  newproperty(:connlimit_above, :required_features => :connection_limiting) do
-    desc <<-EOS
-      Connection limiting value for matched connections above n.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  newproperty(:connlimit_mask, :required_features => :connection_limiting) do
-    desc <<-EOS
-      Connection limiting by subnet mask for matched connections.
-      IPv4: 0-32
-      IPv6: 0-128
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  # Hop limiting properties
-  newproperty(:hop_limit, :required_features => :hop_limiting) do
-    desc <<-EOS
-      Hop limiting value for matched packets.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  # Rate limiting properties
-  newproperty(:limit, :required_features => :rate_limiting) do
-    desc <<-EOS
-      Rate limiting value for matched packets. The format is:
-      rate/[/second/|/minute|/hour|/day].
-
-      Example values are: '50/sec', '40/min', '30/hour', '10/day'."
-    EOS
-  end
-
-  newproperty(:burst, :required_features => :rate_limiting) do
-    desc <<-EOS
-      Rate limiting burst value (per second) before limit checks apply.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  newproperty(:uid, :required_features => :owner) do
-    desc <<-EOS
-      UID or Username owner matching rule.  Accepts a string argument
-      only, as iptables does not accept multiple uid in a single
-      statement.
-    EOS
-  end
-
-  newproperty(:gid, :required_features => :owner) do
-    desc <<-EOS
-      GID or Group owner matching rule.  Accepts a string argument
-      only, as iptables does not accept multiple gid in a single
-      statement.
-    EOS
-  end
-
-  newproperty(:set_mark, :required_features => :mark) do
-    desc <<-EOS
-      Set the Netfilter mark value associated with the packet.  Accepts either of:
-      mark/mask or mark.  These will be converted to hex if they are not already.
-    EOS
-
-    munge do |value|
-      int_or_hex = '[a-fA-F0-9x]'
-      match = value.to_s.match("(#{int_or_hex}+)(/)?(#{int_or_hex}+)?")
-      mark = @resource.to_hex32(match[1])
-
-      # Values that can't be converted to hex.
-      # Or contain a trailing slash with no mask.
-      if mark.nil? or (mark and match[2] and match[3].nil?)
-        raise ArgumentError, "MARK value must be integer or hex between 0 and 0xffffffff"
-      end
-
-      # Old iptables does not support a mask. New iptables will expect one.
-      iptables_version = Facter.fact('iptables_version').value
-      mask_required = (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') >= 0)
-
-      if mask_required
-        if match[3].nil?
-          value = "#{mark}/0xffffffff"
-        else
-          mask = @resource.to_hex32(match[3])
-          if mask.nil?
-            raise ArgumentError, "MARK mask must be integer or hex between 0 and 0xffffffff"
-          end
-          value = "#{mark}/#{mask}"
-        end
-      else
-        unless match[3].nil?
-          raise ArgumentError, "iptables version #{iptables_version} does not support masks on MARK rules"
-        end
-        value = mark
-      end
-
-      value
-    end
-  end
-
-  newproperty(:pkttype, :required_features => :pkttype) do
-    desc <<-EOS
-      Sets the packet type to match.
-    EOS
-
-    newvalues(:unicast, :broadcast, :multicast)
-  end
-
-  newproperty(:isfragment, :required_features => :isfragment) do
-    desc <<-EOS
-      Set to true to match tcp fragments (requires type to be set to tcp)
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:recent, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Enable the recent module. Takes as an argument one of set, update,
-      rcheck or remove. For example:
-
-        # If anyone's appeared on the 'badguy' blacklist within
-        # the last 60 seconds, drop their traffic, and update the timestamp.
-        firewall { '100 Drop badguy traffic':
-          recent   => 'update',
-          rseconds => 60,
-          rsource  => true,
-          rname    => 'badguy',
-          action   => 'DROP',
-          chain    => 'FORWARD',
-        }
-        # No-one should be sending us traffic on eth0 from localhost
-        # Blacklist them
-        firewall { '101 blacklist strange traffic':
-          recent      => 'set',
-          rsource     => true,
-          rname       => 'badguy',
-          destination => '127.0.0.0/8',
-          iniface     => 'eth0',
-          action      => 'DROP',
-          chain       => 'FORWARD',
-        }
-    EOS
-
-    newvalues(:set, :update, :rcheck, :remove)
-    munge do |value|
-       value = "--" + value
-    end
-  end
-
-  newproperty(:rdest, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; add the destination IP address to the list.
-      Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rsource, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; add the source IP address to the list.
-      Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rname, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; The name of the list. Takes a string argument.
-    EOS
-  end
-
-  newproperty(:rseconds, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; used in conjunction with one of `recent => 'rcheck'` or
-      `recent => 'update'`. When used, this will narrow the match to only
-      happen when the address is in the list and was seen within the last given
-      number of seconds.
-    EOS
-  end
-
-  newproperty(:reap, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; can only be used in conjunction with the `rseconds`
-      attribute. When used, this will cause entries older than 'seconds' to be
-      purged.  Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rhitcount, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; used in conjunction with `recent => 'update'` or `recent
-      => 'rcheck'. When used, this will narrow the match to only happen when
-      the address is in the list and packets had been received greater than or
-      equal to the given value.
-    EOS
-  end
-
-  newproperty(:rttl, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; may only be used in conjunction with one of `recent =>
-      'rcheck'` or `recent => 'update'`. When used, this will narrow the match
-      to only happen when the address is in the list and the TTL of the current
-      packet matches that of the packet which hit the `recent => 'set'` rule.
-      This may be useful if you have problems with people faking their source
-      address in order to DoS you via this module by disallowing others access
-      to your site by sending bogus packets to you.  Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:socket, :required_features => :socket) do
-    desc <<-EOS
-      If true, matches if an open socket can be found by doing a coket lookup
-      on the packet.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:ishasmorefrags, :required_features => :ishasmorefrags) do
-    desc <<-EOS
-      If true, matches if the packet has it's 'more fragments' bit set. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:islastfrag, :required_features => :islastfrag) do
-    desc <<-EOS
-      If true, matches if the packet is the last fragment. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:isfirstfrag, :required_features => :isfirstfrag) do
-    desc <<-EOS
-      If true, matches if the packet is the first fragment. 
-      Sadly cannot be negated. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:ipsec_policy, :required_features => :ipsec_policy) do
-	  desc <<-EOS
-	  	 Sets the ipsec policy type
-	  EOS
-
-	  newvalues(:none, :ipsec)
-  end
-
-  newproperty(:ipsec_dir, :required_features => :ipsec_dir) do
-	  desc <<-EOS
-	  	 Sets the ipsec policy direction
-	  EOS
-
-	  newvalues(:in, :out)
-  end
-
-  newproperty(:mask, :required_features => :mask) do
-    desc <<-EOS
-      Sets the mask to use when `recent` is enabled.
-    EOS
-  end
-
-  newparam(:line) do
-    desc <<-EOS
-      Read-only property for caching the rule line.
-    EOS
-  end
-
-  autorequire(:firewallchain) do
-    reqs = []
-    protocol = nil
-
-    case value(:provider)
-    when :iptables
-      protocol = "IPv4"
-    when :ip6tables
-      protocol = "IPv6"
-    end
-
-    unless protocol.nil?
-      table = value(:table)
-      [value(:chain), value(:jump)].each do |chain|
-        reqs << "#{chain}:#{table}:#{protocol}" unless ( chain.nil? || (['INPUT', 'OUTPUT', 'FORWARD'].include?(chain) && table == :filter) )
-      end
-    end
-
-    reqs
-  end
-
-  # Classes would be a better abstraction, pending:
-  # http://projects.puppetlabs.com/issues/19001
-  autorequire(:package) do
-    case value(:provider)
-    when :iptables, :ip6tables
-      %w{iptables iptables-persistent}
-    else
-      []
-    end
-  end
-
-  validate do
-    debug("[validate]")
-
-    # TODO: this is put here to skip validation if ensure is not set. This
-    # is because there is a revalidation stage called later where the values
-    # are not set correctly. I tried tracing it - but have put in this
-    # workaround instead to skip. Must get to the bottom of this.
-    if ! value(:ensure)
-      return
-    end
-
-    # First we make sure the chains and tables are valid combinations
-    if value(:table).to_s == "filter" &&
-      value(:chain) =~ /PREROUTING|POSTROUTING/
-
-      self.fail "PREROUTING and POSTROUTING cannot be used in table 'filter'"
-    end
-
-    if value(:table).to_s == "nat" && value(:chain) =~ /INPUT|FORWARD/
-      self.fail "INPUT and FORWARD cannot be used in table 'nat'"
-    end
-
-    if value(:table).to_s == "raw" &&
-      value(:chain) =~ /INPUT|FORWARD|POSTROUTING/
-
-      self.fail "INPUT, FORWARD and POSTROUTING cannot be used in table raw"
-    end
-
-    # Now we analyse the individual properties to make sure they apply to
-    # the correct combinations.
-    if value(:iniface)
-      unless value(:chain).to_s =~ /INPUT|FORWARD|PREROUTING/
-        self.fail "Parameter iniface only applies to chains " \
-          "INPUT,FORWARD,PREROUTING"
-      end
-    end
-
-    if value(:outiface)
-      unless value(:chain).to_s =~ /OUTPUT|FORWARD|POSTROUTING/
-        self.fail "Parameter outiface only applies to chains " \
-          "OUTPUT,FORWARD,POSTROUTING"
-      end
-    end
-
-    if value(:uid)
-      unless value(:chain).to_s =~ /OUTPUT|POSTROUTING/
-        self.fail "Parameter uid only applies to chains " \
-          "OUTPUT,POSTROUTING"
-      end
-    end
-
-    if value(:gid)
-      unless value(:chain).to_s =~ /OUTPUT|POSTROUTING/
-        self.fail "Parameter gid only applies to chains " \
-          "OUTPUT,POSTROUTING"
-      end
-    end
-
-    if value(:set_mark)
-      unless value(:jump).to_s  =~ /MARK/ &&
-             value(:chain).to_s =~ /PREROUTING|OUTPUT/ &&
-             value(:table).to_s =~ /mangle/
-        self.fail "Parameter set_mark only applies to " \
-          "the PREROUTING or OUTPUT chain of the mangle table and when jump => MARK"
-      end
-    end
-
-    if value(:dport)
-      unless value(:proto).to_s =~ /tcp|udp|sctp/
-        self.fail "[%s] Parameter dport only applies to sctp, tcp and udp " \
-          "protocols. Current protocol is [%s] and dport is [%s]" %
-          [value(:name), should(:proto), should(:dport)]
-      end
-    end
-
-    if value(:jump).to_s == "DNAT"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => DNAT only applies to table => nat"
-      end
-
-      unless value(:todest)
-        self.fail "Parameter jump => DNAT must have todest parameter"
-      end
-    end
-
-    if value(:jump).to_s == "SNAT"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => SNAT only applies to table => nat"
-      end
-
-      unless value(:tosource)
-        self.fail "Parameter jump => SNAT must have tosource parameter"
-      end
-    end
-
-    if value(:jump).to_s == "REDIRECT"
-      unless value(:toports)
-        self.fail "Parameter jump => REDIRECT missing mandatory toports " \
-          "parameter"
-      end
-    end
-
-    if value(:jump).to_s == "MASQUERADE"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => MASQUERADE only applies to table => nat"
-      end
-    end
-
-    if value(:log_prefix) || value(:log_level)
-      unless value(:jump).to_s == "LOG"
-        self.fail "Parameter log_prefix and log_level require jump => LOG"
-      end
-    end
-
-    if value(:burst) && ! value(:limit)
-      self.fail "burst makes no sense without limit"
-    end
-
-    if value(:action) && value(:jump)
-      self.fail "Only one of the parameters 'action' and 'jump' can be set"
-    end
-
-    if value(:connlimit_mask) && ! value(:connlimit_above)
-      self.fail "Parameter 'connlimit_mask' requires 'connlimit_above'"
-    end
-
-    if value(:mask) && ! value(:recent)
-      self.fail "Mask can only be set if recent is enabled."
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb
deleted file mode 100644
index 3e3c5d13706..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-# This is a workaround for bug: #4248 whereby ruby files outside of the normal
-# provider/type path do not load until pluginsync has occured on the puppetmaster
-#
-# In this case I'm trying the relative path first, then falling back to normal
-# mechanisms. This should be fixed in future versions of puppet but it looks
-# like we'll need to maintain this for some time perhaps.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..",".."))
-require 'puppet/util/firewall'
-
-Puppet::Type.newtype(:firewallchain) do
-  include Puppet::Util::Firewall
-
-  @doc = <<-EOS
-    This type provides the capability to manage rule chains for firewalls.
-
-    Currently this supports only iptables, ip6tables and ebtables on Linux. And
-    provides support for setting the default policy on chains and tables that
-    allow it.
-
-    **Autorequires:**
-    If Puppet is managing the iptables or iptables-persistent packages, and
-    the provider is iptables_chain, the firewall resource will autorequire
-    those packages to ensure that any required binaries are installed.
-  EOS
-
-  feature :iptables_chain, "The provider provides iptables chain features."
-  feature :policy, "Default policy (inbuilt chains only)"
-
-  ensurable do
-    defaultvalues
-    defaultto :present
-  end
-
-  newparam(:name) do
-    desc <<-EOS
-      The canonical name of the chain.
-
-      For iptables the format must be {chain}:{table}:{protocol}.
-    EOS
-    isnamevar
-
-    validate do |value|
-      if value !~ Nameformat then
-        raise ArgumentError, "Inbuilt chains must be in the form {chain}:{table}:{protocol} where {table} is one of FILTER, NAT, MANGLE, RAW, RAWPOST, BROUTE or empty (alias for filter), chain can be anything without colons or one of PREROUTING, POSTROUTING, BROUTING, INPUT, FORWARD, OUTPUT for the inbuilt chains, and {protocol} being IPv4, IPv6, ethernet (ethernet bridging) got '#{value}' table:'#{$1}' chain:'#{$2}' protocol:'#{$3}'"
-      else
-        chain = $1
-        table = $2
-        protocol = $3
-        case table
-        when 'filter'
-          if chain =~ /^(PREROUTING|POSTROUTING|BROUTING)$/
-            raise ArgumentError, "INPUT, OUTPUT and FORWARD are the only inbuilt chains that can be used in table 'filter'"
-          end
-        when 'mangle'
-          if chain =~ InternalChains && chain == 'BROUTING'
-            raise ArgumentError, "PREROUTING, POSTROUTING, INPUT, FORWARD and OUTPUT are the only inbuilt chains that can be used in table 'mangle'"
-          end
-        when 'nat'
-          if chain =~ /^(BROUTING|FORWARD)$/
-            raise ArgumentError, "PREROUTING, POSTROUTING, INPUT, and OUTPUT are the only inbuilt chains that can be used in table 'nat'"
-          end
-          if protocol =~/^(IP(v6)?)?$/
-            raise ArgumentError, "table nat isn't valid in IPv6. You must specify ':IPv4' as the name suffix"
-          end
-        when 'raw'
-          if chain =~ /^(POSTROUTING|BROUTING|INPUT|FORWARD)$/
-            raise ArgumentError,'PREROUTING and OUTPUT are the only inbuilt chains in the table \'raw\''
-          end
-        when 'broute'
-          if protocol != 'ethernet'
-            raise ArgumentError,'BROUTE is only valid with protocol \'ethernet\''
-          end
-          if chain =~ /^PREROUTING|POSTROUTING|INPUT|FORWARD|OUTPUT$/
-            raise ArgumentError,'BROUTING is the only inbuilt chain allowed on on table \'broute\''
-          end
-        end
-        if chain == 'BROUTING' && ( protocol != 'ethernet' || table!='broute')
-          raise ArgumentError,'BROUTING is the only inbuilt chain allowed on on table \'BROUTE\' with protocol \'ethernet\' i.e. \'broute:BROUTING:enternet\''
-        end
-      end
-    end
-  end
-
-  newproperty(:policy) do
-    desc <<-EOS
-      This is the action to when the end of the chain is reached.
-      It can only be set on inbuilt chains (INPUT, FORWARD, OUTPUT,
-      PREROUTING, POSTROUTING) and can be one of:
-
-      * accept - the packet is accepted
-      * drop - the packet is dropped
-      * queue - the packet is passed userspace
-      * return - the packet is returned to calling (jump) queue
-                 or the default of inbuilt chains
-    EOS
-    newvalues(:accept, :drop, :queue, :return)
-    defaultto do
-      # ethernet chain have an ACCEPT default while other haven't got an
-      # allowed value
-      if @resource[:name] =~ /:ethernet$/
-        :accept
-      else
-        nil
-      end
-    end
-  end
-
-  newparam(:purge, :boolean => true) do
-    desc <<-EOS
-      Purge unmanaged firewall rules in this chain
-    EOS
-    newvalues(:false, :true)
-    defaultto :false
-  end
-
-  newparam(:ignore) do
-    desc <<-EOS
-      Regex to perform on firewall rules to exempt unmanaged rules from purging (when enabled).
-      This is matched against the output of `iptables-save`.
-
-      This can be a single regex, or an array of them.
-      To support flags, use the ruby inline flag mechanism.
-      Meaning a regex such as
-        /foo/i
-      can be written as
-        '(?i)foo' or '(?i:foo)'
-
-      Full example:
-      firewallchain { 'INPUT:filter:IPv4':
-        purge => true,
-        ignore => [
-          '-j fail2ban-ssh', # ignore the fail2ban jump rule
-          '--comment "[^"]*(?i:ignore)[^"]*"', # ignore any rules with "ignore" (case insensitive) in the comment in the rule
-        ],
-      }
-    EOS
-
-    validate do |value|
-      unless value.is_a?(Array) or value.is_a?(String) or value == false
-        self.devfail "Ignore must be a string or an Array"
-      end
-    end
-    munge do |patterns| # convert into an array of {Regex}es
-      patterns = [patterns] if patterns.is_a?(String)
-      patterns.map{|p| Regexp.new(p)}
-    end
-  end
-
-  # Classes would be a better abstraction, pending:
-  # http://projects.puppetlabs.com/issues/19001
-  autorequire(:package) do
-    case value(:provider)
-    when :iptables_chain
-      %w{iptables iptables-persistent}
-    else
-      []
-    end
-  end
-
-  validate do
-    debug("[validate]")
-
-    value(:name).match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-
-    # Check that we're not removing an internal chain
-    if chain =~ InternalChains && value(:ensure) == :absent
-      self.fail "Cannot remove in-built chains"
-    end
-
-    if value(:policy).nil? && protocol == 'ethernet'
-      self.fail "you must set a non-empty policy on all ethernet table chains"
-    end
-
-    # Check that we're not setting a policy on a user chain
-    if chain !~ InternalChains &&
-      !value(:policy).nil? &&
-      protocol != 'ethernet'
-
-      self.fail "policy can only be set on in-built chains (with the exception of ethernet chains) (table:#{table} chain:#{chain} protocol:#{protocol})"
-    end
-
-    # no DROP policy on nat table
-    if table == 'nat' &&
-      value(:policy) == :drop
-
-      self.fail 'The "nat" table is not intended for filtering, the use of DROP is therefore inhibited'
-    end
-  end
-
-  def generate
-    return [] unless self.purge?
-
-    value(:name).match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-
-    provider = case protocol
-               when 'IPv4'
-                 :iptables
-               when 'IPv6'
-                 :ip6tables
-               end
-
-    # gather a list of all rules present on the system
-    rules_resources = Puppet::Type.type(:firewall).instances
-
-    # Keep only rules in this chain
-    rules_resources.delete_if { |res| (res[:provider] != provider or res.provider.properties[:table].to_s != table or res.provider.properties[:chain] != chain) }
-
-    # Remove rules which match our ignore filter
-    rules_resources.delete_if {|res| value(:ignore).find_index{|f| res.provider.properties[:line].match(f)}} if value(:ignore)
-
-    # We mark all remaining rules for deletion, and then let the catalog override us on rules which should be present
-    rules_resources.each {|res| res[:ensure] = :absent}
-
-    rules_resources
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb
deleted file mode 100644
index aa26d3bc700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-require 'socket'
-require 'resolv'
-require 'puppet/util/ipcidr'
-
-# Util module for puppetlabs-firewall
-module Puppet::Util::Firewall
-  # Translate the symbolic names for icmp packet types to integers
-  def icmp_name_to_number(value_icmp, protocol)
-    if value_icmp =~ /\d{1,2}$/
-      value_icmp
-    elsif protocol == 'inet'
-      case value_icmp
-        when "echo-reply" then "0"
-        when "destination-unreachable" then "3"
-        when "source-quench" then "4"
-        when "redirect" then "6"
-        when "echo-request" then "8"
-        when "router-advertisement" then "9"
-        when "router-solicitation" then "10"
-        when "time-exceeded" then "11"
-        when "parameter-problem" then "12"
-        when "timestamp-request" then "13"
-        when "timestamp-reply" then "14"
-        when "address-mask-request" then "17"
-        when "address-mask-reply" then "18"
-        else nil
-      end
-    elsif protocol == 'inet6'
-      case value_icmp
-        when "destination-unreachable" then "1"
-        when "time-exceeded" then "3"
-        when "parameter-problem" then "4"
-        when "echo-request" then "128"
-        when "echo-reply" then "129"
-        when "router-solicitation" then "133"
-        when "router-advertisement" then "134"
-        when "redirect" then "137"
-        else nil
-      end
-    else
-      raise ArgumentError, "unsupported protocol family '#{protocol}'"
-    end
-  end
-
-  # Convert log_level names to their respective numbers
-  def log_level_name_to_number(value)
-    #TODO make this 0-7 only
-    if value =~ /\d/
-      value
-    else
-      case value
-        when "panic" then "0"
-        when "alert" then "1"
-        when "crit" then "2"
-        when "err" then "3"
-        when "error" then "3"
-        when "warn" then "4"
-        when "warning" then "4"
-        when "not" then "5"
-        when "notice" then "5"
-        when "info" then "6"
-        when "debug" then "7"
-        else nil
-      end
-    end
-  end
-
-  # This method takes a string and a protocol and attempts to convert
-  # it to a port number if valid.
-  #
-  # If the string already contains a port number or perhaps a range of ports
-  # in the format 22:1000 for example, it simply returns the string and does
-  # nothing.
-  def string_to_port(value, proto)
-    proto = proto.to_s
-    unless proto =~ /^(tcp|udp)$/
-      proto = 'tcp'
-    end
-
-    if value.kind_of?(String)
-      if value.match(/^\d+(-\d+)?$/)
-        return value
-      else
-        return Socket.getservbyname(value, proto).to_s
-      end
-    else
-      Socket.getservbyname(value.to_s, proto).to_s
-    end
-  end
-
-  # Takes an address and returns it in CIDR notation.
-  #
-  # If the address is:
-  #
-  #   - A hostname:
-  #     It will be resolved
-  #   - An IPv4 address:
-  #     It will be qualified with a /32 CIDR notation
-  #   - An IPv6 address:
-  #     It will be qualified with a /128 CIDR notation
-  #   - An IP address with a CIDR notation:
-  #     It will be normalised
-  #   - An IP address with a dotted-quad netmask:
-  #     It will be converted to CIDR notation
-  #   - Any address with a resulting prefix length of zero:
-  #     It will return nil which is equivilent to not specifying an address
-  #
-  def host_to_ip(value)
-    begin
-      value = Puppet::Util::IPCidr.new(value)
-    rescue
-      value = Puppet::Util::IPCidr.new(Resolv.getaddress(value))
-    end
-
-    return nil if value.prefixlen == 0
-    value.cidr
-  end
-
-  # Takes an address mask and converts the host portion to CIDR notation.
-  #
-  # This takes into account you can negate a mask but follows all rules
-  # defined in host_to_ip for the host/address part.
-  #
-  def host_to_mask(value)
-    match = value.match /(!)\s?(.*)$/
-    return host_to_ip(value) unless match
-
-    cidr = host_to_ip(match[2])
-    return nil if cidr == nil
-    "#{match[1]} #{cidr}"
-  end
-
-  # Validates the argument is int or hex, and returns valid hex
-  # conversion of the value or nil otherwise.
-  def to_hex32(value)
-      begin
-        value = Integer(value)
-        if value.between?(0, 0xffffffff)
-            return '0x' + value.to_s(16)
-        end
-      rescue ArgumentError
-        # pass
-      end
-    return nil
-  end
-
-  def persist_iptables(proto)
-    debug("[persist_iptables]")
-
-    # Basic normalisation for older Facter
-    os_key = Facter.value(:osfamily)
-    os_key ||= case Facter.value(:operatingsystem)
-    when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer'
-      'RedHat'
-    when 'Debian', 'Ubuntu'
-      'Debian'
-    else
-      Facter.value(:operatingsystem)
-    end
-
-    # Older iptables-persistent doesn't provide save action.
-    if os_key == 'Debian'
-      persist_ver = Facter.value(:iptables_persistent_version)
-      if (persist_ver and Puppet::Util::Package.versioncmp(persist_ver, '0.5.0') < 0)
-        os_key = 'Debian_manual'
-      end
-    end
-
-    # Fedora 15 and newer use systemd to persist iptable rules
-    if os_key == 'RedHat' && Facter.value(:operatingsystem) == 'Fedora' && Facter.value(:operatingsystemrelease).to_i >= 15
-      os_key = 'Fedora'
-    end
-
-    # RHEL 7 and newer also use systemd to persist iptable rules
-    if os_key == 'RedHat' && Facter.value(:operatingsystem) == 'RedHat' && Facter.value(:operatingsystemrelease).to_i >= 7
-      os_key = 'Fedora'
-    end
-
-    cmd = case os_key.to_sym
-    when :RedHat
-      case proto.to_sym
-      when :IPv4
-        %w{/sbin/service iptables save}
-      when :IPv6
-        %w{/sbin/service ip6tables save}
-      end
-    when :Fedora
-      case proto.to_sym
-      when :IPv4
-        %w{/usr/libexec/iptables/iptables.init save}
-      when :IPv6
-        %w{/usr/libexec/iptables/ip6tables.init save}
-      end
-    when :Debian
-      case proto.to_sym
-      when :IPv4, :IPv6
-        %w{/usr/sbin/service iptables-persistent save}
-      end
-    when :Debian_manual
-      case proto.to_sym
-      when :IPv4
-        ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
-      end
-    when :Archlinux
-      case proto.to_sym
-      when :IPv4
-        ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
-      when :IPv6
-        ["/bin/sh", "-c", "/usr/sbin/ip6tables-save > /etc/iptables/ip6tables.rules"]
-      end
-    end
-
-    # Catch unsupported OSs from the case statement above.
-    if cmd.nil?
-      debug('firewall: Rule persistence is not supported for this type/OS')
-      return
-    end
-
-    begin
-      execute(cmd)
-    rescue Puppet::ExecutionFailure => detail
-      warning("Unable to persist firewall rules: #{detail}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb
deleted file mode 100644
index 87e8d5e3720..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'ipaddr'
-
-# IPCidr object wrapper for IPAddr
-module Puppet
-  module Util
-    class IPCidr < IPAddr
-      def initialize(ipaddr)
-        begin
-          super(ipaddr)
-        rescue ArgumentError => e
-          if e.message =~ /invalid address/
-            raise ArgumentError, "Invalid address from IPAddr.new: #{ipaddr}"
-          else
-            raise e
-          end
-        end
-      end
-
-      def netmask
-        _to_string(@mask_addr)
-      end
-
-      def prefixlen
-        m = case @family
-            when Socket::AF_INET
-              IN4MASK
-            when Socket::AF_INET6
-              IN6MASK
-            else
-              raise "unsupported address family"
-            end
-        return $1.length if /\A(1*)(0*)\z/ =~ (@mask_addr & m).to_s(2)
-        raise "bad addr_mask format"
-      end
-
-      def cidr
-        cidr = sprintf("%s/%s", self.to_s, self.prefixlen)
-        cidr
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp
deleted file mode 100644
index 759f3282351..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# = Class: firewall
-#
-# Manages packages and services required by the firewall type/provider.
-#
-# This class includes the appropriate sub-class for your operating system,
-# where supported.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-class firewall (
-  $ensure = running
-) {
-  case $ensure {
-    /^(running|stopped)$/: {
-      # Do nothing.
-    }
-    default: {
-      fail("${title}: Ensure value '${ensure}' is not supported")
-    }
-  }
-
-  case $::kernel {
-    'Linux': {
-      class { "${title}::linux":
-        ensure => $ensure,
-      }
-    }
-    default: {
-      fail("${title}: Kernel '${::kernel}' is not currently supported")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp
deleted file mode 100644
index 7c4f3a80b5b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp
+++ /dev/null
@@ -1,51 +0,0 @@
-# = Class: firewall::linux
-#
-# Installs the `iptables` package for Linux operating systems and includes
-# the appropriate sub-class for any distribution specific services and
-# additional packages.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources. When `running` the
-#   service will be started on boot, and when `stopped` it will not.
-#   Default: running
-#
-class firewall::linux (
-  $ensure = running
-) {
-  $enable = $ensure ? {
-    running => true,
-    stopped => false,
-  }
-
-  package { 'iptables':
-    ensure => present,
-  }
-
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos',
-    'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer': {
-      class { "${title}::redhat":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    'Debian', 'Ubuntu': {
-      class { "${title}::debian":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    'Archlinux': {
-      class { "${title}::archlinux":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    default: {}
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp
deleted file mode 100644
index 546a5a80fe2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# = Class: firewall::linux::archlinux
-#
-# Manages `iptables` and `ip6tables` services, and creates files used for
-# persistence, on Arch Linux systems.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::archlinux (
-  $ensure = 'running',
-  $enable = true
-) {
-  service { 'iptables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-
-  service { 'ip6tables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-
-  file { '/etc/iptables/iptables.rules':
-    ensure => present,
-    before => Service['iptables'],
-  }
-
-  file { '/etc/iptables/ip6tables.rules':
-    ensure => present,
-    before => Service['ip6tables'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp
deleted file mode 100644
index 4d28bc482e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# = Class: firewall::linux::debian
-#
-# Installs the `iptables-persistent` package for Debian-alike systems. This
-# allows rules to be stored to file and restored on boot.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::debian (
-  $ensure = running,
-  $enable = true
-) {
-  package { 'iptables-persistent':
-    ensure => present,
-  }
-
-  if($::operatingsystemrelease =~ /^6\./ and $enable == true
-  and versioncmp($::iptables_persistent_version, '0.5.0') < 0 ) {
-    # This fixes a bug in the iptables-persistent LSB headers in 6.x, without it
-    # we lose idempotency
-    exec { 'iptables-persistent-enable':
-      logoutput => on_failure,
-      command   => '/usr/sbin/update-rc.d iptables-persistent enable',
-      unless    => '/usr/bin/test -f /etc/rcS.d/S*iptables-persistent',
-      require   => Package['iptables-persistent'],
-    }
-  } else {
-    # This isn't a real service/daemon. The start action loads rules, so just
-    # needs to be called on system boot.
-    service { 'iptables-persistent':
-      ensure    => undef,
-      enable    => $enable,
-      hasstatus => true,
-      require   => Package['iptables-persistent'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp
deleted file mode 100644
index f697d211b9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# = Class: firewall::linux::redhat
-#
-# Manages the `iptables` service on RedHat-alike systems.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::redhat (
-  $ensure = running,
-  $enable = true
-) {
-
-  # RHEL 7 and later and Fedora 15 and later require the iptables-services
-  # package, which provides the /usr/libexec/iptables/iptables.init used by
-  # lib/puppet/util/firewall.rb.
-  if $::operatingsystem == RedHat and $::operatingsystemrelease >= 7 {
-    package { 'iptables-services':
-      ensure => present,
-    }
-  }
-
-  if ($::operatingsystem == 'Fedora' and (( $::operatingsystemrelease =~ /^\d+/ and $::operatingsystemrelease >= 15 ) or $::operatingsystemrelease == "Rawhide")) {
-    package { 'iptables-services':
-      ensure => present,
-    }
-  }
-
-  service { 'iptables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json
deleted file mode 100644
index 40fb8612bda..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "name": "puppetlabs-firewall",
-    "version": "1.1.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-firewall",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-firewall",
-    "summary": "Manages Firewalls such as iptable",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "SLES",
-        "operatingsystemrelease": [
-          "11 SP1"
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb
deleted file mode 100644
index cdb4eab3543..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-  describe 'when unmanaged rules exist' do
-    it 'applies with 8.0.0.1 first' do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '101 test source changes':
-            proto  => tcp,
-            port   => '101',
-            action => accept,
-            source => '8.0.0.1',
-          }
-          firewall { '100 test source static':
-            proto  => tcp,
-            port   => '100',
-            action => accept,
-            source => '8.0.0.2',
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'adds a unmanaged rule without a comment' do
-      shell('iptables -A INPUT -t filter -s 8.0.0.3/32 -p tcp -m multiport --ports 102 -j ACCEPT')
-      expect(shell('iptables-save').stdout).to match(/-A INPUT -s 8\.0\.0\.3(\/32)? -p tcp -m multiport --ports 102 -j ACCEPT/)
-    end
-
-    it 'contains the changable 8.0.0.1 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.1(\/32)? -p tcp -m multiport --ports 101 -m comment --comment "101 test source changes" -j ACCEPT/)
-      end
-    end
-    it 'contains the static 8.0.0.2 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.2(\/32)? -p tcp -m multiport --ports 100 -m comment --comment "100 test source static" -j ACCEPT/)
-      end
-    end
-
-    it 'changes to 8.0.0.4 second' do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '101 test source changes':
-            proto  => tcp,
-            port   => '101',
-            action => accept,
-            source => '8.0.0.4',
-          }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Notice: \/Stage\[main\]\/Main\/Firewall\[101 test source changes\]\/source: source changed '8\.0\.0\.1\/32' to '8\.0\.0\.4\/32'/)
-    end
-
-    it 'does not contain the old changing 8.0.0.1 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to_not match(/8\.0\.0\.1/)
-      end
-    end
-    it 'contains the staic 8.0.0.2 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.2(\/32)? -p tcp -m multiport --ports 100 -m comment --comment "100 test source static" -j ACCEPT/)
-      end
-    end
-    it 'contains the changing new 8.0.0.4 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.4(\/32)? -p tcp -m multiport --ports 101 -m comment --comment "101 test source changes" -j ACCEPT/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb
deleted file mode 100644
index aaf05a1f53f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "firewall class:" do
-  it 'should run successfully' do
-    pp = "class { 'firewall': }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'ensure => stopped:' do
-    pp = "class { 'firewall': ensure => stopped }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'ensure => running:' do
-    pp = "class { 'firewall': ensure => running }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb
deleted file mode 100644
index ce6cab4ed72..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'connlimit_above' do
-    context '10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '500 - test':
-            proto           => tcp,
-	    dport           => '22',
-	    connlimit_above => '10',
-            action          => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          #connlimit-saddr is added in Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "500 - test" -m connlimit --connlimit-above 10 --connlimit-mask 32 (--connlimit-saddr )?-j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'connlimit_mask' do
-    context '24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '501 - test':
-            proto           => tcp,
-            dport           => '22',
-            connlimit_above => '10',
-            connlimit_mask  => '24',
-            action          => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          #connlimit-saddr is added in Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "501 - test" -m connlimit --connlimit-above 10 --connlimit-mask 24 (--connlimit-saddr )?-j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb
deleted file mode 100644
index 959efbdfa7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'connmark' do
-    context '50' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '502 - test':
-            proto    => 'all',
-	    connmark => '0x1',
-            action   => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -m comment --comment "502 - test" -m connmark --mark 0x1 -j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb
deleted file mode 100644
index 5353e104d59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb
+++ /dev/null
@@ -1,1618 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-  describe 'name' do
-    context 'valid' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '001 - test': ensure => present }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-    end
-
-    context 'invalid' do
-      it 'fails' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { 'test': ensure => present }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "test"./)
-        end
-      end
-    end
-  end
-
-  describe 'ensure' do
-    context 'default' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'present' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            ensure => present,
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'absent' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            ensure => absent,
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'source' do
-    context '192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -s 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context '! 192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '! 192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT (! -s|-s !) 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid address
-    context '256.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '256.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/host_to_ip failed for 256.168.2.0\/(24|255\.255\.255\.0)/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -s 256.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'src_range' do
-    context '192.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '557 - test':
-            proto  => tcp,
-            port   => '557',
-            action => accept,
-            src_range => '192.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m iprange --src-range 192.168.1.1-192.168.1.10 -m multiport --ports 557 -m comment --comment "557 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid IP
-    context '392.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '557 - test':
-            proto  => tcp,
-            port   => '557',
-            action => accept,
-            src_range => '392.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "392.168.1.1-192.168.1.10"/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m iprange --src-range 392.168.1.1-192.168.1.10 -m multiport --ports 557 -m comment --comment "557 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'destination' do
-    context '192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -d 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context '! 192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '! 192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT (! -d|-d !) 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid address
-    context '256.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '256.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/host_to_ip failed for 256.168.2.0\/(24|255\.255\.255\.0)/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -d 256.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'dst_range' do
-    context '192.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '559 - test':
-            proto  => tcp,
-            port   => '559',
-            action => accept,
-            dst_range => '192.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m iprange --dst-range 192.168.1.1-192.168.1.10 -m multiport --ports 559 -m comment --comment "559 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid IP
-    context '392.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '559 - test':
-            proto  => tcp,
-            port   => '559',
-            action => accept,
-            dst_range => '392.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "392.168.1.1-192.168.1.10"/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m iprange --dst-range 392.168.1.1-192.168.1.10 -m multiport --ports 559 -m comment --comment "559 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'sport' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '560',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --sports 560 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '560-561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --sports 560:561 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '9999560-561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999560' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --sports 9999560-561 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'dport' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 561 -m comment --comment "561 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '561-562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 561:562 -m comment --comment "561 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '9999561-562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999561' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --dports 9999561-562 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'port' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 562 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '562-563',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 562:563 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '9999562-563',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999562' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 9999562-563 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  ['dst_type', 'src_type'].each do |type|
-    describe "#{type}" do
-      context 'MULTICAST' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '563 - test':
-              proto  => tcp,
-              action => accept,
-              #{type} => 'MULTICAST',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m addrtype\s.*\sMULTICAST -m comment --comment "563 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'BROKEN' do
-        it 'fails' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '563 - test':
-              proto  => tcp,
-              action => accept,
-              #{type} => 'BROKEN',
-            }
-          EOS
-
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/Invalid value "BROKEN"./)
-          end
-        end
-
-        it 'should not contain the rule' do
-          shell('iptables-save') do |r|
-            expect(r.stdout).to_not match(/-A INPUT -p tcp -m addrtype\s.*\sBROKEN -m comment --comment "563 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'tcp_flags' do
-    context 'FIN,SYN ACK' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '564 - test':
-            proto  => tcp,
-            action => accept,
-            tcp_flags => 'FIN,SYN ACK',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m tcp --tcp-flags FIN,SYN ACK -m comment --comment "564 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'chain' do
-    context 'INPUT' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '565 - test':
-            proto  => tcp,
-            action => accept,
-            chain  => 'FORWARD',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A FORWARD -p tcp -m comment --comment "565 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'table' do
-    context 'mangle' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '566 - test':
-            proto  => tcp,
-            action => accept,
-            table  => 'mangle',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t mangle') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m comment --comment "566 - test" -j ACCEPT/)
-        end
-      end
-    end
-    context 'nat' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '566 - test2':
-            proto  => tcp,
-            action => accept,
-            table  => 'nat',
-            chain  => 'OUTPUT',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m comment --comment "566 - test2" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'jump' do
-    after :all do
-      iptables_flush_all_tables
-      expect(shell('iptables -t filter -X TEST').stderr).to eq("")
-    end
-
-    context 'MARK' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewallchain { 'TEST:filter:IPv4':
-            ensure => present,
-          }
-          firewall { '567 - test':
-            proto  => tcp,
-            chain  => 'INPUT',
-            jump  => 'TEST',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m comment --comment "567 - test" -j TEST/)
-        end
-      end
-    end
-
-    context 'jump and apply' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewallchain { 'TEST:filter:IPv4':
-            ensure => present,
-          }
-          firewall { '568 - test':
-            proto  => tcp,
-            chain  => 'INPUT',
-            action => 'accept',
-            jump  => 'TEST',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Only one of the parameters 'action' and 'jump' can be set/)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m comment --comment "568 - test" -j TEST/)
-        end
-      end
-    end
-  end
-
-  describe 'tosource' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '568 - test':
-            proto  => tcp,
-            table  => 'nat',
-            chain  => 'POSTROUTING',
-            jump  => 'SNAT',
-            tosource => '192.168.1.1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/A POSTROUTING -p tcp -m comment --comment "568 - test" -j SNAT --to-source 192.168.1.1/)
-        end
-      end
-    end
-  end
-
-  describe 'todest' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '569 - test':
-            proto  => tcp,
-            table  => 'nat',
-            chain  => 'PREROUTING',
-            jump   => 'DNAT',
-            source => '200.200.200.200',
-            todest => '192.168.1.1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -s 200.200.200.200(\/32)? -p tcp -m comment --comment "569 - test" -j DNAT --to-destination 192.168.1.1/)
-        end
-      end
-    end
-  end
-
-  describe 'toports' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '570 - test':
-            proto  => icmp,
-            table  => 'nat',
-            chain  => 'PREROUTING',
-            jump  => 'REDIRECT',
-            toports => '2222',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p icmp -m comment --comment "570 - test" -j REDIRECT --to-ports 2222/)
-        end
-      end
-    end
-  end
-
-  # RHEL5 does not support --random
-  if default['platform'] !~ /el-5/
-    describe 'random' do
-      context '192.168.1.1' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '570 - test 2':
-              proto  => all,
-              table  => 'nat',
-              chain  => 'POSTROUTING',
-              jump   => 'MASQUERADE',
-              source => '172.30.0.0/16',
-              random => true
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save -t nat') do |r|
-            expect(r.stdout).to match(/-A POSTROUTING -s 172\.30\.0\.0\/16 -m comment --comment "570 - test 2" -j MASQUERADE --random/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'icmp' do
-    context 'any' do
-      it 'fails' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '571 - test':
-            proto  => icmp,
-            icmp   => 'any',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/This behaviour should be achieved by omitting or undefining the ICMP parameter/)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p icmp -m comment --comment "570 - test" -m icmp --icmp-type 11/)
-        end
-      end
-    end
-  end
-
-  #iptables version 1.3.5 is not suppored by the ip6tables provider
-  if default['platform'] !~ /el-5/
-    describe 'hop_limit' do
-      context '5' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '571 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '571',
-              action => accept,
-              hop_limit => '5',
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 571 -m comment --comment "571 - test" -m hl --hl-eq 5 -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'invalid' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '571 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '571',
-              action => accept,
-              hop_limit => 'invalid',
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/Invalid value "invalid"./)
-          end
-        end
-
-        it 'should not contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 571 -m comment --comment "571 - test" -m hl --hl-eq invalid -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'ishasmorefrags' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '587 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '587',
-              action => accept,
-              ishasmorefrags => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/A INPUT -p tcp -m frag --fragid 0 --fragmore -m multiport --ports 587 -m comment --comment "587 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '588 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '588',
-              action => accept,
-              ishasmorefrags => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 588 -m comment --comment "588 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'islastfrag' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '589 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '589',
-              action => accept,
-              islastfrag => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m frag --fragid 0 --fraglast -m multiport --ports 589 -m comment --comment "589 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '590 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '590',
-              action => accept,
-              islastfrag => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 590 -m comment --comment "590 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'isfirstfrag' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '591 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '591',
-              action => accept,
-              isfirstfrag => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m frag --fragid 0 --fragfirst -m multiport --ports 591 -m comment --comment "591 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '592 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '592',
-              action => accept,
-              isfirstfrag => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 592 -m comment --comment "592 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'limit' do
-    context '500/sec' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '572 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '572',
-            action => accept,
-            limit => '500/sec',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 572 -m comment --comment "572 - test" -m limit --limit 500\/sec -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'burst' do
-    context '500' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '573 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '573',
-            action => accept,
-            limit => '500/sec',
-            burst => '1500',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 573 -m comment --comment "573 - test" -m limit --limit 500\/sec --limit-burst 1500 -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'invalid' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '571 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '571',
-            action => accept,
-            limit => '500/sec',
-            burst => '1500/sec',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "1500\/sec"./)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 573 -m comment --comment "573 - test" -m limit --limit 500\/sec --limit-burst 1500\/sec -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'uid' do
-    context 'nobody' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '574 - test':
-            ensure => present,
-            proto => tcp,
-            chain => 'OUTPUT',
-            port   => '574',
-            action => accept,
-            uid => 'nobody',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m owner --uid-owner (nobody|\d+) -m multiport --ports 574 -m comment --comment "574 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'gid' do
-    context 'root' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '575 - test':
-            ensure => present,
-            proto => tcp,
-            chain => 'OUTPUT',
-            port   => '575',
-            action => accept,
-            gid => 'root',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m owner --gid-owner (root|\d+) -m multiport --ports 575 -m comment --comment "575 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  #iptables version 1.3.5 does not support masks on MARK rules
-  if default['platform'] !~ /el-5/
-    describe 'set_mark' do
-      context '0x3e8/0xffffffff' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '580 - test':
-              ensure => present,
-              chain => 'OUTPUT',
-              proto => tcp,
-              port   => '580',
-              jump => 'MARK',
-              table => 'mangle',
-              set_mark => '0x3e8/0xffffffff',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save -t mangle') do |r|
-            expect(r.stdout).to match(/-A OUTPUT -p tcp -m multiport --ports 580 -m comment --comment "580 - test" -j MARK --set-xmark 0x3e8\/0xffffffff/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'pkttype' do
-    context 'multicast' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '581 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '581',
-            action => accept,
-            pkttype => 'multicast',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 581 -m pkttype --pkt-type multicast -m comment --comment "581 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'test' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '582 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '582',
-            action => accept,
-            pkttype => 'test',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "test"./)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 582 -m pkttype --pkt-type multicast -m comment --comment "582 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'isfragment' do
-    context 'true' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '583 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '583',
-            action => accept,
-            isfragment => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -f -m multiport --ports 583 -m comment --comment "583 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'false' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '584 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '584',
-            action => accept,
-            isfragment => false,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 584 -m comment --comment "584 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  # RHEL5/SLES does not support -m socket
-  describe 'socket', :unless => (default['platform'] =~ /el-5/ or fact('operatingsystem') == 'SLES') do
-    context 'true' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '585 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '585',
-            action => accept,
-            chain  => 'PREROUTING',
-            table  => 'nat',
-            socket => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p tcp -m multiport --ports 585 -m socket -m comment --comment "585 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'false' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '586 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '586',
-            action => accept,
-            chain  => 'PREROUTING',
-            table  => 'nat',
-            socket => false,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p tcp -m multiport --ports 586 -m comment --comment "586 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'ipsec_policy' do
-    context 'ipsec' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '593 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'ipsec',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "593 - test" -m policy --dir out --pol ipsec -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-
-    context 'none' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '594 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'none',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "594 - test" -m policy --dir out --pol none -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'ipsec_dir' do
-    context 'out' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '595 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'ipsec',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "595 - test" -m policy --dir out --pol ipsec -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-
-    context 'in' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '596 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'INPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'in',
-            ipsec_policy => 'none',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "596 - test" -m policy --dir in --pol none -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'recent' do
-    context 'set' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'set',
-            rdest        => true,
-            rname        => 'list1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          # Mask added as of Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "597 - test" -m recent --set --name list1 (--mask 255.255.255.255 )?--rdest/)
-        end
-      end
-    end
-
-    context 'rcheck' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'rcheck',
-            rsource      => true,
-            rname        => 'list1',
-            rseconds     => 60,
-            rhitcount    => 5,
-            rttl         => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "598 - test" -m recent --rcheck --seconds 60 --hitcount 5 --rttl --name list1 (--mask 255.255.255.255 )?--rsource/)
-        end
-      end
-    end
-
-    context 'update' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '599 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'update',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "599 - test" -m recent --update/)
-        end
-      end
-    end
-
-    context 'remove' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '600 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'remove',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "600 - test" -m recent --remove/)
-        end
-      end
-    end
-  end
-
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('ip6tables --flush')
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb
deleted file mode 100644
index 757336a75c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'puppet resource firewallchain command:' do
-  before :all do
-    iptables_flush_all_tables
-  end
-  describe 'ensure' do
-    context 'present' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'MY_CHAIN:filter:IPv4':
-            ensure  => present,
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'finds the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/MY_CHAIN/)
-        end
-      end
-    end
-
-    context 'absent' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'MY_CHAIN:filter:IPv4':
-            ensure  => absent,
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'fails to find the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/MY_CHAIN/)
-        end
-      end
-    end
-  end
-
-  # XXX purge => false is not yet implemented
-  #context 'adding a firewall rule to a chain:' do
-  #  it 'applies cleanly' do
-  #    pp = <<-EOS
-  #      firewallchain { 'MY_CHAIN:filter:IPv4':
-  #        ensure  => present,
-  #      }
-  #      firewall { '100 my rule':
-  #        chain   => 'MY_CHAIN',
-  #        action  => 'accept',
-  #        proto   => 'tcp',
-  #        dport   => 5000,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_failures => true)
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-  #end
-
-  #context 'not purge firewallchain chains:' do
-  #  it 'does not purge the rule' do
-  #    pp = <<-EOS
-  #      firewallchain { 'MY_CHAIN:filter:IPv4':
-  #        ensure  => present,
-  #        purge   => false,
-  #        before  => Resources['firewall'],
-  #      }
-  #      resources { 'firewall':
-  #        purge => true,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_failures => true) do |r|
-  #      expect(r.stdout).to_not match(/removed/)
-  #      expect(r.stderr).to eq('')
-  #    end
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-
-  #  it 'still has the rule' do
-  #    pp = <<-EOS
-  #      firewall { '100 my rule':
-  #        chain   => 'MY_CHAIN',
-  #        action  => 'accept',
-  #        proto   => 'tcp',
-  #        dport   => 5000,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-  #end
-
-  describe 'policy' do
-    after :all do
-      shell('iptables -t filter -P FORWARD ACCEPT')
-    end
-
-    context 'DROP' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'FORWARD:filter:IPv4':
-            policy  => 'drop',
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'finds the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/FORWARD DROP/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb
deleted file mode 100644
index bfce0e607fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper_acceptance'
-
-if default['platform'] =~ /el-5/
-  describe "firewall ip6tables doesn't work on 1.3.5 because --comment is missing" do
-    before :all do
-      ip6tables_flush_all_tables
-    end
-
-    it "can't use ip6tables" do
-      pp = <<-EOS
-        class { '::firewall': }
-        firewall { '599 - test':
-          ensure   => present,
-          proto    => 'tcp',
-          provider => 'ip6tables',
-        }
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/ip6tables provider is not supported/)
-    end
-  end
-else
-  describe 'firewall ishasmorefrags/islastfrag/isfirstfrag properties' do
-    before :all do
-      ip6tables_flush_all_tables
-    end
-
-    shared_examples "is idempotent" do |values, line_match|
-      it "changes the values to #{values}" do
-        pp = <<-EOS
-            class { '::firewall': }
-            firewall { '599 - test':
-              ensure   => present,
-              proto    => 'tcp',
-              provider => 'ip6tables',
-              #{values}
-            }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-
-        shell('ip6tables-save') do |r|
-          expect(r.stdout).to match(/#{line_match}/)
-        end
-      end
-    end
-    shared_examples "doesn't change" do |values, line_match|
-      it "doesn't change the values to #{values}" do
-        pp = <<-EOS
-            class { '::firewall': }
-            firewall { '599 - test':
-              ensure   => present,
-              proto    => 'tcp',
-              provider => 'ip6tables',
-              #{values}
-            }
-        EOS
-
-        apply_manifest(pp, :catch_changes => true)
-
-        shell('ip6tables-save') do |r|
-          expect(r.stdout).to match(/#{line_match}/)
-        end
-      end
-    end
-
-    describe 'adding a rule' do
-      context 'when unset' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like 'is idempotent', '', /-A INPUT -p tcp -m comment --comment "599 - test"/
-      end
-      context 'when set to true' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like "is idempotent", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-      end
-      context 'when set to false' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like "is idempotent", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-      end
-    end
-    describe 'editing a rule' do
-      context 'when unset or false' do
-        before :each do
-          ip6tables_flush_all_tables
-          shell('ip6tables -A INPUT -p tcp -m comment --comment "599 - test"')
-        end
-        context 'and current value is false' do
-          it_behaves_like "doesn't change", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-        end
-        context 'and current value is true' do
-          it_behaves_like "is idempotent", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-        end
-      end
-      context 'when set to true' do
-        before :each do
-          ip6tables_flush_all_tables
-          shell('ip6tables -A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"')
-        end
-        context 'and current value is false' do
-          it_behaves_like "is idempotent", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-        end
-        context 'and current value is true' do
-          it_behaves_like "doesn't change", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb
deleted file mode 100644
index 7fdedc28732..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall isfragment property' do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  shared_examples "is idempotent" do |value, line_match|
-    it "changes the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure => present,
-            proto  => 'tcp',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-  shared_examples "doesn't change" do |value, line_match|
-    it "doesn't change the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure => present,
-            proto  => 'tcp',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-
-  describe 'adding a rule' do
-    context 'when unset' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', '', /-A INPUT -p tcp -m comment --comment "597 - test"/
-    end
-    context 'when set to true' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-    end
-    context 'when set to false' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like "is idempotent", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-    end
-  end
-  describe 'editing a rule' do
-    context 'when unset or false' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -A INPUT -p tcp -m comment --comment "597 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "doesn't change", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "is idempotent", 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-      end
-    end
-    context 'when set to true' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -A INPUT -p tcp -f -m comment --comment "597 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "is idempotent", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "doesn't change", 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml
deleted file mode 100644
index 3a6470beae2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-      - database
-      - console
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index b41a947169a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml
deleted file mode 100644
index d5166735ec1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-fusion503-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box
-    hypervisor : fusion
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 19181c123d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 624b53716b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index 554c37a505c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5047017e623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index 7e789c8d8df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb
deleted file mode 100644
index c0f93ad21f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "param based tests:" do
-  # Takes a hash and converts it into a firewall resource
-  def pp(params)
-    name = params.delete('name') || '100 test'
-    pm = <<-EOS
-firewall { '#{name}':
-    EOS
-
-    params.each do |k,v|
-      pm += <<-EOS
-  #{k} => #{v},
-      EOS
-    end
-
-    pm += <<-EOS
-}
-    EOS
-    pm
-  end
-
-  it 'test various params', :unless => (default['platform'].match(/el-5/) || fact('operatingsystem') == 'SLES') do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'table' => "'raw'",
-      'socket' => 'true',
-      'chain' => "'PREROUTING'",
-      'jump' => 'LOG',
-      'log_level' => 'debug',
-    })
-
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test log rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name' => '998 log all',
-      'proto' => 'all',
-      'jump' => 'LOG',
-      'log_level' => 'debug',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test log rule - changing names' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name' => '004 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    ppm2 = pp({
-      'name' => '003 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to eq(2)
-
-    ppm = <<-EOS + "\n" + ppm2
-      resources { 'firewall':
-        purge => true,
-      }
-    EOS
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-  end
-
-  it 'test chain - changing names' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name'  => '004 with a chain',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-    })
-
-    ppm2 = pp({
-      'name'  => '004 with a chain',
-      'chain' => 'OUTPUT',
-      'proto' => 'all',
-    })
-
-    apply_manifest(ppm1, :expect_changes => true)
-
-    ppm = <<-EOS + "\n" + ppm2
-      resources { 'firewall':
-        purge => true,
-      }
-    EOS
-    expect(apply_manifest(ppm2, :expect_failures => true).stderr).to match(/is not supported/)
-  end
-
-  it 'test log rule - idempotent' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name' => '004 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test src_range rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name'      => '997 block src ip range',
-      'chain'     => 'INPUT',
-      'proto'     => 'all',
-      'action'    => 'drop',
-      'src_range' => '"10.0.0.1-10.0.0.10"',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test dst_range rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name'      => '998 block dst ip range',
-      'chain'     => 'INPUT',
-      'proto'     => 'all',
-      'action'    => 'drop',
-      'dst_range' => '"10.0.0.2-10.0.0.20"',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb
deleted file mode 100644
index f62b14f936e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "purge tests:" do
-  context('resources purge') do
-    before(:all) do
-      iptables_flush_all_tables
-
-      shell('iptables -A INPUT -s 1.2.1.2')
-      shell('iptables -A INPUT -s 1.2.1.2')
-    end
-
-    it 'make sure duplicate existing rules get purged' do
-
-      pp = <<-EOS
-        class { 'firewall': }
-        resources { 'firewall':
-          purge => true,
-        }
-      EOS
-
-      apply_manifest(pp, :expect_changes => true)
-    end
-
-    it 'saves' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to_not match(/1\.2\.1\.2/)
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  context('chain purge') do
-    before(:each) do
-      iptables_flush_all_tables
-
-      shell('iptables -A INPUT -p tcp -s 1.2.1.1')
-      shell('iptables -A INPUT -p udp -s 1.2.1.1')
-      shell('iptables -A OUTPUT -s 1.2.1.2 -m comment --comment "010 output-1.2.1.2"')
-    end
-
-    it 'purges only the specified chain' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-        }
-      EOS
-
-      apply_manifest(pp, :expect_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/010 output-1\.2\.1\.2/)
-        expect(r.stdout).to_not match(/1\.2\.1\.1/)
-        expect(r.stderr).to eq("")
-      end
-    end
-
-    it 'ignores managed rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'OUTPUT:filter:IPv4':
-          purge => true,
-        }
-        firewall { '010 output-1.2.1.2':
-          chain  => 'OUTPUT',
-          proto  => 'all',
-          source => '1.2.1.2',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'ignores specified rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-          ignore => [
-            '-s 1\.2\.1\.1',
-          ],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'adds managed rules with ignored rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-          ignore => [
-            '-s 1\.2\.1\.1',
-          ],
-        }
-        firewall { '014 input-1.2.1.6':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.6',
-        }
-        -> firewall { '013 input-1.2.1.5':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.5',
-        }
-        -> firewall { '012 input-1.2.1.4':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.4',
-        }
-        -> firewall { '011 input-1.2.1.3':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.3',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-
-      expect(shell('iptables-save').stdout).to match(/-A INPUT -s 1\.2\.1\.1(\/32)? -p tcp\s?\n-A INPUT -s 1\.2\.1\.1(\/32)? -p udp/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb
deleted file mode 100644
index c9a852d8264..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper_acceptance'
-
-# Here we want to test the the resource commands ability to work with different
-# existing ruleset scenarios. This will give the parsing capabilities of the
-# code a good work out.
-describe 'puppet resource firewall command:' do
-  context 'make sure it returns no errors when executed on a clean machine' do
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, some boxes come with rules, that is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'flush iptables and make sure it returns nothing afterwards' do
-    before(:all) do
-      iptables_flush_all_tables
-    end
-
-    # No rules, means no output thanks. And no errors as well.
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        r.stderr.should be_empty
-        r.stdout.should == "\n"
-      end
-    end
-  end
-
-  context 'accepts rules without comments' do
-    before(:all) do
-      iptables_flush_all_tables
-      shell('iptables -A INPUT -j ACCEPT -p tcp --dport 80')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with invalid comments' do
-    before(:all) do
-      iptables_flush_all_tables
-      shell('iptables -A INPUT -j ACCEPT -p tcp --dport 80 -m comment --comment "http"')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with negation' do
-    before :all do
-      iptables_flush_all_tables
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p tcp -j MASQUERADE --to-ports 1024-65535')
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p udp -j MASQUERADE --to-ports 1024-65535')
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -j MASQUERADE')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with match extension tcp flag' do
-    before :all do
-      iptables_flush_all_tables
-      shell('iptables -t mangle -A PREROUTING -d 1.2.3.4 -p tcp -m tcp -m multiport --dports 80,443,8140 -j MARK --set-mark 42')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb
deleted file mode 100644
index b0e66ae5bc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'complex ruleset 1' do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  after :all do
-    shell('iptables -t filter -P INPUT ACCEPT')
-    shell('iptables -t filter -P FORWARD ACCEPT')
-    shell('iptables -t filter -P OUTPUT ACCEPT')
-    shell('iptables -t filter --flush')
-  end
-
-  it 'applies cleanly' do
-    pp = <<-EOS
-      firewall { '090 forward allow local':
-        chain       => 'FORWARD',
-        proto       => 'all',
-        source      => '10.0.0.0/8',
-        destination => '10.0.0.0/8',
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow tcp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'tcp',
-        state       => 'NEW',
-        port        => [80,443,21,20,22,53,123,43,873,25,465],
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow udp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'udp',
-        port        => [53,123],
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow icmp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'icmp',
-        action      => 'accept',
-      }
-
-      firewall { '090 ignore ipsec':
-        table        => 'nat',
-        chain        => 'POSTROUTING',
-        outiface     => 'eth0',
-        ipsec_policy => 'ipsec',
-        ipsec_dir    => 'out',
-        action       => 'accept',
-      }
-      firewall { '093 ignore 10.0.0.0/8':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '10.0.0.0/8',
-        action      => 'accept',
-      }
-      firewall { '093 ignore 172.16.0.0/12':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '172.16.0.0/12',
-        action      => 'accept',
-      }
-      firewall { '093 ignore 192.168.0.0/16':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '192.168.0.0/16',
-        action      => 'accept',
-      }
-      firewall { '100 masq outbound':
-        table    => 'nat',
-        chain    => 'POSTROUTING',
-        outiface => 'eth0',
-        jump     => 'MASQUERADE',
-      }
-      firewall { '101 redirect port 1':
-        table   => 'nat',
-        chain   => 'PREROUTING',
-        iniface => 'eth0',
-        proto   => 'tcp',
-        dport   => '1',
-        toports => '22',
-        jump    => 'REDIRECT',
-      }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'contains appropriate rules' do
-    shell('iptables-save') do |r|
-      [
-        /INPUT ACCEPT/,
-        /FORWARD ACCEPT/,
-        /OUTPUT ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) -d 10.0.0.0\/(8|255\.0\.0\.0) -m comment --comment \"090 forward allow local\" -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p icmp -m comment --comment \"100 forward standard allow icmp\" -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p tcp -m multiport --ports 80,443,21,20,22,53,123,43,873,25,465 -m comment --comment \"100 forward standard allow tcp\" -m state --state NEW -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p udp -m multiport --ports 53,123 -m comment --comment \"100 forward standard allow udp\" -j ACCEPT/
-      ].each do |line|
-        expect(r.stdout).to match(line)
-      end
-    end
-  end
-end
-
-describe 'complex ruleset 2' do
-  after :all do
-    shell('iptables -t filter -P INPUT ACCEPT')
-    shell('iptables -t filter -P FORWARD ACCEPT')
-    shell('iptables -t filter -P OUTPUT ACCEPT')
-    shell('iptables -t filter --flush')
-    expect(shell('iptables -t filter -X LOCAL_INPUT').stderr).to eq("")
-    expect(shell('iptables -t filter -X LOCAL_INPUT_PRE').stderr).to eq("")
-  end
-
-  it 'applies cleanly' do
-    pp = <<-EOS
-      class { '::firewall': }
-      
-      Firewall {
-        proto => 'all',
-        stage => 'pre',
-      }
-      Firewallchain {
-        stage  => 'pre',
-        purge  => 'true',
-        ignore => [
-          '--comment "[^"]*(?i:ignore)[^"]*"',
-        ],
-      }
-
-      firewall { '010 INPUT allow established and related':
-        proto  => 'all',
-        state  => ['ESTABLISHED', 'RELATED'],
-        action => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-      firewall { '012 accept loopback':
-        iniface => 'lo',
-        action  => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-      firewall { '020 ssh':
-        proto  => 'tcp',
-        dport  => '22',
-        state  => 'NEW',
-        action => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-
-      firewall { '013 icmp echo-request':
-        proto  => 'icmp',
-        icmp   => 'echo-request',
-        action => 'accept',
-        source => '10.0.0.0/8',
-      }
-      firewall { '013 icmp destination-unreachable':
-        proto  => 'icmp',
-        icmp   => 'destination-unreachable',
-        action => 'accept',
-      }
-      firewall { '013 icmp time-exceeded':
-        proto  => 'icmp',
-        icmp   => 'time-exceeded',
-        action => 'accept',
-      }
-      firewall { '999 reject':
-        action => 'reject',
-        reject => 'icmp-host-prohibited',
-      }
-
-
-      firewallchain { 'LOCAL_INPUT_PRE:filter:IPv4': }
-      firewall { '001 LOCAL_INPUT_PRE':
-        jump    => 'LOCAL_INPUT_PRE',
-        require => Firewallchain['LOCAL_INPUT_PRE:filter:IPv4'],
-      }
-      firewallchain { 'LOCAL_INPUT:filter:IPv4': }
-      firewall { '900 LOCAL_INPUT':
-        jump    => 'LOCAL_INPUT',
-        require => Firewallchain['LOCAL_INPUT:filter:IPv4'],
-      }
-      firewallchain { 'INPUT:filter:IPv4':
-        policy => 'drop',
-        ignore => [
-          '-j fail2ban-ssh',
-          '--comment "[^"]*(?i:ignore)[^"]*"',
-        ],
-      }
-
-
-      firewall { '010 allow established and related':
-        chain  => 'FORWARD',
-        proto  => 'all',
-        state  => ['ESTABLISHED','RELATED'],
-        action => 'accept',
-        before => Firewallchain['FORWARD:filter:IPv4'],
-      }
-      firewallchain { 'FORWARD:filter:IPv4':
-        policy => 'drop',
-      }
-
-      firewallchain { 'OUTPUT:filter:IPv4': }
-
-
-      # purge unknown rules from mangle table
-      firewallchain { ['PREROUTING:mangle:IPv4', 'INPUT:mangle:IPv4', 'FORWARD:mangle:IPv4', 'OUTPUT:mangle:IPv4', 'POSTROUTING:mangle:IPv4']: }
-
-      # and the nat table
-      firewallchain { ['PREROUTING:nat:IPv4', 'INPUT:nat:IPv4', 'OUTPUT:nat:IPv4', 'POSTROUTING:nat:IPv4']: }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-  it 'contains appropriate rules' do
-    shell('iptables-save') do |r|
-      [
-        /INPUT DROP/,
-        /FORWARD DROP/,
-        /OUTPUT ACCEPT/,
-        /LOCAL_INPUT/,
-        /LOCAL_INPUT_PRE/,
-        /-A INPUT -m comment --comment \"001 LOCAL_INPUT_PRE\" -j LOCAL_INPUT_PRE/,
-        /-A INPUT -m comment --comment \"010 INPUT allow established and related\" -m state --state RELATED,ESTABLISHED -j ACCEPT/,
-        /-A INPUT -i lo -m comment --comment \"012 accept loopback\" -j ACCEPT/,
-        /-A INPUT -p icmp -m comment --comment \"013 icmp destination-unreachable\" -m icmp --icmp-type 3 -j ACCEPT/,
-        /-A INPUT -s 10.0.0.0\/(8|255\.0\.0\.0) -p icmp -m comment --comment \"013 icmp echo-request\" -m icmp --icmp-type 8 -j ACCEPT/,
-        /-A INPUT -p icmp -m comment --comment \"013 icmp time-exceeded\" -m icmp --icmp-type 11 -j ACCEPT/,
-        /-A INPUT -p tcp -m multiport --dports 22 -m comment --comment \"020 ssh\" -m state --state NEW -j ACCEPT/,
-        /-A INPUT -m comment --comment \"900 LOCAL_INPUT\" -j LOCAL_INPUT/,
-        /-A INPUT -m comment --comment \"999 reject\" -j REJECT --reject-with icmp-host-prohibited/,
-        /-A FORWARD -m comment --comment \"010 allow established and related\" -m state --state RELATED,ESTABLISHED -j ACCEPT/
-      ].each do |line|
-        expect(r.stdout).to match(line)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb
deleted file mode 100644
index c4a05348cf3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'spec_helper_acceptance'
-
-# RHEL5 does not support -m socket
-describe 'firewall socket property', :unless => (default['platform'] =~ /el-5/ || fact('operatingsystem') == 'SLES') do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  shared_examples "is idempotent" do |value, line_match|
-    it "changes the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure => present,
-            proto  => 'tcp',
-            chain  => 'PREROUTING',
-            table  => 'raw',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save -t raw') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-  shared_examples "doesn't change" do |value, line_match|
-    it "doesn't change the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure => present,
-            proto  => 'tcp',
-            chain  => 'PREROUTING',
-            table  => 'raw',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save -t raw') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-
-  describe 'adding a rule' do
-    context 'when unset' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', '', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-    end
-    context 'when set to true' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-    end
-    context 'when set to false' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like "is idempotent", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-    end
-  end
-  describe 'editing a rule' do
-    context 'when unset or false' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -t raw -A PREROUTING -p tcp -m comment --comment "598 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "doesn't change", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "is idempotent", 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-      end
-    end
-    context 'when set to true' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -t raw -A PREROUTING -p tcp -m socket -m comment --comment "598 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "is idempotent", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "doesn't change", 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb
deleted file mode 100644
index f29278b97f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-# Some tests for the standard recommended usage
-describe 'standard usage tests:' do
-  it 'applies twice' do
-    pp = <<-EOS
-      class my_fw::pre {
-        Firewall {
-          require => undef,
-        }
-
-        # Default firewall rules
-        firewall { '000 accept all icmp':
-          proto   => 'icmp',
-          action  => 'accept',
-        }->
-        firewall { '001 accept all to lo interface':
-          proto   => 'all',
-          iniface => 'lo',
-          action  => 'accept',
-        }->
-        firewall { '002 accept related established rules':
-          proto   => 'all',
-          ctstate => ['RELATED', 'ESTABLISHED'],
-          action  => 'accept',
-        }
-      }
-      class my_fw::post {
-        firewall { '999 drop all':
-          proto   => 'all',
-          action  => 'drop',
-          before  => undef,
-        }
-      }
-      resources { "firewall":
-        purge => true
-      }
-      Firewall {
-        before  => Class['my_fw::post'],
-        require => Class['my_fw::pre'],
-      }
-      class { ['my_fw::pre', 'my_fw::post']: }
-      class { 'firewall': }
-      firewall { '500 open up port 22':
-        action => 'accept',
-        proto => 'tcp',
-        dport => 22,
-      }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb
deleted file mode 100644
index 7c507d78bdf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# These hashes allow us to iterate across a series of test data
-# creating rspec examples for each parameter to ensure the input :line
-# extrapolates to the desired value for the parameter in question. And
-# vice-versa
-
-# This hash is for testing a line conversion to a hash of parameters
-# which will be used to create a resource.
-ARGS_TO_HASH6 = {
-  'source_destination_ipv6_no_cidr' => {
-    :line => '-A INPUT -s 2001:db8:85a3::8a2e:370:7334 -d 2001:db8:85a3::8a2e:370:7334 -m comment --comment "000 source destination ipv6 no cidr"',
-    :table => 'filter',
-    :provider => 'ip6tables',
-    :params => {
-      :source => '2001:db8:85a3::8a2e:370:7334/128',
-      :destination => '2001:db8:85a3::8a2e:370:7334/128',
-    },
-  },
-  'source_destination_ipv6_netmask' => {
-    :line => '-A INPUT -s 2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -d 2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -m comment --comment "000 source destination ipv6 netmask"',
-    :table => 'filter',
-    :provider => 'ip6tables',
-    :params => {
-      :source => '2001:db8:1234::/48',
-      :destination => '2001:db8:4321::/48',
-    },
-  },
-}
-
-# This hash is for testing converting a hash to an argument line.
-HASH_TO_ARGS6 = {
-  'zero_prefixlen_ipv6' => {
-    :params => {
-      :name => '100 zero prefix length ipv6',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '::/0',
-      :destination => '::/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv6'],
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv4 no cidr',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '1.1.1.1',
-      :destination => '2.2.2.2',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.1/32', '-d', '2.2.2.2/32', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 no cidr'],
-  },
- 'source_destination_ipv6_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv6 no cidr',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '2001:db8:1234::',
-      :destination => '2001:db8:4321::',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/128', '-d', '2001:db8:4321::/128', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 no cidr'],
-  },
- 'source_destination_ipv6_netmask' => {
-    :params => {
-      :name => '000 source destination ipv6 netmask',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-      :destination => '2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/48', '-d', '2001:db8:4321::/48', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 netmask'],
-  },
-  'frag_ishasmorefrags' => {
-    :params => {
-      :name => "100 has more fragments",
-      :ishasmorefrags => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fragmore", "-m", "comment", "--comment", "100 has more fragments"],
-  },
-  'frag_islastfrag' => {
-    :params => {
-      :name => "100 last fragment",
-      :islastfrag => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fraglast", "-m", "comment", "--comment", "100 last fragment"],
-  },
-  'frag_isfirstfrags' => {
-    :params => {
-      :name => "100 first fragment",
-      :isfirstfrag => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fragfirst", "-m", "comment", "--comment", "100 first fragment"],
-  },
-  'hop_limit' => {
-    :params => {
-      :name => "100 hop limit",
-      :hop_limit => 255,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 hop limit", "-m", "hl", "--hl-eq", 255],
-  },
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb
deleted file mode 100644
index 105d27fb6b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb
+++ /dev/null
@@ -1,934 +0,0 @@
-# These hashes allow us to iterate across a series of test data
-# creating rspec examples for each parameter to ensure the input :line
-# extrapolates to the desired value for the parameter in question. And
-# vice-versa
-
-# This hash is for testing a line conversion to a hash of parameters
-# which will be used to create a resource.
-ARGS_TO_HASH = {
-  'dport_and_sport' => {
-    :line => '-A nova-compute-FORWARD -s 0.0.0.0/32 -d 255.255.255.255/32 -p udp -m udp --sport 68 --dport 67 -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :chain => 'nova-compute-FORWARD',
-      :source => '0.0.0.0/32',
-      :destination => '255.255.255.255/32',
-      :sport => ['68'],
-      :dport => ['67'],
-      :proto => 'udp',
-    },
-  },
-  'long_rule_1' => {
-    :line => '-A INPUT -s 1.1.1.1/32 -d 1.1.1.1/32 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -m comment --comment "000 allow foo" -j ACCEPT',
-    :table => 'filter',
-    :compare_all => true,
-    :params => {
-      :action => "accept",
-      :chain => "INPUT",
-      :destination => "1.1.1.1/32",
-      :dport => ["7061","7062"],
-      :ensure => :present,
-      :line => '-A INPUT -s 1.1.1.1/32 -d 1.1.1.1/32 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -m comment --comment "000 allow foo" -j ACCEPT',
-      :name => "000 allow foo",
-      :proto => "tcp",
-      :provider => "iptables",
-      :source => "1.1.1.1/32",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-  },
-  'action_drop_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j DROP',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => "drop",
-    },
-  },
-  'action_reject_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j REJECT',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => "reject",
-    },
-  },
-  'action_nil_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => nil,
-    },
-  },
-  'jump_custom_chain_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j custom_chain',
-    :table => 'filter',
-    :params => {
-      :jump => "custom_chain",
-      :action => nil,
-    },
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :line => '-A INPUT -s 1.1.1.1 -d 2.2.2.2 -m comment --comment "000 source destination ipv4 no cidr"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '2.2.2.2/32',
-    },
-  },
-  'source_destination_ipv6_no_cidr' => {
-    :line => '-A INPUT -s 2001:db8:85a3::8a2e:370:7334 -d 2001:db8:85a3::8a2e:370:7334 -m comment --comment "000 source destination ipv6 no cidr"',
-    :table => 'filter',
-    :params => {
-      :source => '2001:db8:85a3::8a2e:370:7334/128',
-      :destination => '2001:db8:85a3::8a2e:370:7334/128',
-    },
-  },
-  'source_destination_ipv4_netmask' => {
-    :line => '-A INPUT -s 1.1.1.0/255.255.255.0 -d 2.2.0.0/255.255.0.0 -m comment --comment "000 source destination ipv4 netmask"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.0/24',
-      :destination => '2.2.0.0/16',
-    },
-  },
-  'source_destination_ipv6_netmask' => {
-    :line => '-A INPUT -s 2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -d 2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -m comment --comment "000 source destination ipv6 netmask"',
-    :table => 'filter',
-    :params => {
-      :source => '2001:db8:1234::/48',
-      :destination => '2001:db8:4321::/48',
-    },
-  },
-  'source_destination_negate_source' => {
-    :line => '-A INPUT ! -s 1.1.1.1 -d 2.2.2.2 -m comment --comment "000 negated source address"',
-    :table => 'filter',
-    :params => {
-      :source => '! 1.1.1.1/32',
-      :destination => '2.2.2.2/32',
-    },
-  },
-  'source_destination_negate_destination' => {
-    :line => '-A INPUT -s 1.1.1.1 ! -d 2.2.2.2 -m comment --comment "000 negated destination address"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '! 2.2.2.2/32',
-    },
-  },
-  'source_destination_negate_destination_alternative' => {
-    :line => '-A INPUT -s 1.1.1.1 -d ! 2.2.2.2 -m comment --comment "000 negated destination address alternative"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '! 2.2.2.2/32',
-    },
-  },
-  'dport_range_1' => {
-    :line => '-A INPUT -m multiport --dports 1:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :dport => ["1-1024"],
-    },
-  },
-  'dport_range_2' => {
-    :line => '-A INPUT -m multiport --dports 15,512:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :dport => ["15","512-1024"],
-    },
-  },
-  'sport_range_1' => {
-    :line => '-A INPUT -m multiport --sports 1:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :sport => ["1-1024"],
-    },
-  },
-  'sport_range_2' => {
-    :line => '-A INPUT -m multiport --sports 15,512:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :sport => ["15","512-1024"],
-    },
-  },
-  'dst_type_1' => {
-    :line => '-A INPUT -m addrtype --dst-type LOCAL',
-    :table => 'filter',
-    :params => {
-      :dst_type => 'LOCAL',
-    },
-  },
-  'src_type_1' => {
-    :line => '-A INPUT -m addrtype --src-type LOCAL',
-    :table => 'filter',
-    :params => {
-      :src_type => 'LOCAL',
-    },
-  },
-  'dst_range_1' => {
-    :line => '-A INPUT -m iprange --dst-range 10.0.0.2-10.0.0.20',
-    :table => 'filter',
-    :params => {
-      :dst_range => '10.0.0.2-10.0.0.20',
-    },
-  },
-  'src_range_1' => {
-    :line => '-A INPUT -m iprange --src-range 10.0.0.2-10.0.0.20',
-    :table => 'filter',
-    :params => {
-      :src_range => '10.0.0.2-10.0.0.20',
-    },
-  },
-  'tcp_flags_1' => {
-    :line => '-A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK,FIN SYN -m comment --comment "000 initiation"',
-    :table => 'filter',
-    :compare_all => true,
-    :chain => 'INPUT',
-    :proto => 'tcp',
-    :params => {
-      :chain => "INPUT",
-      :ensure => :present,
-      :line => '-A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK,FIN SYN -m comment --comment "000 initiation"',
-      :name => "000 initiation",
-      :proto => "tcp",
-      :provider => "iptables",
-      :table => "filter",
-      :tcp_flags => "SYN,RST,ACK,FIN SYN",
-    },
-  },
-  'state_returns_sorted_values' => {
-    :line => '-A INPUT -m state --state INVALID,RELATED,ESTABLISHED',
-    :table => 'filter',
-    :params => {
-      :state => ['ESTABLISHED', 'INVALID', 'RELATED'],
-      :action => nil,
-    },
-  },
-  'ctstate_returns_sorted_values' => {
-    :line => '-A INPUT -m conntrack --ctstate INVALID,RELATED,ESTABLISHED',
-    :table => 'filter',
-    :params => {
-      :ctstate => ['ESTABLISHED', 'INVALID', 'RELATED'],
-      :action => nil,
-    },
-  },
-  'comment_string_character_validation' => {
-    :line => '-A INPUT -s 192.168.0.1/32 -m comment --comment "000 allow from 192.168.0.1, please"',
-    :table => 'filter',
-    :params => {
-      :source => '192.168.0.1/32',
-    },
-  },
-  'log_level_debug' => {
-    :line => '-A INPUT -m comment --comment "956 INPUT log-level" -m state --state NEW -j LOG --log-level 7',
-    :table => 'filter',
-    :params => {
-      :state => ['NEW'],
-      :log_level => '7',
-      :jump => 'LOG'
-    },
-  },
-  'log_level_warn' => {
-    :line => '-A INPUT -m comment --comment "956 INPUT log-level" -m state --state NEW -j LOG',
-    :table => 'filter',
-    :params => {
-      :state => ['NEW'],
-      :log_level => '4',
-      :jump => 'LOG'
-    },
-  },
-  'load_limit_module_and_implicit_burst' => {
-    :line => '-A INPUT -m multiport --dports 123 -m comment --comment "057 INPUT limit NTP" -m limit --limit 15/hour',
-    :table => 'filter',
-    :params => {
-      :dport => ['123'],
-      :limit => '15/hour',
-      :burst => '5'
-    },
-  },
-  'limit_with_explicit_burst' => {
-    :line => '-A INPUT -m multiport --dports 123 -m comment --comment "057 INPUT limit NTP" -m limit --limit 30/hour --limit-burst 10',
-    :table => 'filter',
-    :params => {
-      :dport => ['123'],
-      :limit => '30/hour',
-      :burst => '10'
-    },
-  },
-  'proto_ipencap' => {
-    :line => '-A INPUT -p ipencap -m comment --comment "0100 INPUT accept ipencap"',
-    :table => 'filter',
-    :params => {
-      :proto => 'ipencap',
-    }
-  },
-  'load_uid_owner_filter_module' => {
-    :line => '-A OUTPUT -m owner --uid-owner root -m comment --comment "057 OUTPUT uid root only" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :uid => 'root',
-      :chain => 'OUTPUT',
-    },
-  },
-  'load_uid_owner_postrouting_module' => {
-    :line => '-t mangle -A POSTROUTING -m owner --uid-owner root -m comment --comment "057 POSTROUTING uid root only" -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :uid => 'root',
-    },
-  },
-  'load_gid_owner_filter_module' => {
-    :line => '-A OUTPUT -m owner --gid-owner root -m comment --comment "057 OUTPUT gid root only" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :gid => 'root',
-    },
-  },
-  'load_gid_owner_postrouting_module' => {
-    :line => '-t mangle -A POSTROUTING -m owner --gid-owner root -m comment --comment "057 POSTROUTING gid root only" -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :gid => 'root',
-    },
-  },
-  'mark_set-mark' => {
-    :line => '-t mangle -A PREROUTING -j MARK --set-xmark 0x3e8/0xffffffff',
-    :table => 'mangle',
-    :params => {
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x3e8/0xffffffff',
-    }
-  },
-  'iniface_1' => {
-    :line => '-A INPUT -i eth0 -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-    },
-  },
-  'iniface_with_vlans_1' => {
-    :line => '-A INPUT -i eth0.234 -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0.234',
-    },
-  },
-  'iniface_with_plus_1' => {
-    :line => '-A INPUT -i eth+ -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth+',
-    },
-  },
-  'outiface_1' => {
-    :line => '-A OUTPUT -o eth0 -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0',
-    },
-  },
-  'outiface_with_vlans_1' => {
-    :line => '-A OUTPUT -o eth0.234 -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0.234',
-    },
-  },
-  'outiface_with_plus_1' => {
-    :line => '-A OUTPUT -o eth+ -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth+',
-    },
-  },
-  'pkttype multicast' => {
-    :line => '-A INPUT -m pkttype --pkt-type multicast -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :pkttype => 'multicast',
-    },
-  },
-  'socket_option' => {
-    :line => '-A PREROUTING -m socket -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'PREROUTING',
-      :socket => true,
-    },
-  },
-  'isfragment_option' => {
-    :line => '-A INPUT -f -m comment --comment "010 a-f comment with dashf" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :name => '010 a-f comment with dashf',
-      :action => 'accept',
-      :isfragment => true,
-    },
-  },
-  'single_tcp_sport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p tcp -m tcp --sport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "tcp",
-      :sport => ["20443"],
-    },
-  },
-  'single_udp_sport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p udp -m udp --sport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "udp",
-      :sport => ["20443"],
-    },
-  },
-  'single_tcp_dport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p tcp -m tcp --dport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "tcp",
-      :dport => ["20443"],
-    },
-  },
-  'single_udp_dport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p udp -m udp --dport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "udp",
-      :dport => ["20443"],
-    },
-  },
-  'connlimit_above' => {
-    :line => '-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "061 REJECT connlimit_above 10" -m connlimit --connlimit-above 10 --connlimit-mask 32 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :action => 'reject',
-    },
-  },
-  'connlimit_above_with_connlimit_mask' => {
-    :line => '-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "061 REJECT connlimit_above 10 with mask 24" -m connlimit --connlimit-above 10 --connlimit-mask 24 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :connlimit_mask => '24',
-      :action => 'reject',
-    },
-  },
-  'connmark' => {
-    :line => '-A INPUT -m comment --comment "062 REJECT connmark" -m connmark --mark 0x1 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'all',
-      :connmark => '0x1',
-      :action => 'reject',
-    },
-  },
-}
-
-# This hash is for testing converting a hash to an argument line.
-HASH_TO_ARGS = {
-  'long_rule_1' => {
-    :params => {
-      :action => "accept",
-      :chain => "INPUT",
-      :destination => "1.1.1.1",
-      :dport => ["7061","7062"],
-      :ensure => :present,
-      :name => "000 allow foo",
-      :proto => "tcp",
-      :source => "1.1.1.1",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-s", "1.1.1.1/32", "-d", "1.1.1.1/32", "-p", :tcp, "-m", "multiport", "--sports", "7061,7062", "-m", "multiport", "--dports", "7061,7062", "-m", "comment", "--comment", "000 allow foo", "-j", "ACCEPT"],
-  },
-  'long_rule_2' => {
-    :params => {
-      :chain => "INPUT",
-      :destination => "2.10.13.3/24",
-      :dport => ["7061"],
-      :ensure => :present,
-      :jump => "my_custom_chain",
-      :name => "700 allow bar",
-      :proto => "udp",
-      :source => "1.1.1.1",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-s", "1.1.1.1/32", "-d", "2.10.13.0/24", "-p", :udp, "-m", "multiport", "--sports", "7061,7062", "-m", "multiport", "--dports", "7061", "-m", "comment", "--comment", "700 allow bar", "-j", "my_custom_chain"],
-  },
-  'no_action' => {
-    :params => {
-      :name => "100 no action",
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment",
-      "100 no action"],
-  },
-  'zero_prefixlen_ipv4' => {
-    :params => {
-      :name => '100 zero prefix length ipv4',
-      :table => 'filter',
-      :source => '0.0.0.0/0',
-      :destination => '0.0.0.0/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv4'],
-  },
-  'zero_prefixlen_ipv6' => {
-    :params => {
-      :name => '100 zero prefix length ipv6',
-      :table => 'filter',
-      :source => '::/0',
-      :destination => '::/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv6'],
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv4 no cidr',
-      :table => 'filter',
-      :source => '1.1.1.1',
-      :destination => '2.2.2.2',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.1/32', '-d', '2.2.2.2/32', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 no cidr'],
-  },
- 'source_destination_ipv6_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv6 no cidr',
-      :table => 'filter',
-      :source => '2001:db8:1234::',
-      :destination => '2001:db8:4321::',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/128', '-d', '2001:db8:4321::/128', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 no cidr'],
-  },
-  'source_destination_ipv4_netmask' => {
-    :params => {
-      :name => '000 source destination ipv4 netmask',
-      :table => 'filter',
-      :source => '1.1.1.0/255.255.255.0',
-      :destination => '2.2.0.0/255.255.0.0',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.0/24', '-d', '2.2.0.0/16', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 netmask'],
-  },
- 'source_destination_ipv6_netmask' => {
-    :params => {
-      :name => '000 source destination ipv6 netmask',
-      :table => 'filter',
-      :source => '2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-      :destination => '2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/48', '-d', '2001:db8:4321::/48', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 netmask'],
-  },
-  'sport_range_1' => {
-    :params => {
-      :name => "100 sport range",
-      :sport => ["1-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--sports", "1:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'sport_range_2' => {
-    :params => {
-      :name => "100 sport range",
-      :sport => ["15","512-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--sports", "15,512:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dport_range_1' => {
-    :params => {
-      :name => "100 sport range",
-      :dport => ["1-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "1:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dport_range_2' => {
-    :params => {
-      :name => "100 sport range",
-      :dport => ["15","512-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "15,512:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dst_type_1' => {
-    :params => {
-      :name => '000 dst_type',
-      :table => 'filter',
-      :dst_type => 'LOCAL',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'addrtype', '--dst-type', :LOCAL, '-m', 'comment', '--comment', '000 dst_type'],
-  },
-  'src_type_1' => {
-    :params => {
-      :name => '000 src_type',
-      :table => 'filter',
-      :src_type => 'LOCAL',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'addrtype', '--src-type', :LOCAL, '-m', 'comment', '--comment', '000 src_type'],
-  },
-  'dst_range_1' => {
-    :params => {
-      :name => '000 dst_range',
-      :table => 'filter',
-      :dst_range => '10.0.0.1-10.0.0.10',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'iprange', '--dst-range', '10.0.0.1-10.0.0.10', '-m', 'comment', '--comment', '000 dst_range'],
-  },
-  'src_range_1' => {
-    :params => {
-      :name => '000 src_range',
-      :table => 'filter',
-      :dst_range => '10.0.0.1-10.0.0.10',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'iprange', '--dst-range', '10.0.0.1-10.0.0.10', '-m', 'comment', '--comment', '000 src_range'],
-  },
-  'tcp_flags_1' => {
-    :params => {
-      :name => "000 initiation",
-      :tcp_flags => "SYN,RST,ACK,FIN SYN",
-      :table => "filter",
-    },
-
-    :args => ["-t", :filter, "-p", :tcp, "-m", "tcp", "--tcp-flags", "SYN,RST,ACK,FIN", "SYN", "-m", "comment", "--comment", "000 initiation",]
-  },
-  'states_set_from_array' => {
-    :params => {
-      :name => "100 states_set_from_array",
-      :table => "filter",
-      :state => ['ESTABLISHED', 'INVALID']
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 states_set_from_array",
-      "-m", "state", "--state", "ESTABLISHED,INVALID"],
-  },
-  'ctstates_set_from_array' => {
-    :params => {
-      :name => "100 ctstates_set_from_array",
-      :table => "filter",
-      :ctstate => ['ESTABLISHED', 'INVALID']
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 ctstates_set_from_array",
-      "-m", "conntrack", "--ctstate", "ESTABLISHED,INVALID"],
-  },
-  'comment_string_character_validation' => {
-    :params => {
-      :name => "000 allow from 192.168.0.1, please",
-      :table => 'filter',
-      :source => '192.168.0.1'
-    },
-    :args => ['-t', :filter, '-s', '192.168.0.1/32', '-p', :tcp, '-m', 'comment', '--comment', '000 allow from 192.168.0.1, please'],
-  },
-  'port_property' => {
-    :params => {
-      :name => '001 port property',
-      :table => 'filter',
-      :port => '80',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--ports', '80', '-m', 'comment', '--comment', '001 port property'],
-  },
-  'log_level_debug' => {
-    :params => {
-      :name => '956 INPUT log-level',
-      :table => 'filter',
-      :state => 'NEW',
-      :jump => 'LOG',
-      :log_level => 'debug'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '956 INPUT log-level', '-m', 'state', '--state', 'NEW', '-j', 'LOG', '--log-level', '7'],
-  },
-  'log_level_warn' => {
-    :params => {
-      :name => '956 INPUT log-level',
-      :table => 'filter',
-      :state => 'NEW',
-      :jump => 'LOG',
-      :log_level => 'warn'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '956 INPUT log-level', '-m', 'state', '--state', 'NEW', '-j', 'LOG', '--log-level', '4'],
-  },
-  'load_limit_module_and_implicit_burst' => {
-    :params => {
-      :name => '057 INPUT limit NTP',
-      :table => 'filter',
-      :dport => '123',
-      :limit => '15/hour'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--dports', '123', '-m', 'comment', '--comment', '057 INPUT limit NTP', '-m', 'limit', '--limit', '15/hour'],
-  },
-  'limit_with_explicit_burst' => {
-    :params => {
-      :name => '057 INPUT limit NTP',
-      :table => 'filter',
-      :dport => '123',
-      :limit => '30/hour',
-      :burst => '10'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--dports', '123', '-m', 'comment', '--comment', '057 INPUT limit NTP', '-m', 'limit', '--limit', '30/hour', '--limit-burst', '10'],
-  },
-  'proto_ipencap' => {
-    :params => {
-      :name => '0100 INPUT accept ipencap',
-      :table => 'filter',
-      :proto => 'ipencap',
-    },
-    :args => ['-t', :filter, '-p', :ipencap, '-m', 'comment', '--comment', '0100 INPUT accept ipencap'],
-  },
-  'load_uid_owner_filter_module' => {
-    :params => {
-      :name => '057 OUTPUT uid root only',
-      :table => 'filter',
-      :uid => 'root',
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :proto => 'all',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'owner', '--uid-owner', 'root', '-m', 'comment', '--comment', '057 OUTPUT uid root only', '-j', 'ACCEPT'],
-  },
-  'load_uid_owner_postrouting_module' => {
-    :params => {
-      :name => '057 POSTROUTING uid root only',
-      :table => 'mangle',
-      :uid => 'root',
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :proto => 'all',
-    },
-    :args => ['-t', :mangle, '-p', :all, '-m', 'owner', '--uid-owner', 'root', '-m', 'comment', '--comment', '057 POSTROUTING uid root only', '-j', 'ACCEPT'],
-  },
-  'load_gid_owner_filter_module' => {
-    :params => {
-      :name => '057 OUTPUT gid root only',
-      :table => 'filter',
-      :chain => 'OUTPUT',
-      :gid => 'root',
-      :action => 'accept',
-      :proto => 'all',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'owner', '--gid-owner', 'root', '-m', 'comment', '--comment', '057 OUTPUT gid root only', '-j', 'ACCEPT'],
-  },
-  'load_gid_owner_postrouting_module' => {
-    :params => {
-      :name => '057 POSTROUTING gid root only',
-      :table => 'mangle',
-      :gid => 'root',
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :proto => 'all',
-    },
-    :args => ['-t', :mangle, '-p', :all, '-m', 'owner', '--gid-owner', 'root', '-m', 'comment', '--comment', '057 POSTROUTING gid root only', '-j', 'ACCEPT'],
-  },
-  'mark_set-mark_int' => {
-    :params => {
-      :name     => '058 set-mark 1000',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '1000',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 1000', '-j', 'MARK', '--set-xmark', '0x3e8/0xffffffff'],
-  },
-  'mark_set-mark_hex' => {
-    :params => {
-      :name     => '058 set-mark 0x32',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32', '-j', 'MARK', '--set-xmark', '0x32/0xffffffff'],
-  },
-  'mark_set-mark_hex_with_hex_mask' => {
-    :params => {
-      :name     => '058 set-mark 0x32/0xffffffff',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32/0xffffffff',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32/0xffffffff', '-j', 'MARK', '--set-xmark', '0x32/0xffffffff'],
-    },
-  'mark_set-mark_hex_with_mask' => {
-    :params => {
-      :name     => '058 set-mark 0x32/4',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32/4',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32/4', '-j', 'MARK', '--set-xmark', '0x32/0x4'],
-    },
-    'iniface_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-    },
-    :args => ["-t", :filter, "-i", "eth0", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'iniface_with_vlans_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0.234',
-    },
-    :args => ["-t", :filter, "-i", "eth0.234", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'iniface_with_plus_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth+',
-    },
-    :args => ["-t", :filter, "-i", "eth+", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'outiface_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0',
-    },
-    :args => ["-t", :filter, "-o", "eth0", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'outiface_with_vlans_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0.234',
-    },
-    :args => ["-t", :filter, "-o", "eth0.234", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'outiface_with_plus_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth+',
-    },
-    :args => ["-t", :filter, "-o", "eth+", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'pkttype multicast' => {
-    :params => {
-      :name => '062 pkttype multicast',
-      :table => "filter",
-      :action => 'accept',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-      :pkttype => 'multicast',
-    },
-    :args => ["-t", :filter, "-i", "eth0", "-p", :tcp, "-m", "pkttype", "--pkt-type", :multicast, "-m", "comment", "--comment", "062 pkttype multicast", "-j", "ACCEPT"],
-  },
-  'socket_option' => {
-    :params => {
-      :name => '050 socket option',
-      :table => 'mangle',
-      :action => 'accept',
-      :chain => 'PREROUTING',
-      :socket => true,
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'socket', '-m', 'comment', '--comment', '050 socket option', '-j', 'ACCEPT'],
-  },
-  'isfragment_option' => {
-    :params => {
-      :name => '050 isfragment option',
-      :table => 'filter',
-      :proto => :all,
-      :action => 'accept',
-      :isfragment => true,
-    },
-    :args => ['-t', :filter, '-p', :all, '-f', '-m', 'comment', '--comment', '050 isfragment option', '-j', 'ACCEPT'],
-  },
-  'isfragment_option not changing -f in comment' => {
-    :params => {
-      :name => '050 testcomment-with-fdashf',
-      :table => 'filter',
-      :proto => :all,
-      :action => 'accept',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'comment', '--comment', '050 testcomment-with-fdashf', '-j', 'ACCEPT'],
-  },
-  'connlimit_above' => {
-    :params => {
-      :name => '061 REJECT connlimit_above 10',
-      :table => 'filter',
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "22", "-m", "comment", "--comment", "061 REJECT connlimit_above 10", "-j", "REJECT", "-m", "connlimit", "--connlimit-above", "10"],
-  },
-  'connlimit_above_with_connlimit_mask' => {
-    :params => {
-      :name => '061 REJECT connlimit_above 10 with mask 24',
-      :table => 'filter',
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :connlimit_mask => '24',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "22", "-m", "comment", "--comment", "061 REJECT connlimit_above 10 with mask 24", "-j", "REJECT", "-m", "connlimit", "--connlimit-above", "10", "--connlimit-mask", "24"],
-  },
-  'connmark' => {
-    :params => {
-      :name => '062 REJECT connmark',
-      :table => 'filter',
-      :proto => 'all',
-      :connmark => '0x1',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :all, "-m", "comment", "--comment", "062 REJECT connmark", "-j", "REJECT", "-m", "connmark", "--mark", "0x1"],
-  },
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb
deleted file mode 100644
index dc8bc39cb48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# Don't want puppet getting the command line arguments for rake or autotest
-ARGV.clear
-
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec-puppet'
-
-Bundler.require :default, :test
-
-require 'pathname'
-require 'tmpdir'
-
-Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
-  require behaviour.relative_path_from(Pathname.new(dir))
-end
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |config|
-  config.tty = true
-  config.mock_with :rspec do |c|
-    c.syntax = :expect
-  end
-  config.module_path = File.join(fixture_path, 'modules')
-  config.manifest_dir = File.join(fixture_path, 'manifests')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 13d056fa934..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'beaker-rspec'
-
-def iptables_flush_all_tables
-  ['filter', 'nat', 'mangle', 'raw'].each do |t|
-    expect(shell("iptables -t #{t} -F").stderr).to eq("")
-  end
-end
-
-def ip6tables_flush_all_tables
-  ['filter'].each do |t|
-    expect(shell("ip6tables -t #{t} -F").stderr).to eq("")
-  end
-end
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'firewall')
-    hosts.each do |host|
-      shell('/bin/touch /etc/puppet/hiera.yaml')
-      shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb
deleted file mode 100644
index 954d9ee10d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::archlinux', :type => :class do
-  it { should contain_service('iptables').with(
-    :ensure   => 'running',
-    :enable   => 'true'
-  )}
-  it { should contain_service('ip6tables').with(
-    :ensure   => 'running',
-    :enable   => 'true'
-  )}
-
-  context 'ensure => stopped' do
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_service('iptables').with(
-      :ensure   => 'stopped'
-    )}
-    it { should contain_service('ip6tables').with(
-      :ensure   => 'stopped'
-    )}
-  end
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables').with(
-      :enable   => 'false'
-    )}
-    it { should contain_service('ip6tables').with(
-      :enable   => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb
deleted file mode 100644
index 98285b642ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::debian', :type => :class do
-  it { should contain_package('iptables-persistent').with(
-    :ensure => 'present'
-  )}
-  it { should contain_service('iptables-persistent').with(
-    :ensure   => nil,
-    :enable   => 'true',
-    :require  => 'Package[iptables-persistent]'
-  )}
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables-persistent').with(
-      :enable   => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
deleted file mode 100644
index ea49d2b83b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::redhat', :type => :class do
-  it { should contain_service('iptables').with(
-    :ensure => 'running',
-    :enable => 'true'
-  )}
-
-  context 'ensure => stopped' do
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_service('iptables').with(
-      :ensure => 'stopped'
-    )}
-  end
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables').with(
-      :enable => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb
deleted file mode 100644
index 42056c1b1af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux', :type => :class do
-  let(:facts_default) {{ :kernel => 'Linux' }}
-  it { should contain_package('iptables').with_ensure('present') }
-
-  context 'RedHat like' do
-    %w{RedHat CentOS Fedora}.each do |os|
-      context "operatingsystem => #{os}" do
-        releases = (os == 'Fedora' ? [14,15,'Rawhide'] : [6,7])
-        releases.each do |osrel|
-          context "operatingsystemrelease => #{osrel}" do
-            let(:facts) { facts_default.merge({ :operatingsystem => os,
-                                                :operatingsystemrelease => osrel}) }
-            it { should contain_class('firewall::linux::redhat').with_require('Package[iptables]') }
-          end
-        end
-      end
-    end
-  end
-
-  context 'Debian like' do
-    %w{Debian Ubuntu}.each do |os|
-      context "operatingsystem => #{os}" do
-        let(:facts) { facts_default.merge({ :operatingsystem => os }) }
-        it { should contain_class('firewall::linux::debian').with_require('Package[iptables]') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb
deleted file mode 100644
index efc153ab2e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall', :type => :class do
-  context 'kernel => Linux' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    it { should contain_class('firewall::linux').with_ensure('running') }
-  end
-
-  context 'kernel => Windows' do
-    let(:facts) {{ :kernel => 'Windows' }}
-    it { expect { should contain_class('firewall::linux') }.to raise_error(Puppet::Error) }
-  end
-
-  context 'ensure => stopped' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_class('firewall::linux').with_ensure('stopped') }
-  end
-
-  context 'ensure => test' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    let(:params) {{ :ensure => 'test' }}
-    it { expect { should contain_class('firewall::linux') }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb
deleted file mode 100644
index 13a23a5c299..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe "Facter::Util::Fact iptables_persistent_version" do
-  before { Facter.clear }
-  let(:dpkg_cmd) { "dpkg-query -Wf '${Version}' iptables-persistent 2>/dev/null" }
-
-  {
-    "Debian" => "0.0.20090701",
-    "Ubuntu" => "0.5.3ubuntu2",
-  }.each do |os, ver|
-    describe "#{os} package installed" do
-      before {
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return(os)
-        allow(Facter::Util::Resolution).to receive(:exec).with(dpkg_cmd).
-          and_return(ver)
-      }
-      it { Facter.fact(:iptables_persistent_version).value.should == ver }
-    end
-  end
-
-  describe 'Ubuntu package not installed' do
-    before {
-      allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-      allow(Facter::Util::Resolution).to receive(:exec).with(dpkg_cmd).
-        and_return(nil)
-    }
-    it { Facter.fact(:iptables_persistent_version).value.should be_nil }
-  end
-
-  describe 'CentOS not supported' do
-    before { allow(Facter.fact(:operatingsystem)).to receive(:value).
-               and_return("CentOS") }
-    it { Facter.fact(:iptables_persistent_version).value.should be_nil }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb
deleted file mode 100644
index 5773fdce569..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "Facter::Util::Fact" do
-  before {
-    Facter.clear
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:kernelrelease)).to receive(:value).and_return('2.6')
-  }
-
-  describe 'iptables_version' do
-    it {
-      allow(Facter::Util::Resolution).to receive(:exec).with('iptables --version').
-      and_return('iptables v1.4.7')
-      Facter.fact(:iptables_version).value.should == '1.4.7'
-    }
-  end
-
-  describe 'ip6tables_version' do
-    before { allow(Facter::Util::Resolution).to receive(:exec).
-             with('ip6tables --version').and_return('ip6tables v1.4.7') }
-    it { Facter.fact(:ip6tables_version).value.should == '1.4.7' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb
deleted file mode 100755
index f350c2e3c58..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-if Puppet.version < '3.4.0'
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
-
-describe 'iptables chain provider detection' do
-  if Puppet.version < '3.4.0'
-    let(:exists) {
-      Puppet::Provider::Confine::Exists
-    }
-  else
-    let(:exists) {
-      Puppet::Confine::Exists
-    }
-  end
-
-  before :each do
-    # Reset the default provider
-    Puppet::Type.type(:firewallchain).defaultprovider = nil
-  end
-
-  it "should default to iptables provider if /sbin/(eb|ip|ip6)tables[-save] exists" do
-    # Stub lookup for /sbin/iptables & /sbin/iptables-save
-    allow(exists).to receive(:which).with("ebtables").
-      and_return "/sbin/ebtables"
-    allow(exists).to receive(:which).with("ebtables-save").
-      and_return "/sbin/ebtables-save"
-
-    allow(exists).to receive(:which).with("iptables").
-      and_return "/sbin/iptables"
-    allow(exists).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-
-    allow(exists).to receive(:which).with("ip6tables").
-      and_return "/sbin/ip6tables"
-    allow(exists).to receive(:which).with("ip6tables-save").
-      and_return "/sbin/ip6tables-save"
-
-    # Every other command should return false so we don't pick up any
-    # other providers
-    allow(exists).to receive(:which).with() { |value|
-      value !~ /(eb|ip|ip6)tables(-save)?$/
-    }.and_return false
-
-    # Create a resource instance and make sure the provider is iptables
-    resource = Puppet::Type.type(:firewallchain).new({
-      :name => 'test:filter:IPv4',
-    })
-    expect(resource.provider.class.to_s).to eq("Puppet::Type::Firewallchain::ProviderIptables_chain")
-  end
-end
-
-describe 'iptables chain provider' do
-  let(:provider) { Puppet::Type.type(:firewallchain).provider(:iptables_chain) }
-  let(:resource) {
-    Puppet::Type.type(:firewallchain).new({
-      :name  => ':test:',
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewallchain).to receive(:defaultprovider).and_return provider
-    allow(provider).to receive(:command).with(:ebtables_save).and_return "/sbin/ebtables-save"
-    allow(provider).to receive(:command).with(:iptables_save).and_return "/sbin/iptables-save"
-    allow(provider).to receive(:command).with(:ip6tables_save).and_return "/sbin/ip6tables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    # Pretend to return nil from iptables
-    allow(provider).to receive(:execute).with(['/sbin/ip6tables-save']).and_return("")
-    allow(provider).to receive(:execute).with(['/sbin/ebtables-save']).and_return("")
-    allow(provider).to receive(:execute).with(['/sbin/iptables-save']).and_return("")
-
-    provider.instances.each do |chain|
-      expect(chain).to be_instance_of(provider)
-      expect(chain.properties[:provider].to_s).to eq(provider.name.to_s)
-    end
-  end
-
-end
-
-describe 'iptables chain resource parsing' do
-  let(:provider) { Puppet::Type.type(:firewallchain).provider(:iptables_chain) }
-
-  before :each do
-    ebtables = ['BROUTE:BROUTING:ethernet',
-                'BROUTE:broute:ethernet',
-                ':INPUT:ethernet',
-                ':FORWARD:ethernet',
-                ':OUTPUT:ethernet',
-                ':filter:ethernet',
-                ':filterdrop:ethernet',
-                ':filterreturn:ethernet',
-                'NAT:PREROUTING:ethernet',
-                'NAT:OUTPUT:ethernet',
-                'NAT:POSTROUTING:ethernet',
-               ]
-    allow(provider).to receive(:execute).with(['/sbin/ebtables-save']).and_return('
-*broute
-:BROUTING ACCEPT
-:broute ACCEPT
-
-*filter
-:INPUT ACCEPT
-:FORWARD ACCEPT
-:OUTPUT ACCEPT
-:filter ACCEPT
-:filterdrop DROP
-:filterreturn RETURN
-
-*nat
-:PREROUTING ACCEPT
-:OUTPUT ACCEPT
-:POSTROUTING ACCEPT
-')
-
-    iptables = [
-     'raw:PREROUTING:IPv4',
-     'raw:OUTPUT:IPv4',
-     'raw:raw:IPv4',
-     'mangle:PREROUTING:IPv4',
-     'mangle:INPUT:IPv4',
-     'mangle:FORWARD:IPv4',
-     'mangle:OUTPUT:IPv4',
-     'mangle:POSTROUTING:IPv4',
-     'mangle:mangle:IPv4',
-     'NAT:PREROUTING:IPv4',
-     'NAT:OUTPUT:IPv4',
-     'NAT:POSTROUTING:IPv4',
-     'NAT:mangle:IPv4',
-     'NAT:mangle:IPv4',
-     'NAT:mangle:IPv4',
-     ':$5()*&%\'"^$): :IPv4',
-    ]
-    allow(provider).to receive(:execute).with(['/sbin/iptables-save']).and_return('
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*raw
-:PREROUTING ACCEPT [12:1780]
-:OUTPUT ACCEPT [19:1159]
-:raw - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*mangle
-:PREROUTING ACCEPT [12:1780]
-:INPUT ACCEPT [12:1780]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [19:1159]
-:POSTROUTING ACCEPT [19:1159]
-:mangle - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*nat
-:PREROUTING ACCEPT [2242:639750]
-:OUTPUT ACCEPT [5176:326206]
-:POSTROUTING ACCEPT [5162:325382]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [5673:420879]
-:$5()*&%\'"^$):  - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-')
-    ip6tables = [
-      'raw:PREROUTING:IPv6',
-      'raw:OUTPUT:IPv6',
-      'raw:ff:IPv6',
-      'mangle:PREROUTING:IPv6',
-      'mangle:INPUT:IPv6',
-      'mangle:FORWARD:IPv6',
-      'mangle:OUTPUT:IPv6',
-      'mangle:POSTROUTING:IPv6',
-      'mangle:ff:IPv6',
-      ':INPUT:IPv6',
-      ':FORWARD:IPv6',
-      ':OUTPUT:IPv6',
-      ':test:IPv6',
-    ]
-    allow(provider).to receive(:execute).with(['/sbin/ip6tables-save']).and_return('
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*raw
-:PREROUTING ACCEPT [2173:489241]
-:OUTPUT ACCEPT [0:0]
-:ff - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*mangle
-:PREROUTING ACCEPT [2301:518373]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-:ff - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [20:1292]
-:test - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-')
-    @all = ebtables + iptables + ip6tables
-    # IPv4 and IPv6 names also exist as resources {table}:{chain}:IP and {table}:{chain}:
-    iptables.each { |name| @all += [ name[0..-3], name[0..-5] ] }
-    ip6tables.each { |name| @all += [ name[0..-3], name[0..-5] ] }
-  end
-
-  it 'should have all in parsed resources' do
-    provider.instances.each do |resource|
-      @all.include?(resource.name)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb
deleted file mode 100644
index d6f5b64cfea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-if Puppet.version < '3.4.0'
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
-
-describe 'iptables provider detection' do
-  if Puppet.version < '3.4.0'
-    let(:exists) {
-      Puppet::Provider::Confine::Exists
-    }
-  else
-    let(:exists) {
-      Puppet::Confine::Exists
-    }
-  end
-
-  before :each do
-    # Reset the default provider
-    Puppet::Type.type(:firewall).defaultprovider = nil
-  end
-
-  it "should default to iptables provider if /sbin/iptables[-save] exists" do
-    # Stub lookup for /sbin/iptables & /sbin/iptables-save
-    allow(exists).to receive(:which).with("iptables").
-      and_return "/sbin/iptables"
-    allow(exists).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-
-    # Every other command should return false so we don't pick up any
-    # other providers
-    allow(exists).to receive(:which).with() { |value|
-      ! ["iptables","iptables-save"].include?(value)
-    }.and_return false
-
-    # Create a resource instance and make sure the provider is iptables
-    resource = Puppet::Type.type(:firewall).new({
-      :name => '000 test foo',
-    })
-    expect(resource.provider.class.to_s).to eq("Puppet::Type::Firewall::ProviderIptables")
-  end
-end
-
-describe 'iptables provider' do
-  let(:provider) { Puppet::Type.type(:firewall).provider(:iptables) }
-  let(:resource) {
-    Puppet::Type.type(:firewall).new({
-      :name  => '000 test foo',
-      :action  => 'accept',
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return provider
-    allow(provider).to receive(:command).with(:iptables_save).and_return "/sbin/iptables-save"
-
-    # Stub iptables version
-    allow(Facter.fact(:iptables_version)).to receive(:value).and_return("1.4.2")
-
-    allow(Puppet::Util::Execution).to receive(:execute).and_return ""
-    allow(Puppet::Util).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    provider.instances.each do |rule|
-      expect(rule).to be_instance_of(provider)
-      expect(rule.properties[:provider].to_s).to eq(provider.name.to_s)
-    end
-  end
-
-  it 'should ignore lines with fatal errors' do
-    allow(Puppet::Util::Execution).to receive(:execute).with(['/sbin/iptables-save']).
-      and_return("FATAL: Could not load /lib/modules/2.6.18-028stab095.1/modules.dep: No such file or directory")
-
-    expect(provider.instances.length).to be_zero
-  end
-
-  describe '#insert_order' do
-    let(:iptables_save_output) { [
-      '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-      '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -m comment --comment "200 test" -j ACCEPT',
-      '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT'
-    ] }
-    let(:resources) do
-      iptables_save_output.each_with_index.collect { |l,index| provider.rule_to_hash(l, 'filter', index) }
-    end
-    let(:providers) do
-      resources.collect { |r| provider.new(r) }
-    end
-    it 'understands offsets for adding rules to the beginning' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(1) # 1-indexed
-    end
-    it 'understands offsets for editing rules at the beginning' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(1)
-    end
-    it 'understands offsets for adding rules to the middle' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '101 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(2)
-    end
-    it 'understands offsets for editing rules at the middle' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '200 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(2)
-    end
-    it 'understands offsets for adding rules to the end' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '301 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(4)
-    end
-    it 'understands offsets for editing rules at the end' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '300 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(3)
-    end
-
-    context 'with unname rules between' do
-      let(:iptables_save_output) { [
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 150 -m comment --comment "150 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 250 -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 350 -m comment --comment "350 test" -j ACCEPT',
-      ] }
-      it 'understands offsets for adding rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for editing rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for adding rules between managed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '120 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(2)
-      end
-      it 'understands offsets for adding rules between unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '151 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(3)
-      end
-      it 'understands offsets for adding rules after unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '351 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(7)
-      end
-    end
-
-    context 'with unname rules before and after' do
-      let(:iptables_save_output) { [
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 050 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 090 -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 150 -m comment --comment "150 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 250 -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 350 -m comment --comment "350 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.5/32 -p tcp -m multiport --ports 400 -j ACCEPT',
-        '-A INPUT -s 8.0.0.5/32 -p tcp -m multiport --ports 450 -j ACCEPT',
-      ] }
-      it 'understands offsets for adding rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for editing rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(3)
-      end
-      it 'understands offsets for adding rules between managed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '120 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(4)
-      end
-      it 'understands offsets for adding rules between unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '151 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(5)
-      end
-      it 'understands offsets for adding rules after unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '351 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(9)
-      end
-      it 'understands offsets for adding rules at the end' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '950 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(11)
-      end
-    end
-  end
-
-  # Load in ruby hash for test fixtures.
-  load 'spec/fixtures/iptables/conversion_hash.rb'
-
-  describe 'when converting rules to resources' do
-    ARGS_TO_HASH.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { provider.rule_to_hash(data[:line], data[:table], 0) }
-
-        # If this option is enabled, make sure the parameters exactly match
-        if data[:compare_all] then
-          it "the parameter hash keys should be the same as returned by rules_to_hash" do
-            expect(resource.keys).to match_array(data[:params].keys)
-          end
-        end
-
-        # Iterate across each parameter, creating an example for comparison
-        data[:params].each do |param_name, param_value|
-          it "the parameter '#{param_name.to_s}' should match #{param_value.inspect}" do
-            # booleans get cludged to string "true"
-            if param_value == true then
-              expect(resource[param_name]).to be_true
-            else
-              expect(resource[param_name]).to eq(data[:params][param_name])
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when working out general_args' do
-    HASH_TO_ARGS.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { Puppet::Type.type(:firewall).new(data[:params]) }
-        let(:provider) { Puppet::Type.type(:firewall).provider(:iptables) }
-        let(:instance) { provider.new(resource) }
-
-        it 'general_args should be valid' do
-          expect(instance.general_args.flatten).to eq(data[:args])
-        end
-      end
-    end
-  end
-
-  describe 'when converting rules without comments to resources' do
-    let(:sample_rule) {
-      '-A INPUT -s 1.1.1.1 -d 1.1.1.1 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'rule name contains a MD5 sum of the line' do
-      expect(resource[:name]).to eq("9000 #{Digest::MD5.hexdigest(resource[:line])}")
-    end
-
-    it 'parsed the rule arguments correctly' do
-      expect(resource[:chain]).to eq('INPUT')
-      expect(resource[:source]).to eq('1.1.1.1/32')
-      expect(resource[:destination]).to eq('1.1.1.1/32')
-      expect(resource[:proto]).to eq('tcp')
-      expect(resource[:dport]).to eq(['7061', '7062'])
-      expect(resource[:sport]).to eq(['7061', '7062'])
-      expect(resource[:action]).to eq('accept')
-    end
-  end
-
-  describe 'when converting existing rules generates by system-config-firewall-tui to resources' do
-    let(:sample_rule) {
-      # as generated by iptables-save from rules created with system-config-firewall-tui
-      '-A INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'rule name contains a MD5 sum of the line' do
-      expect(resource[:name]).to eq("9000 #{Digest::MD5.hexdigest(resource[:line])}")
-    end
-
-    it 'parse arguments' do
-      expect(resource[:chain]).to eq('INPUT')
-      expect(resource[:proto]).to eq('tcp')
-      expect(resource[:dport]).to eq(['22'])
-      expect(resource[:state]).to eq(['NEW'])
-      expect(resource[:action]).to eq('accept')
-    end
-  end
-
-  describe 'when creating resources' do
-    let(:instance) { provider.new(resource) }
-
-    it 'insert_args should be an array' do
-      expect(instance.insert_args.class).to eq(Array)
-    end
-  end
-
-  describe 'when modifying resources' do
-    let(:instance) { provider.new(resource) }
-
-    it 'update_args should be an array' do
-      expect(instance.update_args.class).to eq(Array)
-    end
-
-    it 'fails when modifying the chain' do
-      expect { instance.chain = "OUTPUT" }.to raise_error(/is not supported/)
-    end
-  end
-
-  describe 'when deleting resources' do
-    let(:sample_rule) {
-      '-A INPUT -s 1.1.1.1 -d 1.1.1.1 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'resource[:line] looks like the original rule' do
-      resource[:line] == sample_rule
-    end
-
-    it 'delete_args is an array' do
-      expect(instance.delete_args.class).to eq(Array)
-    end
-
-    it 'delete_args is the same as the rule string when joined' do
-      expect(instance.delete_args.join(' ')).to eq(sample_rule.gsub(/\-A/,
-        '-t filter -D'))
-    end
-  end
-end
-
-describe 'ip6tables provider' do
-  let(:provider6) { Puppet::Type.type(:firewall).provider(:ip6tables) }
-  let(:resource) {
-    Puppet::Type.type(:firewall).new({
-      :name  => '000 test foo',
-      :action  => 'accept',
-      :provider => "ip6tables",
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewall).to receive(:ip6tables).and_return provider6
-    allow(provider6).to receive(:command).with(:ip6tables_save).and_return "/sbin/ip6tables-save"
-
-    # Stub iptables version
-    allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return '1.4.7'
-
-    allow(Puppet::Util::Execution).to receive(:execute).and_return ''
-    allow(Puppet::Util).to receive(:which).with("ip6tables-save").
-      and_return "/sbin/ip6tables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    provider6.instances.each do |rule|
-      rule.should be_instance_of(provider6)
-      rule.properties[:provider6].to_s.should == provider6.name.to_s
-    end
-  end
-
-  it 'should ignore lines with fatal errors' do
-    allow(Puppet::Util::Execution).to receive(:execute).with(['/sbin/ip6tables-save']).
-      and_return("FATAL: Could not load /lib/modules/2.6.18-028stab095.1/modules.dep: No such file or directory")
-    provider6.instances.length.should == 0
-  end
-
-  # Load in ruby hash for test fixtures.
-  load 'spec/fixtures/ip6tables/conversion_hash.rb'
-
-  describe 'when converting rules to resources' do
-    ARGS_TO_HASH6.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { provider6.rule_to_hash(data[:line], data[:table], 0) }
-
-        # If this option is enabled, make sure the parameters exactly match
-        if data[:compare_all] then
-          it "the parameter hash keys should be the same as returned by rules_to_hash" do
-            resource.keys.should =~ data[:params].keys
-          end
-        end
-
-        # Iterate across each parameter, creating an example for comparison
-        data[:params].each do |param_name, param_value|
-          it "the parameter '#{param_name.to_s}' should match #{param_value.inspect}" do
-            resource[param_name].should == data[:params][param_name]
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when working out general_args' do
-    HASH_TO_ARGS6.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { Puppet::Type.type(:firewall).new(data[:params]) }
-        let(:provider6) { Puppet::Type.type(:firewall).provider(:ip6tables) }
-        let(:instance) { provider6.new(resource) }
-
-        it 'general_args should be valid' do
-          instance.general_args.flatten.should == data[:args]
-        end
-      end
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb
deleted file mode 100755
index afb61662b60..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb
+++ /dev/null
@@ -1,650 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-firewall = Puppet::Type.type(:firewall)
-
-describe firewall do
-  before :each do
-    @class = firewall
-    @provider = double 'provider'
-    allow(@provider).to receive(:name).and_return(:iptables)
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return @provider
-
-    @resource = @class.new({:name  => '000 test foo'})
-
-    # Stub iptables version
-    allow(Facter.fact(:iptables_version)).to receive(:value).and_return('1.4.2')
-    allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return('1.4.2')
-
-    # Stub confine facts
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
-  end
-
-  it 'should have :name be its namevar' do
-    @class.key_attributes.should == [:name]
-  end
-
-  describe ':name' do
-    it 'should accept a name' do
-      @resource[:name] = '000-test-foo'
-      @resource[:name].should == '000-test-foo'
-    end
-
-    it 'should not accept a name with non-ASCII chars' do
-      lambda { @resource[:name] = '%*#^(#$' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':action' do
-    it "should have no default" do
-      res = @class.new(:name => "000 test")
-      res.parameters[:action].should == nil
-    end
-
-    [:accept, :drop, :reject].each do |action|
-      it "should accept value #{action}" do
-        @resource[:action] = action
-        @resource[:action].should == action
-      end
-    end
-
-    it 'should fail when value is not recognized' do
-      lambda { @resource[:action] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':chain' do
-    [:INPUT, :FORWARD, :OUTPUT, :PREROUTING, :POSTROUTING].each do |chain|
-      it "should accept chain value #{chain}" do
-        @resource[:chain] = chain
-        @resource[:chain].should == chain
-      end
-    end
-
-    it 'should fail when the chain value is not recognized' do
-      lambda { @resource[:chain] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':table' do
-    [:nat, :mangle, :filter, :raw].each do |table|
-      it "should accept table value #{table}" do
-        @resource[:table] = table
-        @resource[:table].should == table
-      end
-    end
-
-    it "should fail when table value is not recognized" do
-      lambda { @resource[:table] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':proto' do
-    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all].each do |proto|
-      it "should accept proto value #{proto}" do
-        @resource[:proto] = proto
-        @resource[:proto].should == proto
-      end
-    end
-
-    it "should fail when proto value is not recognized" do
-      lambda { @resource[:proto] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':jump' do
-    it "should have no default" do
-      res = @class.new(:name => "000 test")
-      res.parameters[:jump].should == nil
-    end
-
-    ['QUEUE', 'RETURN', 'DNAT', 'SNAT', 'LOG', 'MASQUERADE', 'REDIRECT', 'MARK'].each do |jump|
-      it "should accept jump value #{jump}" do
-        @resource[:jump] = jump
-        @resource[:jump].should == jump
-      end
-    end
-
-    ['ACCEPT', 'DROP', 'REJECT'].each do |jump|
-      it "should now fail when value #{jump}" do
-        lambda { @resource[:jump] = jump }.should raise_error(Puppet::Error)
-      end
-    end
-
-    it "should fail when jump value is not recognized" do
-      lambda { @resource[:jump] = '%^&*' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  [:source, :destination].each do |addr|
-    describe addr do
-      it "should accept a #{addr} as a string" do
-        @resource[addr] = '127.0.0.1'
-        @resource[addr].should == '127.0.0.1/32'
-      end
-      ['0.0.0.0/0', '::/0'].each do |prefix|
-        it "should be nil for zero prefix length address #{prefix}" do
-          @resource[addr] = prefix
-          @resource[addr].should == nil
-        end
-      end
-      it "should accept a negated #{addr} as a string" do
-        @resource[addr] = '! 127.0.0.1'
-        @resource[addr].should == '! 127.0.0.1/32'
-      end
-    end
-  end
-
-  [:dport, :sport].each do |port|
-    describe port do
-      it "should accept a #{port} as string" do
-        @resource[port] = '22'
-        @resource[port].should == ['22']
-      end
-
-      it "should accept a #{port} as an array" do
-        @resource[port] = ['22','23']
-        @resource[port].should == ['22','23']
-      end
-
-      it "should accept a #{port} as a number" do
-        @resource[port] = 22
-        @resource[port].should == ['22']
-      end
-
-      it "should accept a #{port} as a hyphen separated range" do
-        @resource[port] = ['22-1000']
-        @resource[port].should == ['22-1000']
-      end
-
-      it "should accept a #{port} as a combination of arrays of single and " \
-        "hyphen separated ranges" do
-
-        @resource[port] = ['22-1000','33','3000-4000']
-        @resource[port].should == ['22-1000','33','3000-4000']
-      end
-
-      it "should convert a port name for #{port} to its number" do
-        @resource[port] = 'ssh'
-        @resource[port].should == ['22']
-      end
-
-      it "should not accept something invalid for #{port}" do
-        expect { @resource[port] = 'something odd' }.to raise_error(Puppet::Error, /^Parameter .+ failed.+Munging failed for value ".+" in class .+: no such service/)
-      end
-
-      it "should not accept something invalid in an array for #{port}" do
-        expect { @resource[port] = ['something odd','something even odder'] }.to raise_error(Puppet::Error, /^Parameter .+ failed.+Munging failed for value ".+" in class .+: no such service/)
-      end
-    end
-  end
-
-  [:dst_type, :src_type].each do |addrtype|
-    describe addrtype do
-      it "should have no default" do
-        res = @class.new(:name => "000 test")
-        res.parameters[addrtype].should == nil
-      end
-    end
-
-    [:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST, :BLACKHOLE,
-     :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE].each do |type|
-      it "should accept #{addrtype} value #{type}" do
-        @resource[addrtype] = type
-        @resource[addrtype].should == type
-      end
-    end
-
-    it "should fail when #{addrtype} value is not recognized" do
-      lambda { @resource[addrtype] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  [:iniface, :outiface].each do |iface|
-    describe iface do
-      it "should accept #{iface} value as a string" do
-        @resource[iface] = 'eth1'
-        @resource[iface].should == 'eth1'
-      end
-    end
-  end
-
-  [:tosource, :todest].each do |addr|
-    describe addr do
-      it "should accept #{addr} value as a string" do
-        @resource[addr] = '127.0.0.1'
-      end
-    end
-  end
-
-  describe ':log_level' do
-    values = {
-      'panic' => '0',
-      'alert' => '1',
-      'crit'  => '2',
-      'err'   => '3',
-      'warn'  => '4',
-      'warning' => '4',
-      'not'  => '5',
-      'notice' => '5',
-      'info' => '6',
-      'debug' => '7'
-    }
-
-    values.each do |k,v|
-      it {
-        @resource[:log_level] = k
-        @resource[:log_level].should == v
-      }
-
-      it {
-        @resource[:log_level] = 3
-        @resource[:log_level].should == 3
-      }
-
-      it { lambda { @resource[:log_level] = 'foo' }.should raise_error(Puppet::Error) }
-    end
-  end
-
-  describe ':icmp' do
-    icmp_codes = {
-      :iptables => {
-        '0' => 'echo-reply',
-        '3' => 'destination-unreachable',
-        '4' => 'source-quench',
-        '6' => 'redirect',
-        '8' => 'echo-request',
-        '9' => 'router-advertisement',
-        '10' => 'router-solicitation',
-        '11' => 'time-exceeded',
-        '12' => 'parameter-problem',
-        '13' => 'timestamp-request',
-        '14' => 'timestamp-reply',
-        '17' => 'address-mask-request',
-        '18' => 'address-mask-reply'
-      },
-      :ip6tables => {
-        '1' => 'destination-unreachable',
-        '3' => 'time-exceeded',
-        '4' => 'parameter-problem',
-        '128' => 'echo-request',
-        '129' => 'echo-reply',
-        '133' => 'router-solicitation',
-        '134' => 'router-advertisement',
-        '137' => 'redirect'
-      }
-    }
-    icmp_codes.each do |provider, values|
-      describe provider do
-        values.each do |k,v|
-          it 'should convert icmp string to number' do
-            @resource[:provider] = provider
-            @resource[:provider].should == provider
-            @resource[:icmp] = v
-            @resource[:icmp].should == k
-          end
-        end
-      end
-    end
-
-    it 'should accept values as integers' do
-      @resource[:icmp] = 9
-      @resource[:icmp].should == 9
-    end
-
-    it 'should fail if icmp type is "any"' do
-      lambda { @resource[:icmp] = 'any' }.should raise_error(Puppet::Error)
-    end
-
-    it 'should fail if icmp type cannot be mapped to a numeric' do
-      lambda { @resource[:icmp] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':state' do
-    it 'should accept value as a string' do
-      @resource[:state] = :INVALID
-      @resource[:state].should == [:INVALID]
-    end
-
-    it 'should accept value as an array' do
-      @resource[:state] = [:INVALID, :NEW]
-      @resource[:state].should == [:INVALID, :NEW]
-    end
-
-    it 'should sort values alphabetically' do
-      @resource[:state] = [:NEW, :ESTABLISHED]
-      @resource[:state].should == [:ESTABLISHED, :NEW]
-    end
-  end
-
-  describe ':ctstate' do
-    it 'should accept value as a string' do
-      @resource[:ctstate] = :INVALID
-      @resource[:ctstate].should == [:INVALID]
-    end
-
-    it 'should accept value as an array' do
-      @resource[:ctstate] = [:INVALID, :NEW]
-      @resource[:ctstate].should == [:INVALID, :NEW]
-    end
-
-    it 'should sort values alphabetically' do
-      @resource[:ctstate] = [:NEW, :ESTABLISHED]
-      @resource[:ctstate].should == [:ESTABLISHED, :NEW]
-    end
-  end
-
-  describe ':burst' do
-    it 'should accept numeric values' do
-      @resource[:burst] = 12
-      @resource[:burst].should == 12
-    end
-
-    it 'should fail if value is not numeric' do
-      lambda { @resource[:burst] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':recent' do
-    ['set', 'update', 'rcheck', 'remove'].each do |recent|
-      it "should accept recent value #{recent}" do
-        @resource[:recent] = recent
-        @resource[:recent].should == "--#{recent}"
-      end
-    end
-  end
-
-  describe ':action and :jump' do
-    it 'should allow only 1 to be set at a time' do
-      expect {
-        @class.new(
-          :name => "001-test",
-          :action => "accept",
-          :jump => "custom_chain"
-        )
-      }.to raise_error(Puppet::Error, /Only one of the parameters 'action' and 'jump' can be set$/)
-    end
-  end
-  describe ':gid and :uid' do
-    it 'should allow me to set uid' do
-      @resource[:uid] = 'root'
-      @resource[:uid].should == 'root'
-    end
-    it 'should allow me to set uid as an array, and silently hide my error' do
-      @resource[:uid] = ['root', 'bobby']
-      @resource[:uid].should == 'root'
-    end
-    it 'should allow me to set gid' do
-      @resource[:gid] = 'root'
-      @resource[:gid].should == 'root'
-    end
-    it 'should allow me to set gid as an array, and silently hide my error' do
-      @resource[:gid] = ['root', 'bobby']
-      @resource[:gid].should == 'root'
-    end
-  end
-
-  describe ':set_mark' do
-    ['1.3.2', '1.4.2'].each do |iptables_version|
-      describe "with iptables #{iptables_version}" do
-        before {
-          Facter.clear
-          allow(Facter.fact(:iptables_version)).to receive(:value).and_return iptables_version
-          allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return iptables_version
-        }
-
-        if iptables_version == '1.3.2'
-          it 'should allow me to set set-mark without mask' do
-            @resource[:set_mark] = '0x3e8'
-            @resource[:set_mark].should == '0x3e8'
-          end
-          it 'should convert int to hex without mask' do
-            @resource[:set_mark] = '1000'
-            @resource[:set_mark].should == '0x3e8'
-          end
-          it 'should fail if mask is present' do
-            lambda { @resource[:set_mark] = '0x3e8/0xffffffff'}.should raise_error(
-              Puppet::Error, /iptables version #{iptables_version} does not support masks on MARK rules$/
-            )
-          end
-        end
-
-        if iptables_version == '1.4.2'
-          it 'should allow me to set set-mark with mask' do
-            @resource[:set_mark] = '0x3e8/0xffffffff'
-            @resource[:set_mark].should == '0x3e8/0xffffffff'
-          end
-          it 'should convert int to hex and add a 32 bit mask' do
-            @resource[:set_mark] = '1000'
-            @resource[:set_mark].should == '0x3e8/0xffffffff'
-          end
-          it 'should add a 32 bit mask' do
-            @resource[:set_mark] = '0x32'
-            @resource[:set_mark].should == '0x32/0xffffffff'
-          end
-          it 'should use the mask provided' do
-            @resource[:set_mark] = '0x32/0x4'
-            @resource[:set_mark].should == '0x32/0x4'
-          end
-          it 'should use the mask provided and convert int to hex' do
-            @resource[:set_mark] = '1000/0x4'
-            @resource[:set_mark].should == '0x3e8/0x4'
-          end
-          it 'should fail if mask value is more than 32 bits' do
-            lambda { @resource[:set_mark] = '1/4294967296'}.should raise_error(
-              Puppet::Error, /MARK mask must be integer or hex between 0 and 0xffffffff$/
-            )
-          end
-          it 'should fail if mask is malformed' do
-            lambda { @resource[:set_mark] = '1000/0xq4'}.should raise_error(
-              Puppet::Error, /MARK mask must be integer or hex between 0 and 0xffffffff$/
-            )
-          end
-        end
-
-        ['/', '1000/', 'pwnie'].each do |bad_mark|
-          it "should fail with malformed mark '#{bad_mark}'" do
-            lambda { @resource[:set_mark] = bad_mark}.should raise_error(Puppet::Error)
-          end
-        end
-        it 'should fail if mark value is more than 32 bits' do
-          lambda { @resource[:set_mark] = '4294967296'}.should raise_error(
-            Puppet::Error, /MARK value must be integer or hex between 0 and 0xffffffff$/
-          )
-        end
-      end
-    end
-  end
-
-  [:chain, :jump].each do |param|
-    describe param do
-      it 'should autorequire fwchain when table and provider are undefined' do
-        @resource[param] = 'FOO'
-        @resource[:table].should == :filter
-        @resource[:provider].should == :iptables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv4')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is undefined and provider is ip6tables' do
-        @resource[param] = 'FOO'
-        @resource[:table].should == :filter
-        @resource[:provider] = :ip6tables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv6')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is raw and provider is undefined' do
-        @resource[param] = 'FOO'
-        @resource[:table] = :raw
-        @resource[:provider].should == :iptables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:raw:IPv4')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is raw and provider is ip6tables' do
-        @resource[param] = 'FOO'
-        @resource[:table] = :raw
-        @resource[:provider] = :ip6tables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:raw:IPv6')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      # test where autorequire is still needed (table != filter)
-      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
-        it "should autorequire fwchain #{test_chain} when table is mangle and provider is undefined" do
-          @resource[param] = test_chain
-          @resource[:table] = :mangle
-          @resource[:provider].should == :iptables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv4")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.source.ref.should == chain.ref
-          rel.target.ref.should == @resource.ref
-        end
-
-        it "should autorequire fwchain #{test_chain} when table is mangle and provider is ip6tables" do
-          @resource[param] = test_chain
-          @resource[:table] = :mangle
-          @resource[:provider] = :ip6tables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv6")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.source.ref.should == chain.ref
-          rel.target.ref.should == @resource.ref
-        end
-      end
-
-      # test of case where autorequire should not happen
-      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
-
-        it "should not autorequire fwchain #{test_chain} when table and provider are undefined" do
-          @resource[param] = test_chain
-          @resource[:table].should == :filter
-          @resource[:provider].should == :iptables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv4")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.should == nil
-        end
-
-        it "should not autorequire fwchain #{test_chain} when table is undefined and provider is ip6tables" do
-          @resource[param] = test_chain
-          @resource[:table].should == :filter
-          @resource[:provider] = :ip6tables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv6")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.should == nil
-        end
-      end
-    end
-  end
-
-  describe ":chain and :jump" do
-    it 'should autorequire independent fwchains' do
-      @resource[:chain] = 'FOO'
-      @resource[:jump] = 'BAR'
-      @resource[:table].should == :filter
-      @resource[:provider].should == :iptables
-
-      chain_foo = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv4')
-      chain_bar = Puppet::Type.type(:firewallchain).new(:name => 'BAR:filter:IPv4')
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource @resource
-      catalog.add_resource chain_foo
-      catalog.add_resource chain_bar
-      rel = @resource.autorequire
-      rel[0].source.ref.should == chain_foo.ref
-      rel[0].target.ref.should == @resource.ref
-      rel[1].source.ref.should == chain_bar.ref
-      rel[1].target.ref.should == @resource.ref
-    end
-  end
-
-  describe ':pkttype' do
-    [:multicast, :broadcast, :unicast].each do |pkttype|
-      it "should accept pkttype value #{pkttype}" do
-        @resource[:pkttype] = pkttype
-        @resource[:pkttype].should == pkttype
-      end
-    end
-
-    it 'should fail when the pkttype value is not recognized' do
-      lambda { @resource[:pkttype] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe 'autorequire packages' do
-    [:iptables, :ip6tables].each do |provider|
-      it "provider #{provider} should autorequire package iptables" do
-        @resource[:provider] = provider
-        @resource[:provider].should == provider
-        package = Puppet::Type.type(:package).new(:name => 'iptables')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource package
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == package.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it "provider #{provider} should autorequire packages iptables and iptables-persistent" do
-        @resource[:provider] = provider
-        @resource[:provider].should == provider
-        packages = [
-          Puppet::Type.type(:package).new(:name => 'iptables'),
-          Puppet::Type.type(:package).new(:name => 'iptables-persistent')
-        ]
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        packages.each do |package|
-          catalog.add_resource package
-        end
-        packages.zip(@resource.autorequire) do |package, rel|
-          rel.source.ref.should == package.ref
-          rel.target.ref.should == @resource.ref
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
deleted file mode 100755
index 88ca99dc598..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-firewallchain = Puppet::Type.type(:firewallchain)
-
-describe firewallchain do
-  before(:each) do
-    # Stub confine facts
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
-  end
-  let(:klass) { firewallchain }
-  let(:provider) {
-    prov = double 'provider'
-    allow(prov).to receive(:name).and_return(:iptables_chain)
-    prov
-  }
-  let(:resource) {
-    allow(Puppet::Type::Firewallchain).to receive(:defaultprovider).and_return provider
-    klass.new({:name => 'INPUT:filter:IPv4', :policy => :accept })
-  }
-
-  it 'should have :name be its namevar' do
-    klass.key_attributes.should == [:name]
-  end
-
-  describe ':name' do
-    {'nat' => ['PREROUTING', 'POSTROUTING', 'INPUT', 'OUTPUT'],
-     'mangle' => [ 'PREROUTING', 'POSTROUTING', 'INPUT', 'FORWARD', 'OUTPUT' ],
-     'filter' => ['INPUT','OUTPUT','FORWARD'],
-     'raw' => [ 'PREROUTING', 'OUTPUT'],
-     'broute' => ['BROUTING']
-    }.each_pair do |table, allowedinternalchains|
-      ['IPv4', 'IPv6', 'ethernet'].each do |protocol|
-        [ 'test', '$5()*&%\'"^$09):' ].each do |chainname|
-          name = "#{chainname}:#{table}:#{protocol}"
-          if table == 'nat' && protocol == 'IPv6'
-            it "should fail #{name}" do
-              expect { resource[:name] = name }.to raise_error(Puppet::Error)
-            end
-          elsif protocol != 'ethernet' && table == 'broute'
-            it "should fail #{name}" do
-              expect { resource[:name] = name }.to raise_error(Puppet::Error)
-            end
-          else
-            it "should accept name #{name}" do
-              resource[:name] = name
-              resource[:name].should == name
-            end
-          end
-        end # chainname
-      end # protocol
-
-      [ 'PREROUTING', 'POSTROUTING', 'BROUTING', 'INPUT', 'FORWARD', 'OUTPUT' ].each do |internalchain|
-        name = internalchain + ':' + table + ':'
-        if internalchain == 'BROUTING'
-          name += 'ethernet'
-        elsif table == 'nat'
-          name += 'IPv4'
-        else
-          name += 'IPv4'
-        end
-        if allowedinternalchains.include? internalchain
-          it "should allow #{name}" do
-            resource[:name] = name
-            resource[:name].should == name
-          end
-        else
-          it "should fail #{name}" do
-            expect { resource[:name] = name }.to raise_error(Puppet::Error)
-          end
-        end
-      end # internalchain
-
-    end # table, allowedinternalchainnames
-
-    it 'should fail with invalid table names' do
-      expect { resource[:name] = 'wrongtablename:test:IPv4' }.to raise_error(Puppet::Error)
-    end
-
-    it 'should fail with invalid protocols names' do
-      expect { resource[:name] = 'test:filter:IPv5' }.to raise_error(Puppet::Error)
-    end
-
-  end
-
-  describe ':policy' do
-
-    [:accept, :drop, :queue, :return].each do |policy|
-      it "should accept policy #{policy}" do
-        resource[:policy] = policy
-        resource[:policy].should == policy
-      end
-    end
-
-    it 'should fail when value is not recognized' do
-      expect { resource[:policy] = 'not valid' }.to raise_error(Puppet::Error)
-    end
-
-    [:accept, :drop, :queue, :return].each do |policy|
-      it "non-inbuilt chains should not accept policy #{policy}" do
-        expect { klass.new({:name => 'testchain:filter:IPv4', :policy => policy }) }.to raise_error(Puppet::Error)
-      end
-      it "non-inbuilt chains can accept policies on protocol = ethernet (policy #{policy})" do
-        klass.new({:name => 'testchain:filter:ethernet', :policy => policy })
-      end
-    end
-
-  end
-
-  describe 'autorequire packages' do
-    it "provider iptables_chain should autorequire package iptables" do
-      resource[:provider].should == :iptables_chain
-      package = Puppet::Type.type(:package).new(:name => 'iptables')
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource resource
-      catalog.add_resource package
-      rel = resource.autorequire[0]
-      rel.source.ref.should == package.ref
-      rel.target.ref.should == resource.ref
-    end
-
-    it "provider iptables_chain should autorequire packages iptables and iptables-persistent" do
-      resource[:provider].should == :iptables_chain
-      packages = [
-        Puppet::Type.type(:package).new(:name => 'iptables'),
-        Puppet::Type.type(:package).new(:name => 'iptables-persistent')
-      ]
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource resource
-      packages.each do |package|
-        catalog.add_resource package
-      end
-      packages.zip(resource.autorequire) do |package, rel|
-        rel.source.ref.should == package.ref
-        rel.target.ref.should == resource.ref
-      end
-    end
-  end
-
-  describe 'purge iptables rules' do
-    before(:each) do
-      allow(Puppet::Type.type(:firewall).provider(:iptables)).to receive(:iptables_save).and_return(<<EOS
-# Completed on Sun Jan  5 19:30:21 2014
-# Generated by iptables-save v1.4.12 on Sun Jan  5 19:30:21 2014
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
-:LOCAL_FORWARD - [0:0]
-:LOCAL_FORWARD_PRE - [0:0]
-:LOCAL_INPUT - [0:0]
-:LOCAL_INPUT_PRE - [0:0]
-:fail2ban-ssh - [0:0]
--A INPUT -p tcp -m multiport --dports 22 -j fail2ban-ssh
--A INPUT -i lo -m comment --comment "012 accept loopback" -j ACCEPT
--A INPUT -p tcp -m multiport --dports 22 -m comment --comment "020 ssh" -j ACCEPT
--A OUTPUT -d 1.2.1.2 -j DROP
--A fail2ban-ssh -j RETURN
-COMMIT
-# Completed on Sun Jan  5 19:30:21 2014
-EOS
-)
-    end
-
-    it 'should generate iptables resources' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true)
-
-      expect(resource.generate.size).to eq(3)
-    end
-
-    it 'should not generate ignored iptables rules' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true, :ignore => ['-j fail2ban-ssh'])
-
-      expect(resource.generate.size).to eq(2)
-    end
-
-    it 'should not generate iptables resources when not enabled' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4')
-
-      expect(resource.generate.size).to eq(0)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb
deleted file mode 100644
index e5864879c32..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-require 'spec_helper'
-
-describe 'Puppet::Util::Firewall' do
-  let(:resource) {
-    type = Puppet::Type.type(:firewall)
-    provider = double 'provider'
-    allow(provider).to receive(:name).and_return(:iptables)
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return(provider)
-    type.new({:name => '000 test foo'})
-  }
-
-  before(:each) { resource }
-
-  describe '#host_to_ip' do
-    subject { resource }
-    specify {
-      expect(Resolv).to receive(:getaddress).with('puppetlabs.com').and_return('96.126.112.51')
-      subject.host_to_ip('puppetlabs.com').should == '96.126.112.51/32'
-    }
-    specify { subject.host_to_ip('96.126.112.51').should == '96.126.112.51/32' }
-    specify { subject.host_to_ip('96.126.112.51/32').should == '96.126.112.51/32' }
-    specify { subject.host_to_ip('2001:db8:85a3:0:0:8a2e:370:7334').should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_ip('2001:db8:1234::/48').should == '2001:db8:1234::/48' }
-    specify { subject.host_to_ip('0.0.0.0/0').should == nil }
-    specify { subject.host_to_ip('::/0').should == nil }
-  end
-
-  describe '#host_to_mask' do
-    subject { resource }
-    specify {
-      expect(Resolv).to receive(:getaddress).at_least(:once).with('puppetlabs.com').and_return('96.126.112.51')
-      subject.host_to_mask('puppetlabs.com').should == '96.126.112.51/32'
-      subject.host_to_mask('!puppetlabs.com').should == '! 96.126.112.51/32'
-    }
-    specify { subject.host_to_mask('96.126.112.51').should == '96.126.112.51/32' }
-    specify { subject.host_to_mask('!96.126.112.51').should == '! 96.126.112.51/32' }
-    specify { subject.host_to_mask('96.126.112.51/32').should == '96.126.112.51/32' }
-    specify { subject.host_to_mask('! 96.126.112.51/32').should == '! 96.126.112.51/32' }
-    specify { subject.host_to_mask('2001:db8:85a3:0:0:8a2e:370:7334').should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_mask('!2001:db8:85a3:0:0:8a2e:370:7334').should == '! 2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_mask('2001:db8:1234::/48').should == '2001:db8:1234::/48' }
-    specify { subject.host_to_mask('! 2001:db8:1234::/48').should == '! 2001:db8:1234::/48' }
-    specify { subject.host_to_mask('0.0.0.0/0').should == nil }
-    specify { subject.host_to_mask('!0.0.0.0/0').should == nil }
-    specify { subject.host_to_mask('::/0').should == nil }
-    specify { subject.host_to_mask('! ::/0').should == nil }
-  end
-
-  describe '#icmp_name_to_number' do
-    describe 'proto unsupported' do
-      subject { resource }
-
-      %w{inet5 inet8 foo}.each do |proto|
-        it "should reject invalid proto #{proto}" do
-          expect { subject.icmp_name_to_number('echo-reply', proto) }.
-            to raise_error(ArgumentError, "unsupported protocol family '#{proto}'")
-        end
-      end
-    end
-
-    describe 'proto IPv4' do
-      proto = 'inet'
-      subject { resource }
-      specify { subject.icmp_name_to_number('echo-reply', proto).should == '0' }
-      specify { subject.icmp_name_to_number('destination-unreachable', proto).should == '3' }
-      specify { subject.icmp_name_to_number('source-quench', proto).should == '4' }
-      specify { subject.icmp_name_to_number('redirect', proto).should == '6' }
-      specify { subject.icmp_name_to_number('echo-request', proto).should == '8' }
-      specify { subject.icmp_name_to_number('router-advertisement', proto).should == '9' }
-      specify { subject.icmp_name_to_number('router-solicitation', proto).should == '10' }
-      specify { subject.icmp_name_to_number('time-exceeded', proto).should == '11' }
-      specify { subject.icmp_name_to_number('parameter-problem', proto).should == '12' }
-      specify { subject.icmp_name_to_number('timestamp-request', proto).should == '13' }
-      specify { subject.icmp_name_to_number('timestamp-reply', proto).should == '14' }
-      specify { subject.icmp_name_to_number('address-mask-request', proto).should == '17' }
-      specify { subject.icmp_name_to_number('address-mask-reply', proto).should == '18' }
-    end
-
-    describe 'proto IPv6' do
-      proto = 'inet6'
-      subject { resource }
-      specify { subject.icmp_name_to_number('destination-unreachable', proto).should == '1' }
-      specify { subject.icmp_name_to_number('time-exceeded', proto).should == '3' }
-      specify { subject.icmp_name_to_number('parameter-problem', proto).should == '4' }
-      specify { subject.icmp_name_to_number('echo-request', proto).should == '128' }
-      specify { subject.icmp_name_to_number('echo-reply', proto).should == '129' }
-      specify { subject.icmp_name_to_number('router-solicitation', proto).should == '133' }
-      specify { subject.icmp_name_to_number('router-advertisement', proto).should == '134' }
-      specify { subject.icmp_name_to_number('redirect', proto).should == '137' }
-    end
-  end
-
-  describe '#string_to_port' do
-    subject { resource }
-    specify { subject.string_to_port('80','tcp').should == '80' }
-    specify { subject.string_to_port(80,'tcp').should == '80' }
-    specify { subject.string_to_port('http','tcp').should == '80' }
-    specify { subject.string_to_port('domain','udp').should == '53' }
-  end
-
-  describe '#to_hex32' do
-    subject { resource }
-    specify { subject.to_hex32('0').should == '0x0' }
-    specify { subject.to_hex32('0x32').should == '0x32' }
-    specify { subject.to_hex32('42').should == '0x2a' }
-    specify { subject.to_hex32('4294967295').should == '0xffffffff' }
-    specify { subject.to_hex32('4294967296').should == nil }
-    specify { subject.to_hex32('-1').should == nil }
-    specify { subject.to_hex32('bananas').should == nil }
-  end
-
-  describe '#persist_iptables' do
-    before { Facter.clear }
-    subject { resource }
-
-    describe 'when proto is IPv4' do
-      let(:proto) { 'IPv4' }
-
-      it 'should exec /sbin/service if running RHEL 6 or earlier' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
-
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for systemd if running RHEL 7 or greater' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('7')
-
-        expect(subject).to receive(:execute).with(%w{/usr/libexec/iptables/iptables.init save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for systemd if running Fedora 15 or greater' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Fedora')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('15')
-
-        expect(subject).to receive(:execute).with(%w{/usr/libexec/iptables/iptables.init save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for CentOS identified from operatingsystem' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for Archlinux identified from osfamily' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('Archlinux')
-        expect(subject).to receive(:execute).with(['/bin/sh', '-c', '/usr/sbin/iptables-save > /etc/iptables/iptables.rules'])
-        subject.persist_iptables(proto)
-      end
-
-      it 'should raise a warning when exec fails' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
-
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save}).
-          and_raise(Puppet::ExecutionFailure, 'some error')
-        expect(subject).to receive(:warning).with('Unable to persist firewall rules: some error')
-        subject.persist_iptables(proto)
-      end
-    end
-
-    describe 'when proto is IPv6' do
-      let(:proto) { 'IPv6' }
-
-      it 'should exec for newer Ubuntu' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-        allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.5.3ubuntu2')
-        expect(subject).to receive(:execute).with(%w{/usr/sbin/service iptables-persistent save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should not exec for older Ubuntu which does not support IPv6' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-        allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.0.20090701')
-        expect(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
-      end
-
-      it 'should not exec for Suse which is not supported' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('Suse')
-        expect(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
deleted file mode 100644
index 916f74a350a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe 'Puppet::Util::IPCidr' do
-  describe 'ipv4 address' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('96.126.112.51') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '96.126.112.51/32' }
-    specify { subject.prefixlen.should == 32 }
-    specify { subject.netmask.should == '255.255.255.255' }
-  end
-
-  describe 'single ipv4 address with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('96.126.112.51/32') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '96.126.112.51/32' }
-    specify { subject.prefixlen.should == 32 }
-    specify { subject.netmask.should == '255.255.255.255' }
-  end
-
-  describe 'ipv4 address range with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('96.126.112.0/24') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '96.126.112.0/24' }
-    specify { subject.prefixlen.should == 24 }
-    specify { subject.netmask.should == '255.255.255.0' }
-  end
-
-  describe 'ipv4 open range with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('0.0.0.0/0') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '0.0.0.0/0' }
-    specify { subject.prefixlen.should == 0 }
-    specify { subject.netmask.should == '0.0.0.0' }
-  end
-
-  describe 'ipv6 address' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.prefixlen.should == 128 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
-  end
-
-  describe 'single ipv6 addr with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334/128') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.prefixlen.should == 128 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
-  end
-
-  describe 'ipv6 addr range with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:1234::/48') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:1234::/48' }
-    specify { subject.prefixlen.should == 48 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:0000:0000:0000:0000:0000' }
-  end
-
-  describe 'ipv6 open range with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('::/0') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '::/0' }
-    specify { subject.prefixlen.should == 0 }
-    specify { subject.netmask.should == '0000:0000:0000:0000:0000:0000:0000:0000' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml
deleted file mode 100644
index 2aa9e3d77a7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    vcsrepo: git://github.com/puppetlabs/puppetlabs-vcsrepo.git
-  symlinks:
-    git: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG
deleted file mode 100644
index 670358b6896..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG
+++ /dev/null
@@ -1,2 +0,0 @@
-2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
-* initial commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile
deleted file mode 100644
index 9403b43a06a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name 'puppetlabs-git'
-version '0.0.3'
-source 'git://github.com/puppetlabs/puppetlabs-git.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'module for installing git'
-description 'module for installing git'
-project_page 'https://github.com/puppetlabs/puppetlabs-git/'
-dependency 'puppetlabs/vcsrepo'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md
deleted file mode 100644
index 49e51f48178..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-#git
-
-####Table of Contents
-
-1. [Overview - What is the [Modulename] module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with [Modulename]](#setup)
-    * [What [Modulename] affects](#what-registry-affects)
-4. [Usage - Configuration options and additional functionality](#usage)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-Simple module that can install git or gitosis
-
-##Module Description
-
-This module installs the git revision control system on a target node. It does not manage a git server or any associated services; it simply ensures a bare minimum set of features (e.g. just a package) to use git.
-
-##Setup
-
-###What git affects
-
-* Package['git']
-
-The specifics managed by the module may vary depending on the platform.
-
-##Usage
-
-###I just want `git` installed
-Simply include the `git` class.
-
-```puppet
-include git
-```
-
-###I want to use `git subtree` with bash completion
-
-```puppet
-include git::subtree
-```
-
-##Reference
-
-###Classes
-
-* `git`: Installs the git client package.
-* `gitosis`: Installs the gitosis package. No configuration
-* `subtree`: Installs and configures git-subtree for git 1.7 and up.
-
-###Facts
-
-* `git_exec_path`: Path to the directory containing all `git-*` commands.
-* `git_version`: Version of git that is installed. Undefined if not installed.
-
-##Limitations
-
-This module is known to work with the following operating system families:
-
- - RedHat 5, 6
- - Debian 6.0.7 or newer
- - Ubuntu 12.04 or newer
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh
deleted file mode 100644
index f2683e44946..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!bash
-#
-# bash completion support for Git subtree.
-#
-# To use this routine:
-#
-#    1) Make sure you have installed and configured the core Git completion script, which is required to make this script work;
-#    2) Copy this file to somewhere (e.g. ~/.git-subtree-completion.sh);
-#    3) Added the following line to your .bashrc:
-#        source ~/.git-subtree-completion.sh
-#
-
-_git_subtree ()
-{
-        local cur="${COMP_WORDS[COMP_CWORD]}"
-
-        if [ $COMP_CWORD -eq 2 ]; then
-                __gitcomp "add merge pull push split"
-                return
-        elif [ $COMP_CWORD -eq 3 ]; then
-                __gitcomp "--prefix="
-                return
-        fi
-        __gitcomp "$(__git_remotes)"
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb
deleted file mode 100644
index 23d06e0b0d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# git_exec_path.rb
-Facter.add('git_exec_path') do
-  setcode 'git --exec-path 2>/dev/null'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb
deleted file mode 100644
index 4cb71d2ccee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# git_version
-Facter.add('git_version') do
-  setcode 'git --version 2>/dev/null'.sub(/git version /, '')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp
deleted file mode 100644
index 64b7b2df3d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class: gitosis
-#
-# This installs and configures gitosis 
-#
-# Requires:
-#  - Class[git]
-#
-class git::gitosis {
-  include ::git
-  package {'gitosis':
-    ensure => present
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp
deleted file mode 100644
index 7e57fa23cb8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Class: git
-#
-# This class installs git
-#
-# Actions:
-#   - Install the git package
-#
-# Sample Usage:
-#  class { 'git': }
-#
-class git {
-  if ! defined(Package['git']) {
-    package { 'git':
-      ensure => present
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp
deleted file mode 100644
index 6c47ca8b4de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: git::subtree
-#
-# Installs and configure git-subtree
-#
-class git::subtree {
-
-  include ::git
-
-  Package['git'] -> Class['git::subtree']
-
-  if (versioncmp('1.7.0', $::git_version) > 0) {
-    fail 'git-subtree requires git 1.7 or later!'
-  }
-
-  if (versioncmp('1.7.11', $::git_version) > 0) {
-    $source_dir = '/usr/src/git-subtree'
-    vcsrepo { $source_dir:
-      ensure   => present,
-      source   => 'http://github.com/apenwarr/git-subtree.git',
-      provider => 'git',
-      revision => '2793ee6ba',
-    }
-  } else {
-    $source_dir = '/usr/share/doc/git-core/contrib/subtree'
-  }
-
-  exec { "/usr/bin/make prefix=/usr libexecdir=${::git_exec_path}":
-    creates => "${source_dir}/git-subtree",
-    cwd     => $source_dir,
-  }
-  ->
-  exec { "/usr/bin/make prefix=/usr libexecdir=${::git_exec_path} install":
-    creates => "${::git_exec_path}/git-subtree",
-    cwd     => $source_dir,
-  }
-
-  file { '/etc/bash_completion.d/git-subtree':
-    ensure => file,
-    source => 'puppet:///modules/git/subtree/bash_completion.sh',
-    mode   => '0644',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb
deleted file mode 100644
index e7a6e325395..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'spec_helper'
-
-describe 'git::subtree' do
-
-  context 'when git version < 1.7.0' do
-    let(:facts) { { :git_version => '1.6.0' } }
-
-    it 'should fail' do
-      expect { should create_class('git::subtree') }.to raise_error(Puppet::Error, /git-subtree requires git 1.7 or later!/)
-    end
-  end
-
-  context 'when git version > 1.7.0 and < 1.7.11' do
-    let(:facts) { {
-      :git_version   => '1.7.0',
-      :git_exec_path => '/usr/lib/git-core',
-    } }
-
-    it { should create_class('git') }
-
-    it { should create_vcsrepo('/usr/src/git-subtree').with({
-      :ensure   => 'present',
-      :source   => 'http://github.com/apenwarr/git-subtree.git',
-      :provider => 'git',
-      :revision => '2793ee6ba',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core').with({
-      :creates => '/usr/src/git-subtree/git-subtree',
-      :cwd     => '/usr/src/git-subtree',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core install').with({
-      :creates => '/usr/lib/git-core/git-subtree',
-      :cwd     => '/usr/src/git-subtree',
-    })}
-
-    it { should create_file('/etc/bash_completion.d/git-subtree').with({
-      :ensure => 'file',
-      :source => 'puppet:///modules/git/subtree/bash_completion.sh',
-      :mode   => '0644',
-    })}
-  end 
-
-  context 'when git version >= 1.7.11' do
-    let(:facts) { {
-      :git_version   => '1.7.11',
-      :git_exec_path => '/usr/lib/git-core',
-    } }
-
-    it { should create_class('git') }
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core').with({
-      :creates => '/usr/share/doc/git-core/contrib/subtree/git-subtree',
-      :cwd     => '/usr/share/doc/git-core/contrib/subtree',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core install').with({
-      :creates => '/usr/lib/git-core/git-subtree',
-      :cwd     => '/usr/share/doc/git-core/contrib/subtree',
-    })}
-
-    it { should create_file('/etc/bash_completion.d/git-subtree').with({
-      :ensure => 'file',
-      :source => 'puppet:///modules/git/subtree/bash_completion.sh',
-      :mode   => '0644',
-    })}
-  end 
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp
deleted file mode 100644
index e6240ae21f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'git::gitosis': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp
deleted file mode 100644
index c232904713f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'git': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml
deleted file mode 100644
index 0d21abb8c40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    mailcatcher: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml
deleted file mode 100644
index 08a65c81874..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile
deleted file mode 100644
index 170516d9813..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-gem 'puppet', puppetversion
-
-group :test do
-  gem 'rake', '>= 0.9.0'
-  gem 'rspec', '>= 2.8.0'
-  gem 'rspec-puppet', '>= 0.1.1'
-  gem 'puppetlabs_spec_helper', '>= 0.4.1'
-  gem 'puppet-lint'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile
deleted file mode 100644
index 54de3a1024f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'actionjack-mailcatcher'
-version '0.1.5'
-source 'https://github.com/actionjack/puppet-mailcatcher'
-author 'actionjack'
-license 'Apache License, Version 2.0'
-summary 'Install and configure the mailcatcher application.'
-description "This puppet module is used to install and configure the mailcatcher
-application.
-MailCatcher runs a super simple SMTP server which catches any message sent to it
-to display in a web interface."
-project_page 'https://github.com/actionjack/puppet-mailcatcher'
-
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md
deleted file mode 100644
index 12d569a08b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Mailcatcher
-
-[![Build Status](https://travis-ci.org/actionjack/puppet-mailcatcher.png?branch=master)](https://travis-ci.org/actionjack/puppet-mailcatcher)
-
-This puppet module is used to install and configure the mailcatcher application.
-MailCatcher runs a super simple SMTP server which catches any message sent to it to display in a web interface.
-http://mailcatcher.me/
-
-* * *
-
-## Configuration
-
-
-## Dependencies
-
-Current dependencies are:
-
- * 'puppetlabs/stdlib', '>= 2.1.0'
-
-## Usage
-
-
-
-```ruby
-class {'mailcatcher': }
-```
-
-## Documentation
-
-This module is written in puppetdoc compliant format so details on configuration and usage can be found by executing:
-
-```bash
-$ puppet doc manifest/init.pp
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile
deleted file mode 100644
index e0e78cfbb8a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp
deleted file mode 100644
index c4a27921e90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# class mailcatcher::config
-#
-class mailcatcher::config {
-  user { 'mailcatcher':
-    ensure  => present,
-    comment => 'Mailcatcher Mock Smtp Service User',
-    home    => '/var/spool/mailcatcher',
-    shell   => '/bin/true',
-  }
-
-  file { $mailcatcher::params::log_path:
-    ensure  => directory,
-    owner   => 'mailcatcher',
-    group   => 'mailcatcher',
-    mode    => 0755,
-    require => User['mailcatcher']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp
deleted file mode 100644
index 31c5d3434e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp
+++ /dev/null
@@ -1,64 +0,0 @@
-# == Class: mailcatcher
-#
-# Install and configure Mailcatcher.
-# MailCatcher runs a super simple SMTP server which catches any message sent to
-# it to display in a web interface.
-# http://mailcatcher.me/
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*smtp_ip*]
-#   What IP address the mailcatcher smtp service should listen on.
-#   The default is 127.0.0.1
-#
-# [*smtp_port*]
-#   What TCP Port the mailcatcher smtp service should listen on.
-#   The default is 1025
-#
-# [*http_ip*]
-#   What IP address the mailcatcher web mail client service should listen on.
-#   The default is 0.0.0.0
-#
-# [*http_port*]
-#   What TCP Port the mailcatcher web mail client service should listen on.
-#   The default is 1080
-#
-# [*mailcatcher_path*]
-#   Path to the mailcatcher program.
-#   The default is '/usr/local/bin'
-#
-# === Examples
-#
-# [*default*]
-#
-#  class { mailcatcher:  }
-#
-# [*listen on all ethernet adapters*]
-#
-#  class { mailcatcher:
-#   smtp_ip => '0.0.0.0'
-#  }
-#
-# === Authors
-#
-# Martin Jackson <contact@uncommonsense-uk.com>
-#
-# === Copyright
-#
-# Copyright 2013 Martin Jackson, unless otherwise noted.
-#
-class mailcatcher (
-  $smtp_ip          = $mailcatcher::params::smtp_ip,
-  $smtp_port        = $mailcatcher::params::smtp_port,
-  $http_ip          = $mailcatcher::params::http_ip,
-  $http_port        = $mailcatcher::params::http_port,
-  $mailcatcher_path = $mailcatcher::params::mailcatcher_path,
-  $log_path         = $mailcatcher::params::log_path
-) inherits mailcatcher::params {
-
-  class {'mailcatcher::package': } ->
-  class {'mailcatcher::config': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp
deleted file mode 100644
index 6d66fb836b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# class mailcatcher::package
-#
-class mailcatcher::package {
-  each( $mailcatcher::params::packages ) |$package| {
-    if ! defined(Package[$package]) {
-      package { $package:
-        ensure => present
-      }
-    }
-  }
-
-  package { 'mailcatcher':
-    ensure   => present,
-    provider => 'gem',
-    require  => Package[$mailcatcher::params::packages]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp
deleted file mode 100644
index a21d6b07e5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# class mailcatcher::params
-#
-class mailcatcher::params {
-  $smtp_ip          = '0.0.0.0'
-  $smtp_port        = '1025'
-  $http_ip          = '0.0.0.0'
-  $http_port        = '1080'
-  $mailcatcher_path = '/usr/local/bin'
-  $log_path         = '/var/log/mailcatcher'
-
-  case $::osfamily {
-    'Debian': {
-      $packages = ['ruby-dev', 'sqlite3', 'libsqlite3-dev', 'rubygems']
-    }
-    'Redhat': {
-      $packages = ['ruby-devel', 'sqlite', 'sqlite-devel', 'ruby-sqlite3', 'rubygems']
-    }
-    default: {
-      fail("${::osfamily} is not supported.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb
deleted file mode 100644
index 4ae17bd3b1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'mailcatcher', :type => :class do
-  context "As a Web Operations Engineer" do
-    context 'When I install the mailcatcher base class on Ubuntu' do
-      let :facts do {
-          :osfamily        => 'Debian',
-          :operatingsystem => 'Ubuntu'
-      }
-      end
-
-      describe 'by default it' do
-        it { should contain_package('ruby-dev') }
-        it { should contain_package('sqlite3') }
-        it { should contain_package('libsqlite3-dev') }
-        it { should contain_package('rubygems') }
-        it { should contain_package('mailcatcher').with({ 'provider' => 'gem'}) }
-        it { should contain_user('mailcatcher') }
-        it 'should contain a properly formatted start up configuration for upstart' do
-          should contain_file('/etc/init/mailcatcher.conf').with_content(/exec\s+nohup\s+\/usr\/local\/bin\/mailcatcher\s+--http-ip\s+0\.0\.0\.0\s+--http-port\s+1080\s+--smtp-ip\s+0\.0\.0\.0\s+--smtp-port\s+1025\s+-f/)
-        end
-        it { should contain_file('/etc/init/mailcatcher.conf').with({ :notify => 'Class[Mailcatcher::Service]'})}
-        it { should contain_file('/var/log/mailcatcher').with({
-            :ensure  => 'directory',
-            :owner   => 'mailcatcher',
-            :group   => 'mailcatcher',
-            :mode    => '0755',
-            :require => 'User[mailcatcher]'
-        })}
-        it { should contain_service('mailcatcher').with({
-            :ensure     => 'running',
-            :provider   => 'upstart',
-            :hasstatus  => true,
-            :hasrestart => true,
-            :require    => 'Class[Mailcatcher::Config]',
-        })}
-
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb
deleted file mode 100644
index 3d92005247c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb
deleted file mode 100644
index 4cd663ffe59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-# mailcatcher - mock smtp server
-#
-# mailCatcher runs a super simple SMTP server which catches any
-# message sent to it to display in a web interface.
-
-description     "mock smtp server"
-
-start on startup
-stop on shutdown
-
-setuid mailcatcher
-setgid mailcatcher
-
-script
- exec nohup <%= @mailcatcher_path %>/mailcatcher<%= @options.join(' ') %> -f  >> /var/log/mailcatcher/mailcatcher.log 2>&1
-end script
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp
deleted file mode 100644
index adead2832a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation
-# errors and view a log of events) or by fully applying the test in a virtual
-# environment (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here:
-# http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-include mailcatcher
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml
deleted file mode 100644
index e48e20aaee9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-  symlinks:
-    "mongodb": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml
deleted file mode 100644
index f6eff1ce965..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-branches:
-  only:
-    - master
-language: ruby
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system 2.1.11
-  - gem --version
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: "iUYpjvk33JffZB9lVRqjuwRWesvcvmTknh908xnf60rUOA0QbGEPXxQY+LsQJEIimVsMA22fV6vp9BcqMEjO7OfK2MvAWsEWU/lG+kisFqhWDRf96sADE7k/RvPWJeB2xe+lWXK7Eh26jgctNfk4NptX1X1MjGmdzEvH7Aq79/w="
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG
deleted file mode 100644
index 92a220f481d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG
+++ /dev/null
@@ -1,74 +0,0 @@
-##2014-05-27 - Release 0.8.0
-
-This feature features a rewritten mongodb_replset{} provider, includes several
-important bugfixes, ruby 1.8 support, and two new features.
-
-####Features
-- Rewritten mongodb_replset{}, featuring puppet resource support, prefetching,
-and flushing.
-- Add Ruby 1.8 compatibility.
-- Adds `syslog`, allowing you to configure mongodb to send all logging to the hosts syslog.
-- Add mongodb::replset, a wrapper class for hiera users.
-- Improved testing!
-
-####Bugfixes
-- Fixes the package names to work since 10gen renamed them again.
-- Fix provider name in the README.
-- Disallow `nojournal` and `journal` to be set at the same time.
-- Changed - to = for versioned install on Ubuntu.
-
-####Known Bugs
-* No known bugs
-
-2014-1-29 - Version 0.7.0
-
-Summary:
-
-Added Replica Set Type and Provider
-
-2014-1-17 - Version 0.6.0
-
-Summary:
-
-Added support for installing MongoDB client on 
-RHEL family systems.
-
-2014-01-10 Version 0.5.0
-
-Summary:
-
-Added types for providers for Mongo users and databases.
-
-2013-12 Version 0.4.0
-
-Major refactoring of the MongoDB module. Includes a new 'mongodb::globals' 
-that consolidates many shared parameters into one location. This is an 
-API-breaking release in anticipation of a 1.0 release.
-
-2013-10-31 - Version 0.3.0
-
-Summary:
-
-Adds a number of parameters and fixes some platform
-specific bugs in module deployment.
-
-2013-09-25 - Version 0.2.0
-
-Summary:
-
-This release fixes a duplicate parameter.
-
-Fixes:
-- Fix a duplicated parameter.
-
-2012-07-13 Puppet Labs <info@puppetlabs.com> - 0.1.0
-* Add support for RHEL/CentOS
-* Change default mongodb install location to OS repo
-
-2012-05-29 Puppet Labs <info@puppetlabs.com> - 0.0.2
-* Fix Modulefile typo.
-* Remove repo pin.
-* Update spec tests and add travis support.
-
-2012-05-03 Puppet Labs <info@puppetlabs.com> - 0.0.1
-* Initial Release.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile
deleted file mode 100644
index 39abe867d49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile
+++ /dev/null
@@ -1,19 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :test, :development do
-  gem 'rspec-puppet',            :require => false
-  gem 'rake',                    :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE
deleted file mode 100644
index 8961ce8a6d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Puppet Labs Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile
deleted file mode 100644
index e2eb82771a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-mongodb'
-version '0.8.0'
-source 'git@github.com:puppetlabs/puppetlabs-mongodb.git'
-author 'puppetlabs'
-license 'Apache License Version 2.0'
-summary 'mongodb puppet module'
-description '10gen mongodb puppet module'
-project_page 'https://github.com/puppetlabs/puppetlabs-mongodb'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'puppetlabs/stdlib', '>= 2.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md
deleted file mode 100644
index 2bc16bb3485..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md
+++ /dev/null
@@ -1,515 +0,0 @@
-# mongodb puppet module
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-mongodb.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-mongodb)
-
-####Table of Contents
-
-1. [Overview] (#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with mongodb](#setup)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-6. [Limitations - OS compatibility, etc.] (#limitations)
-7. [Development - Guide for contributing to the module] (#development)
-
-## Overview
-
-Installs MongoDB on RHEL/Ubuntu/Debian from OS repo, or alternatively from
-10gen repository [installation documentation](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages).
-
-### Deprecation Warning ###
-
-This release is a major refactoring of the module which means that the API may
-have changed in backwards incompatible ways. If your project depends on the old API,
-please pin your dependencies to 0.3 version to ensure your environments don't break.
-
-The current module design is undergoing review for potential 1.0 release. We welcome
-any feedback with regard to the APIs and patterns used in this release.
-
-##Module Description
-
-The MongoDB module manages mongod server installation and configuration of the
-mongod daemon. For the time being it supports only a single MongoDB server
-instance, without sharding functionality.
-
-For the 0.5 release, the MongoDB module now supports database and user types.
-
-For the 0.6 release, the MongoDB module now supports basic replicaset features
-(initiating a replicaset and adding members, but without specific options).
-
-## Setup
-
-###What MongoDB affects
-
-* MongoDB package.
-* MongoDB configuration files.
-* MongoDB service.
-* MongoDB client.
-* 10gen/mongodb apt/yum repository.
-
-###Beginning with MongoDB
-
-If you just want a server installation with the default options you can run
-`include '::mongodb::server'`. If you need to customize configuration
-options you need to do the following:
-
-```puppet
-class {'::mongodb::server':
-  port    => 27018,
-  verbose => true,
-}
-```
-
-For Red Hat family systems, the client can be installed in a similar fashion:
-
-```
-puppet class {'::mongodb::client':}
-```
-
-Note that for Debian/Ubuntu family systems the client is installed with the 
-server. Using the client class will by default install the server.
-
-Although most distros come with a prepacked MongoDB server we recommend to
-use the 10gen/MongoDB software repository, because most of the current OS
-packages are outdated and not appropriate for a production environment.
-To install MongoDB from 10gen repository:
-
-```puppet
-class {'::mongodb::globals':
-  manage_package_repo => true,
-}->
-class {'::mongodb::server': }->
-class {'::mongodb::client': }
-```
-
-## Usage
-
-Most of the interaction for the server is done via `mongodb::server`. For
-more options please have a look at [mongodb::server](#class-mongodbserver).
-Also in this version we introduced `mongodb::globals`, which is meant more
-for future implementation, where you can configure the main settings for
-this module in a global way, to be used by other classes and defined resources.
-On its own it does nothing.
-
-### Create MongoDB database
-
-To install MongoDB server, create database "testdb" and user "user1" with password "pass1".
-
-```puppet
-class {'::mongodb::server':
-  auth => true,
-}
-
-mongodb::db { 'testdb':
-  user          => 'user1',
-  password_hash => 'a15fbfca5e3a758be80ceaf42458bcd8',
-}
-```
-Parameter 'password_hash' is hex encoded md5 hash of "user1:mongo:pass1".
-Unsafe plain text password could be used with 'password' parameter instead of 'password_hash'.
-
-## Reference
-
-### Classes
-
-####Public classes
-* `mongodb::server`: Installs and configure MongoDB
-* `mongodb::client`: Installs the MongoDB client shell (for Red Hat family systems)
-* `mongodb::globals`: Configure main settings in a global way
-
-####Private classes
-* `mongodb::repo`: Manage 10gen/MongoDB software repository
-* `mongodb::repo::apt`: Manage Debian/Ubuntu apt 10gen/MongoDB repository
-* `mongodb::repo::yum`: Manage Redhat/CentOS apt 10gen/MongoDB repository
-* `mongodb::server::config`: Configures MongoDB configuration files
-* `mongodb::server::install`: Install MongoDB software packages
-* `mongodb::server::service`: Manages service
-* `mongodb::client::install`: Installs the MongoDB client software package
-
-####Class: mongodb::globals
-*Note:* most server specific defaults should be overridden in the `mongodb::server`
-class. This class should only be used if you are using a non-standard OS or
-if you are changing elements such as `version` or `manage_package_repo` that
-can only be changed here.
-
-This class allows you to configure the main settings for this module in a
-global way, to be used by the other classes and defined resources. On its
-own it does nothing.
-
-#####`server_package_name`
-This setting can be used to override the default MongoDB server package
-name. If not specified, the module will use whatever package name is the
-default for your OS distro.
-
-#####`service_name`
-This setting can be used to override the default MongoDB service name. If not
-specified, the module will use whatever service name is the default for your OS distro.
-
-#####`service_provider`
-This setting can be used to override the default MongoDB service provider. If
-not specified, the module will use whatever service provider is the default for
-your OS distro.
-
-#####`service_status`
-This setting can be used to override the default status check command for
-your MongoDB service. If not specified, the module will use whatever service
-name is the default for your OS distro.
-
-#####`user`
-This setting can be used to override the default MongoDB user and owner of the
-service and related files in the file system. If not specified, the module will
-use the default for your OS distro.
-
-#####`group`
-This setting can be used to override the default MongoDB user group to be used
-for related files in the file system. If not specified, the module will use
-the default for your OS distro.
-
-#####`bind_ip`
-This setting can be used to configure MonogDB process to bind to and listen
-for connections from applications on this address. If not specified, the
-module will use the default for your OS distro.
-*Note:* This value should be passed as an array.
-
-#####`version`
-The version of MonogDB to install/manage. This is a simple way of providing
-a specific version such as '2.2' or '2.4' for example. If not specified,
-the module will use the default for your OS distro.
-
-####Class: mongodb::server
-
-Most of the parameters manipulate the mongod.conf file.
-
-For more details about configuration parameters consult the
-[MongoDB Configuration File Options](http://docs.mongodb.org/manual/reference/configuration-options/).
-
-#####`ensure`
-Used to ensure that the package is installed and the service is running, or that the package is absent/purged and the service is stopped. Valid values are true/false/present/absent/purged.
-
-#####`config`
-Path of the config file. If not specified, the module will use the default
-for your OS distro.
-
-#####`dbpath`
-Set this value to designate a directory for the mongod instance to store
-it's data. If not specified, the module will use the default for your OS distro.
-
-#####`pidfilepath`
-Specify a file location to hold the PID or process ID of the mongod process.
-If not specified, the module will use the default for your OS distro.
-
-#####`logpath`
-Specify the path to a file name for the log file that will hold all diagnostic
-logging information. Unless specified, mongod will output all log information
-to the standard output.
-
-#####`bind_ip`
-Set this option to configure the mongod or mongos process to bind to and listen
-for connections from applications on this address. If not specified, the module
-will use the default for your OS distro. Example: bind_ip=['127.0.0.1', '192.168.0.3']
-*Note*: bind_ip accepts an array as a value.
-
-#####`logappend`
-Set to true to add new entries to the end of the logfile rather than overwriting
-the content of the log when the process restarts. Default: True
-
-#####`fork`
-Set to true to fork server process at launch time. The default setting depends on
-the operating system.
-
-#####`port`
-Specifies a TCP port for the server instance to listen for client connections.
-Default: 27017
-
-#####`journal`
-Set to true to enable operation journaling to ensure write durability and
-data consistency. Default: on 64-bit systems true and on 32-bit systems false
-
-#####`nojournal`
-Set nojournal = true to disable durability journaling. By default, mongod
-enables journaling in 64-bit versions after v2.0.
-Default: on 64-bit systems  false and on 32-bit systems true
-
-*Note*: You must use journal to enable journaling on 32-bit systems.
-
-#####`smallfiles`
-Set to true to modify MongoDB to use a smaller default data file size.
-Specifically, smallfiles reduces the initial size for data files and
-limits them to 512 megabytes.  Default: false
-
-#####`cpu`
-Set to true to force mongod to report every four seconds CPU utilization
-and the amount of time that the processor waits for I/O operations to
-complete (i.e. I/O wait.) Default: false
-
-#####`auth`
-Set to true to enable database authentication for users connecting from
-remote hosts. If no users exist, the localhost interface will continue
-to have access to the database until you create the first user.
-Default: false
-
-#####`noauth`
-Disable authentication. Currently the default. Exists for future compatibility
- and clarity.
-
-#####`verbose`
-Increases the amount of internal reporting returned on standard output or in
-the log file generated by `logpath`. Default: false
-
-#####`verbositylevel`
-MongoDB has the following levels of verbosity: v, vv, vvv, vvvv and vvvvv.
-Default: None
-
-#####`objcheck`
-Forces the mongod to validate all requests from clients upon receipt to ensure
-that clients never insert invalid documents into the database.
-Default: on v2.4 default to true and on earlier version to false
-
-#####`quota`
-Set to true to enable a maximum limit for the number of data files each database
-can have. The default quota is 8 data files, when quota is true. Default: false
-
-#####`quotafiles`
-Modify limit on the number of data files per database. This option requires the
-`quota` setting. Default: 8
-
-#####`diaglog`
-Creates a very verbose diagnostic log for troubleshooting and recording various
-errors.  Valid values: 0, 1, 2, 3 and 7.
-For more information please refer to [MongoDB Configuration File Options](http://docs.mongodb.org/manual/reference/configuration-options/).
-
-#####`directoryperdb`
-Set to true to modify the storage pattern of the data directory to store each
-database’s files in a distinct folder. Default: false
-
-#####`profile`
-Modify this value to changes the level of database profiling, which inserts
-information about operation performance into output of mongod or the
-log file if specified by `logpath`.
-
-#####`maxconns`
-Specifies a value to set the maximum number of simultaneous connections
-that MongoDB will accept. Default: depends on system (i.e. ulimit and file descriptor)
-limits. Unless set, MongoDB will not limit its own connections.
-
-#####`oplog_size`
-Specifies a maximum size in megabytes for the replication operation log
-(e.g. oplog.) mongod creates an oplog based on the maximum amount of space
-available. For 64-bit systems, the oplog is typically 5% of available disk space.
-
-#####`nohints`
-Ignore query hints. Default: None
-
-#####`nohttpinterface`
-Set to true to disable the HTTP interface. This command will override the rest
-and disable the HTTP interface if you specify both. Default: false
-
-#####`noscripting`
-Set noscripting = true to disable the scripting engine. Default: false
-
-#####`notablescan`
-Set notablescan = true to forbid operations that require a table scan. Default: false
-
-#####`noprealloc`
-Set noprealloc = true to disable the preallocation of data files. This will shorten
-the start up time in some cases, but can cause significant performance penalties
-during normal operations. Default: false
-
-#####`nssize`
-Use this setting to control the default size for all newly created namespace
-files (i.e .ns). Default: 16
-
-#####`mms_token`
-MMS token for mms monitoring. Default: None
-
-#####`mms_name`
-MMS identifier for mms monitoring. Default: None
-
-#####`mms_interval`
-MMS interval for mms monitoring. Default: None
-
-#####`replset`
-Use this setting to configure replication with replica sets. Specify a replica
-set name as an argument to this set. All hosts must have the same set name.
-
-#####`rest`
-Set to true to enable a simple REST interface. Default: false
-
-#####`slowms`
-Sets the threshold for mongod to consider a query “slow” for the database profiler.
-Default: 100 ms
-
-#####`keyfile`
-Specify the path to a key file to store authentication information. This option
-is only useful for the connection between replica set members. Default: None
-
-#####`master`
-Set to true to configure the current instance to act as master instance in a
-replication configuration. Default: False  *Note*: deprecated – use replica sets
-
-#####`set_parameter`
-Specify extra configuration file parameters (i.e.
-textSearchEnabled=true). Default: None
-
-#####`syslog`
-Sends all logging output to the host’s syslog system rather than to standard
-output or a log file. Default: None
-*Important*: You cannot use syslog with logpath.
-
-#####`slave`
-Set to true to configure the current instance to act as slave instance in a
-replication configuration. Default: false
-*Note*: deprecated – use replica sets
-
-#####`only`
-Used with the slave option, only specifies only a single database to
-replicate. Default: <>
-*Note*: deprecated – use replica sets
-
-#####`source`
-Used with the slave setting to specify the master instance from which
-this slave instance will replicate. Default: <>
-*Note*: deprecated – use replica sets
-
-### Definitions
-
-#### Definition: mongodb:db
-
-Creates database with user. Resource title used as database name.
-
-#####`user`
-Name of the user for database
-
-#####`password_hash`
-Hex encoded md5 hash of "$username:mongo:$password".
-For more information please refer to [MongoDB Authentication Process](http://docs.mongodb.org/meta-driver/latest/legacy/implement-authentication-in-driver/#authentication-process).
-
-#####`password`
-Plain-text user password (will be hashed)
-
-#####`roles`
-Array with user roles. Default: ['dbAdmin']
-
-### Providers
-
-#### Provider: mongodb_database
-'mongodb_database' can be used to create and manage databases within MongoDB.
-
-```puppet
-mongodb_database { testdb:
-  ensure   => present,
-  tries    => 10,
-  require  => Class['mongodb::server'],
-}
-```
-#####`tries`
-The maximum amount of two second tries to wait MongoDB startup. Default: 10
-
-
-#### Provider: mongodb_user
-'mongodb_user' can be used to create and manage users within MongoDB database.
-
-```puppet
-mongodb_user { testuser:
-  ensure        => present,
-  password_hash => mongodb_password('testuser', 'p@ssw0rd'),
-  database      => testdb,
-  roles         => ['readWrite', 'dbAdmin'],
-  tries         => 10,
-  require       => Class['mongodb::server'],
-}
-```
-#####`password_hash`
-Hex encoded md5 hash of "$username:mongo:$password".
-
-#####`database`
-Name of database. It will be created, if not exists.
-
-#####`roles`
-Array with user roles. Default: ['dbAdmin']
-
-#####`tries`
-The maximum amount of two second tries to wait MongoDB startup. Default: 10
-
-#### Provider: mongodb_replset
-'mongodb_replset' can be used to create and manage MongoDB replicasets.
-
-```puppet
-mongodb_replset { rsmain:
-  ensure  => present,
-  members => ['host1:27017', 'host2:27017', 'host3:27017']
-}
-```
-
-Ideally the ```mongodb_replset``` resource will be declared on the initial
-desired primary node (arbitrarily the first of the list) and this node will be
-processed once the secondary nodes are up. This will ensure all the nodes are
-in the first configuration of the replicaset, else it will require running
-puppet again to add them.
-
-#####`members`
-Array of 'host:port' of the replicaset members.
-
-It currently only adds members without options.
-
-## Limitation
-
-This module has been tested on:
-
-* Debian 7.* (Wheezy)
-* Debian 6.* (squeeze)
-* Ubuntu 12.04.2 (precise)
-* Ubuntu 10.04.4 LTS (lucid)
-* RHEL 5/6
-* CentOS 5/6
-
-For a full list of tested operating systems please have a look at the [.nodeset.xml](https://github.com/puppetlabs/puppetlabs-mongodb/blob/master/.nodeset.yml) definition.
-
-This module should support `service_ensure` separate from the `ensure` value on `Class[mongodb::server]` but it does not yet.
-
-## Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Testing
-
-There are two types of tests distributed with this module. Unit tests with
-rspec-puppet and system tests using rspec-system.
-
-
-unit tests should be run under Bundler with the gem versions as specified
-in the Gemfile. To install the necessary gems:
-
-    bundle install --path=vendor
-
-Test setup and teardown is handled with rake tasks, so the
-supported way of running tests is with
-
-    bundle exec rake spec
-
-
-For system test you will also need to install vagrant > 1.3.x and virtualbox > 4.2.10.
-To run the system tests
-
-    bundle exec rake spec:system
-
-To run the tests on different operating systems, see the sets available in [.nodeset.xml](https://github.com/puppetlabs/puppetlabs-mongodb/blob/master/.nodeset.yml)
-and run the specific set with the following syntax:
-
-    RSPEC_SET=ubuntu-server-12042-x64 bundle exec rake spec:system
-
-### Authors
-
-We would like to thank everyone who has contributed issues and pull requests to this module.
-A complete list of contributors can be found on the
-[GitHub Contributor Graph](https://github.com/puppetlabs/puppetlabs-mongodb/graphs/contributors)
-for the [puppetlabs-mongodb module](https://github.com/puppetlabs/puppetlabs-mongodb).
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb
deleted file mode 100644
index e61bcb9dae9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:mongodb_password, :type => :rvalue, :doc => <<-EOS
-    Returns the mongodb password hash from the clear text password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, 'mongodb_password(): Wrong number of arguments ' +
-      "given (#{args.size} for 2)") if args.size != 2
-
-    Digest::MD5.hexdigest("#{args[0]}:mongo:#{args[1]}")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb
deleted file mode 100644
index 0acc76996ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-Puppet::Type.type(:mongodb_database).provide(:mongodb) do
-
-  desc "Manages MongoDB database."
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mongo => 'mongo'
-
-  def block_until_mongodb(tries = 10)
-    begin
-      mongo('--quiet', '--eval', 'db.getMongo()')
-    rescue => e
-      debug('MongoDB server not ready, retrying')
-      sleep 2
-      if (tries -= 1) > 0
-        retry
-      else
-        raise e
-      end
-    end
-  end
-
-  def create
-    mongo(@resource[:name], '--quiet', '--eval', "db.dummyData.insert({\"created_by_puppet\": 1})")
-  end
-
-  def destroy
-    mongo(@resource[:name], '--quiet', '--eval', 'db.dropDatabase()')
-  end
-
-  def exists?
-    block_until_mongodb(@resource[:tries])
-    mongo("--quiet", "--eval", 'db.getMongo().getDBNames()').split(",").include?(@resource[:name])
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb
deleted file mode 100644
index d77afe3036e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# Author: François Charlier <francois.charlier@enovance.com>
-#
-
-Puppet::Type.type(:mongodb_replset).provide(:mongo) do
-
-  desc "Manage hosts members for a replicaset."
-
-  confine :true =>
-    begin
-      require 'json'
-      true
-    rescue LoadError
-      false
-    end
-
-  commands :mongo => 'mongo'
-
-  mk_resource_methods
-
-  def initialize(resource={})
-    super(resource)
-    @property_flush = {}
-  end
-
-  def members=(hosts)
-    @property_flush[:members] = hosts
-  end
-
-  def self.instances
-    instance = get_replset_properties
-    if instance
-      # There can only be one replset per node
-      [new(instance)]
-    else
-      []
-    end
-  end
-
-  def self.prefetch(resources)
-    instances.each do |prov|
-      if resource = resources[prov.name]
-        resource.provider = prov
-      end
-    end
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present
-  end
-
-  def create
-    @property_flush[:ensure] = :present
-    @property_flush[:members] = resource.should(:members)
-  end
-
-  def destroy
-    @property_flush[:ensure] = :absent
-  end
-
-  def flush
-    set_members
-    @property_hash = self.class.get_replset_properties
-  end
-
-  private
-
-  def db_ismaster(host)
-    mongo_command("db.isMaster()", host)
-  end
-
-  def rs_initiate(conf, master)
-    return mongo_command("rs.initiate(#{conf})", master)
-  end
-
-  def rs_status(host)
-    mongo_command("rs.status()", host)
-  end
-
-  def rs_add(host, master)
-    mongo_command("rs.add(\"#{host}\")", master)
-  end
-
-  def rs_remove(host, master)
-    mongo_command("rs.remove(\"#{host}\")", master)
-  end
-
-  def master_host(hosts)
-    hosts.each do |host|
-      status = db_ismaster(host)
-      if status.has_key?('primary')
-        return status['primary']
-      end
-    end
-    false
-  end
-
-  def self.get_replset_properties
-    output = mongo_command('rs.conf()')
-    if output['members']
-      members = output['members'].collect do |val|
-        val['host']
-      end
-      props = {
-        :name     => output['_id'],
-        :ensure   => :present,
-        :members  => members,
-        :provider => :mongo,
-      }
-    else
-      props = nil
-    end
-    Puppet.debug("MongoDB replset properties: #{props.inspect}")
-    props
-  end
-
-  def alive_members(hosts)
-    hosts.select do |host|
-      begin
-        Puppet.debug "Checking replicaset member #{host} ..."
-        status = rs_status(host)
-        if status.has_key?('errmsg') and status['errmsg'] == 'not running with --replSet'
-          raise Puppet::Error, "Can't configure replicaset #{self.name}, host #{host} is not supposed to be part of a replicaset."
-        end
-        if status.has_key?('set')
-          if status['set'] != self.name
-            raise Puppet::Error, "Can't configure replicaset #{self.name}, host #{host} is already part of another replicaset."
-          end
-
-          # This node is alive and supposed to be a member of our set
-          Puppet.debug "Host #{self.name} is available for replset #{status['set']}"
-          true
-        elsif status.has_key?('info')
-          Puppet.debug "Host #{self.name} is alive but unconfigured: #{status['info']}"
-          true
-        end
-      rescue Puppet::ExecutionFailure
-        Puppet.warning "Can't connect to replicaset member #{host}."
-
-        false
-      end
-    end
-  end
-
-  def set_members
-    if @property_flush[:ensure] == :absent
-      # TODO: I don't know how to remove a node from a replset; unimplemented
-      #Puppet.debug "Removing all members from replset #{self.name}"
-      #@property_hash[:members].collect do |member|
-      #  rs_remove(member, master_host(@property_hash[:members]))
-      #end
-      return
-    end
-
-    if ! @property_flush[:members].empty?
-      # Find the alive members so we don't try to add dead members to the replset
-      alive_hosts = alive_members(@property_flush[:members])
-      dead_hosts  = @property_flush[:members] - alive_hosts
-      raise Puppet::Error, "Can't connect to any member of replicaset #{self.name}." if alive_hosts.empty?
-      Puppet.debug "Alive members: #{alive_hosts.inspect}"
-      Puppet.debug "Dead members: #{dead_hosts.inspect}" unless dead_hosts.empty?
-    else
-      alive_hosts = []
-    end
-
-    if @property_flush[:ensure] == :present and @property_hash[:ensure] != :present
-      Puppet.debug "Initializing the replset #{self.name}"
-
-      # Create a replset configuration
-      hostconf = alive_hosts.each_with_index.map do |host,id|
-        "{ _id: #{id}, host: \"#{host}\" }"
-      end.join(',')
-      conf = "{ _id: \"#{self.name}\", members: [ #{hostconf} ] }"
-
-      # Set replset members with the first host as the master
-      output = rs_initiate(conf, alive_hosts[0])
-      if output['ok'] == 0
-        raise Puppet::Error, "rs.initiate() failed for replicaset #{self.name}: #{output['errmsg']}"
-      end
-    else
-      # Add members to an existing replset
-      if master = master_host(alive_hosts)
-        current_hosts = db_ismaster(master)['hosts']
-        newhosts = alive_hosts - current_hosts
-        newhosts.each do |host|
-          output = rs_add(host, master)
-          if output['ok'] == 0
-            raise Puppet::Error, "rs.add() failed to add host to replicaset #{self.name}: #{output['errmsg']}"
-          end
-        end
-      else
-        raise Puppet::Error, "Can't find master host for replicaset #{self.name}."
-      end
-    end
-  end
-
-  def mongo_command(command, host, retries=4)
-    self.class.mongo_command(command,host,retries)
-  end
-
-  def self.mongo_command(command, host=nil, retries=4)
-    # Allow waiting for mongod to become ready
-    # Wait for 2 seconds initially and double the delay at each retry
-    wait = 2
-    begin
-      args = Array.new
-      args << '--quiet'
-      args << ['--host',host] if host
-      args << ['--eval',"printjson(#{command})"]
-      output = mongo(args.flatten)
-    rescue Puppet::ExecutionFailure => e
-      if e =~ /Error: couldn't connect to server/ and wait <= 2**max_wait
-        info("Waiting #{wait} seconds for mongod to become available")
-        sleep wait
-        wait *= 2
-        retry
-      else
-        raise
-      end
-    end
-
-    # Dirty hack to remove JavaScript objects
-    output.gsub!(/ISODate\((.+?)\)/, '\1 ')
-    output.gsub!(/Timestamp\((.+?)\)/, '[\1]')
-
-    #Hack to avoid non-json empty sets
-    output = "{}" if output == "null\n"
-
-    JSON.parse(output)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb
deleted file mode 100644
index 10e0bf7f07a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-Puppet::Type.type(:mongodb_user).provide(:mongodb) do
-
-  desc "Manage users for a MongoDB database."
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mongo => 'mongo'
-
-  def block_until_mongodb(tries = 10)
-    begin
-      mongo('--quiet', '--eval', 'db.getMongo()')
-    rescue
-      debug('MongoDB server not ready, retrying')
-      sleep 2
-      retry unless (tries -= 1) <= 0
-    end
-  end
-
-  def create
-    mongo(@resource[:database], '--eval', "db.system.users.insert({user:\"#{@resource[:name]}\", pwd:\"#{@resource[:password_hash]}\", roles: #{@resource[:roles].inspect}})")
-  end
-
-  def destroy
-    mongo(@resource[:database], '--quiet', '--eval', "db.removeUser(\"#{@resource[:name]}\")")
-  end
-
-  def exists?
-    block_until_mongodb(@resource[:tries])
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.find({user:\"#{@resource[:name]}\"}).count()").strip.eql?('1')
-  end
-
-  def password_hash
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.findOne({user:\"#{@resource[:name]}\"})[\"pwd\"]").strip
-  end
-
-  def password_hash=(value)
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.update({user:\"#{@resource[:name]}\"}, { $set: {pwd:\"#{value}\"}})")
-  end
-
-  def roles
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.findOne({user:\"#{@resource[:name]}\"})[\"roles\"]").strip.split(",").sort
-  end
-
-  def roles=(value)
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.update({user:\"#{@resource[:name]}\"}, { $set: {roles: #{@resource[:roles].inspect}}})")
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb
deleted file mode 100644
index 45c0f8fa238..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-Puppet::Type.newtype(:mongodb_database) do
-  @doc = "Manage MongoDB databases."
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the database."
-    newvalues(/^\w+$/)
-  end
-
-  newparam(:tries) do
-    desc "The maximum amount of two second tries to wait MongoDB startup."
-    defaultto 10
-    newvalues(/^\d+$/)
-    munge do |value|
-      Integer(value)
-    end
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb
deleted file mode 100644
index 8115ef034e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Author: François Charlier <francois.charlier@enovance.com>
-#
-
-Puppet::Type.newtype(:mongodb_replset) do
-  @doc = "Manage a MongoDB replicaSet"
-
-  ensurable do
-    defaultto :present
-
-    newvalue(:present) do
-      provider.create
-    end
-  end
-
-  newparam(:name) do
-    desc "The name of the replicaSet"
-  end
-
-  newproperty(:members, :array_matching => :all) do
-    desc "The replicaSet members"
-
-    def insync?(is)
-      is.sort == should.sort
-    end
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb
deleted file mode 100644
index 7f7e97b8430..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-Puppet::Type.newtype(:mongodb_user) do
-  @doc = 'Manage a MongoDB user. This includes management of users password as well as privileges.'
-
-  ensurable
-
-  def initialize(*args)
-    super
-    # Sort roles array before comparison.
-    self[:roles] = Array(self[:roles]).sort!
-  end
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the user."
-  end
-
-  newparam(:database) do
-    desc "The user's target database."
-    defaultto do
-      fail("Parameter 'database' must be set")
-    end
-    newvalues(/^\w+$/)
-  end
-
-  newparam(:tries) do
-    desc "The maximum amount of two second tries to wait MongoDB startup."
-    defaultto 10
-    newvalues(/^\d+$/)
-    munge do |value|
-      Integer(value)
-    end
-  end
-
-  newproperty(:roles, :array_matching => :all) do
-    desc "The user's roles."
-    defaultto ['dbAdmin']
-    newvalue(/^\w+$/)
-
-    # Pretty output for arrays.
-    def should_to_s(value)
-      value.inspect
-    end
-
-    def is_to_s(value)
-      value.inspect
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc "The password hash of the user. Use mongodb_password() for creating hash."
-    defaultto do
-      fail("Property 'password_hash' must be set. Use mongodb_password() for creating hash.")
-    end
-    newvalue(/^\w+$/)
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp
deleted file mode 100644
index de1b339c7d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Class for installing a MongoDB client shell (CLI).
-#
-# == Parameters
-#
-# [ensure] Desired ensure state of the package. Optional.
-#   Defaults to 'true'
-#
-# [package_name] Name of the package to install the client from. Default
-#   is repository dependent.
-#
-class mongodb::client (
-  $ensure       = $mongodb::params::ensure_client,
-  $package_name = $mongodb::params::client_package_name,
-) inherits mongodb::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      class { 'mongodb::client::install': }
-    }
-    'Debian': {
-      warning ('Debian client is included by default with server. Please use ::mongodb::server to install the mongo client for Debian family systems.')
-    }
-    default: {
-      # no action taken, failure happens in params.pp
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp
deleted file mode 100644
index 6da26003baf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::client::install {
-  $package_ensure = $mongodb::client::ensure
-  $package_name   = $mongodb::client::package_name
-
-  case $package_ensure {
-    true:     {
-      $my_package_ensure = 'present'
-    }
-    false:    {
-      $my_package_ensure = 'purged'
-    }
-    'absent': {
-      $my_package_ensure = 'purged'
-    }
-    default:  {
-      $my_package_ensure = $package_ensure
-    }
-  }
-
-  package { 'mongodb_client':
-    ensure  => $my_package_ensure,
-    name    => $package_name,
-    tag     => 'mongodb',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp
deleted file mode 100644
index 708f5d75e7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: mongodb::db
-#
-# Class for creating mongodb databases and users.
-#
-# == Parameters
-#
-#  user - Database username.
-#  password_hash - Hashed password. Hex encoded md5 hash of "$username:mongo:$password".
-#  password - Plain text user password. This is UNSAFE, use 'password_hash' unstead.
-#  roles (default: ['dbAdmin']) - array with user roles.
-#  tries (default: 10) - The maximum amount of two second tries to wait MongoDB startup.
-#
-define mongodb::db (
-  $user,
-  $password_hash = false,
-  $password      = false,
-  $roles         = ['dbAdmin'],
-  $tries         = 10,
-) {
-
-  mongodb_database { $name:
-    ensure   => present,
-    tries    => $tries,
-    require  => Class['mongodb::server'],
-  }
-
-  if $password_hash {
-    $hash = $password_hash
-  } elsif $password {
-    $hash = mongodb_password($user, $password)
-  } else {
-    fail("Parameter 'password_hash' or 'password' should be provided to mongodb::db.")
-  }
-
-  mongodb_user { $user:
-    ensure        => present,
-    password_hash => $hash,
-    database      => $name,
-    roles         => $roles,
-    require       => Mongodb_database[$name],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp
deleted file mode 100644
index fb04df694de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Class for setting cross-class global overrides. See README.md for more
-# details.
-
-class mongodb::globals (
-  $server_package_name  = undef,
-  $client_package_name  = undef,
-
-  $service_name         = undef,
-  $service_provider     = undef,
-  $service_status       = undef,
-
-  $user                 = undef,
-  $group                = undef,
-  $bind_ip              = undef,
-
-  $version              = undef,
-
-  $manage_package_repo  = undef,
-) {
-
-  # Setup of the repo only makes sense globally, so we are doing it here.
-  if($manage_package_repo) {
-    class { '::mongodb::repo':
-      ensure  => present,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp
deleted file mode 100644
index d489731b0d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp
+++ /dev/null
@@ -1,136 +0,0 @@
-# == Class: mongodb
-#
-# Direct use of this class is deprecated. Please use mongodb::server
-#
-# Manage mongodb installations on RHEL, CentOS, Debian and Ubuntu - either
-# installing from the 10Gen repo or from EPEL in the case of EL systems.
-#
-# === Parameters
-#
-# enable_10gen (default: false) - Whether or not to set up 10gen software repositories
-# init (auto discovered) - override init (sysv or upstart) for Debian derivatives
-# location - override apt location configuration for Debian derivatives
-# packagename (auto discovered) - override the package name
-# servicename (auto discovered) - override the service name
-# service-enable (default: true) - Enable the service and ensure it is running
-#
-# === Examples
-#
-# To install with defaults from the distribution packages on any system:
-#   include mongodb
-#
-# To install from 10gen on a EL server
-#   class { 'mongodb':
-#     enable_10gen => true,
-#   }
-#
-# === Authors
-#
-# Craig Dunn <craig@craigdunn.org>
-#
-# === Copyright
-#
-# Copyright 2013 PuppetLabs
-#
-
-class mongodb (
-  # Deprecated parameters
-  $enable_10gen    = undef,
-
-  $init            = $mongodb::params::service_provider,
-  $location        = '',
-  $packagename     = undef,
-  $version         = undef,
-  $servicename     = $mongodb::params::service_name,
-  $service_enable  = true, #deprecated
-  $logpath         = $mongodb::params::logpath,
-  $logappend       = true,
-  $fork            = $mongodb::params::fork,
-  $port            = 27017,
-  $dbpath          = $mongodb::params::dbpath,
-  $journal         = undef,
-  $nojournal       = undef,
-  $smallfiles      = undef,
-  $cpu             = undef,
-  $noauth          = undef,
-  $auth            = undef,
-  $verbose         = undef,
-  $objcheck        = undef,
-  $quota           = undef,
-  $oplog           = undef, #deprecated it's on if replica set
-  $oplog_size      = undef,
-  $nohints         = undef,
-  $nohttpinterface = undef,
-  $noscripting     = undef,
-  $notablescan     = undef,
-  $noprealloc      = undef,
-  $nssize          = undef,
-  $mms_token       = undef,
-  $mms_name        = undef,
-  $mms_interval    = undef,
-  $slave           = undef,
-  $only            = undef,
-  $master          = undef,
-  $source          = undef,
-  $replset         = undef,
-  $rest            = undef,
-  $slowms          = undef,
-  $keyfile         = undef,
-  $bind_ip         = undef,
-  $pidfilepath     = undef
-) inherits mongodb::params {
-
-  if $enable_10gen {
-    fail("Parameter enable_10gen is no longer supported. Please use class { 'mongodb::globals': manage_package_repo => true }")
-  }
-
-  if $version {
-    fail("Parameter version is no longer supported. Please use class { 'mongodb::globals': version => VERSION }")
-  }
-
-  if $oplog {
-    fail('Parameter is no longer supported. On replica set Oplog is enabled by default.')
-  }
-
-  notify { 'An attempt has been made below to automatically apply your custom
-    settings to mongodb::server. Please verify this works in a safe test
-    environment.': }
-
-  class { 'mongodb::server':
-    package_name    => $packagename,
-    logpath         => $logpath,
-    logappend       => $logappend,
-    fork            => $fork,
-    port            => $port,
-    dbpath          => $dbpath,
-    journal         => $journal,
-    nojournal       => $nojournal,
-    smallfiles      => $smallfiles,
-    cpu             => $cpu,
-    noauth          => $noauth,
-    verbose         => $verbose,
-    objcheck        => $objcheck,
-    quota           => $quota,
-    oplog_size      => $oplog_size,
-    nohints         => $nohints,
-    nohttpinterface => $nohttpinterface,
-    noscripting     => $noscripting,
-    notablescan     => $notablescan,
-    noprealloc      => $noprealloc,
-    nssize          => $nssize,
-    mms_token       => $mms_token,
-    mms_name        => $mms_name,
-    mms_interval    => $mms_interval,
-    slave           => $slave,
-    only            => $only,
-    master          => $master,
-    source          => $source,
-    replset         => $replset,
-    rest            => $rest,
-    slowms          => $slowms,
-    keyfile         => $keyfile,
-    bind_ip         => $bind_ip,
-    pidfilepath     => $pidfilepath,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp
deleted file mode 100644
index 5afc4845e35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::params inherits mongodb::globals {
-  $ensure           = true
-  $service_status   = $service_status
-  $ensure_client    = true
-
-  # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
-  case $::osfamily {
-    'RedHat', 'Linux': {
-
-      if $mongodb::globals::manage_package_repo {
-        $user        = pick($user, 'mongod')
-        $group       = pick($group, 'mongod')
-        if $::mongodb::globals::version {
-          $server_package_name = "mongodb-org-server-${::mongodb::globals::version}"
-          $client_package_name = "mongodb-org-${::mongodb::globals::version}"
-        } else {
-          $server_package_name = 'mongodb-org-server'
-          $client_package_name = 'mongodb-org'
-        }
-        $service_name = pick($service_name, 'mongod')
-        $config      = '/etc/mongod.conf'
-        $dbpath      = '/var/lib/mongo'
-        $logpath     = '/var/log/mongodb/mongod.log'
-        $pidfilepath = '/var/run/mongodb/mongod.pid'
-        $bind_ip     = pick($bind_ip, ['127.0.0.1'])
-        $fork        = true
-      } else {
-        # RedHat/CentOS doesn't come with a prepacked mongodb
-        # so we assume that you are using EPEL repository.
-        $user                = pick($user, 'mongodb')
-        $group               = pick($group, 'mongodb')
-        $server_package_name = pick($server_package_name, 'mongodb-server')
-        $client_package_name = pick($client_package_name, 'mongodb')
-
-        $service_name        = pick($service_name, 'mongod')
-        $config              = '/etc/mongodb.conf'
-        $dbpath              = '/var/lib/mongodb'
-        $logpath             = '/var/log/mongodb/mongodb.log'
-        $bind_ip             = pick($bind_ip, ['127.0.0.1'])
-        $pidfilepath         = '/var/run/mongodb/mongodb.pid'
-        $fork                = true
-        $journal             = true
-      }
-    }
-    'Debian': {
-      if $mongodb::globals::manage_package_repo {
-        $user  = pick($user, 'mongodb')
-        $group = pick($group, 'mongodb')
-        if $::mongodb::globals::version {
-          $server_package_name = "mongodb-10gen=${::mongodb::globals::version}"
-        } else {
-          $server_package_name = 'mongodb-10gen'
-        }
-        $service_name = 'mongodb'
-        $config       = '/etc/mongodb.conf'
-        $dbpath       = '/var/lib/mongodb'
-        $logpath      = '/var/log/mongodb/mongodb.log'
-        $bind_ip      = ['127.0.0.1']
-      } else {
-        # although we are living in a free world,
-        # I would not recommend to use the prepacked
-        # mongodb server on Ubuntu 12.04 or Debian 6/7,
-        # because its really outdated
-        $user                = pick($user, 'mongodb')
-        $group               = pick($group, 'mongodb')
-        $server_package_name = pick($server_package_name, 'mongodb-server')
-        $client_package_name = pick($client_package_name, 'mongodb')
-        $service_name        = pick($service_name, 'mongodb')
-        $config              = '/etc/mongodb.conf'
-        $dbpath              = '/var/lib/mongodb'
-        $logpath             = '/var/log/mongodb/mongodb.log'
-        $bind_ip             = pick($bind_ip, ['127.0.0.1'])
-        $pidfilepath         = undef
-      }
-      # avoid using fork because of the init scripts design
-      $fork = undef
-    }
-    default: {
-      fail("Osfamily ${::osfamily} and ${::operatingsystem} is not supported")
-    }
-  }
-
-  case $::operatingsystem {
-    'Ubuntu': {
-      $service_provider = pick($service_provider, 'upstart')
-    }
-    default: {
-      $service_provider = undef
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp
deleted file mode 100644
index ce4a0255579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrapper class useful for hiera based deployments
-
-class mongodb::replset(
-  $sets = undef
-) {
-
-  if $sets {
-    create_resources(mongodb_replset, $sets)
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp
deleted file mode 100644
index ecd6de1b71c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo (
-  $ensure  = $mongodb::params::ensure,
-) inherits mongodb::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      $location = $::architecture ? {
-        'x86_64' => 'http://downloads-distro.mongodb.org/repo/redhat/os/x86_64/',
-        'i686'   => 'http://downloads-distro.mongodb.org/repo/redhat/os/i686/',
-        'i386'   => 'http://downloads-distro.mongodb.org/repo/redhat/os/i686/',
-        default  => undef
-      }
-      class { 'mongodb::repo::yum': }
-    }
-
-    'Debian': {
-      $location = $::operatingsystem ? {
-        'Debian' => 'http://downloads-distro.mongodb.org/repo/debian-sysvinit',
-        'Ubuntu' => 'http://downloads-distro.mongodb.org/repo/ubuntu-upstart',
-        default  => undef
-      }
-      class { 'mongodb::repo::apt': }
-    }
-
-    default: {
-      if($ensure == 'present' or $ensure == true) {
-        fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily RedHat, Debian and Ubuntu")
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp
deleted file mode 100644
index e8f4b812f91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo::apt inherits mongodb::repo {
-  # we try to follow/reproduce the instruction
-  # from http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
-
-  include ::apt
-
-  if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) {
-    apt::source { 'downloads-distro.mongodb.org':
-      location    => $::mongodb::repo::location,
-      release     => 'dist',
-      repos       => '10gen',
-      key         => '9ECBEC467F0CEB10',
-      key_server  => 'keyserver.ubuntu.com',
-      include_src => false,
-    }
-
-    Apt::Source['downloads-distro.mongodb.org']->Package<|tag == 'mongodb'|>
-  }
-  else {
-    apt::source { 'downloads-distro.mongodb.org':
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp
deleted file mode 100644
index 3a3f6b5d849..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo::yum inherits mongodb::repo {
-  # We try to follow/reproduce the instruction
-  # http://docs.mongodb.org/manual/tutorial/install-mongodb-on-red-hat-centos-or-fedora-linux/
-
-  if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) {
-    yumrepo { 'mongodb':
-      descr    => 'MongoDB/10gen Repository',
-      baseurl  => $::mongodb::repo::location,
-      gpgcheck => '0',
-      enabled  => '1',
-    }
-    Yumrepo['mongodb'] -> Package<|tag == 'mongodb'|>
-  }
-  else {
-    yumrepo { 'mongodb':
-      enabled => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp
deleted file mode 100644
index 04c576a1398..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# This installs a MongoDB server. See README.md for more details.
-class mongodb::server (
-  $ensure           = $mongodb::params::ensure,
-
-  $user             = $mongodb::params::user,
-  $group            = $mongodb::params::group,
-
-  $config           = $mongodb::params::config,
-  $dbpath           = $mongodb::params::dbpath,
-  $pidfilepath      = $mongodb::params::pidfilepath,
-
-  $service_provider = $mongodb::params::service_provider,
-  $service_name     = $mongodb::params::service_name,
-  $service_status   = $mongodb::params::service_status,
-
-  $package_ensure  = $ensure,
-  $package_name    = $mongodb::params::server_package_name,
-
-  $logpath         = $mongodb::params::logpath,
-  $bind_ip         = $mongodb::params::bind_ip,
-  $logappend       = true,
-  $fork            = $mongodb::params::fork,
-  $port            = 27017,
-  $journal         = $mongodb::params::journal,
-  $nojournal       = undef,
-  $smallfiles      = undef,
-  $cpu             = undef,
-  $auth            = false,
-  $noauth          = undef,
-  $verbose         = undef,
-  $verbositylevel  = undef,
-  $objcheck        = undef,
-  $quota           = undef,
-  $quotafiles      = undef,
-  $diaglog         = undef,
-  $directoryperdb  = undef,
-  $profile         = undef,
-  $maxconns        = undef,
-  $oplog_size      = undef,
-  $nohints         = undef,
-  $nohttpinterface = undef,
-  $noscripting     = undef,
-  $notablescan     = undef,
-  $noprealloc      = undef,
-  $nssize          = undef,
-  $mms_token       = undef,
-  $mms_name        = undef,
-  $mms_interval    = undef,
-  $replset         = undef,
-  $rest            = undef,
-  $slowms          = undef,
-  $keyfile         = undef,
-  $set_parameter   = undef,
-  $syslog          = undef,
-
-  # Deprecated parameters
-  $master          = undef,
-  $slave           = undef,
-  $only            = undef,
-  $source          = undef,
-) inherits mongodb::params {
-
-
-  if ($ensure == 'present' or $ensure == true) {
-    anchor { 'mongodb::server::start': }->
-    class { 'mongodb::server::install': }->
-    class { 'mongodb::server::config': }->
-    class { 'mongodb::server::service': }->
-    anchor { 'mongodb::server::end': }
-  } else {
-    anchor { 'mongodb::server::start': }->
-    class { 'mongodb::server::service': }->
-    class { 'mongodb::server::config': }->
-    class { 'mongodb::server::install': }->
-    anchor { 'mongodb::server::end': }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp
deleted file mode 100644
index 2056c14d546..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp
+++ /dev/null
@@ -1,92 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::config {
-  $ensure          = $mongodb::server::ensure
-  $user            = $mongodb::server::user
-  $group           = $mongodb::server::group
-  $config          = $mongodb::server::config
-
-  $dbpath          = $mongodb::server::dbpath
-  $pidfilepath     = $mongodb::server::pidfilepath
-  $logpath         = $mongodb::server::logpath
-  $logappend       = $mongodb::server::logappend
-  $fork            = $mongodb::server::fork
-  $port            = $mongodb::server::port
-  $journal         = $mongodb::server::journal
-  $nojournal       = $mongodb::server::nojournal
-  $smallfiles      = $mongodb::server::smallfiles
-  $cpu             = $mongodb::server::cpu
-  $auth            = $mongodb::server::auth
-  $noath           = $mongodb::server::noauth
-  $verbose         = $mongodb::server::verbose
-  $verbositylevel  = $mongodb::server::verbositylevel
-  $objcheck        = $mongodb::server::objcheck
-  $quota           = $mongodb::server::quota
-  $quotafiles      = $mongodb::server::quotafiles
-  $diaglog         = $mongodb::server::diaglog
-  $oplog_size      = $mongodb::server::oplog_size
-  $nohints         = $mongodb::server::nohints
-  $nohttpinterface = $mongodb::server::nohttpinterface
-  $noscripting     = $mongodb::server::noscripting
-  $notablescan     = $mongodb::server::notablescan
-  $noprealloc      = $mongodb::server::noprealloc
-  $nssize          = $mongodb::server::nssize
-  $mms_token       = $mongodb::server::mms_token
-  $mms_name        = $mongodb::server::mms_name
-  $mms_interval    = $mongodb::server::mms_interval
-  $master          = $mongodb::server::master
-  $slave           = $mongodb::server::slave
-  $only            = $mongodb::server::only
-  $source          = $mongodb::server::source
-  $replset         = $mongodb::server::replset
-  $rest            = $mongodb::server::rest
-  $slowms          = $mongodb::server::slowms
-  $keyfile         = $mongodb::server::keyfile
-  $bind_ip         = $mongodb::server::bind_ip
-  $directoryperdb  = $mongodb::server::directoryperdb
-  $profile         = $mongodb::server::profile
-  $set_parameter   = $mongodb::server::set_parameter
-  $syslog          = $mongodb::server::syslog
-
-  File {
-    owner => $user,
-    group => $group,
-  }
-
-  if ($logpath and $syslog) { fail('You cannot use syslog with logpath')}
-
-  if ($ensure == 'present' or $ensure == true) {
-
-    # Exists for future compatibility and clarity.
-    if $auth {
-      $noauth = false
-    }
-    else {
-      $noauth = true
-    }
-
-    file { $config:
-      content => template('mongodb/mongodb.conf.erb'),
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      notify  => Class['mongodb::server::service']
-    }
-
-    file { $dbpath:
-      ensure  => directory,
-      mode    => '0755',
-      owner   => $user,
-      group   => $group,
-      require => File[$config]
-    }
-  } else {
-    file { $dbpath:
-      ensure => absent,
-      force  => true,
-      backup => false,
-    }
-    file { $config:
-      ensure => absent
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp
deleted file mode 100644
index 46b0e749b17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::install {
-  $package_ensure = $mongodb::server::package_ensure
-  $package_name   = $mongodb::server::package_name
-
-  case $package_ensure {
-    true:     {
-      $my_package_ensure = 'present'
-      $file_ensure     = 'directory'
-    }
-    false:    {
-      $my_package_ensure = 'absent'
-      $file_ensure     = 'absent'
-    }
-    'absent': {
-      $my_package_ensure = 'absent'
-      $file_ensure     = 'absent'
-    }
-    'purged': {
-      $my_package_ensure = 'purged'
-      $file_ensure     = 'absent'
-    }
-    default:  {
-      $my_package_ensure = $package_ensure
-      $file_ensure     = 'present'
-    }
-  }
-
-  package { 'mongodb_server':
-    ensure  => $my_package_ensure,
-    name    => $package_name,
-    tag     => 'mongodb',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp
deleted file mode 100644
index 8cb4a48ef5e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::service {
-  $ensure           = $mongodb::server::ensure
-  $service_name     = $mongodb::server::service_name
-  $service_provider = $mongodb::server::service_provider
-  $service_status   = $mongodb::server::service_status
-
-  $service_ensure = $ensure ? {
-    present => true,
-    absent  => false,
-    purged  => false,
-    default => $ensure
-  }
-
-  service { 'mongodb':
-    ensure    => $service_ensure,
-    name      => $service_name,
-    enable    => $service_ensure,
-    provider  => $service_provider,
-    hasstatus => true,
-    status    => $service_status,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml
deleted file mode 100644
index ae19ee77c81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-HOSTS:
-  'master':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-  'slave':
-    roles:
-      - slave
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml
deleted file mode 100644
index ae19ee77c81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-HOSTS:
-  'master':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-  'slave':
-    roles:
-      - slave
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb
deleted file mode 100644
index 8be5a0f4638..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper_acceptance'
-
-if hosts.length > 1
-  describe 'mongodb_replset resource' do
-    after :all do
-      # Have to drop the DB to disable replsets for further testing
-      on hosts, %{mongo local --verbose --eval 'db.dropDatabase()'}
-
-      pp = <<-EOS
-        class { 'mongodb::globals': }
-        -> class { 'mongodb::server':
-          ensure => purged,
-        }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
-        }
-      EOS
-
-      apply_manifest_on(hosts.reverse, pp, :catch_failures => true)
-    end
-
-    it 'configures mongo on both nodes' do
-      pp = <<-EOS
-        class { 'mongodb::globals': }
-        -> class { 'mongodb::server':
-          bind_ip => '0.0.0.0',
-          replset => 'test',
-        }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
-        }
-      EOS
-
-      apply_manifest_on(hosts.reverse, pp, :catch_failures => true)
-      apply_manifest_on(hosts.reverse, pp, :catch_changes  => true)
-    end
-
-    it 'sets up the replset with puppet' do
-      pp = <<-EOS
-        mongodb_replset { 'test':
-          members => [#{hosts.collect{|x|"'#{x}:27017'"}.join(',')}],
-        }
-      EOS
-      apply_manifest_on(hosts_as('master'), pp, :catch_failures => true)
-      on(hosts_as('master'), 'mongo --quiet --eval "printjson(rs.conf())"') do |r|
-        expect(r.stdout).to match /#{hosts[0]}:27017/
-        expect(r.stdout).to match /#{hosts[1]}:27017/
-      end
-    end
-
-    it 'inserts data on the master' do
-      sleep(30)
-      on hosts_as('master'), %{mongo --verbose --eval 'db.test.save({name:"test1",value:"some value"})'}
-    end
-
-    it 'checks the data on the master' do
-      on hosts_as('master'), %{mongo --verbose --eval 'printjson(db.test.findOne({name:"test1"}))'} do |r|
-        expect(r.stdout).to match /some value/
-      end
-    end
-
-    it 'checks the data on the slave' do
-      sleep(10)
-      on hosts_as('slave'), %{mongo --verbose --eval 'rs.slaveOk(); printjson(db.test.findOne({name:"test1"}))'} do |r|
-        expect(r.stdout).to match /some value/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb
deleted file mode 100644
index c1132f594cd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mongodb::server class' do
-
-  shared_examples 'normal tests' do |tengen|
-    if tengen
-      case fact('osfamily')
-      when 'RedHat'
-        package_name = 'mongodb-org-server'
-        service_name = 'mongod'
-        config_file  = '/etc/mongod.conf'
-      when 'Debian'
-        package_name = 'mongodbdb-org-10gen'
-        service_name = 'mongodb'
-        config_file  = '/etc/mongodb.conf'
-      end
-    else
-      case fact('osfamily')
-      when 'RedHat'
-        package_name = 'mongodb-server'
-        service_name = 'mongod'
-        config_file  = '/etc/mongodb.conf'
-      when 'Debian'
-        package_name = 'mongodb-server'
-        service_name = 'mongodb'
-        config_file  = '/etc/mongodb.conf'
-      end
-    end
-
-    client_name  = 'mongo --version'
-
-    context "default parameters with 10gen => #{tengen}" do
-      after :all do
-        if tengen
-          puts "XXX uninstalls mongodb because changing the port with tengen doesn't work because they have a crappy init script"
-          pp = <<-EOS
-            class {'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': ensure => absent, }
-            -> class { 'mongodb::client': ensure => absent, }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-
-      it 'should work with no errors' do
-        case fact('osfamily')
-        when 'RedHat'
-          pp = <<-EOS
-            class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': }
-            -> class { 'mongodb::client': }
-          EOS
-        when 'Debian'
-          pp = <<-EOS
-            class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': }
-          EOS
-        end
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes  => true)
-      end
-
-      describe package(package_name) do
-        it { should be_installed }
-      end
-
-      describe file(config_file) do
-        it { should be_file }
-      end
-
-      describe service(service_name) do
-         it { should be_enabled }
-         it { should be_running }
-      end
-
-      describe port(27017) do
-        it do
-          sleep(20)
-          should be_listening
-        end
-      end
-
-      describe command(client_name) do
-        it do
-          should return_exit_status 0
-        end
-      end
-    end
-
-    context "test using custom port and 10gen => #{tengen}" do
-      it 'change port to 27018' do
-        pp = <<-EOS
-          class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-          -> class { 'mongodb::server': port => 27018, }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes  => true)
-      end
-
-      describe port(27018) do
-        sleep(20)
-        it { sleep 5 ; should be_listening }
-      end
-    end
-
-    describe "uninstalling with 10gen => #{tengen}" do
-      it 'uninstalls mongodb' do
-        pp = <<-EOS
-          class {'mongodb::globals': manage_package_repo => #{tengen}, }
-          -> class { 'mongodb::server': ensure => absent, }
-          -> class { 'mongodb::client': ensure => absent, }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-
-  it_behaves_like 'normal tests', false
-  it_behaves_like 'normal tests', true
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb
deleted file mode 100644
index 5fe4bfa7cc5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::client::install', :type => :class do
-  describe 'it should create package' do
-    let(:pre_condition) { ["class mongodb::client { $ensure = true $package_name = 'mongodb' }", "include mongodb::client"]}
-    it {
-      should contain_package('mongodb_client').with({
-        :ensure => 'present',
-        :name   => 'mongodb',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb
deleted file mode 100644
index aa051e915f2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::repo', :type => :class do
-
-  context 'when deploying on Debian' do
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-        :operatingsystem => 'Debian',
-        :lsbdistid       => 'Debian',
-      }
-    end
-
-    it {
-      should contain_class('mongodb::repo::apt')
-    }
-  end
-
-  context 'when deploying on CentOS' do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-        :operatingsystem => 'CentOS',
-      }
-    end
-
-    it {
-      should contain_class('mongodb::repo::yum')
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb
deleted file mode 100644
index db05b88e310..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server::config', :type => :class do
-
-  describe 'with preseted variables' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf')
-    }
-
-  end
-
-  describe 'with default values' do
-    let(:pre_condition) {[ "class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $user = 'mongod' $group = 'mongod' $port = 29017 $bind_ip = ['0.0.0.0'] $fork = true $logpath ='/var/log/mongo/mongod.log' $logappend = true }",  "include mongodb::server" ]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with({
-        :mode   => '0644',
-        :owner  => 'root',
-        :group  => 'root'
-      })
-
-      should contain_file('/etc/mongod.conf').with_content(/^dbpath=\/var\/lib\/mongo/)
-      should contain_file('/etc/mongod.conf').with_content(/bind_ip\s=\s0\.0\.0\.0/)
-      should contain_file('/etc/mongod.conf').with_content(/^port = 29017$/)
-      should contain_file('/etc/mongod.conf').with_content(/^logappend=true/)
-      should contain_file('/etc/mongod.conf').with_content(/^logpath=\/var\/log\/mongo\/mongod\.log/)
-      should contain_file('/etc/mongod.conf').with_content(/^fork=true/)
-    }
-  end
-
-  describe 'with absent ensure' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = absent }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with({ :ensure => 'absent' })
-    }
-
-  end
-
-  describe 'with specific bind_ip values' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $bind_ip = ['127.0.0.1', '10.1.1.13']}", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/bind_ip\s=\s127\.0\.0\.1\,10\.1\.1\.13/)
-    }
-  end
-
-  describe 'when specifying auth to true' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $auth = true $dbpath = '/var/lib/mongo' $ensure = present }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/^auth=true/)
-    }
-  end
-  
-  describe 'when specifying set_parameter value' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $set_parameter = 'textSearchEnable=true' $dbpath = '/var/lib/mongo' $ensure = present }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/^setParameter = textSearchEnable=true/)
-    }
-  end
-
-  describe 'with journal:' do
-    context 'on true with i686 architecture' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $journal = true }", "include mongodb::server"]}
-      let (:facts) { { :architecture => 'i686' } }
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^journal = true/)
-      }
-    end
-  end
-
-  # check nested quota and quotafiles
-  describe 'with quota to' do
-
-    context 'true and without quotafiles' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $quota = true }", "include mongodb::server"]}
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^quota = true/)
-      }
-    end
-
-    context 'true and with quotafiles' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $quota = true $quotafiles = 1 }", "include mongodb::server"]}
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/quota = true/)
-        should contain_file('/etc/mongod.conf').with_content(/quotaFiles = 1/)
-      }
-    end
-  end
-
-  describe 'when specifying syslog value' do
-    context 'it should be set to true' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $syslog = true }", "include mongodb::server"]}
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^syslog = true/)
-      }
-    end
-
-    context 'if logpath is also set an error should be raised' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $syslog = true $logpath ='/var/log/mongo/mongod.log' }", "include mongodb::server"]}
-
-      it {
-        expect { should contain_file('/etc/mongod.conf') }.to raise_error(Puppet::Error, /You cannot use syslog with logpath/)
-      }
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb
deleted file mode 100644
index 5ca01a90e42..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server::install', :type => :class do
-
-  describe 'it should create package and dbpath file' do
-    let(:pre_condition) { ["class mongodb::server { $package_ensure = true $dbpath = '/var/lib/mongo' $user = 'mongodb' $package_name = 'mongodb-server' }", "include mongodb::server"]}
-
-    it {
-      should contain_package('mongodb_server').with({
-        :ensure => 'present',
-        :name   => 'mongodb-server',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb
deleted file mode 100644
index c74e7f0c166..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server' do
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'Debian',
-    }
-  end
-
-  context 'with defaults' do
-    it { should contain_class('mongodb::server::install') }
-    it { should contain_class('mongodb::server::config') }
-  end
-
-  context 'when deploying on Solaris' do
-    let :facts do
-      { :osfamily        => 'Solaris' }
-    end
-    it { expect { should raise_error(Puppet::Error) } }
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb
deleted file mode 100644
index 65a6f105238..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::db', :type => :define do
-  let(:title) { 'testdb' }
-
-  let(:params) {
-    { 'user'     => 'testuser',
-      'password' => 'testpass',
-    }
-  }
-
-  it 'should contain mongodb_database with mongodb::server requirement' do
-    should contain_mongodb_database('testdb')\
-      .with_require('Class[Mongodb::Server]')
-  end
-
-  it 'should contain mongodb_user with mongodb_database requirement' do
-    should contain_mongodb_user('testuser')\
-      .with_require('Mongodb_database[testdb]')
-  end
-
-  it 'should contain mongodb_user with proper database name' do
-    should contain_mongodb_user('testuser')\
-      .with_database('testdb')
-  end
-
-  it 'should contain mongodb_user with proper roles' do
-    params.merge!({'roles' => ['testrole1', 'testrole2']})
-    should contain_mongodb_user('testuser')\
-      .with_roles(["testrole1", "testrole2"])
-  end
-
-  it 'should prefer password_hash instead of password' do
-    params.merge!({'password_hash' => 'securehash'})
-    should contain_mongodb_user('testuser')\
-      .with_password_hash('securehash')
-  end
-
-  it 'should contain mongodb_database with proper tries param' do
-    params.merge!({'tries' => 5})
-    should contain_mongodb_database('testdb').with_tries(5)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb
deleted file mode 100755
index c1c09a9b74e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-    on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
-  else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'mongodb')
-    on hosts, 'puppet module install puppetlabs-stdlib'
-    on hosts, 'puppet module install puppetlabs-apt'
-    case fact('osfamily')
-    when 'RedHat'
-      on hosts, 'puppet module install stahnma-epel'
-      apply_manifest_on hosts, 'include epel'
-    end
-    on hosts, 'service iptables stop'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb
deleted file mode 100644
index 7e2c48fb5e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-include Serverspec::Helper::RSpecSystem
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mongodb')
-    shell('puppet module install puppetlabs-stdlib')
-    shell('puppet module install puppetlabs-apt')
-
-    case node.facts['osfamily']
-    when 'RedHat'
-      shell('puppet module install stahnma-epel')
-      puppet_apply('include epel')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb
deleted file mode 100644
index 5b0b825e565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'the mongodb_password function' do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'should exist' do
-    Puppet::Parser::Functions.function('mongodb_password').should == 'function_mongodb_password'
-  end
-
-  it 'should raise a ParseError if there no arguments' do
-    lambda { scope.function_mongodb_password([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should raise a ParseError if there is more than 2 arguments' do
-    lambda { scope.function_mongodb_password(%w(foo bar baz)) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should convert password into a hash' do
-    result = scope.function_mongodb_password(%w(user pass))
-    result.should(eq('e0c4a7b97d4db31f5014e9694e567d6b'))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb
deleted file mode 100644
index 4376ada54b9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_database).provider(:mongodb) do
-
-  let(:resource) { Puppet::Type.type(:mongodb_database).new(
-    { :ensure   => :present,
-      :name     => 'new_database',
-      :provider => described_class.name
-    }
-  )}
-
-  let(:provider) { resource.provider }
-
-  describe 'create' do
-    it 'makes a database' do
-      provider.expects(:mongo)
-      provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a database' do
-      provider.expects(:mongo)
-      provider.destroy
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if database exists' do
-      provider.expects(:mongo).at_least(2).returns("db1,new_database,db2")
-      provider.exists?.should be_true
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb
deleted file mode 100644
index 51b3f9effe2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# Authors: Emilien Macchi <emilien.macchi@enovance.com>
-#          Francois Charlier <francois.charlier@enovance.com>
-#
-
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_replset).provider(:mongo) do
-
-  valid_members = ['mongo1:27017', 'mongo2:27017', 'mongo3:27017']
-
-  let(:resource) { Puppet::Type.type(:mongodb_replset).new(
-    { :ensure        => :present,
-      :name          => 'rs_test',
-      :members       => valid_members,
-      :provider      => :mongo
-    }
-  )}
-
-  let(:resources) { { 'rs_test' => resource } }
-  let(:provider) { described_class.new(resource) }
-
-  describe '#create' do
-    it 'should create a replicaset' do
-      provider.class.stubs(:get_replset_properties)
-      provider.stubs(:alive_members).returns(valid_members)
-      provider.expects('rs_initiate').with("{ _id: \"rs_test\", members: [ { _id: 0, host: \"mongo1:27017\" },{ _id: 1, host: \"mongo2:27017\" },{ _id: 2, host: \"mongo3:27017\" } ] }", "mongo1:27017").returns(
-        { "info" => "Config now saved locally.  Should come online in about a minute.",
-          "ok"   => 1 } )
-      provider.create
-      provider.flush
-    end
-  end
-
-  describe '#exists?' do
-    describe 'when the replicaset does not exist' do
-      it 'returns false' do
-        provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"startupStatus" : 3,
-	"info" : "run rs.initiate(...) if not yet done for the set",
-	"ok" : 0,
-	"errmsg" : "can't get local.system.replset config from self or any seed (EMPTYCONFIG)"
-}
-EOT
-        provider.class.prefetch(resources)
-        resource.provider.exists?.should be_false
-      end
-    end
-
-    describe 'when the replicaset exists' do
-      it 'returns true' do
-        provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"_id" : "rs_test",
-	"version" : 1,
-	"members" : [ ]
-}
-EOT
-        provider.class.prefetch(resources)
-        resource.provider.exists?.should be_true
-      end
-    end
-  end
-
-  describe '#members' do
-    it 'returns the members of a configured replicaset' do
-      provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"_id" : "rs_test",
-	"version" : 1,
-	"members" : [
-		{
-			"_id" : 0,
-			"host" : "mongo1:27017"
-		},
-		{
-			"_id" : 1,
-			"host" : "mongo2:27017"
-		},
-		{
-			"_id" : 2,
-			"host" : "mongo3:27017"
-		}
-	]
-}
-EOT
-      provider.class.prefetch(resources)
-      resource.provider.members.should =~ valid_members
-    end
-  end
-
-  describe 'members=' do
-    before :each do
-      provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"setName" : "rs_test",
-	"ismaster" : true,
-	"secondary" : false,
-	"hosts" : [
-		"mongo1:27017"
-	],
-	"primary" : "mongo1:27017",
-	"me" : "mongo1:27017",
-	"maxBsonObjectSize" : 16777216,
-	"maxMessageSizeBytes" : 48000000,
-	"localTime" : ISODate("2014-01-10T19:31:51.281Z"),
-	"ok" : 1
-}
-EOT
-    end
-
-    it 'adds missing members to an existing replicaset' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_test" })
-      provider.expects('rs_add').times(2).returns({ 'ok' => 1 })
-      provider.members=(valid_members)
-      provider.flush
-    end
-
-    it 'raises an error when the master host is not available' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_test" })
-      provider.stubs(:db_ismaster).returns({ "primary" => false })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, "Can't find master host for replicaset #{resource[:name]}.")
-    end
-
-    it 'raises an error when at least one member is not running with --replSet' do
-      provider.stubs(:rs_status).returns({ "ok" => 0, "errmsg" => "not running with --replSet" })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, /is not supposed to be part of a replicaset\.$/)
-    end
-
-    it 'raises an error when at least one member is configured with another replicaset name' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_another" })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, /is already part of another replicaset\.$/)
-    end
-
-    it 'raises an error when no member is available' do
-      provider.class.stubs(:mongo_command).raises(Puppet::ExecutionFailure, <<EOT)
-Fri Jan 10 20:20:33.995 Error: couldn't connect to server localhost:9999 at src/mongo/shell/mongo.js:147
-exception: connect failed
-EOT
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, "Can't connect to any member of replicaset #{resource[:name]}.")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
deleted file mode 100644
index 997b6cae6cd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_user).provider(:mongodb) do
-
-  let(:resource) { Puppet::Type.type(:mongodb_user).new(
-    { :ensure        => :present,
-      :name          => 'new_user',
-      :database      => 'new_database',
-      :password_hash => 'pass',
-      :roles         => ['role1', 'role2'],
-      :provider      => described_class.name
-    }
-  )}
-
-  let(:provider) { resource.provider }
-
-  describe 'create' do
-    it 'creates a user' do
-      provider.expects(:mongo)
-      provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user' do
-      provider.expects(:mongo)
-      provider.destroy
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      provider.expects(:mongo).at_least(2).returns("1")
-      provider.exists?.should be_true
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a password_hash' do
-      provider.expects(:mongo).returns("pass\n")
-      provider.password_hash.should == "pass"
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes a password_hash' do
-      provider.expects(:mongo)
-      provider.password_hash=("newpass")
-    end
-  end
-
-  describe 'roles' do
-    it 'returns a sorted roles' do
-      provider.expects(:mongo).returns("role2,role1\n")
-      provider.roles.should == ['role1','role2']
-    end
-  end
-
-  describe 'roles=' do
-    it 'changes a roles' do
-      provider.expects(:mongo)
-      provider.roles=(['role3','role4'])
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb
deleted file mode 100644
index 245a1becf1f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'puppet'
-require 'puppet/type/mongodb_database'
-describe Puppet::Type.type(:mongodb_database) do
-
-  before :each do
-    @db = Puppet::Type.type(:mongodb_database).new(:name => 'test')
-  end
-
-  it 'should accept a database name' do
-    @db[:name].should == 'test'
-  end
-
-  it 'should accept a tries parameter' do
-    @db[:tries] = 5
-    @db[:tries].should == 5
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_database).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb
deleted file mode 100644
index f9b72d42361..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Author: Emilien Macchi <emilien.macchi@enovance.com>
-#
-
-require 'puppet'
-require 'puppet/type/mongodb_replset'
-describe Puppet::Type.type(:mongodb_replset) do
-
-  before :each do
-    @replset = Puppet::Type.type(:mongodb_replset).new(:name => 'test')
-  end
-
-  it 'should accept a replica set name' do
-    @replset[:name].should == 'test'
-  end
-
-  it 'should accept a members array' do
-    @replset[:members] = ['mongo1:27017', 'mongo2:27017']
-    @replset[:members].should == ['mongo1:27017', 'mongo2:27017']
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_replset).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb
deleted file mode 100644
index c822265d11d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'puppet'
-require 'puppet/type/mongodb_user'
-describe Puppet::Type.type(:mongodb_user) do
-
-  before :each do
-    @user = Puppet::Type.type(:mongodb_user).new(
-              :name => 'test',
-              :database => 'testdb',
-              :password_hash => 'pass')
-  end
-
-  it 'should accept a user name' do
-    @user[:name].should == 'test'
-  end
-
-  it 'should accept a database name' do
-    @user[:database].should == 'testdb'
-  end
-
-  it 'should accept a tries parameter' do
-    @user[:tries] = 5
-    @user[:tries].should == 5
-  end
-
-  it 'should accept a password' do
-    @user[:password_hash] = 'foo'
-    @user[:password_hash].should == 'foo'
-  end
-
-  it 'should use default role' do
-    @user[:roles].should == ['dbAdmin']
-  end
-
-  it 'should accept a roles array' do
-    @user[:roles] = ['role1', 'role2']
-    @user[:roles].should == ['role1', 'role2']
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-  it 'should require a database' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({:name => 'test', :password_hash => 'pass'})
-    }.to raise_error(Puppet::Error, 'Parameter \'database\' must be set')
-  end
-
-  it 'should require a password_hash' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({:name => 'test', :database => 'testdb'})
-    }.to raise_error(Puppet::Error, 'Property \'password_hash\' must be set. Use mongodb_password() for creating hash.')
-  end
-
-  it 'should sort roles' do
-    # Reinitialize type with explicit unsorted roles.
-    @user = Puppet::Type.type(:mongodb_user).new(
-              :name => 'test',
-              :database => 'testdb',
-              :password_hash => 'pass',
-              :roles => ['b', 'a'])
-    @user[:roles].should == ['a', 'b']
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb
deleted file mode 100644
index 85d81054bb3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb
+++ /dev/null
@@ -1,172 +0,0 @@
-# mongo.conf - generated from Puppet
-
-
-<% if @logpath -%>
-#where to log
-logpath=<%= @logpath %>
-<% if @logappend -%>
-logappend=<%= @logappend %>
-<% end -%>
-<% end -%>
-<% if @bind_ip -%>
-# Set this option to configure the mongod or mongos process to bind to and
-# listen for connections from applications on this address.
-# You may concatenate a list of comma separated values to bind mongod to multiple IP addresses.
-bind_ip = <%= Array(@bind_ip).join(',') %>
-<% end -%>
-<% if @fork -%>
-# fork and run in background
-fork=<%= @fork %>
-<% end -%>
-port = <%= @port %>
-dbpath=<%= @dbpath %>
-<% if @pidfilepath -%>
-# location of pidfile
-pidfilepath = <%= @pidfilepath %>
-<% end -%>
-<% if @nojournal and not @journal -%>
-# Disables write-ahead journaling
-nojournal = <%= @nojournal %>
-<% end -%>
-<% if @journal and not @nojournal -%>
-# Enables journaling
-journal = <%= @journal %>
-<% end -%>
-<% if @cpu -%>
-# Enables periodic logging of CPU utilization and I/O wait
-cpu = <%= @cpu %>
-<% end -%>
-# Turn on/off security.  Off is currently the default
-<% if @noauth and not @auth -%>
-noauth=<%= @noauth %>
-<% end -%>
-<% if @auth and not @noauth -%>
-auth=<%= @auth %>
-<% end -%>
-<% if @verbose -%>
-# Verbose logging output.
-verbose = <%= @verbose %>
-<% end -%>
-<% if @verbositylevel -%>
-<%= @verbositylevel -%> = true
-<% end -%>
-<% if @objcheck -%>
-# Inspect all client data for validity on receipt (useful for
-# developing drivers)
-objcheck = <%= @objcheck %>
-<% end -%>
-<% if @maxconns -%>
-maxConns = <%= @maxconns %>
-<% end -%>
-<% if @quota -%>
-# Enable db quota management
-quota = <%= @quota %>
-<% if @quotafiles -%>
-quotaFiles = <%= @quotafiles %>
-<% end -%>
-<% end -%>
-<% if @diaglog -%>
-# Set oplogging level where n is
-#   0=off (default)
-#   1=W
-#   2=R
-#   3=both
-#   7=W+some reads
-diaglog  = <%= @diaglog %>
-<% end -%>
-<% if @oplog_size -%>
-# Specifies a maximum size in megabytes for the replication operation log
-oplogSize = <%= @oplog_size %>
-<% end -%>
-<% if @nohints -%>
-# Ignore query hints
-nohints = <%= @nohints %>
-<% end -%>
-<% if @nohttpinterface -%>
-# Disable the HTTP interface (Defaults to localhost:27018).
-nohttpinterface = <%= @nohttpinterface %>
-<% end -%>
-<% if @noscripting -%>
-# Turns off server-side scripting.  This will result in greatly limited
-# functionality
-noscripting = <%= @noscripting %>
-<% end -%>
-<% if @notablescan -%>
-# Turns off table scans.  Any query that would do a table scan fails.
-notablescan = <%= @notablescan %>
-<% end -%>
-<% if @noprealloc -%>
-# Disable data file preallocation.
-noprealloc = <%= @noprealloc %>
-<% end -%>
-<% if @nssize -%>
-# Specify .ns file size for new databases in megabytes.
-nssize = <%= @nssize %>
-<% end -%>
-<% if @mms_token -%>
-# Accout token for Mongo monitoring server.
-mms-token = <%= @mms_token %>
-<% end -%>
-<% if @mms_name -%>
-# Server name for Mongo monitoring server.
-mms-name = <%= @mms_name %>
-<% end -%>
-<% if @mms_interval -%>
-# Ping interval for Mongo monitoring server.
-mms-interval = <%= @mms_interval %>
-<% end -%>
-<% if @slave -%>
-slave = <%= @slave %>
-<% end -%>
-<% if @source -%>
-source = <%= @source %>
-<% end -%>
-<% if @only -%>
-# Slave only: specify a single database to replicate
-only = <%= @only %>
-<% end -%>
-<% if @master -%>
-master = <%= @master %>
-<% end -%>
-<% if @directoryperdb -%>
-# Alters the storage pattern of the data directory to store each database
-# files in a distinct folder.
-directoryperdb = <%= @directoryperdb %>
-<% end -%>
-<% if @replset -%>
-# Configure ReplicaSet membership
-replSet = <%= @replset %>
-<% end -%>
-<% if @smallfiles -%>
-# Use a smaller default data file size.
-smallfiles = <%= @smallfiles %>
-<% end -%>
-<% if @rest -%>
-# Enable rest API (disabled by default)
-rest = <%= @rest %>
-<% end -%>
-<% if @profile -%>
-# Modify this value to changes the level of database profiling, which inserts
-# information about operation performance into output of mongod or the log file.
-#0 = Off. No profiling. default
-#1 = On. Only includes slow operations.
-#2 = On. Includes all operations.
-profile = <%= @profile %>
-<% end -%>
-<% if @slowms -%>
-# Sets the threshold in milliseconds for mongod to consider a query slow for the profiler.
-slowms = <%= @slowms %>
-<% end -%>
-<% if @keyfile -%>
-# Specify the path to a key file to store authentication information.
-keyFile = <%= @keyfile %>
-<% end -%>
-<% if @directoryperdb -%>
-directoryperdb = <%= @directoryperdb %>
-<% end -%>
-<% if @set_parameter -%>
-setParameter = <%= @set_parameter %>
-<% end -%>
-<% if @syslog -%>
-syslog = <%= @syslog %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp
deleted file mode 100644
index 8166214bb7c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mongodb::globals':
-  manage_package_repo => true
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp
deleted file mode 100644
index aac044ee0d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { '::mongodb': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp
deleted file mode 100644
index a758b8dd266..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-node default {
-  class { '::mongodb::globals':
-    manage_package_repo => true
-  } ->
-  class { '::mongodb::server':
-    smallfiles => true,
-    bind_ip    => ['0.0.0.0'],
-    replset    => 'rsmain'
-  }
-}
-
-node /mongo1/ inherits default {
-  mongodb_replset{'rsmain':
-    members => ['mongo1:27017', 'mongo2:27017', 'mongo3:27017']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp
deleted file mode 100644
index 95106ebc989..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'mongodb::globals': manage_package_repo => true }->
-class { 'mongodb::server': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml
deleted file mode 100644
index 5631e2a2312..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
-  symlinks:
-    "mysql": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml
deleted file mode 100644
index 42aea591808..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        Hc9OPm/kRTmjXSP3TbLir/y6Yy1LqmZS8zrqxdTbpo3Z04EYv1uKhaFDpECl
-        0a6bJRUWpLWIuDco08fHMeCTWoFGzE97EDelhHKSYiTNllzYKWPHy7ki/al6
-        wjz0gLtiDfmktHQOHatBy6EKLFjoyjGoE4cUUta4Ixq4tMBNzEA=
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md
deleted file mode 100644
index 8349998f3fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md
+++ /dev/null
@@ -1,476 +0,0 @@
-##2014-03-04 - Supported Release 2.2.3
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* No known bugs
-
-##2014-03-04 - Supported Release 2.2.2
-###Summary
-This is a supported release. Mostly comprised of enhanced testing, plus a
-bugfix for Suse.
-
-####Bugfixes
-- PHP bindings on Suse
-- Test fixes
-
-####Known Bugs
-* No known bugs
-
-##2014-02-19 - Version 2.2.1
-
-###Summary
-
-Minor release that repairs mysql_database{} so that it sees the correct
-collation settings (it was only checking the global mysql ones, not the
-actual database and constantly setting it over and over since January 22nd).
-
-Also fixes a bunch of tests on various platforms.
-
-
-##2014-02-13 - Version 2.2.0
-
-###Summary
-
-####Features
-- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to
-  mysql::server::backup to allow customizing the mysqlbackupdir.
-- Support multiple options of the same name, allowing you to
-  do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three
-  lines of replicate-do-db = base1, replicate-do-db = base2 etc.
-
-####Bugfixes
-- Fix `restart` so it actually stops mysql restarting if set to false.
-- DRY out the defaults_file functionality in the providers.
-- mysql_grant fixed to work with root@localhost/@.
-- mysql_grant fixed for WITH MAX_QUERIES_PER_HOUR
-- mysql_grant fixed so revoking all privileges accounts for GRANT OPTION
-- mysql_grant fixed to remove duplicate privileges.
-- mysql_grant fixed to handle PROCEDURES when removing privileges.
-- mysql_database won't try to create existing databases, breaking replication.
-- bind_address renamed bind-address in 'mysqld' options.
-- key_buffer renamed to key_buffer_size.
-- log_error renamed to log-error.
-- pid_file renamed to pid-file.
-- Ensure mysql::server:root_password runs before mysql::server::backup
-- Fix options_override -> override_options in the README.
-- Extensively rewrite the README to be accurate and awesome.
-- Move to requiring stdlib 3.2.0, shipped in PE3.0
-- Add many new tests.
-
-
-##2013-11-13 - Version 2.1.0
-
-###Summary
-
-The most important changes in 2.1.0 are improvements to the my.cnf creation,
-as well as providers.  Setting options to = true strips them to be just the
-key name itself, which is required for some options.
-
-The provider updates fix a number of bugs, from lowercase privileges to
-deprecation warnings.
-
-Last, the new hiera integration functionality should make it easier to
-externalize all your grants, users, and, databases.  Another great set of
-community submissions helped to make this release.
-
-####Features
-- Some options can not take a argument. Gets rid of the '= true' when an
-option is set to true.
-- Easier hiera integration:  Add hash parameters to mysql::server to allow
-specifying grants, users, and databases.
-
-####Bugfixes
-- Fix an issue with lowercase privileges in mysql_grant{} causing them to be reapplied needlessly.
-- Changed defaults-file to defaults-extra-file in providers.
-- Ensure /root/.my.cnf is 0600 and root owned.
-- database_user deprecation warning was incorrect.
-- Add anchor pattern for client.pp
-- Documentation improvements.
-- Various test fixes.
-
-
-##2013-10-21 - Version 2.0.1
-
-###Summary
-
-This is a bugfix release to handle an issue where unsorted mysql_grant{}
-privileges could cause Puppet to incorrectly reapply the permissions on
-each run.
-
-####Bugfixes
-- Mysql_grant now sorts privileges in the type and provider for comparison.
-- Comment and test tweak for PE3.1.
-
-
-##2013-10-14 - Version 2.0.0
-
-###Summary
-
-(Previously detailed in the changelog for 2.0.0-rc1)
-
-This module has been completely refactored and works significantly different.
-The changes are broad and touch almost every piece of the module.
-
-See the README.md for full details of all changes and syntax.
-Please remain on 1.0.0 if you don't have time to fully test this in dev.
-
-* mysql::server, mysql::client, and mysql::bindings are the primary interface
-classes.
-* mysql::server takes an `override_options` parameter to set my.cnf options,
-with the hash format: { 'section' => { 'thing' => 'value' }}
-* mysql attempts backwards compatibility by forwarding all parameters to
-mysql::server.
-
-
-##2013-10-09 - Version 2.0.0-rc5
-
-###Summary
-
-Hopefully the final rc!  Further fixes to mysql_grant (stripping out the
-cleverness so we match a much wider range of input.)
-
-####Bugfixes
-- Make mysql_grant accept '.*'@'.*' in terms of input for user@host.
-
-
-##2013-10-09 - Version 2.0.0-rc4
-
-###Summary
-
-Bugfixes to mysql_grant and mysql_user form the bulk of this rc, as well as
-ensuring that values in the override_options hash that contain a value of ''
-are created as just "key" in the conf rather than "key =" or "key = false".
-
-####Bugfixes
-- Improve mysql_grant to work with IPv6 addresses (both long and short).
-- Ensure @host users work as well as user@host users.
-- Updated my.cnf template to support items with no values.
-
-
-##2013-10-07 - Version 2.0.0-rc3
-
-###Summary
-Fix mysql::server::monitor's use of mysql_user{}.
-
-####Bugfixes
-- Fix myql::server::monitor's use of mysql_user{} to grant the proper
-permissions.  Add specs as well.  (Thanks to treydock!)
-
-
-##2013-10-03 - Version 2.0.0-rc2
-
-###Summary
-Bugfixes
-
-####Bugfixes
-- Fix a duplicate parameter in mysql::server
-
-
-##2013-10-03 - Version 2.0.0-rc1
-
-###Summary
-
-This module has been completely refactored and works significantly different.
-The changes are broad and touch almost every piece of the module.
-
-See the README.md for full details of all changes and syntax.
-Please remain on 1.0.0 if you don't have time to fully test this in dev.
-
-* mysql::server, mysql::client, and mysql::bindings are the primary interface
-classes.
-* mysql::server takes an `override_options` parameter to set my.cnf options,
-with the hash format: { 'section' => { 'thing' => 'value' }}
-* mysql attempts backwards compatibility by forwarding all parameters to
-mysql::server.
-
----
-##2013-09-23 - Version 1.0.0
-
-###Summary
-
-This release introduces a number of new type/providers, to eventually
-replace the database_ ones.  The module has been converted to call the
-new providers rather than the previous ones as they have a number of
-fixes, additional options, and work with puppet resource.
-
-This 1.0.0 release precedes a large refactoring that will be released
-almost immediately after as 2.0.0.
-
-####Features
-- Added mysql_grant, mysql_database, and mysql_user.
-- Add `mysql::bindings` class and refactor all other bindings to be contained underneath mysql::bindings:: namespace.
-- Added support to back up specified databases only with 'mysqlbackup' parameter.
-- Add option to mysql::backup to set the backup script to perform a mysqldump on each database to its own file
-
-####Bugfixes
-- Update my.cnf.pass.erb to allow custom socket support
-- Add environment variable for .my.cnf in mysql::db.
-- Add HOME environment variable for .my.cnf to mysqladmin command when
-(re)setting root password
-
----
-##2013-07-15 - Version 0.9.0
-####Features
-- Add `mysql::backup::backuprotate` parameter
-- Add `mysql::backup::delete_before_dump` parameter
-- Add `max_user_connections` attribute to `database_user` type
-
-####Bugfixes
-- Add client package dependency for `mysql::db`
-- Remove duplicate `expire_logs_days` and `max_binlog_size` settings
-- Make root's `.my.cnf` file path dynamic
-- Update pidfile path for Suse variants
-- Fixes for lint
-
-##2013-07-05 - Version 0.8.1
-####Bugfixes
- - Fix a typo in the Fedora 19 support.
-
-##2013-07-01 - Version 0.8.0
-####Features
- - mysql::perl class to install perl-DBD-mysql.
- - minor improvements to the providers to improve reliability
- - Install the MariaDB packages on Fedora 19 instead of MySQL.
- - Add new `mysql` class parameters:
-   -  `max_connections`: The maximum number of allowed connections.
-   -  `manage_config_file`: Opt out of puppetized control of my.cnf.
-   -  `ft_min_word_len`: Fine tune the full text search.
-   -  `ft_max_word_len`: Fine tune the full text search.
- - Add new `mysql` class performance tuning parameters:
-   -  `key_buffer`
-   -  `thread_stack`
-   -  `thread_cache_size`
-   -  `myisam-recover`
-   -  `query_cache_limit`
-   -  `query_cache_size`
-   -  `max_connections`
-   -  `tmp_table_size`
-   -  `table_open_cache`
-   -  `long_query_time`
- - Add new `mysql` class replication parameters:
-   -  `server_id`
-   -  `sql_log_bin`
-   -  `log_bin`
-   -  `max_binlog_size`
-   -  `binlog_do_db`
-   -  `expire_logs_days`
-   -  `log_bin_trust_function_creators`
-   -  `replicate_ignore_table`
-   -  `replicate_wild_do_table`
-   -  `replicate_wild_ignore_table`
-   -  `expire_logs_days`
-   -  `max_binlog_size`
-
-####Bugfixes
- - No longer restart MySQL when /root/.my.cnf changes.
- - Ensure mysql::config runs before any mysql::db defines.
-
-##2013-06-26 - Version 0.7.1
-####Bugfixes
-- Single-quote password for special characters
-- Update travis testing for puppet 3.2.x and missing Bundler gems
-
-##2013-06-25 - Version 0.7.0
-This is a maintenance release for community bugfixes and exposing
-configuration variables.
-
-* Add new `mysql` class parameters:
-  -  `basedir`: The base directory mysql uses
-  -  `bind_address`: The IP mysql binds to
-  -  `client_package_name`: The name of the mysql client package
-  -  `config_file`: The location of the server config file
-  -  `config_template`: The template to use to generate my.cnf
-  -  `datadir`: The directory MySQL's datafiles are stored
-  -  `default_engine`: The default engine to use for tables
-  -  `etc_root_password`: Whether or not to add the mysql root password to
- /etc/my.cnf
-  -  `java_package_name`: The name of the java package containing the java
- connector
-  -  `log_error`: Where to log errors
-  -  `manage_service`: Boolean dictating if mysql::server should manage the
- service
-  -  `max_allowed_packet`: Maximum network packet size mysqld will accept
-  -  `old_root_password`: Previous root user password
-  -  `php_package_name`: The name of the phpmysql package to install
-  -  `pidfile`: The location mysql will expect the pidfile to be
-  -  `port`: The port mysql listens on
-  -  `purge_conf_dir`: Value fed to recurse and purge parameters of the
- /etc/mysql/conf.d resource
-  -  `python_package_name`: The name of the python mysql package to install
-  -  `restart`: Whether to restart mysqld
-  -  `root_group`: Use specified group for root-owned files
-  -  `root_password`: The root MySQL password to use
-  -  `ruby_package_name`: The name of the ruby mysql package to install
-  -  `ruby_package_provider`: The installation suite to use when installing the
- ruby package
-  -  `server_package_name`: The name of the server package to install
-  -  `service_name`: The name of the service to start
-  -  `service_provider`: The name of the service provider
-  -  `socket`: The location of the MySQL server socket file
-  -  `ssl_ca`: The location of the SSL CA Cert
-  -  `ssl_cert`: The location of the SSL Certificate to use
-  -  `ssl_key`: The SSL key to use
-  -  `ssl`: Whether or not to enable ssl
-  -  `tmpdir`: The directory MySQL's tmpfiles are stored
-* Deprecate `mysql::package_name` parameter in favor of
-`mysql::client_package_name`
-* Fix local variable template deprecation
-* Fix dependency ordering in `mysql::db`
-* Fix ANSI quoting in queries
-* Fix travis support (but still messy)
-* Fix typos
-
-##2013-01-11 - Version 0.6.1
-* Fix providers when /root/.my.cnf is absent
-
-##2013-01-09 - Version 0.6.0
-* Add `mysql::server::config` define for specific config directives
-* Add `mysql::php` class for php support
-* Add `backupcompress` parameter to `mysql::backup`
-* Add `restart` parameter to `mysql::config`
-* Add `purge_conf_dir` parameter to `mysql::config`
-* Add `manage_service` parameter to `mysql::server`
-* Add syslog logging support via the `log_error` parameter
-* Add initial SuSE support
-* Fix remove non-localhost root user when fqdn != hostname
-* Fix dependency in `mysql::server::monitor`
-* Fix .my.cnf path for root user and root password
-* Fix ipv6 support for users
-* Fix / update various spec tests
-* Fix typos
-* Fix lint warnings
-
-##2012-08-23 - Version 0.5.0
-* Add puppetlabs/stdlib as requirement
-* Add validation for mysql privs in provider
-* Add `pidfile` parameter to mysql::config
-* Add `ensure` parameter to mysql::db
-* Add Amazon linux support
-* Change `bind_address` parameter to be optional in my.cnf template
-* Fix quoting root passwords
-
-##2012-07-24 - Version 0.4.0
-* Fix various bugs regarding database names
-* FreeBSD support
-* Allow specifying the storage engine
-* Add a backup class
-* Add a security class to purge default accounts
-
-##2012-05-03 - Version 0.3.0
-* 14218 Query the database for available privileges
-* Add mysql::java class for java connector installation
-* Use correct error log location on different distros
-* Fix set_mysql_rootpw to properly depend on my.cnf
-
-##2012-04-11 - Version 0.2.0
-
-##2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* (#13203) Add ssl support (f7e0ea5)
-
-##2012-03-18 - Nan Liu <nan@puppetlabs.com>
-* Travis ci before script needs success exit code. (0ea463b)
-
-##2012-03-18 - Nan Liu <nan@puppetlabs.com>
-* Fix Puppet 2.6 compilation issues. (9ebbbc4)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Add travis.ci for testing multiple puppet versions. (33c72ef)
-
-##2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* (#13163) Datadir should be configurable (f353fc6)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Document create_resources dependency. (558a59c)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Fix spec test issues related to error message. (eff79b5)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Fix mysql service on Ubuntu. (72da2c5)
-
-##2012-03-16 - Dan Bode <dan@puppetlabs.com>
-* Add more spec test coverage (55e399d)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* (#11963) Fix spec test due to path changes. (1700349)
-
-##2012-03-07 - François Charlier <fcharlier@ploup.net>
-* Add a test to check path for 'mysqld-restart' (b14c7d1)
-
-##2012-03-07 - François Charlier <fcharlier@ploup.net>
-* Fix path for 'mysqld-restart' (1a9ae6b)
-
-##2012-03-15 - Dan Bode <dan@puppetlabs.com>
-* Add rspec-puppet tests for mysql::config (907331a)
-
-##2012-03-15 - Dan Bode <dan@puppetlabs.com>
-* Moved class dependency between sever and config to server (da62ad6)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Notify mysql restart from set_mysql_rootpw exec (0832a2c)
-
-##2012-03-15 - Nan Liu <nan@puppetlabs.com>
-* Add documentation related to osfamily fact. (8265d28)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Mention osfamily value in failure message (e472d3b)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Fix bug when querying for all database users (015490c)
-
-##2012-02-09 - Nan Liu <nan@puppetlabs.com>
-* Major refactor of mysql module. (b1f90fd)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Per @ghoneycutt, we should fail explicitly and explain why. (09af083)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Removing duplicate declaration (7513d03)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Use socket value from params class instead of hardcoding. (663e97c)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Instead of hardcoding the config file target, pull it from mysql::params (031a47d)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Moved $socket to within the case to toggle between distros.  Added a $config_file variable to allow per-distro config file destinations. (360eacd)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Pretty sure this is a bug, 99% of Linux distros out there won't ever hit the default. (3462e6b)
-
-##2012-02-09 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* Changed the README to use markdown (3b7dfeb)
-
-##2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net>
-* (#12412) mysqltuner.pl update (b809e6f)
-
-##2011-11-17 - Matthias Pigulla <mp@webfactory.de>
-* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1)
-
-##2011-12-20 - Jeff McCune <jeff@puppetlabs.com>
-* (minor) Fixup typos in Modulefile metadata (a0ed6a1)
-
-##2011-12-19 - Carl Caum <carl@carlcaum.com>
-* Only notify Exec to import sql if sql is given (0783c74)
-
-##2011-12-19 - Carl Caum <carl@carlcaum.com>
-* (#11508) Only load sql_scripts on DB creation (e3b9fd9)
-
-##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
-* Require not needed due to implicit dependencies (3058feb)
-
-##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
-* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d)
-
-##2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
-* initial commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile
deleted file mode 100644
index 39687be0319..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile
+++ /dev/null
@@ -1,25 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :development, :test do
-  gem 'mime-types', '<2.0',      :require => false
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile
deleted file mode 100644
index e89be88ecb3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'puppetlabs-mysql'
-version '2.2.3'
-source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
-author 'Puppet Labs'
-license 'Apache 2.0'
-summary 'Mysql module'
-description 'Mysql module'
-project_page 'http://github.com/puppetlabs/puppetlabs-mysql'
-dependency 'puppetlabs/stdlib', '>= 3.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md
deleted file mode 100644
index 03b6bbd369b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md
+++ /dev/null
@@ -1,523 +0,0 @@
-#MySQL
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with mysql](#setup)
-    * [What mysql affects](#what-mysql-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with mysql](#beginning-with-mysql)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-The mysql module installs, configures, and manages the MySQL service.
-
-##Module Description
-
-The mysql module manages both the installation and configuration of MySQL as
-well as extends Puppet to allow management of MySQL resources, such as
-databases, users, and grants.
-
-##Backwards Compatibility
-
-This module has just undergone a very large rewrite.  Some new classes have been added, and many previous classes and configurations work differently than before.  We've attempted to handle backwards compatibility automatically by adding a
-`attempt_compatibility_mode` parameter to the main mysql class.  If you set
-this to 'true' it will attempt to map your previous parameters into the new
-`mysql::server` class.
-
-#####WARNING
-
-Compatibility mode may fail. It may eat your MySQL server. PLEASE test it before running it live, even if the test is just a no-op and manual comparison. Please be careful!
-
-##Setup
-
-###What MySQL affects
-
-* MySQL package
-* MySQL configuration files
-* MySQL service
-
-###Beginning with MySQL
-
-If you just want a server installed with the default options you can run
-`include '::mysql::server'`.  
-
-If you need to customize options, such as the root
-password or `/etc/my.cnf` settings, then you must also pass in an override hash:
-
-```puppet
-class { '::mysql::server':
-  root_password    => 'strongpassword',
-  override_options => { 'mysqld' => { 'max_connections' => '1024' } }
-}
-```
-
-##Usage
-
-All interaction for the server is done via `mysql::server`.  To install the
-client you use `mysql::client`, and to install bindings you can use
-`mysql::bindings`.
-
-###Overrides
-
-The hash structure for overrides in `mysql::server` is as follows:
-
-```puppet
-$override_options = {
-  'section' => {
-    'item'             => 'thing',
-  }
-}
-```
-
-For items that you would traditionally represent as:
-
-<pre>
-[section]
-thing = X
-</pre>
-
-You can just make an entry like `thing => true`, `thing => value`, or `thing => "` in the hash. You can also pass an array `thing => ['value', 'value2']` or even list each `thing => value` separately on separate lines. MySQL doesn't care if 'thing' is alone or set to a value; it'll happily accept both.  To keep an option out of the my.cnf file, e.g. when using override_options to revert to a default value, you can pass thing => undef.
-If an option needs multiple instances, you can pass an array. For example
-
-```puppet
-$override_options = {
-  'mysqld' => {
-    'replicate-do-db' => ['base1', 'base2'],
-  }
-}
-```
-
-will produce
-
-<pre>
-[mysql]
-replicate-do-db = base1
-replicate-do-db = base2
-</pre>
-
-###Custom configuration
-
-To add custom MySQL configuration, drop additional files into
-`/etc/mysql/conf.d/`. Dropping files into conf.d allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The conf.d location is hardcoded into the my.cnf template file.
-
-##Reference
-
-###Classes
-
-####Public classes
-* `mysql::server`: Installs and configures MySQL.
-* `mysql::server::account_security`: Deletes default MySQL accounts.
-* `mysql::server::monitor`: Sets up a monitoring user.
-* `mysql::server::mysqltuner`: Installs MySQL tuner script.
-* `mysql::server::backup`: Sets up MySQL backups via cron.
-* `mysql::bindings`: Installs various MySQL language bindings.
-* `mysql::client`: Installs MySQL client (for non-servers).
-
-####Private classes
-* `mysql::server::install`: Installs packages.
-* `mysql::server::config`: Configures MYSQL.
-* `mysql::server::service`: Manages service.
-* `mysql::server::root_password`: Sets MySQL root password.
-* `mysql::server::providers`: Creates users, grants, and databases.
-* `mysql::bindings::java`: Installs Java bindings.
-* `mysql::bindings::perl`: Installs Perl bindings.
-* `mysql::bindings::python`: Installs Python bindings.
-* `mysql::bindings::ruby`: Installs Ruby bindings.
-* `mysql::client::install`:  Installs MySQL client.
-
-###Parameters
-
-####mysql::server
-
-#####`root_password`
-
-The MySQL root password.  Puppet will attempt to set the root password and update `/root/.my.cnf` with it.
-
-#####`old_root_password`
-
-The previous root password (**REQUIRED** if you wish to change the root password via Puppet.)
-
-#####`override_options`
-
-The hash of override options to pass into MySQL.  It can be structured
-like a hash in the my.cnf file, so entries look like
-
-```puppet
-$override_options = {
-  'section' => {
-    'item'             => 'thing',
-  }
-}
-```
-
-For items that you would traditionally represent as:
-
-<pre>
-[section]
-thing = X
-</pre>
-
-You can just make an entry like `thing => true`, `thing => value`, or `thing => "` in the hash. You can also pass an array `thing => ['value', 'value2']` or even list each `thing => value` separately on separate lines. MySQL doesn't care if 'thing' is alone or set to a value; it'll happily accept both.  To keep an option out of the my.cnf file, e.g. when using override_options to revert to a default value, you can pass thing => undef.
-
-#####`config_file`
-
-The location of the MySQL configuration file.
-
-#####`manage_config_file`
-
-Whether the MySQL configuration file should be managed.
-
-#####`purge_conf_dir`
-
-Whether the conf.d directory should be purged.
-
-#####`restart`
-
-Whether the service should be restarted when things change.
-
-#####`root_group`
-
-What is the group used for root?
-
-#####`package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`package_name`
-
-The name of the mysql server package to install.
-
-#####`remove_default_accounts`
-
-Boolean to decide if we should automatically include
-`mysql::server::account_security`.
-
-#####`service_enabled`
-
-Boolean to decide if the service should be enabled.
-
-#####`service_manage`
-
-Boolean to decide if the service should be managed.
-
-#####`service_name`
-
-The name of the mysql server service.
-
-#####`service_provider`
-
-The provider to use to manage the service.
-
-#####`users`
-
-Optional hash of users to create, which are passed to [mysql_user](#mysql_user). 
-
-```puppet
-$users = {
-  'someuser@localhost' => {
-    ensure                   => 'present',
-    max_connections_per_hour => '0',
-    max_queries_per_hour     => '0',
-    max_updates_per_hour     => '0',
-    max_user_connections     => '0',
-    password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF',
-  },
-}
-```
-
-#####`grants`
-
-Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). 
-
-```puppet
-$grants = {
-  'someuser@localhost/somedb.*' => {
-    ensure     => 'present',
-    options    => ['GRANT'],
-    privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
-    table      => 'somedb.*',
-    user       => 'someuser@localhost',
-  },
-}
-```
-
-#####`databases`
-
-Optional hash of databases to create, which are passed to [mysql_database](#mysql_database).
-
-```puppet
-$databases = {
-  'somedb' => {
-    ensure  => 'present',
-    charset => 'utf8',
-  },
-}
-```
-
-####mysql::server::backup
-
-#####`backupuser`
-
-MySQL user to create for backups.
-
-#####`backuppassword`
-
-MySQL user password for backups.
-
-#####`backupdir`
-
-Directory to back up into.
-
-#####`backupdirmode`
-
-Permissions applied to the backup directory. This parameter is passed directly
-to the `file` resource.
-
-#####`backupdirowner`
-
-Owner for the backup directory. This parameter is passed directly to the `file`
-resource.
-
-#####`backupdirgroup`
-
-Group owner for the backup directory. This parameter is passed directly to the
-`file` resource.
-
-#####`backupcompress`
-
-Boolean to determine if backups should be compressed.
-
-#####`backuprotate`
-
-How many days to keep backups for.
-
-#####`delete_before_dump`
-
-Boolean to determine if you should cleanup before backing up or after.
-
-#####`backupdatabases`
-
-Array of databases to specifically back up.
-
-#####`file_per_database`
-
-Whether a separate file be used per database.
-
-#####`ensure`
-
-Allows you to remove the backup scripts. Can be 'present' or 'absent'.
-
-#####`time`
-
-An array of two elements to set the backup time.  Allows ['23', '5'] or ['3', '45'] for HH:MM times.
-
-#####`postscript`
-
-A script that is executed at when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines, when supplied as an array. It could also be one or more externally managed (executable) files.
-
-####mysql::server::monitor
-
-#####`mysql_monitor_username`
-
-The username to create for MySQL monitoring.
-
-#####`mysql_monitor_password`
-
-The password to create for MySQL monitoring.
-
-#####`mysql_monitor_hostname`
-
-The hostname to allow to access the MySQL monitoring user.
-
-####mysql::bindings
-
-#####`java_enable`
-
-Boolean to decide if the Java bindings should be installed.
-
-#####`perl_enable`
-
-Boolean to decide if the Perl bindings should be installed.
-
-#####`php_enable`
-
-Boolean to decide if the PHP bindings should be installed.
-
-#####`python_enable`
-
-Boolean to decide if the Python bindings should be installed.
-
-#####`ruby_enable`
-
-Boolean to decide if the Ruby bindings should be installed.
-
-#####`java_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`java_package_name`
-
-The name of the package to install.
-
-#####`java_package_provider`
-
-What provider should be used to install the package.
-
-#####`perl_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`perl_package_name`
-
-The name of the package to install.
-
-#####`perl_package_provider`
-
-What provider should be used to install the package.
-
-#####`python_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`python_package_name`
-
-The name of the package to install.
-
-#####`python_package_provider`
-
-What provider should be used to install the package.
-
-#####`ruby_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`ruby_package_name`
-
-The name of the package to install.
-
-#####`ruby_package_provider`
-
-What provider should be used to install the package.
-
-####mysql::client
-
-#####`bindings_enable`
-
-Boolean to automatically install all bindings.
-
-#####`package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`package_name`
-
-What is the name of the mysql client package to install.
-
-###Defines
-
-####mysql::db
-
-Creates a database with a user and assigns some privileges.
-
-```puppet
-    mysql::db { 'mydb':
-      user     => 'myuser',
-      password => 'mypass',
-      host     => 'localhost',
-      grant    => ['SELECT', 'UPDATE'],
-    }
-```
-
-###Providers
-
-####mysql_database
-
-`mysql_database` can be used to create and manage databases within MySQL.
-
-```puppet
-mysql_database { 'information_schema':
-  ensure  => 'present',
-  charset => 'utf8',
-  collate => 'utf8_swedish_ci',
-}
-mysql_database { 'mysql':
-  ensure  => 'present',
-  charset => 'latin1',
-  collate => 'latin1_swedish_ci',
-}
-```
-
-####mysql_user
-
-`mysql_user` can be used to create and manage user grants within MySQL.
-
-```puppet
-mysql_user { 'root@127.0.0.1':
-  ensure                   => 'present',
-  max_connections_per_hour => '0',
-  max_queries_per_hour     => '0',
-  max_updates_per_hour     => '0',
-  max_user_connections     => '0',
-}
-```
-
-####mysql_grant
-
-`mysql_grant` can be used to create grant permissions to access databases within
-MySQL.  To use it you must create the title of the resource as shown below,
-following the pattern of `username@hostname/database.table`:
-
-```puppet
-mysql_grant { 'root@localhost/*.*':
-  ensure     => 'present',
-  options    => ['GRANT'],
-  privileges => ['ALL'],
-  table      => '*.*',
-  user       => 'root@localhost',
-}
-```
-
-##Limitations
-
-This module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-#Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Authors
-
-This module is based on work by David Schmitt. The following contributors have contributed patches to this module (beyond Puppet Labs):
-
-* Larry Ludwig
-* Christian G. Warden
-* Daniel Black
-* Justin Ellison
-* Lowe Schmidt
-* Matthias Pigulla
-* William Van Hevelingen
-* Michael Arnold
-* Chris Weyl
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile
deleted file mode 100644
index bb60173e570..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'rspec-system/rake_task'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO
deleted file mode 100644
index 39132939307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-The best that I can tell is that this code traces back to David Schmitt. It has been forked many times since then :)
-
-1. you cannot add databases to an instance that has a root password
-2. you have to specify username as USER@BLAH or it cannot be found
-3. mysql_grant does not complain if user does not exist
-4. Needs support for pre-seeding on debian
-5. the types may need to take user/password
-6. rather or not to configure /etc/.my.cnf should be configurable
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl
deleted file mode 100644
index 46cdb7f42f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl
+++ /dev/null
@@ -1,966 +0,0 @@
-#!/usr/bin/perl -w
-# mysqltuner.pl - Version 1.2.0
-# High Performance MySQL Tuning Script
-# Copyright (C) 2006-2011 Major Hayden - major@mhtx.net
-#
-# For the latest updates, please visit http://mysqltuner.com/
-# Git repository available at http://github.com/rackerhacker/MySQLTuner-perl
-#
-# This 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/>.
-#
-# This project would not be possible without help from:
-#   Matthew Montgomery     Paul Kehrer          Dave Burgess
-#   Jonathan Hinds         Mike Jackson         Nils Breunese
-#   Shawn Ashlee           Luuk Vosslamber      Ville Skytta
-#   Trent Hornibrook       Jason Gill           Mark Imbriaco
-#   Greg Eden              Aubin Galinotti      Giovanni Bechis
-#   Bill Bradford          Ryan Novosielski     Michael Scheidell
-#   Blair Christensen      Hans du Plooy        Victor Trac
-#   Everett Barnes         Tom Krouper          Gary Barrueto
-#   Simon Greenaway        Adam Stein           Isart Montane
-#   Baptiste M.
-#
-# Inspired by Matthew Montgomery's tuning-primer.sh script:
-# http://forge.mysql.com/projects/view.php?id=44
-#
-use strict;
-use warnings;
-use diagnostics;
-use File::Spec;
-use Getopt::Long;
-
-# Set up a few variables for use in the script
-my $tunerversion = "1.2.0";
-my (@adjvars, @generalrec);
-
-# Set defaults
-my %opt = (
-		"nobad" 		=> 0,
-		"nogood" 		=> 0,
-		"noinfo" 		=> 0,
-		"nocolor" 		=> 0,
-		"forcemem" 		=> 0,
-		"forceswap" 	=> 0,
-		"host" 			=> 0,
-		"socket" 		=> 0,
-		"port" 			=> 0,
-		"user" 			=> 0,
-		"pass"			=> 0,
-		"skipsize" 		=> 0,
-		"checkversion" 	=> 0,
-	);
-
-# Gather the options from the command line
-GetOptions(\%opt,
-		'nobad',
-		'nogood',
-		'noinfo',
-		'nocolor',
-		'forcemem=i',
-		'forceswap=i',
-		'host=s',
-		'socket=s',
-		'port=i',
-		'user=s',
-		'pass=s',
-		'skipsize',
-		'checkversion',
-		'help',
-	);
-
-if (defined $opt{'help'} && $opt{'help'} == 1) { usage(); }
-
-sub usage {
-	# Shown with --help option passed
-	print "\n".
-		"   MySQLTuner $tunerversion - MySQL High Performance Tuning Script\n".
-		"   Bug reports, feature requests, and downloads at http://mysqltuner.com/\n".
-		"   Maintained by Major Hayden (major\@mhtx.net) - Licensed under GPL\n".
-		"\n".
-		"   Important Usage Guidelines:\n".
-		"      To run the script with the default options, run the script without arguments\n".
-		"      Allow MySQL server to run for at least 24-48 hours before trusting suggestions\n".
-		"      Some routines may require root level privileges (script will provide warnings)\n".
-		"      You must provide the remote server's total memory when connecting to other servers\n".
-		"\n".
-		"   Connection and Authentication\n".
-		"      --host <hostname>    Connect to a remote host to perform tests (default: localhost)\n".
-		"      --socket <socket>    Use a different socket for a local connection\n".
-		"      --port <port>        Port to use for connection (default: 3306)\n".
-		"      --user <username>    Username to use for authentication\n".
-		"      --pass <password>    Password to use for authentication\n".
-		"\n".
-		"   Performance and Reporting Options\n".
-		"      --skipsize           Don't enumerate tables and their types/sizes (default: on)\n".
-		"                             (Recommended for servers with many tables)\n".
-		"      --checkversion       Check for updates to MySQLTuner (default: don't check)\n".
-		"      --forcemem <size>    Amount of RAM installed in megabytes\n".
-		"      --forceswap <size>   Amount of swap memory configured in megabytes\n".
-		"\n".
-		"   Output Options:\n".
-		"      --nogood             Remove OK responses\n".
-		"      --nobad              Remove negative/suggestion responses\n".
-		"      --noinfo             Remove informational responses\n".
-		"      --nocolor            Don't print output in color\n".
-		"\n";
-	exit;
-}
-
-my $devnull = File::Spec->devnull();
-
-# Setting up the colors for the print styles
-my $good = ($opt{nocolor} == 0)? "[\e[0;32mOK\e[0m]" : "[OK]" ;
-my $bad = ($opt{nocolor} == 0)? "[\e[0;31m!!\e[0m]" : "[!!]" ;
-my $info = ($opt{nocolor} == 0)? "[\e[0;34m--\e[0m]" : "[--]" ;
-
-# Functions that handle the print styles
-sub goodprint { print $good." ".$_[0] unless ($opt{nogood} == 1); }
-sub infoprint { print $info." ".$_[0] unless ($opt{noinfo} == 1); }
-sub badprint { print $bad." ".$_[0] unless ($opt{nobad} == 1); }
-sub redwrap { return ($opt{nocolor} == 0)? "\e[0;31m".$_[0]."\e[0m" : $_[0] ; }
-sub greenwrap { return ($opt{nocolor} == 0)? "\e[0;32m".$_[0]."\e[0m" : $_[0] ; }
-
-# Calculates the parameter passed in bytes, and then rounds it to one decimal place
-sub hr_bytes {
-	my $num = shift;
-	if ($num >= (1024**3)) { #GB
-		return sprintf("%.1f",($num/(1024**3)))."G";
-	} elsif ($num >= (1024**2)) { #MB
-		return sprintf("%.1f",($num/(1024**2)))."M";
-	} elsif ($num >= 1024) { #KB
-		return sprintf("%.1f",($num/1024))."K";
-	} else {
-		return $num."B";
-	}
-}
-
-# Calculates the parameter passed in bytes, and then rounds it to the nearest integer
-sub hr_bytes_rnd {
-	my $num = shift;
-	if ($num >= (1024**3)) { #GB
-		return int(($num/(1024**3)))."G";
-	} elsif ($num >= (1024**2)) { #MB
-		return int(($num/(1024**2)))."M";
-	} elsif ($num >= 1024) { #KB
-		return int(($num/1024))."K";
-	} else {
-		return $num."B";
-	}
-}
-
-# Calculates the parameter passed to the nearest power of 1000, then rounds it to the nearest integer
-sub hr_num {
-	my $num = shift;
-	if ($num >= (1000**3)) { # Billions
-		return int(($num/(1000**3)))."B";
-	} elsif ($num >= (1000**2)) { # Millions
-		return int(($num/(1000**2)))."M";
-	} elsif ($num >= 1000) { # Thousands
-		return int(($num/1000))."K";
-	} else {
-		return $num;
-	}
-}
-
-# Calculates uptime to display in a more attractive form
-sub pretty_uptime {
-	my $uptime = shift;
-	my $seconds = $uptime % 60;
-	my $minutes = int(($uptime % 3600) / 60);
-	my $hours = int(($uptime % 86400) / (3600));
-	my $days = int($uptime / (86400));
-	my $uptimestring;
-	if ($days > 0) {
-		$uptimestring = "${days}d ${hours}h ${minutes}m ${seconds}s";
-	} elsif ($hours > 0) {
-		$uptimestring = "${hours}h ${minutes}m ${seconds}s";
-	} elsif ($minutes > 0) {
-		$uptimestring = "${minutes}m ${seconds}s";
-	} else {
-		$uptimestring = "${seconds}s";
-	}
-	return $uptimestring;
-}
-
-# Retrieves the memory installed on this machine
-my ($physical_memory,$swap_memory,$duflags);
-sub os_setup {
-	sub memerror {
-		badprint "Unable to determine total memory/swap; use '--forcemem' and '--forceswap'\n";
-		exit;
-	}
-	my $os = `uname`;
-	$duflags = ($os =~ /Linux/) ? '-b' : '';
-	if ($opt{'forcemem'} > 0) {
-		$physical_memory = $opt{'forcemem'} * 1048576;
-		infoprint "Assuming $opt{'forcemem'} MB of physical memory\n";
-		if ($opt{'forceswap'} > 0) {
-			$swap_memory = $opt{'forceswap'} * 1048576;
-			infoprint "Assuming $opt{'forceswap'} MB of swap space\n";
-		} else {
-			$swap_memory = 0;
-			badprint "Assuming 0 MB of swap space (use --forceswap to specify)\n";
-		}
-	} else {
-		if ($os =~ /Linux/) {
-			$physical_memory = `free -b | grep Mem | awk '{print \$2}'` or memerror;
-			$swap_memory = `free -b | grep Swap | awk '{print \$2}'` or memerror;
-		} elsif ($os =~ /Darwin/) {
-			$physical_memory = `sysctl -n hw.memsize` or memerror;
-			$swap_memory = `sysctl -n vm.swapusage | awk '{print \$3}' | sed 's/\..*\$//'` or memerror;
-		} elsif ($os =~ /NetBSD|OpenBSD/) {
-			$physical_memory = `sysctl -n hw.physmem` or memerror;
-			if ($physical_memory < 0) {
-				$physical_memory = `sysctl -n hw.physmem64` or memerror;
-			}
-			$swap_memory = `swapctl -l | grep '^/' | awk '{ s+= \$2 } END { print s }'` or memerror;
-		} elsif ($os =~ /BSD/) {
-			$physical_memory = `sysctl -n hw.realmem`;
-			$swap_memory = `swapinfo | grep '^/' | awk '{ s+= \$2 } END { print s }'`;
-		} elsif ($os =~ /SunOS/) {
-			$physical_memory = `/usr/sbin/prtconf | grep Memory | cut -f 3 -d ' '` or memerror;
-			chomp($physical_memory);
-			$physical_memory = $physical_memory*1024*1024;
-		} elsif ($os =~ /AIX/) {
-			$physical_memory = `lsattr -El sys0 | grep realmem | awk '{print \$2}'` or memerror;
-			chomp($physical_memory);
-			$physical_memory = $physical_memory*1024;
-			$swap_memory = `lsps -as | awk -F"(MB| +)" '/MB /{print \$2}'` or memerror;
-			chomp($swap_memory);
-			$swap_memory = $swap_memory*1024*1024;
-		}
-	}
-	chomp($physical_memory);
-}
-
-# Checks to see if a MySQL login is possible
-my ($mysqllogin,$doremote,$remotestring);
-sub mysql_setup {
-	$doremote = 0;
-	$remotestring = '';
-	my $command = `which mysqladmin`;
-	chomp($command);
-	if (! -e $command) {
-		badprint "Unable to find mysqladmin in your \$PATH.  Is MySQL installed?\n";
-		exit;
-	}
-	# Are we being asked to connect via a socket?
-	if ($opt{socket} ne 0) {
-		$remotestring = " -S $opt{socket}";
-	}
-	# Are we being asked to connect to a remote server?
-	if ($opt{host} ne 0) {
-		chomp($opt{host});
-		$opt{port} = ($opt{port} eq 0)? 3306 : $opt{port} ;
-		# If we're doing a remote connection, but forcemem wasn't specified, we need to exit
-		if ($opt{'forcemem'} eq 0) {
-			badprint "The --forcemem option is required for remote connections\n";
-			exit;
-		}
-		infoprint "Performing tests on $opt{host}:$opt{port}\n";
-		$remotestring = " -h $opt{host} -P $opt{port}";
-		$doremote = 1;
-	}
-	# Did we already get a username and password passed on the command line?
-	if ($opt{user} ne 0 and $opt{pass} ne 0) {
-		$mysqllogin = "-u $opt{user} -p'$opt{pass}'".$remotestring;
-		my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			goodprint "Logged in using credentials passed on the command line\n";
-			return 1;
-		} else {
-			badprint "Attempted to use login credentials, but they were invalid\n";
-			exit 0;
-		}
-	}
-	if ( -r "/etc/psa/.psa.shadow" and $doremote == 0 ) {
-		# It's a Plesk box, use the available credentials
-		$mysqllogin = "-u admin -p`cat /etc/psa/.psa.shadow`";
-		my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-		unless ($loginstatus =~ /mysqld is alive/) {
-			badprint "Attempted to use login credentials from Plesk, but they failed.\n";
-			exit 0;
-		}
-	} elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 ){
-		# We have a debian maintenance account, use it
-		$mysqllogin = "--defaults-extra-file=/etc/mysql/debian.cnf";
-		my $loginstatus = `mysqladmin $mysqllogin ping 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			goodprint "Logged in using credentials from debian maintenance account.\n";
-			return 1;
-		} else {
-			badprint "Attempted to use login credentials from debian maintenance account, but they failed.\n";
-			exit 0;
-		}
-	} else {
-		# It's not Plesk or debian, we should try a login
-		my $loginstatus = `mysqladmin $remotestring ping 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			# Login went just fine
-			$mysqllogin = " $remotestring ";
-			# Did this go well because of a .my.cnf file or is there no password set?
-			my $userpath = `printenv HOME`;
-			if (length($userpath) > 0) {
-				chomp($userpath);
-			}
-			unless ( -e "${userpath}/.my.cnf" ) {
-				badprint "Successfully authenticated with no password - SECURITY RISK!\n";
-			}
-			return 1;
-		} else {
-			print STDERR "Please enter your MySQL administrative login: ";
-			my $name = <>;
-			print STDERR "Please enter your MySQL administrative password: ";
-			system("stty -echo >$devnull 2>&1");
-			my $password = <>;
-			system("stty echo >$devnull 2>&1");
-			chomp($password);
-			chomp($name);
-			$mysqllogin = "-u $name";
-			if (length($password) > 0) {
-				$mysqllogin .= " -p'$password'";
-			}
-			$mysqllogin .= $remotestring;
-			my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-			if ($loginstatus =~ /mysqld is alive/) {
-				print STDERR "\n";
-				if (! length($password)) {
-					# Did this go well because of a .my.cnf file or is there no password set?
-					my $userpath = `ls -d ~`;
-					chomp($userpath);
-					unless ( -e "$userpath/.my.cnf" ) {
-						badprint "Successfully authenticated with no password - SECURITY RISK!\n";
-					}
-				}
-				return 1;
-			} else {
-				print "\n".$bad." Attempted to use login credentials, but they were invalid.\n";
-				exit 0;
-			}
-			exit 0;
-		}
-	}
-}
-
-# Populates all of the variable and status hashes
-my (%mystat,%myvar,$dummyselect);
-sub get_all_vars {
-	# We need to initiate at least one query so that our data is useable
-	$dummyselect = `mysql $mysqllogin -Bse "SELECT VERSION();"`;
-	my @mysqlvarlist = `mysql $mysqllogin -Bse "SHOW /*!50000 GLOBAL */ VARIABLES;"`;
-	foreach my $line (@mysqlvarlist) {
-		$line =~ /([a-zA-Z_]*)\s*(.*)/;
-		$myvar{$1} = $2;
-	}
-	my @mysqlstatlist = `mysql $mysqllogin -Bse "SHOW /*!50000 GLOBAL */ STATUS;"`;
-	foreach my $line (@mysqlstatlist) {
-		$line =~ /([a-zA-Z_]*)\s*(.*)/;
-		$mystat{$1} = $2;
-	}
-	# Workaround for MySQL bug #59393 wrt. ignore-builtin-innodb
-	if (($myvar{'ignore_builtin_innodb'} || "") eq "ON") {
-		$myvar{'have_innodb'} = "NO";
-	}
-	# have_* for engines is deprecated and will be removed in MySQL 5.6;
-	# check SHOW ENGINES and set corresponding old style variables.
-	# Also works around MySQL bug #59393 wrt. skip-innodb
-	my @mysqlenginelist = `mysql $mysqllogin -Bse "SHOW ENGINES;" 2>$devnull`;
-	foreach my $line (@mysqlenginelist) {
-		if ($line =~ /^([a-zA-Z_]+)\s+(\S+)/) {
-			my $engine = lc($1);
-			if ($engine eq "federated" || $engine eq "blackhole") {
-				$engine .= "_engine";
-			} elsif ($engine eq "berkeleydb") {
-				$engine = "bdb";
-			}
-			my $val = ($2 eq "DEFAULT") ? "YES" : $2;
-			$myvar{"have_$engine"} = $val;
-		}
-	}
-}
-
-sub security_recommendations {
-	print "\n-------- Security Recommendations  -------------------------------------------\n";
-	my @mysqlstatlist = `mysql $mysqllogin -Bse "SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE password = '' OR password IS NULL;"`;
-	if (@mysqlstatlist) {
-		foreach my $line (sort @mysqlstatlist) {
-			chomp($line);
-			badprint "User '".$line."' has no password set.\n";
-		}
-	} else {
-		goodprint "All database users have passwords assigned\n";
-	}
-}
-
-sub get_replication_status {
-	my $slave_status = `mysql $mysqllogin -Bse "show slave status\\G"`;
-	my ($io_running) = ($slave_status =~ /slave_io_running\S*\s+(\S+)/i);
-	my ($sql_running) = ($slave_status =~ /slave_sql_running\S*\s+(\S+)/i);
-	if ($io_running eq 'Yes' && $sql_running eq 'Yes') {
-		if ($myvar{'read_only'} eq 'OFF') {
-			badprint "This replication slave is running with the read_only option disabled.";
-		} else {
-			goodprint "This replication slave is running with the read_only option enabled.";
-		}
-	}
-}
-
-# Checks for updates to MySQLTuner
-sub validate_tuner_version {
-	print "\n-------- General Statistics --------------------------------------------------\n";
-	if ($opt{checkversion} eq 0) {
-		infoprint "Skipped version check for MySQLTuner script\n";
-		return;
-	}
-	my $update;
-	my $url = "http://mysqltuner.com/versioncheck.php?v=$tunerversion";
-	if (-e "/usr/bin/curl") {
-		$update = `/usr/bin/curl --connect-timeout 5 '$url' 2>$devnull`;
-		chomp($update);
-	} elsif (-e "/usr/bin/wget") {
-		$update = `/usr/bin/wget -e timestamping=off -T 5 -O - '$url' 2>$devnull`;
-		chomp($update);
-	}
-	if ($update eq 1) {
-		badprint "There is a new version of MySQLTuner available\n";
-	} elsif ($update eq 0) {
-		goodprint "You have the latest version of MySQLTuner\n";
-	} else {
-		infoprint "Unable to check for the latest MySQLTuner version\n";
-	}
-}
-
-# Checks for supported or EOL'ed MySQL versions
-my ($mysqlvermajor,$mysqlverminor);
-sub validate_mysql_version {
-	($mysqlvermajor,$mysqlverminor) = $myvar{'version'} =~ /(\d)\.(\d)/;
-	if (!mysql_version_ge(5)) {
-		badprint "Your MySQL version ".$myvar{'version'}." is EOL software!  Upgrade soon!\n";
-	} elsif (mysql_version_ge(6)) {
-		badprint "Currently running unsupported MySQL version ".$myvar{'version'}."\n";
-	} else {
-		goodprint "Currently running supported MySQL version ".$myvar{'version'}."\n";
-	}
-}
-
-# Checks if MySQL version is greater than equal to (major, minor)
-sub mysql_version_ge {
-	my ($maj, $min) = @_;
-	return $mysqlvermajor > $maj || ($mysqlvermajor == $maj && $mysqlverminor >= ($min || 0));
-}
-
-# Checks for 32-bit boxes with more than 2GB of RAM
-my ($arch);
-sub check_architecture {
-	if ($doremote eq 1) { return; }
-	if (`uname` =~ /SunOS/ && `isainfo -b` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} elsif (`uname` !~ /SunOS/ && `uname -m` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} elsif (`uname` =~ /AIX/ && `bootinfo -K` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} else {
-		$arch = 32;
-		if ($physical_memory > 2147483648) {
-			badprint "Switch to 64-bit OS - MySQL cannot currently use all of your RAM\n";
-		} else {
-			goodprint "Operating on 32-bit architecture with less than 2GB RAM\n";
-		}
-	}
-}
-
-# Start up a ton of storage engine counts/statistics
-my (%enginestats,%enginecount,$fragtables);
-sub check_storage_engines {
-	if ($opt{skipsize} eq 1) {
-		print "\n-------- Storage Engine Statistics -------------------------------------------\n";
-		infoprint "Skipped due to --skipsize option\n";
-		return;
-	}
-	print "\n-------- Storage Engine Statistics -------------------------------------------\n";
-	infoprint "Status: ";
-	my $engines;
-	$engines .= (defined $myvar{'have_archive'} && $myvar{'have_archive'} eq "YES")? greenwrap "+Archive " : redwrap "-Archive " ;
-	$engines .= (defined $myvar{'have_bdb'} && $myvar{'have_bdb'} eq "YES")? greenwrap "+BDB " : redwrap "-BDB " ;
-	$engines .= (defined $myvar{'have_federated_engine'} && $myvar{'have_federated_engine'} eq "YES")? greenwrap "+Federated " : redwrap "-Federated " ;
-	$engines .= (defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES")? greenwrap "+InnoDB " : redwrap "-InnoDB " ;
-	$engines .= (defined $myvar{'have_isam'} && $myvar{'have_isam'} eq "YES")? greenwrap "+ISAM " : redwrap "-ISAM " ;
-	$engines .= (defined $myvar{'have_ndbcluster'} && $myvar{'have_ndbcluster'} eq "YES")? greenwrap "+NDBCluster " : redwrap "-NDBCluster " ;
-	print "$engines\n";
-	if (mysql_version_ge(5)) {
-		# MySQL 5 servers can have table sizes calculated quickly from information schema
-		my @templist = `mysql $mysqllogin -Bse "SELECT ENGINE,SUM(DATA_LENGTH),COUNT(ENGINE) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND ENGINE IS NOT NULL GROUP BY ENGINE ORDER BY ENGINE ASC;"`;
-		foreach my $line (@templist) {
-			my ($engine,$size,$count);
-			($engine,$size,$count) = $line =~ /([a-zA-Z_]*)\s+(\d+)\s+(\d+)/;
-			if (!defined($size)) { next; }
-			$enginestats{$engine} = $size;
-			$enginecount{$engine} = $count;
-		}
-		$fragtables = `mysql $mysqllogin -Bse "SELECT COUNT(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND Data_free > 0 AND NOT ENGINE='MEMORY';"`;
-		chomp($fragtables);
-	} else {
-		# MySQL < 5 servers take a lot of work to get table sizes
-		my @tblist;
-		# Now we build a database list, and loop through it to get storage engine stats for tables
-		my @dblist = `mysql $mysqllogin -Bse "SHOW DATABASES"`;
-		foreach my $db (@dblist) {
-			chomp($db);
-			if ($db eq "information_schema") { next; }
-			my @ixs = (1, 6, 9);
-			if (!mysql_version_ge(4, 1)) {
-				# MySQL 3.23/4.0 keeps Data_Length in the 5th (0-based) column
-				@ixs = (1, 5, 8);
-			}
-			push(@tblist, map { [ (split)[@ixs] ] } `mysql $mysqllogin -Bse "SHOW TABLE STATUS FROM \\\`$db\\\`"`);
-		}
-		# Parse through the table list to generate storage engine counts/statistics
-		$fragtables = 0;
-		foreach my $tbl (@tblist) {
-			my ($engine, $size, $datafree) = @$tbl;
-			if (defined $enginestats{$engine}) {
-				$enginestats{$engine} += $size;
-				$enginecount{$engine} += 1;
-			} else {
-				$enginestats{$engine} = $size;
-				$enginecount{$engine} = 1;
-			}
-			if ($datafree > 0) {
-				$fragtables++;
-			}
-		}
-	}
-	while (my ($engine,$size) = each(%enginestats)) {
-		infoprint "Data in $engine tables: ".hr_bytes_rnd($size)." (Tables: ".$enginecount{$engine}.")"."\n";
-	}
-	# If the storage engine isn't being used, recommend it to be disabled
-	if (!defined $enginestats{'InnoDB'} && defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES") {
-		badprint "InnoDB is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-innodb to MySQL configuration to disable InnoDB");
-	}
-	if (!defined $enginestats{'BerkeleyDB'} && defined $myvar{'have_bdb'} && $myvar{'have_bdb'} eq "YES") {
-		badprint "BDB is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-bdb to MySQL configuration to disable BDB");
-	}
-	if (!defined $enginestats{'ISAM'} && defined $myvar{'have_isam'} && $myvar{'have_isam'} eq "YES") {
-		badprint "ISAM is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-isam to MySQL configuration to disable ISAM (MySQL > 4.1.0)");
-	}
-	# Fragmented tables
-	if ($fragtables > 0) {
-		badprint "Total fragmented tables: $fragtables\n";
-		push(@generalrec,"Run OPTIMIZE TABLE to defragment tables for better performance");
-	} else {
-		goodprint "Total fragmented tables: $fragtables\n";
-	}
-}
-
-my %mycalc;
-sub calculations {
-	if ($mystat{'Questions'} < 1) {
-		badprint "Your server has not answered any queries - cannot continue...";
-		exit 0;
-	}
-	# Per-thread memory
-	if (mysql_version_ge(4)) {
-		$mycalc{'per_thread_buffers'} = $myvar{'read_buffer_size'} + $myvar{'read_rnd_buffer_size'} + $myvar{'sort_buffer_size'} + $myvar{'thread_stack'} + $myvar{'join_buffer_size'};
-	} else {
-		$mycalc{'per_thread_buffers'} = $myvar{'record_buffer'} + $myvar{'record_rnd_buffer'} + $myvar{'sort_buffer'} + $myvar{'thread_stack'} + $myvar{'join_buffer_size'};
-	}
-	$mycalc{'total_per_thread_buffers'} = $mycalc{'per_thread_buffers'} * $myvar{'max_connections'};
-	$mycalc{'max_total_per_thread_buffers'} = $mycalc{'per_thread_buffers'} * $mystat{'Max_used_connections'};
-
-	# Server-wide memory
-	$mycalc{'max_tmp_table_size'} = ($myvar{'tmp_table_size'} > $myvar{'max_heap_table_size'}) ? $myvar{'max_heap_table_size'} : $myvar{'tmp_table_size'} ;
-	$mycalc{'server_buffers'} = $myvar{'key_buffer_size'} + $mycalc{'max_tmp_table_size'};
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_buffer_pool_size'}) ? $myvar{'innodb_buffer_pool_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_additional_mem_pool_size'}) ? $myvar{'innodb_additional_mem_pool_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_log_buffer_size'}) ? $myvar{'innodb_log_buffer_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'query_cache_size'}) ? $myvar{'query_cache_size'} : 0 ;
-
-	# Global memory
-	$mycalc{'max_used_memory'} = $mycalc{'server_buffers'} + $mycalc{"max_total_per_thread_buffers"};
-	$mycalc{'total_possible_used_memory'} = $mycalc{'server_buffers'} + $mycalc{'total_per_thread_buffers'};
-	$mycalc{'pct_physical_memory'} = int(($mycalc{'total_possible_used_memory'} * 100) / $physical_memory);
-
-	# Slow queries
-	$mycalc{'pct_slow_queries'} = int(($mystat{'Slow_queries'}/$mystat{'Questions'}) * 100);
-
-	# Connections
-	$mycalc{'pct_connections_used'} = int(($mystat{'Max_used_connections'}/$myvar{'max_connections'}) * 100);
-	$mycalc{'pct_connections_used'} = ($mycalc{'pct_connections_used'} > 100) ? 100 : $mycalc{'pct_connections_used'} ;
-
-	# Key buffers
-	if (mysql_version_ge(4, 1)) {
-		$mycalc{'pct_key_buffer_used'} = sprintf("%.1f",(1 - (($mystat{'Key_blocks_unused'} * $myvar{'key_cache_block_size'}) / $myvar{'key_buffer_size'})) * 100);
-	}
-	if ($mystat{'Key_read_requests'} > 0) {
-		$mycalc{'pct_keys_from_mem'} = sprintf("%.1f",(100 - (($mystat{'Key_reads'} / $mystat{'Key_read_requests'}) * 100)));
-	} else {
-	    $mycalc{'pct_keys_from_mem'} = 0;
-	}
-	if ($doremote eq 0 and !mysql_version_ge(5)) {
-		my $size = 0;
-		$size += (split)[0] for `find $myvar{'datadir'} -name "*.MYI" 2>&1 | xargs du -L $duflags 2>&1`;
-		$mycalc{'total_myisam_indexes'} = $size;
-	} elsif (mysql_version_ge(5)) {
-		$mycalc{'total_myisam_indexes'} = `mysql $mysqllogin -Bse "SELECT IFNULL(SUM(INDEX_LENGTH),0) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema') AND ENGINE = 'MyISAM';"`;
-	}
-	if (defined $mycalc{'total_myisam_indexes'} and $mycalc{'total_myisam_indexes'} == 0) {
-		$mycalc{'total_myisam_indexes'} = "fail";
-	} elsif (defined $mycalc{'total_myisam_indexes'}) {
-		chomp($mycalc{'total_myisam_indexes'});
-	}
-
-	# Query cache
-	if (mysql_version_ge(4)) {
-		$mycalc{'query_cache_efficiency'} = sprintf("%.1f",($mystat{'Qcache_hits'} / ($mystat{'Com_select'} + $mystat{'Qcache_hits'})) * 100);
-		if ($myvar{'query_cache_size'}) {
-			$mycalc{'pct_query_cache_used'} = sprintf("%.1f",100 - ($mystat{'Qcache_free_memory'} / $myvar{'query_cache_size'}) * 100);
-		}
-	if ($mystat{'Qcache_lowmem_prunes'} == 0) {
-			$mycalc{'query_cache_prunes_per_day'} = 0;
-		} else {
-			$mycalc{'query_cache_prunes_per_day'} = int($mystat{'Qcache_lowmem_prunes'} / ($mystat{'Uptime'}/86400));
-		}
-	}
-
-	# Sorting
-	$mycalc{'total_sorts'} = $mystat{'Sort_scan'} + $mystat{'Sort_range'};
-	if ($mycalc{'total_sorts'} > 0) {
-		$mycalc{'pct_temp_sort_table'} = int(($mystat{'Sort_merge_passes'} / $mycalc{'total_sorts'}) * 100);
-	}
-
-	# Joins
-	$mycalc{'joins_without_indexes'} = $mystat{'Select_range_check'} + $mystat{'Select_full_join'};
-	$mycalc{'joins_without_indexes_per_day'} = int($mycalc{'joins_without_indexes'} / ($mystat{'Uptime'}/86400));
-
-	# Temporary tables
-	if ($mystat{'Created_tmp_tables'} > 0) {
-		if ($mystat{'Created_tmp_disk_tables'} > 0) {
-			$mycalc{'pct_temp_disk'} = int(($mystat{'Created_tmp_disk_tables'} / ($mystat{'Created_tmp_tables'} + $mystat{'Created_tmp_disk_tables'})) * 100);
-		} else {
-			$mycalc{'pct_temp_disk'} = 0;
-		}
-	}
-
-	# Table cache
-	if ($mystat{'Opened_tables'} > 0) {
-		$mycalc{'table_cache_hit_rate'} = int($mystat{'Open_tables'}*100/$mystat{'Opened_tables'});
-	} else {
-		$mycalc{'table_cache_hit_rate'} = 100;
-	}
-
-	# Open files
-	if ($myvar{'open_files_limit'} > 0) {
-		$mycalc{'pct_files_open'} = int($mystat{'Open_files'}*100/$myvar{'open_files_limit'});
-	}
-
-	# Table locks
-	if ($mystat{'Table_locks_immediate'} > 0) {
-		if ($mystat{'Table_locks_waited'} == 0) {
-			$mycalc{'pct_table_locks_immediate'} = 100;
-		} else {
-			$mycalc{'pct_table_locks_immediate'} = int($mystat{'Table_locks_immediate'}*100/($mystat{'Table_locks_waited'} + $mystat{'Table_locks_immediate'}));
-		}
-	}
-
-	# Thread cache
-	$mycalc{'thread_cache_hit_rate'} = int(100 - (($mystat{'Threads_created'} / $mystat{'Connections'}) * 100));
-
-	# Other
-	if ($mystat{'Connections'} > 0) {
-		$mycalc{'pct_aborted_connections'} = int(($mystat{'Aborted_connects'}/$mystat{'Connections'}) * 100);
-	}
-	if ($mystat{'Questions'} > 0) {
-		$mycalc{'total_reads'} = $mystat{'Com_select'};
-		$mycalc{'total_writes'} = $mystat{'Com_delete'} + $mystat{'Com_insert'} + $mystat{'Com_update'} + $mystat{'Com_replace'};
-		if ($mycalc{'total_reads'} == 0) {
-			$mycalc{'pct_reads'} = 0;
-			$mycalc{'pct_writes'} = 100;
-		} else {
-			$mycalc{'pct_reads'} = int(($mycalc{'total_reads'}/($mycalc{'total_reads'}+$mycalc{'total_writes'})) * 100);
-			$mycalc{'pct_writes'} = 100-$mycalc{'pct_reads'};
-		}
-	}
-
-	# InnoDB
-	if ($myvar{'have_innodb'} eq "YES") {
-		$mycalc{'innodb_log_size_pct'} = ($myvar{'innodb_log_file_size'} * 100 / $myvar{'innodb_buffer_pool_size'});
-	}
-}
-
-sub mysql_stats {
-	print "\n-------- Performance Metrics -------------------------------------------------\n";
-	# Show uptime, queries per second, connections, traffic stats
-	my $qps;
-	if ($mystat{'Uptime'} > 0) { $qps = sprintf("%.3f",$mystat{'Questions'}/$mystat{'Uptime'}); }
-	if ($mystat{'Uptime'} < 86400) { push(@generalrec,"MySQL started within last 24 hours - recommendations may be inaccurate"); }
-	infoprint "Up for: ".pretty_uptime($mystat{'Uptime'})." (".hr_num($mystat{'Questions'}).
-		" q [".hr_num($qps)." qps], ".hr_num($mystat{'Connections'})." conn,".
-		" TX: ".hr_num($mystat{'Bytes_sent'}).", RX: ".hr_num($mystat{'Bytes_received'}).")\n";
-	infoprint "Reads / Writes: ".$mycalc{'pct_reads'}."% / ".$mycalc{'pct_writes'}."%\n";
-
-	# Memory usage
-	infoprint "Total buffers: ".hr_bytes($mycalc{'server_buffers'})." global + ".hr_bytes($mycalc{'per_thread_buffers'})." per thread ($myvar{'max_connections'} max threads)\n";
-	if ($mycalc{'total_possible_used_memory'} > 2*1024*1024*1024 && $arch eq 32) {
-		badprint "Allocating > 2GB RAM on 32-bit systems can cause system instability\n";
-		badprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-	} elsif ($mycalc{'pct_physical_memory'} > 85) {
-		badprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-		push(@generalrec,"Reduce your overall MySQL memory footprint for system stability");
-	} else {
-		goodprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-	}
-
-	# Slow queries
-	if ($mycalc{'pct_slow_queries'} > 5) {
-		badprint "Slow queries: $mycalc{'pct_slow_queries'}% (".hr_num($mystat{'Slow_queries'})."/".hr_num($mystat{'Questions'}).")\n";
-	} else {
-		goodprint "Slow queries: $mycalc{'pct_slow_queries'}% (".hr_num($mystat{'Slow_queries'})."/".hr_num($mystat{'Questions'}).")\n";
-	}
-	if ($myvar{'long_query_time'} > 10) { push(@adjvars,"long_query_time (<= 10)"); }
-	if (defined($myvar{'log_slow_queries'})) {
-		if ($myvar{'log_slow_queries'} eq "OFF") { push(@generalrec,"Enable the slow query log to troubleshoot bad queries"); }
-	}
-
-	# Connections
-	if ($mycalc{'pct_connections_used'} > 85) {
-		badprint "Highest connection usage: $mycalc{'pct_connections_used'}%  ($mystat{'Max_used_connections'}/$myvar{'max_connections'})\n";
-		push(@adjvars,"max_connections (> ".$myvar{'max_connections'}.")");
-		push(@adjvars,"wait_timeout (< ".$myvar{'wait_timeout'}.")","interactive_timeout (< ".$myvar{'interactive_timeout'}.")");
-		push(@generalrec,"Reduce or eliminate persistent connections to reduce connection usage")
-	} else {
-		goodprint "Highest usage of available connections: $mycalc{'pct_connections_used'}% ($mystat{'Max_used_connections'}/$myvar{'max_connections'})\n";
-	}
-
-	# Key buffer
-	if (!defined($mycalc{'total_myisam_indexes'}) and $doremote == 1) {
-		push(@generalrec,"Unable to calculate MyISAM indexes on remote MySQL server < 5.0.0");
-	} elsif ($mycalc{'total_myisam_indexes'} =~ /^fail$/) {
-		badprint "Cannot calculate MyISAM index size - re-run script as root user\n";
-	} elsif ($mycalc{'total_myisam_indexes'} == "0") {
-		badprint "None of your MyISAM tables are indexed - add indexes immediately\n";
-	} else {
-		if ($myvar{'key_buffer_size'} < $mycalc{'total_myisam_indexes'} && $mycalc{'pct_keys_from_mem'} < 95) {
-			badprint "Key buffer size / total MyISAM indexes: ".hr_bytes($myvar{'key_buffer_size'})."/".hr_bytes($mycalc{'total_myisam_indexes'})."\n";
-			push(@adjvars,"key_buffer_size (> ".hr_bytes($mycalc{'total_myisam_indexes'}).")");
-		} else {
-			goodprint "Key buffer size / total MyISAM indexes: ".hr_bytes($myvar{'key_buffer_size'})."/".hr_bytes($mycalc{'total_myisam_indexes'})."\n";
-		}
-		if ($mystat{'Key_read_requests'} > 0) {
-			if ($mycalc{'pct_keys_from_mem'} < 95) {
-				badprint "Key buffer hit rate: $mycalc{'pct_keys_from_mem'}% (".hr_num($mystat{'Key_read_requests'})." cached / ".hr_num($mystat{'Key_reads'})." reads)\n";
-			} else {
-				goodprint "Key buffer hit rate: $mycalc{'pct_keys_from_mem'}% (".hr_num($mystat{'Key_read_requests'})." cached / ".hr_num($mystat{'Key_reads'})." reads)\n";
-			}
-		} else {
-			# No queries have run that would use keys
-		}
-	}
-
-	# Query cache
-	if (!mysql_version_ge(4)) {
-		# MySQL versions < 4.01 don't support query caching
-		push(@generalrec,"Upgrade MySQL to version 4+ to utilize query caching");
-	} elsif ($myvar{'query_cache_size'} < 1) {
-		badprint "Query cache is disabled\n";
-		push(@adjvars,"query_cache_size (>= 8M)");
-	} elsif ($mystat{'Com_select'} == 0) {
-		badprint "Query cache cannot be analyzed - no SELECT statements executed\n";
-	} else {
-		if ($mycalc{'query_cache_efficiency'} < 20) {
-			badprint "Query cache efficiency: $mycalc{'query_cache_efficiency'}% (".hr_num($mystat{'Qcache_hits'})." cached / ".hr_num($mystat{'Qcache_hits'}+$mystat{'Com_select'})." selects)\n";
-			push(@adjvars,"query_cache_limit (> ".hr_bytes_rnd($myvar{'query_cache_limit'}).", or use smaller result sets)");
-		} else {
-			goodprint "Query cache efficiency: $mycalc{'query_cache_efficiency'}% (".hr_num($mystat{'Qcache_hits'})." cached / ".hr_num($mystat{'Qcache_hits'}+$mystat{'Com_select'})." selects)\n";
-		}
-		if ($mycalc{'query_cache_prunes_per_day'} > 98) {
-			badprint "Query cache prunes per day: $mycalc{'query_cache_prunes_per_day'}\n";
-			if ($myvar{'query_cache_size'} > 128*1024*1024) {
-			    push(@generalrec,"Increasing the query_cache size over 128M may reduce performance");
-		        push(@adjvars,"query_cache_size (> ".hr_bytes_rnd($myvar{'query_cache_size'}).") [see warning above]");
-			} else {
-		        push(@adjvars,"query_cache_size (> ".hr_bytes_rnd($myvar{'query_cache_size'}).")");
-			}
-		} else {
-			goodprint "Query cache prunes per day: $mycalc{'query_cache_prunes_per_day'}\n";
-		}
-	}
-
-	# Sorting
-	if ($mycalc{'total_sorts'} == 0) {
-		# For the sake of space, we will be quiet here
-		# No sorts have run yet
-	} elsif ($mycalc{'pct_temp_sort_table'} > 10) {
-		badprint "Sorts requiring temporary tables: $mycalc{'pct_temp_sort_table'}% (".hr_num($mystat{'Sort_merge_passes'})." temp sorts / ".hr_num($mycalc{'total_sorts'})." sorts)\n";
-		push(@adjvars,"sort_buffer_size (> ".hr_bytes_rnd($myvar{'sort_buffer_size'}).")");
-		push(@adjvars,"read_rnd_buffer_size (> ".hr_bytes_rnd($myvar{'read_rnd_buffer_size'}).")");
-	} else {
-		goodprint "Sorts requiring temporary tables: $mycalc{'pct_temp_sort_table'}% (".hr_num($mystat{'Sort_merge_passes'})." temp sorts / ".hr_num($mycalc{'total_sorts'})." sorts)\n";
-	}
-
-	# Joins
-	if ($mycalc{'joins_without_indexes_per_day'} > 250) {
-		badprint "Joins performed without indexes: $mycalc{'joins_without_indexes'}\n";
-		push(@adjvars,"join_buffer_size (> ".hr_bytes($myvar{'join_buffer_size'}).", or always use indexes with joins)");
-		push(@generalrec,"Adjust your join queries to always utilize indexes");
-	} else {
-		# For the sake of space, we will be quiet here
-		# No joins have run without indexes
-	}
-
-	# Temporary tables
-	if ($mystat{'Created_tmp_tables'} > 0) {
-		if ($mycalc{'pct_temp_disk'} > 25 && $mycalc{'max_tmp_table_size'} < 256*1024*1024) {
-			badprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-			push(@adjvars,"tmp_table_size (> ".hr_bytes_rnd($myvar{'tmp_table_size'}).")");
-			push(@adjvars,"max_heap_table_size (> ".hr_bytes_rnd($myvar{'max_heap_table_size'}).")");
-			push(@generalrec,"When making adjustments, make tmp_table_size/max_heap_table_size equal");
-			push(@generalrec,"Reduce your SELECT DISTINCT queries without LIMIT clauses");
-		} elsif ($mycalc{'pct_temp_disk'} > 25 && $mycalc{'max_tmp_table_size'} >= 256) {
-			badprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-			push(@generalrec,"Temporary table size is already large - reduce result set size");
-			push(@generalrec,"Reduce your SELECT DISTINCT queries without LIMIT clauses");
-		} else {
-			goodprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-		}
-	} else {
-		# For the sake of space, we will be quiet here
-		# No temporary tables have been created
-	}
-
-	# Thread cache
-	if ($myvar{'thread_cache_size'} eq 0) {
-		badprint "Thread cache is disabled\n";
-		push(@generalrec,"Set thread_cache_size to 4 as a starting value");
-		push(@adjvars,"thread_cache_size (start at 4)");
-	} else {
-		if ($mycalc{'thread_cache_hit_rate'} <= 50) {
-			badprint "Thread cache hit rate: $mycalc{'thread_cache_hit_rate'}% (".hr_num($mystat{'Threads_created'})." created / ".hr_num($mystat{'Connections'})." connections)\n";
-			push(@adjvars,"thread_cache_size (> $myvar{'thread_cache_size'})");
-		} else {
-			goodprint "Thread cache hit rate: $mycalc{'thread_cache_hit_rate'}% (".hr_num($mystat{'Threads_created'})." created / ".hr_num($mystat{'Connections'})." connections)\n";
-		}
-	}
-
-	# Table cache
-	if ($mystat{'Open_tables'} > 0) {
-		if ($mycalc{'table_cache_hit_rate'} < 20) {
-			badprint "Table cache hit rate: $mycalc{'table_cache_hit_rate'}% (".hr_num($mystat{'Open_tables'})." open / ".hr_num($mystat{'Opened_tables'})." opened)\n";
-			if (mysql_version_ge(5, 1)) {
-				push(@adjvars,"table_cache (> ".$myvar{'table_open_cache'}.")");
-			} else {
-				push(@adjvars,"table_cache (> ".$myvar{'table_cache'}.")");
-			}
-			push(@generalrec,"Increase table_cache gradually to avoid file descriptor limits");
-		} else {
-			goodprint "Table cache hit rate: $mycalc{'table_cache_hit_rate'}% (".hr_num($mystat{'Open_tables'})." open / ".hr_num($mystat{'Opened_tables'})." opened)\n";
-		}
-	}
-
-	# Open files
-	if (defined $mycalc{'pct_files_open'}) {
-		if ($mycalc{'pct_files_open'} > 85) {
-			badprint "Open file limit used: $mycalc{'pct_files_open'}% (".hr_num($mystat{'Open_files'})."/".hr_num($myvar{'open_files_limit'}).")\n";
-			push(@adjvars,"open_files_limit (> ".$myvar{'open_files_limit'}.")");
-		} else {
-			goodprint "Open file limit used: $mycalc{'pct_files_open'}% (".hr_num($mystat{'Open_files'})."/".hr_num($myvar{'open_files_limit'}).")\n";
-		}
-	}
-
-	# Table locks
-	if (defined $mycalc{'pct_table_locks_immediate'}) {
-		if ($mycalc{'pct_table_locks_immediate'} < 95) {
-			badprint "Table locks acquired immediately: $mycalc{'pct_table_locks_immediate'}%\n";
-			push(@generalrec,"Optimize queries and/or use InnoDB to reduce lock wait");
-		} else {
-			goodprint "Table locks acquired immediately: $mycalc{'pct_table_locks_immediate'}% (".hr_num($mystat{'Table_locks_immediate'})." immediate / ".hr_num($mystat{'Table_locks_waited'}+$mystat{'Table_locks_immediate'})." locks)\n";
-		}
-	}
-
-	# Performance options
-	if (!mysql_version_ge(4, 1)) {
-		push(@generalrec,"Upgrade to MySQL 4.1+ to use concurrent MyISAM inserts");
-	} elsif ($myvar{'concurrent_insert'} eq "OFF") {
-		push(@generalrec,"Enable concurrent_insert by setting it to 'ON'");
-	} elsif ($myvar{'concurrent_insert'} eq 0) {
-		push(@generalrec,"Enable concurrent_insert by setting it to 1");
-	}
-	if ($mycalc{'pct_aborted_connections'} > 5) {
-		badprint "Connections aborted: ".$mycalc{'pct_aborted_connections'}."%\n";
-		push(@generalrec,"Your applications are not closing MySQL connections properly");
-	}
-
-	# InnoDB
-	if (defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES" && defined $enginestats{'InnoDB'}) {
-		if ($myvar{'innodb_buffer_pool_size'} > $enginestats{'InnoDB'}) {
-			goodprint "InnoDB data size / buffer pool: ".hr_bytes($enginestats{'InnoDB'})."/".hr_bytes($myvar{'innodb_buffer_pool_size'})."\n";
-		} else {
-			badprint "InnoDB data size / buffer pool: ".hr_bytes($enginestats{'InnoDB'})."/".hr_bytes($myvar{'innodb_buffer_pool_size'})."\n";
-			push(@adjvars,"innodb_buffer_pool_size (>= ".hr_bytes_rnd($enginestats{'InnoDB'}).")");
-		}
-	}
-}
-
-# Take the two recommendation arrays and display them at the end of the output
-sub make_recommendations {
-	print "\n-------- Recommendations -----------------------------------------------------\n";
-	if (@generalrec > 0) {
-		print "General recommendations:\n";
-		foreach (@generalrec) { print "    ".$_."\n"; }
-	}
-	if (@adjvars > 0) {
-		print "Variables to adjust:\n";
-		if ($mycalc{'pct_physical_memory'} > 90) {
-			print "  *** MySQL's maximum memory usage is dangerously high ***\n".
-				  "  *** Add RAM before increasing MySQL buffer variables ***\n";
-		}
-		foreach (@adjvars) { print "    ".$_."\n"; }
-	}
-	if (@generalrec == 0 && @adjvars ==0) {
-		print "No additional performance recommendations are available.\n"
-	}
-	print "\n";
-}
-
-# ---------------------------------------------------------------------------
-# BEGIN 'MAIN'
-# ---------------------------------------------------------------------------
-print	"\n >>  MySQLTuner $tunerversion - Major Hayden <major\@mhtx.net>\n".
-		" >>  Bug reports, feature requests, and downloads at http://mysqltuner.com/\n".
-		" >>  Run with '--help' for additional options and output filtering\n";
-mysql_setup;					# Gotta login first
-os_setup;						# Set up some OS variables
-get_all_vars;					# Toss variables/status into hashes
-validate_tuner_version;			# Check current MySQLTuner version
-validate_mysql_version;			# Check current MySQL version
-check_architecture;				# Suggest 64-bit upgrade
-check_storage_engines;			# Show enabled storage engines
-security_recommendations;		# Display some security recommendations
-calculations;					# Calculate everything we need
-mysql_stats;					# Print the server stats
-make_recommendations;			# Make recommendations based on stats
-# ---------------------------------------------------------------------------
-# END 'MAIN'
-# ---------------------------------------------------------------------------
-
-# Local variables:
-# indent-tabs-mode: t
-# cperl-indent-level: 8
-# perl-indent-level: 8
-# End:
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
deleted file mode 100644
index aca9c7a3dad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:mysql_deepmerge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Recursively merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-        $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-        $merged_hash = mysql_deepmerge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }
-
-    When there is a duplicate key that is a hash, they are recursively merged.
-    When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
-    When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate),
-      the rightmost style will win.
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("mysql_deepmerge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    result = Hash.new
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "mysql_deepmerge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-
-      # Now we have to traverse our hash assigning our non-hash values
-      # to the matching keys in our result while following our hash values
-      # and repeating the process.
-      overlay( result, arg )
-    end
-    return( result )
-  end
-end
-
-def has_normalized!(hash, key)
-  return true if hash.has_key?( key )
-  return false unless key.match(/-|_/)
-  other_key = key.include?('-') ? key.gsub( '-', '_' ) : key.gsub( '_', '-' )
-  return false unless hash.has_key?( other_key )
-  hash[key] = hash.delete( other_key )
-  return true;
-end
-
-def overlay( hash1, hash2 )
-  hash2.each do |key, value|
-    if(has_normalized!( hash1, key ) and value.is_a?(Hash) and hash1[key].is_a?(Hash))
-      overlay( hash1[key], value )
-    else
-      hash1[key] = value
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
deleted file mode 100644
index f057a3139da..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# hash a string as mysql's "PASSWORD()" function would do it
-require 'digest/sha1'
-
-module Puppet::Parser::Functions
-  newfunction(:mysql_password, :type => :rvalue, :doc => <<-EOS
-    Returns the mysql password hash from the clear text password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, 'mysql_password(): Wrong number of arguments ' +
-      "given (#{args.size} for 1)") if args.size != 1
-
-    '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(args[0])).upcase
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
deleted file mode 100644
index 8e850d02a52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:mysql_strip_hash, :type => :rvalue, :arity => 1, :doc => <<-EOS
-TEMPORARY FUNCTION: EXPIRES 2014-03-10
-When given a hash this function strips out all blank entries.
-EOS
-  ) do |args|
-
-    hash = args[0]
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'mysql_strip_hash(): Requires hash to work with')
-    end
-
-    # Filter out all the top level blanks.
-    hash.reject{|k,v| v == ''}.each do |k,v|
-      if v.is_a?(Hash)
-        v.reject!{|ki,vi| vi == '' }
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
deleted file mode 100644
index ace742967e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-  desc 'Manages MySQL database.'
-
-  defaultfor :kernel => 'Linux'
-
-  optional_commands :mysql      => 'mysql'
-  optional_commands :mysqladmin => 'mysqladmin'
-
-  def self.instances
-    mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
-      new(:name => name)
-    end
-  end
-
-  def create
-    mysql([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{resource[:charset]}"].compact)
-  end
-
-  def destroy
-    mysqladmin([defaults_file, '-f', 'drop', @resource[:name]].compact)
-  end
-
-  def charset
-    mysql([defaults_file, '-NBe', "show create database `#{resource[:name]}`"].compact).match(/.*?(\S+)\s(?:COLLATE.*)?\*\//)[1]
-  end
-
-  def charset=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact)
-  end
-
-  def exists?
-    begin
-      mysql([defaults_file, '-NBe', 'show databases'].compact).match(/^#{@resource[:name]}$/)
-    rescue => e
-      debug(e.message)
-      return nil
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
deleted file mode 100644
index eabc649c3dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-# A grant is either global or per-db. This can be distinguished by the syntax
-# of the name:
-#   user@host => global
-#   user@host/db => per-db
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database_grant).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'Uses mysql as database.'
-
-  defaultfor :kernel => 'Linux'
-
-  optional_commands :mysql      => 'mysql'
-  optional_commands :mysqladmin => 'mysqladmin'
-
-  def self.prefetch(resources)
-    @user_privs = query_user_privs
-    @db_privs = query_db_privs
-  end
-
-  def self.user_privs
-    @user_privs || query_user_privs
-  end
-
-  def self.db_privs
-    @db_privs || query_db_privs
-  end
-
-  def user_privs
-    self.class.user_privs
-  end
-
-  def db_privs
-    self.class.db_privs
-  end
-
-  def self.query_user_privs
-    results = mysql([defaults_file, 'mysql', '-Be', 'describe user'].compact)
-    column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
-    @user_privs = column_names.delete_if { |e| !( e =~/_priv$/) }
-  end
-
-  def self.query_db_privs
-    results = mysql([defaults_file, 'mysql', '-Be', 'describe db'].compact)
-    column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
-    @db_privs = column_names.delete_if { |e| !(e =~/_priv$/) }
-  end
-
-  def mysql_flush
-    mysqladmin([defaults_file, 'flush-privileges'].compact)
-  end
-
-  # this parses the
-  def split_name(string)
-    matches = /^([^@]*)@([^\/]*)(\/(.*))?$/.match(string).captures.compact
-    case matches.length
-    when 2
-      {
-        :type => :user,
-        :user => matches[0],
-        :host => matches[1]
-      }
-    when 4
-      {
-        :type => :db,
-        :user => matches[0],
-        :host => matches[1],
-        :db => matches[3]
-      }
-    end
-  end
-
-  def create_row
-    unless @resource.should(:privileges).empty?
-      name = split_name(@resource[:name])
-      case name[:type]
-      when :user
-        mysql([defaults_file, 'mysql', '-e', "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
-          name[:host], name[:user],
-        ]].compact)
-      when :db
-        mysql([defaults_file, 'mysql', '-e', "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
-          name[:host], name[:user], name[:db],
-        ]].compact)
-      end
-      mysql_flush
-    end
-  end
-
-  def destroy
-    mysql([defaults_file, 'mysql', '-e', "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]].compact)
-  end
-
-  def row_exists?
-    name = split_name(@resource[:name])
-    fields = [:user, :host]
-    if name[:type] == :db
-      fields << :db
-    end
-    not mysql([defaults_file, 'mysql', '-NBe', "SELECT '1' FROM %s WHERE %s" % [ name[:type], fields.map do |f| "%s='%s'" % [f, name[f]] end.join(' AND ')]].compact).empty?
-  end
-
-  def all_privs_set?
-    all_privs = case split_name(@resource[:name])[:type]
-                when :user
-                  user_privs
-                when :db
-                  db_privs
-                end
-    all_privs = all_privs.collect do |p| p.downcase end.sort.join('|')
-    privs = privileges.collect do |p| p.downcase end.sort.join('|')
-
-    all_privs == privs
-  end
-
-  def privileges
-    name = split_name(@resource[:name])
-    privs = ''
-
-    case name[:type]
-    when :user
-      privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.user where user='%s' and host='%s'" % [ name[:user], name[:host] ]].compact)
-    when :db
-      privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.db where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]].compact)
-    end
-
-    if privs.match(/^$/)
-      privs = [] # no result, no privs
-    else
-      # returns a line with field names and a line with values, each tab-separated
-      privs = privs.split(/\n/).map! do |l| l.chomp.split(/\t/) end
-      # transpose the lines, so we have key/value pairs
-      privs = privs[0].zip(privs[1])
-      privs = privs.select do |p| p[0].match(/_priv$/) and p[1] == 'Y' end
-    end
-
-    privs.collect do |p| p[0] end
-  end
-
-  def privileges=(privs)
-    unless row_exists?
-      create_row
-    end
-
-    # puts "Setting privs: ", privs.join(", ")
-    name = split_name(@resource[:name])
-    stmt = ''
-    where = ''
-    all_privs = []
-    case name[:type]
-    when :user
-      stmt = 'update user set '
-      where = " where user='%s' and host='%s'" % [ name[:user], name[:host] ]
-      all_privs = user_privs
-    when :db
-      stmt = 'update db set '
-      where = " where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]
-      all_privs = db_privs
-    end
-
-    if privs[0].downcase == 'all'
-      privs = all_privs
-    end
-
-    # Downcase the requested priviliges for case-insensitive selection
-    # we don't map! here because the all_privs object has to remain in
-    # the same case the DB gave it to us in
-    privs = privs.map { |p| p.downcase }
-
-    # puts "stmt:", stmt
-    set = all_privs.collect do |p| "%s = '%s'" % [p, privs.include?(p.downcase) ? 'Y' : 'N'] end.join(', ')
-    # puts "set:", set
-    stmt = stmt << set << where
-
-    validate_privs privs, all_privs
-    mysql([defaults_file, 'mysql', '-Be', stmt].compact)
-    mysql_flush
-  end
-
-  def validate_privs(set_privs, all_privs)
-    all_privs = all_privs.collect { |p| p.downcase }
-    set_privs = set_privs.collect { |p| p.downcase }
-    invalid_privs = Array.new
-    hints = Array.new
-    # Test each of the user provided privs to see if they exist in all_privs
-    set_privs.each do |priv|
-      invalid_privs << priv unless all_privs.include?(priv)
-      hints << "#{priv}_priv" if all_privs.include?("#{priv}_priv")
-    end
-    unless invalid_privs.empty?
-      # Print a decently helpful and gramatically correct error message
-      hints = "Did you mean '#{hints.join(',')}'?" unless hints.empty?
-      p = invalid_privs.size > 1 ? ['s', 'are not valid'] : ['', 'is not valid']
-      detail = ["The privilege#{p[0]} '#{invalid_privs.join(',')}' #{p[1]}."]
-      fail [detail, hints].join(' ')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
deleted file mode 100644
index 71e76d5c369..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database_user).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'manage users for a mysql database.'
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mysql      => 'mysql'
-  commands :mysqladmin => 'mysqladmin'
-
-  def self.instances
-    users = mysql([defaults_file, 'mysql', '-BNe' "select concat(User, '@',Host) as User from mysql.user"].compact).split("\n")
-    users.select{ |user| user =~ /.+@/ }.collect do |name|
-      new(:name => name)
-    end
-  end
-
-  def create
-    merged_name          = self.class.cmd_user(@resource[:name])
-    password_hash        = @resource.value(:password_hash)
-    max_user_connections = @resource.value(:max_user_connections) || 0
-
-    mysql([defaults_file, 'mysql', '-e', "grant usage on *.* to #{merged_name} identified by PASSWORD
-      '#{password_hash}' with max_user_connections #{max_user_connections}"].compact)
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    merged_name   = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, 'mysql', '-e', "drop user #{merged_name}"].compact)
-
-    exists? ? (return false) : (return true)
-  end
-
-  def password_hash
-    mysql([defaults_file, 'mysql', '-NBe', "select password from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
-  end
-
-  def password_hash=(string)
-    mysql([defaults_file, 'mysql', '-e', "SET PASSWORD FOR #{self.class.cmd_user(@resource[:name])} = '#{string}'"].compact)
-
-    password_hash == string ? (return true) : (return false)
-  end
-
-  def max_user_connections
-    mysql([defaults_file, "mysql", "-NBe", "select max_user_connections from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
-  end
-
-  def max_user_connections=(int)
-    mysql([defaults_file, "mysql", "-e", "grant usage on *.* to %s with max_user_connections #{int}" % [ self.class.cmd_user(@resource[:name])] ].compact).chomp
-
-    max_user_connections == int ? (return true) : (return false)
-  end
-
-  def exists?
-    not mysql([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
-  end
-
-  def flush
-    @property_hash.clear
-    mysqladmin([defaults_file, 'flush-privileges'].compact)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb
deleted file mode 100644
index 9b34ca00e27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-class Puppet::Provider::Mysql < Puppet::Provider
-
-  # Without initvars commands won't work.
-  initvars
-  commands :mysql      => 'mysql'
-  commands :mysqladmin => 'mysqladmin'
-
-  # Optional defaults file
-  def self.defaults_file
-    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
-      "--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
-    else
-      nil
-    end
-  end
-  
-  def defaults_file
-    self.class.defaults_file
-  end
-
-  def self.users
-    mysql([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n")
-  end
-
-  # Take root@localhost and munge it to 'root'@'localhost'
-  def self.cmd_user(user)
-    "'#{user.sub('@', "'@'")}'"
-  end
-
-  # Take root.* and return ON `root`.*
-  def self.cmd_table(table)
-    table_string = ''
-
-    # We can't escape *.* so special case this.
-    if table == '*.*'
-      table_string << '*.*'
-    # Special case also for PROCEDURES
-    elsif table.start_with?('PROCEDURE ')
-      table_string << table.sub(/^PROCEDURE (.*)(\..*)/, 'PROCEDURE `\1`\2')
-    else
-      table_string << table.sub(/^(.*)(\..*)/, '`\1`\2')
-    end
-    table_string
-  end
-
-  def self.cmd_privs(privileges)
-    if privileges.include?('ALL')
-      return 'ALL PRIVILEGES'
-    else
-      priv_string = ''
-      privileges.each do |priv|
-        priv_string << "#{priv}, "
-      end
-    end
-    # Remove trailing , from the last element.
-    priv_string.sub(/, $/, '')
-  end
-
-  # Take in potential options and build up a query string with them.
-  def self.cmd_options(options)
-    option_string = ''
-    options.each do |opt|
-      if opt == 'GRANT'
-        option_string << ' WITH GRANT OPTION'
-      end
-    end
-    option_string
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
deleted file mode 100644
index ae9ab393024..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_database).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-  desc 'Manages MySQL databases.'
-
-  commands :mysql => 'mysql'
-
-  def self.instances
-    mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
-      attributes = {}
-      mysql([defaults_file, '-NBe', "show variables like '%_database'", name].compact).split("\n").each do |line|
-        k,v = line.split(/\s/)
-        attributes[k] = v
-      end
-      new(:name    => name,
-          :ensure  => :present,
-          :charset => attributes['character_set_database'],
-          :collate => attributes['collation_database']
-         )
-    end
-  end
-
-  # We iterate over each mysql_database entry in the catalog and compare it against
-  # the contents of the property_hash generated by self.instances
-  def self.prefetch(resources)
-    databases = instances
-    resources.keys.each do |database|
-      if provider = databases.find { |db| db.name == database }
-        resources[database].provider = provider
-      end
-    end
-  end
-
-  def create
-    mysql([defaults_file, '-NBe', "create database if not exists `#{@resource[:name]}` character set #{@resource[:charset]} collate #{@resource[:collate]}"].compact)
-
-    @property_hash[:ensure]  = :present
-    @property_hash[:charset] = @resource[:charset]
-    @property_hash[:collate] = @resource[:collate]
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    mysql([defaults_file, '-NBe', "drop database `#{@resource[:name]}`"].compact)
-
-    @property_hash.clear
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  mk_resource_methods
-
-  def charset=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact)
-    @property_hash[:charset] = value
-    charset == value ? (return true) : (return false)
-  end
-
-  def collate=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE #{value}"].compact)
-    @property_hash[:collate] = value
-    collate == value ? (return true) : (return false)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
deleted file mode 100644
index 7dabf462056..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_grant).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'Set grants for users in MySQL.'
-
-  def self.instances
-    instances = []
-    users.select{ |user| user =~ /.+@/ }.collect do |user|
-      user_string = self.cmd_user(user)
-      query = "SHOW GRANTS FOR #{user_string};"
-      grants = mysql([defaults_file, "-NBe", query].compact)
-      # Once we have the list of grants generate entries for each.
-      grants.each_line do |grant|
-        # Match the munges we do in the type.
-        munged_grant = grant.delete("'").delete("`")
-        # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION)
-        if match = munged_grant.match(/^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)$/)
-          privileges, table, user, host, rest = match.captures
-          # Once we split privileges up on the , we need to make sure we
-          # shortern ALL PRIVILEGES to just all.
-          stripped_privileges = privileges.split(',').map do |priv|
-            priv == 'ALL PRIVILEGES' ? 'ALL' : priv.lstrip.rstrip
-          end
-          # Same here, but to remove OPTION leaving just GRANT.
-          options = ['GRANT'] if rest.match(/WITH\sGRANT\sOPTION/)
-          # We need to return an array of instances so capture these
-          instances << new(
-              :name       => "#{user}@#{host}/#{table}",
-              :ensure     => :present,
-              :privileges => stripped_privileges.sort,
-              :table      => table,
-              :user       => "#{user}@#{host}",
-              :options    => options
-          )
-        end
-      end
-    end
-    return instances
-  end
-
-  def self.prefetch(resources)
-    users = instances
-    resources.keys.each do |name|
-      if provider = users.find { |user| user.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def grant(user, table, privileges, options)
-    user_string = self.class.cmd_user(user)
-    priv_string = self.class.cmd_privs(privileges)
-    table_string = self.class.cmd_table(table)
-    query = "GRANT #{priv_string}"
-    query << " ON #{table_string}"
-    query << " TO #{user_string}"
-    query << self.class.cmd_options(options) unless options.nil?
-    mysql([defaults_file, '-e', query].compact)
-  end
-
-  def create
-    grant(@resource[:user], @resource[:table], @resource[:privileges], @resource[:options])
-
-    @property_hash[:ensure]     = :present
-    @property_hash[:table]      = @resource[:table]
-    @property_hash[:user]       = @resource[:user]
-    @property_hash[:options]    = @resource[:options] if @resource[:options]
-    @property_hash[:privileges] = @resource[:privileges]
-
-    exists? ? (return true) : (return false)
-  end
-
-  def revoke(user, table)
-    user_string = self.class.cmd_user(user)
-    table_string = self.class.cmd_table(table)
-
-    query = "REVOKE ALL ON #{table_string} FROM #{user_string}"
-    mysql([defaults_file, '-e', query].compact)
-    # revoke grant option needs to be a extra query, because
-    # "REVOKE ALL PRIVILEGES, GRANT OPTION [..]" is only valid mysql syntax
-    # if no ON clause is used.
-    query = "REVOKE GRANT OPTION ON #{table_string} FROM #{user_string}"
-    mysql([defaults_file, '-e', query].compact)
-  end
-
-  def destroy
-    revoke(@property_hash[:user], @property_hash[:table])
-    @property_hash.clear
-
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  def flush
-    @property_hash.clear
-    mysql([defaults_file, '-NBe', 'FLUSH PRIVILEGES'].compact)
-  end
-
-  mk_resource_methods
-
-  def privileges=(privileges)
-    revoke(@property_hash[:user], @property_hash[:table])
-    grant(@property_hash[:user], @property_hash[:table], privileges, @property_hash[:options])
-    @property_hash[:privileges] = privileges
-
-    self.privileges
-  end
-
-  def options=(options)
-    revoke(@property_hash[:user], @property_hash[:table])
-    grant(@property_hash[:user], @property_hash[:table], @property_hash[:privileges], options)
-    @property_hash[:options] = options
-
-    self.options
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
deleted file mode 100644
index 066ea0b00d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_user).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'manage users for a mysql database.'
-  commands :mysql => 'mysql'
-
-  # Build a property_hash containing all the discovered information about MySQL
-  # users.
-  def self.instances
-    users = mysql([defaults_file, '-NBe',
-      "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n")
-    # To reduce the number of calls to MySQL we collect all the properties in
-    # one big swoop.
-    users.collect do |name|
-      query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'"
-      @max_user_connections, @max_connections_per_hour, @max_queries_per_hour,
-      @max_updates_per_hour, @password = mysql([defaults_file, "-NBe", query].compact).split(/\s/)
-
-      new(:name                     => name,
-          :ensure                   => :present,
-          :password_hash            => @password,
-          :max_user_connections     => @max_user_connections,
-          :max_connections_per_hour => @max_connections_per_hour,
-          :max_queries_per_hour     => @max_queries_per_hour,
-          :max_updates_per_hour     => @max_updates_per_hour
-         )
-    end
-  end
-
-  # We iterate over each mysql_user entry in the catalog and compare it against
-  # the contents of the property_hash generated by self.instances
-  def self.prefetch(resources)
-    users = instances
-    resources.keys.each do |name|
-      if provider = users.find { |user| user.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def create
-    merged_name             = @resource[:name].sub('@', "'@'")
-    password_hash            = @resource.value(:password_hash)
-    max_user_connections     = @resource.value(:max_user_connections) || 0
-    max_connections_per_hour = @resource.value(:max_connections_per_hour) || 0
-    max_queries_per_hour     = @resource.value(:max_queries_per_hour) || 0
-    max_updates_per_hour     = @resource.value(:max_updates_per_hour) || 0
-
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO '#{merged_name}' IDENTIFIED BY PASSWORD '#{password_hash}' WITH MAX_USER_CONNECTIONS #{max_user_connections} MAX_CONNECTIONS_PER_HOUR #{max_connections_per_hour} MAX_QUERIES_PER_HOUR #{max_queries_per_hour} MAX_UPDATES_PER_HOUR #{max_updates_per_hour}"].compact)
-
-    @property_hash[:ensure] = :present
-    @property_hash[:password_hash] = password_hash
-    @property_hash[:max_user_connections] = max_user_connections
-    @property_hash[:max_connections_per_hour] = max_connections_per_hour
-    @property_hash[:max_queries_per_hour] = max_queries_per_hour
-    @property_hash[:max_updates_per_hour] = max_updates_per_hour
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    merged_name = @resource[:name].sub('@', "'@'")
-    mysql([defaults_file, '-e', "DROP USER '#{merged_name}'"].compact)
-
-    @property_hash.clear
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  ##
-  ## MySQL user properties
-  ##
-
-  # Generates method for all properties of the property_hash
-  mk_resource_methods
-
-  def password_hash=(string)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "SET PASSWORD FOR #{merged_name} = '#{string}'"].compact)
-
-    password_hash == string ? (return true) : (return false)
-  end
-
-  def max_user_connections=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}"].compact).chomp
-
-    max_user_connections == int ? (return true) : (return false)
-  end
-
-  def max_connections_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}"].compact).chomp
-
-    max_connections_per_hour == int ? (return true) : (return false)
-  end
-
-  def max_queries_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}"].compact).chomp
-
-    max_queries_per_hour == int ? (return true) : (return false)
-  end
-
-  def max_updates_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}"].compact).chomp
-
-    max_updates_per_hour == int ? (return true) : (return false)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb
deleted file mode 100644
index b02fb109988..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database) do
-  @doc = 'Manage databases.'
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc 'The name of the database.'
-    validate do |value|
-      Puppet.warning("database has been deprecated in favor of mysql_database.")
-      true
-    end
-  end
-
-  newproperty(:charset) do
-    desc 'The characterset to use for a database'
-    defaultto :utf8
-    newvalue(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb
deleted file mode 100644
index 7fdad823179..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database_grant) do
-  @doc = "Manage a database user's rights."
-  #ensurable
-
-  autorequire :database do
-    # puts "Starting db autoreq for %s" % self[:name]
-    reqs = []
-    matches = self[:name].match(/^([^@]+)@([^\/]+)\/(.+)$/)
-    unless matches.nil?
-      reqs << matches[3]
-    end
-    # puts "Autoreq: '%s'" % reqs.join(" ")
-    reqs
-  end
-
-  autorequire :database_user do
-    # puts "Starting user autoreq for %s" % self[:name]
-    reqs = []
-    matches = self[:name].match(/^([^@]+)@([^\/]+).*$/)
-    unless matches.nil?
-      reqs << '%s@%s' % [ matches[1], matches[2] ]
-    end
-    # puts "Autoreq: '%s'" % reqs.join(" ")
-    reqs
-  end
-
-  newparam(:name, :namevar=>true) do
-    desc 'The primary key: either user@host for global privilges or user@host/database for database specific privileges'
-    validate do |value|
-      Puppet.warning("database_grant has been deprecated in favor of mysql_grant.")
-      true
-    end
-  end
-
-  newproperty(:privileges, :array_matching => :all) do
-    desc 'The privileges the user should have. The possible values are implementation dependent.'
-
-    def should_to_s(newvalue = @should)
-      if newvalue
-        unless newvalue.is_a?(Array)
-          newvalue = [ newvalue ]
-        end
-        newvalue.collect do |v| v.downcase end.sort.join ', '
-      else
-        nil
-      end
-    end
-
-    def is_to_s(currentvalue = @is)
-      if currentvalue
-        unless currentvalue.is_a?(Array)
-          currentvalue = [ currentvalue ]
-        end
-        currentvalue.collect do |v| v.downcase end.sort.join ', '
-      else
-        nil
-      end
-    end
-
-    # use the sorted outputs for comparison
-    def insync?(is)
-      if defined? @should and @should
-        case self.should_to_s
-        when 'all'
-          self.provider.all_privs_set?
-        when self.is_to_s(is)
-          true
-        else
-          false
-        end
-      else
-        true
-      end
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb
deleted file mode 100644
index 9a9d5fbc746..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database_user) do
-  @doc = 'Manage a database user. This includes management of users password as well as privileges'
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the user. This uses the 'username@hostname' or username@hostname."
-    validate do |value|
-      Puppet.warning("database has been deprecated in favor of mysql_user.")
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc 'The password hash of the user. Use mysql_password() for creating such a hash.'
-    newvalue(/\w+/)
-  end
-
-  newproperty(:max_user_connections) do
-    desc "Max concurrent connections for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
deleted file mode 100644
index 3e8518c9670..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-Puppet::Type.newtype(:mysql_database) do
-  @doc = 'Manage MySQL databases.'
-
-  ensurable
-
-  newparam(:name, :namevar => true) do
-    desc 'The name of the MySQL database to manage.'
-  end
-
-  newproperty(:charset) do
-    desc 'The CHARACTER SET setting for the database'
-    defaultto :utf8
-    newvalue(/^\S+$/)
-  end
-
-  newproperty(:collate) do
-    desc 'The COLLATE setting for the database'
-    defaultto :utf8_general_ci
-    newvalue(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
deleted file mode 100644
index be8dfbc340c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:mysql_grant) do
-  @doc = "Manage a MySQL user's rights."
-  ensurable
-
-  autorequire(:file) { '/root/.my.cnf' }
-
-  def initialize(*args)
-    super
-    # Forcibly munge any privilege with 'ALL' in the array to exist of just
-    # 'ALL'.  This can't be done in the munge in the property as that iterates
-    # over the array and there's no way to replace the entire array before it's
-    # returned to the provider.
-    if self[:ensure] == :present and Array(self[:privileges]).count > 1 and self[:privileges].to_s.include?('ALL')
-      self[:privileges] = 'ALL'
-    end
-    # Sort the privileges array in order to ensure the comparision in the provider
-    # self.instances method match.  Otherwise this causes it to keep resetting the
-    # privileges.
-    self[:privileges] = Array(self[:privileges]).map(&:upcase).uniq.reject{|k| k == 'GRANT' or k == 'GRANT OPTION'}.sort!
-  end
-
-  validate do
-    fail('privileges parameter is required.') if self[:ensure] == :present and self[:privileges].nil?
-    fail('table parameter is required.') if self[:ensure] == :present and self[:table].nil?
-    fail('user parameter is required.') if self[:ensure] == :present and self[:user].nil?
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'Name to describe the grant.'
-
-    munge do |value|
-      value.delete("'")
-    end
-  end
-
-  newproperty(:privileges, :array_matching => :all) do
-    desc 'Privileges for user'
-
-    munge do |value|
-      value.upcase
-    end
-  end
-
-  newproperty(:table) do
-    desc 'Table to apply privileges to.'
-
-    munge do |value|
-      value.delete("`")
-    end
-
-    newvalues(/.*\..*/,/@/)
-  end
-
-  newproperty(:user) do
-    desc 'User to operate on.'
-    validate do |value|
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:options, :array_matching => :all) do
-    desc 'Options to grant.'
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
deleted file mode 100644
index 38564a948b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:mysql_user) do
-  @doc = 'Manage a MySQL user. This includes management of users password as well as privileges.'
-
-  ensurable
-
-  newparam(:name, :namevar => true) do
-    desc "The name of the user. This uses the 'username@hostname' or username@hostname."
-    validate do |value|
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc 'The password hash of the user. Use mysql_password() for creating such a hash.'
-    newvalue(/\w+/)
-  end
-
-  newproperty(:max_user_connections) do
-    desc "Max concurrent connections for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_connections_per_hour) do
-    desc "Max connections per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_queries_per_hour) do
-    desc "Max queries per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_updates_per_hour) do
-    desc "Max updates per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp
deleted file mode 100644
index 680a5744d51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Deprecated class
-class mysql::backup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupcompress = true,
-  $backuprotate = 30,
-  $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-) {
-
-  crit("This class has been deprecated and callers should directly call
-  mysql::server::backup now.")
-
-  class { 'mysql::server::backup':
-    ensure             => $ensure,
-    backupuser         => $backupuser,
-    backuppassword     => $backuppassword,
-    backupdir          => $backupdir,
-    backupcompress     => $backupcompress,
-    backuprotate       => $backuprotate,
-    delete_before_dump => $delete_before_dump,
-    backupdatabases    => $backupdatabases,
-    file_per_database  => $file_per_database,
-    time               => $time,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp
deleted file mode 100644
index 88c49033932..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# See README.md.
-class mysql::bindings (
-  # Boolean to determine if we should include the classes.
-  $java_enable   = false,
-  $perl_enable   = false,
-  $php_enable    = false,
-  $python_enable = false,
-  $ruby_enable   = false,
-  # Settings for the various classes.
-  $java_package_ensure     = $mysql::params::java_package_ensure,
-  $java_package_name       = $mysql::params::java_package_name,
-  $java_package_provider   = $mysql::params::java_package_provider,
-  $perl_package_ensure     = $mysql::params::perl_package_ensure,
-  $perl_package_name       = $mysql::params::perl_package_name,
-  $perl_package_provider   = $mysql::params::perl_package_provider,
-  $php_package_ensure      = $mysql::params::php_package_ensure,
-  $php_package_name        = $mysql::params::php_package_name,
-  $php_package_provider    = $mysql::params::php_package_provider,
-  $python_package_ensure   = $mysql::params::python_package_ensure,
-  $python_package_name     = $mysql::params::python_package_name,
-  $python_package_provider = $mysql::params::python_package_provider,
-  $ruby_package_ensure     = $mysql::params::ruby_package_ensure,
-  $ruby_package_name       = $mysql::params::ruby_package_name,
-  $ruby_package_provider   = $mysql::params::ruby_package_provider
-) inherits mysql::params {
-
-  if $java_enable   { include '::mysql::bindings::java' }
-  if $perl_enable   { include '::mysql::bindings::perl' }
-  if $php_enable    { include '::mysql::bindings::php' }
-  if $python_enable { include '::mysql::bindings::python' }
-  if $ruby_enable   { include '::mysql::bindings::ruby' }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp
deleted file mode 100644
index d0808373349..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::java {
-
-  package { 'mysql-connector-java':
-    ensure   => $mysql::bindings::java_package_ensure,
-    name     => $mysql::bindings::java_package_name,
-    provider => $mysql::bindings::java_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp
deleted file mode 100644
index 58c76f4b348..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::perl {
-
-  package{ 'perl_mysql':
-    ensure   => $mysql::bindings::perl_package_ensure,
-    name     => $mysql::bindings::perl_package_name,
-    provider => $mysql::bindings::perl_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp
deleted file mode 100644
index 81d08d3aa49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class: See README.md
-class mysql::bindings::php {
-
-  package { 'php-mysql':
-    ensure   => $mysql::bindings::php_package_ensure,
-    name     => $mysql::bindings::php_package_name,
-    provider => $mysql::bindings::php_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp
deleted file mode 100644
index 96a3882b340..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::python {
-
-  package { 'python-mysqldb':
-    ensure   => $mysql::bindings::python_package_ensure,
-    name     => $mysql::bindings::python_package_name,
-    provider => $mysql::bindings::python_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp
deleted file mode 100644
index f916f54c23b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::ruby {
-
-  package{ 'ruby_mysql':
-    ensure   => $mysql::bindings::ruby_package_ensure,
-    name     => $mysql::bindings::ruby_package_name,
-    provider => $mysql::bindings::ruby_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp
deleted file mode 100644
index 59487f7005b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-class mysql::client (
-  $bindings_enable = $mysql::params::bindings_enable,
-  $package_ensure  = $mysql::params::client_package_ensure,
-  $package_name    = $mysql::params::client_package_name,
-) inherits mysql::params {
-
-  include '::mysql::client::install'
-
-  if $bindings_enable {
-    class { 'mysql::bindings':
-      java_enable   => true,
-      perl_enable   => true,
-      php_enable    => true,
-      python_enable => true,
-      ruby_enable   => true,
-    }
-  }
-
-
-  # Anchor pattern workaround to avoid resources of mysql::client::install to
-  # "float off" outside mysql::client
-  anchor { 'mysql::client::start': } ->
-    Class['mysql::client::install'] ->
-  anchor { 'mysql::client::end': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp
deleted file mode 100644
index a443f5320ea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class mysql::client::install {
-
-  package { 'mysql_client':
-    ensure => $mysql::client::package_ensure,
-    name   => $mysql::client::package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp
deleted file mode 100644
index d406a07d521..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp
+++ /dev/null
@@ -1,59 +0,0 @@
-# See README.md for details.
-define mysql::db (
-  $user,
-  $password,
-  $charset     = 'utf8',
-  $collate     = 'utf8_general_ci',
-  $host        = 'localhost',
-  $grant       = 'ALL',
-  $sql         = '',
-  $enforce_sql = false,
-  $ensure      = 'present'
-) {
-  #input validation
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  $table = "${name}.*"
-
-  include '::mysql::client'
-
-  mysql_database { $name:
-    ensure   => $ensure,
-    charset  => $charset,
-    collate  => $collate,
-    provider => 'mysql',
-    require  => [ Class['mysql::server'], Class['mysql::client'] ],
-    before   => Mysql_user["${user}@${host}"],
-  }
-
-  $user_resource = {
-    ensure        => $ensure,
-    password_hash => mysql_password($password),
-    provider      => 'mysql',
-    require       => Class['mysql::server'],
-  }
-  ensure_resource('mysql_user', "${user}@${host}", $user_resource)
-
-  if $ensure == 'present' {
-    mysql_grant { "${user}@${host}/${table}":
-      privileges => $grant,
-      provider   => 'mysql',
-      user       => "${user}@${host}",
-      table      => $table,
-      require    => [ Mysql_user["${user}@${host}"], Class['mysql::server'] ],
-    }
-
-    $refresh = ! $enforce_sql
-
-    if $sql {
-      exec{ "${name}-import":
-        command     => "/usr/bin/mysql ${name} < ${sql}",
-        logoutput   => true,
-        environment => "HOME=${::root_home}",
-        refreshonly => $refresh,
-        require     => Mysql_grant["${user}@${host}/${table}"],
-        subscribe   => Mysql_database[$name],
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp
deleted file mode 100644
index eba5c206311..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-class mysql(
-  $basedir               = '',
-  $bind_address          = '',
-  $client_package_ensure = '',
-  $client_package_name   = '',
-  $config_file           = '',
-  $config_template       = '',
-  $datadir               = '',
-  $default_engine        = '',
-  $etc_root_password     = '',
-  $log_error             = '',
-  $manage_config_file    = '',
-  $manage_service        = '',
-  $max_allowed_packet    = '',
-  $max_connections       = '',
-  $old_root_password     = '',
-  $package_ensure        = '',
-  $php_package_name      = '',
-  $pidfile               = '',
-  $port                  = '',
-  $purge_conf_dir        = '',
-  $restart               = '',
-  $root_group            = '',
-  $root_password         = '',
-  $server_package_name   = '',
-  $service_name          = '',
-  $service_provider      = '',
-  $socket                = '',
-  $ssl                   = '',
-  $ssl_ca                = '',
-  $ssl_cert              = '',
-  $ssl_key               = '',
-  $tmpdir                = '',
-  $attempt_compatibility_mode = false,
-) {
-
-  if $attempt_compatibility_mode {
-    notify { "An attempt has been made below to automatically apply your custom
-    settings to mysql::server. Please verify this works in a safe test
-    environment.": }
-
-    $override_options = {
-      'client'                 => {
-        'port'                 => $port,
-        'socket'               => $socket
-      },
-      'mysqld_safe'            => {
-        'log_error'            => $log_error,
-        'socket'               => $socket,
-      },
-      'mysqld'               => {
-        'basedir'            => $basedir,
-        'bind_address'       => $bind_address,
-        'datadir'            => $datadir,
-        'log_error'          => $log_error,
-        'max_allowed_packet' => $max_allowed_packet,
-        'max_connections'    => $max_connections,
-        'pid_file'           => $pidfile,
-        'port'               => $port,
-        'socket'             => $socket,
-        'ssl-ca'             => $ssl_ca,
-        'ssl-cert'           => $ssl_cert,
-        'ssl-key'            => $ssl_key,
-        'tmpdir'             => $tmpdir,
-      },
-      'mysqldump'              => {
-        'max_allowed_packet'  => $max_allowed_packet,
-      },
-      'config_file'          => $config_file,
-      'etc_root_password'    => $etc_root_password,
-      'manage_config_file'   => $manage_config_file,
-      'old_root_password'    => $old_root_password,
-      'purge_conf_dir'       => $purge_conf_dir,
-      'restart'              => $restart,
-      'root_group'           => $root_group,
-      'root_password'        => $root_password,
-      'service_name'         => $service_name,
-      'ssl'                  => $ssl
-    }
-    $filtered_options = mysql_strip_hash($override_options)
-    validate_hash($filtered_options)
-    notify { $filtered_options: }
-    class { 'mysql::server':
-      override_options => $filtered_options,
-    }
-
-  } else {
-    fail("ERROR:  This class has been deprecated and the functionality moved
-    into mysql::server.  If you run mysql::server without correctly calling
-    mysql:: server with the new override_options hash syntax you will revert
-    your MySQL to the stock settings.  Do not proceed without removing this
-    class and using mysql::server correctly.
-
-    If you are brave you may set attempt_compatibility_mode in this class which
-    attempts to automap the previous settings to appropriate calls to
-    mysql::server")
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp
deleted file mode 100644
index 67dd785b09d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp
+++ /dev/null
@@ -1,230 +0,0 @@
-# Private class: See README.md.
-class mysql::params {
-
-  $manage_config_file     = true
-  $old_root_password      = ''
-  $purge_conf_dir         = false
-  $restart                = false
-  $root_password          = 'UNSET'
-  $server_package_ensure  = 'present'
-  $server_service_manage  = true
-  $server_service_enabled = true
-  # mysql::bindings
-  $bindings_enable         = false
-  $java_package_ensure     = 'present'
-  $java_package_provider   = undef
-  $perl_package_ensure     = 'present'
-  $perl_package_provider   = undef
-  $php_package_ensure      = 'present'
-  $php_package_provider    = undef
-  $python_package_ensure   = 'present'
-  $python_package_provider = undef
-  $ruby_package_ensure     = 'present'
-  $ruby_package_provider   = undef
-
-
-  case $::osfamily {
-    'RedHat': {
-      if $::operatingsystem == 'Fedora' and (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 19 or $::operatingsystemrelease == "Rawhide") {
-        $client_package_name = 'mariadb'
-        $server_package_name = 'mariadb-server'
-      } else {
-        $client_package_name = 'mysql'
-        $server_package_name = 'mysql-server'
-      }
-      $basedir             = '/usr'
-      $config_file         = '/etc/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = '/var/log/mysqld.log'
-      $pidfile             = '/var/run/mysqld/mysqld.pid'
-      $root_group          = 'root'
-      $server_service_name = 'mysqld'
-      $socket              = '/var/lib/mysql/mysql.sock'
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'mysql-connector-java'
-      $perl_package_name   = 'perl-DBD-MySQL'
-      $php_package_name    = 'php-mysql'
-      $python_package_name = 'MySQL-python'
-      $ruby_package_name   = 'ruby-mysql'
-    }
-
-    'Suse': {
-      $client_package_name   = $::operatingsystem ? {
-        /OpenSuSE/           => 'mysql-community-server-client',
-        /(SLES|SLED)/        => 'mysql-client',
-      }
-      $server_package_name   = $::operatingsystem ? {
-        /OpenSuSE/           => 'mysql-community-server',
-        /(SLES|SLED)/        => 'mysql',
-      }
-      $basedir             = '/usr'
-      $config_file         = '/etc/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/log/mysql/mysqld.log',
-        /(SLES|SLED)/      => '/var/log/mysqld.log',
-      }
-      $pidfile             = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/run/mysql/mysqld.pid',
-        /(SLES|SLED)/      => '/var/lib/mysql/mysqld.pid',
-      }
-      $root_group          = 'root'
-      $server_service_name = 'mysql'
-      $socket              = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/run/mysql/mysql.sock',
-        /(SLES|SLED)/      => '/var/lib/mysql/mysql.sock',
-      }
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'mysql-connector-java'
-      $perl_package_name   = 'perl-DBD-mysql'
-      $php_package_name    = 'apache2-mod_php53'
-      $python_package_name = 'python-mysql'
-      $ruby_package_name   = $::operatingsystem ? {
-        /OpenSuSE/         => 'rubygem-mysql',
-        /(SLES|SLED)/      => 'ruby-mysql',
-      }
-    }
-
-    'Debian': {
-      $client_package_name = 'mysql-client'
-      $server_package_name = 'mysql-server'
-
-      $basedir             = '/usr'
-      $config_file         = '/etc/mysql/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = '/var/log/mysql/error.log'
-      $pidfile             = '/var/run/mysqld/mysqld.pid'
-      $root_group          = 'root'
-      $server_service_name = 'mysql'
-      $socket              = '/var/run/mysqld/mysqld.sock'
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'libmysql-java'
-      $perl_package_name   = 'libdbd-mysql-perl'
-      $php_package_name    = 'php5-mysql'
-      $python_package_name = 'python-mysqldb'
-      $ruby_package_name   = 'libmysql-ruby'
-    }
-
-    'FreeBSD': {
-      $client_package_name = 'databases/mysql55-client'
-      $server_package_name = 'databases/mysql55-server'
-      $basedir             = '/usr/local'
-      $config_file         = '/var/db/mysql/my.cnf'
-      $datadir             = '/var/db/mysql'
-      $log_error           = "/var/db/mysql/${::hostname}.err"
-      $pidfile             = '/var/db/mysql/mysql.pid'
-      $root_group          = 'wheel'
-      $server_service_name = 'mysql-server'
-      $socket              = '/tmp/mysql.sock'
-      $ssl_ca              = undef
-      $ssl_cert            = undef
-      $ssl_key             = undef
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'databases/mysql-connector-java'
-      $perl_package_name   = 'p5-DBD-mysql'
-      $php_package_name    = 'php5-mysql'
-      $python_package_name = 'databases/py-MySQLdb'
-      $ruby_package_name   = 'databases/ruby-mysql'
-    }
-
-    default: {
-      case $::operatingsystem {
-        'Amazon': {
-          $client_package_name = 'mysql'
-          $server_package_name = 'mysql-server'
-          $basedir             = '/usr'
-          $config_file         = '/etc/my.cnf'
-          $datadir             = '/var/lib/mysql'
-          $log_error           = '/var/log/mysqld.log'
-          $pidfile             = '/var/run/mysqld/mysqld.pid'
-          $root_group          = 'root'
-          $server_service_name = 'mysqld'
-          $socket              = '/var/lib/mysql/mysql.sock'
-          $ssl_ca              = '/etc/mysql/cacert.pem'
-          $ssl_cert            = '/etc/mysql/server-cert.pem'
-          $ssl_key             = '/etc/mysql/server-key.pem'
-          $tmpdir              = '/tmp'
-          # mysql::bindings
-          $java_package_name   = 'mysql-connector-java'
-          $perl_package_name   = 'perl-DBD-MySQL'
-          $php_package_name    = 'php-mysql'
-          $python_package_name = 'MySQL-python'
-          $ruby_package_name   = 'ruby-mysql'
-        }
-
-        default: {
-          fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat, Debian, and FreeBSD, or operatingsystem Amazon")
-        }
-      }
-    }
-  }
-
-  case $::operatingsystem {
-    'Ubuntu': {
-      $server_service_provider = upstart
-    }
-    default: {
-      $server_service_provider = undef
-    }
-  }
-
-  $default_options = {
-    'client'          => {
-      'port'          => '3306',
-      'socket'        => $mysql::params::socket,
-    },
-    'mysqld_safe'        => {
-      'nice'             => '0',
-      'log-error'        => $mysql::params::log_error,
-      'socket'           => $mysql::params::socket,
-    },
-    'mysqld'                  => {
-      'basedir'               => $mysql::params::basedir,
-      'bind-address'          => '127.0.0.1',
-      'datadir'               => $mysql::params::datadir,
-      'expire_logs_days'      => '10',
-      'key_buffer_size'       => '16M',
-      'log-error'             => $mysql::params::log_error,
-      'max_allowed_packet'    => '16M',
-      'max_binlog_size'       => '100M',
-      'max_connections'       => '151',
-      'myisam_recover'        => 'BACKUP',
-      'pid-file'              => $mysql::params::pidfile,
-      'port'                  => '3306',
-      'query_cache_limit'     => '1M',
-      'query_cache_size'      => '16M',
-      'skip-external-locking' => true,
-      'socket'                => $mysql::params::socket,
-      'ssl'                   => false,
-      'ssl-ca'                => $mysql::params::ssl_ca,
-      'ssl-cert'              => $mysql::params::ssl_cert,
-      'ssl-key'               => $mysql::params::ssl_key,
-      'thread_cache_size'     => '8',
-      'thread_stack'          => '256K',
-      'tmpdir'                => $mysql::params::tmpdir,
-      'user'                  => 'mysql',
-    },
-    'mysqldump'             => {
-      'max_allowed_packet'  => '16M',
-      'quick'               => true,
-      'quote-names'         => true,
-    },
-    'isamchk'      => {
-      'key_buffer_size' => '16M',
-    },
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp
deleted file mode 100644
index ae8b208a187..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Class: mysql::server:  See README.md for documentation.
-class mysql::server (
-  $config_file             = $mysql::params::config_file,
-  $manage_config_file      = $mysql::params::manage_config_file,
-  $old_root_password       = $mysql::params::old_root_password,
-  $override_options        = {},
-  $package_ensure          = $mysql::params::server_package_ensure,
-  $package_name            = $mysql::params::server_package_name,
-  $purge_conf_dir          = $mysql::params::purge_conf_dir,
-  $remove_default_accounts = false,
-  $restart                 = $mysql::params::restart,
-  $root_group              = $mysql::params::root_group,
-  $root_password           = $mysql::params::root_password,
-  $service_enabled         = $mysql::params::server_service_enabled,
-  $service_manage          = $mysql::params::server_service_manage,
-  $service_name            = $mysql::params::server_service_name,
-  $service_provider        = $mysql::params::server_service_provider,
-  $users                   = {},
-  $grants                  = {},
-  $databases               = {},
-
-  # Deprecated parameters
-  $enabled                 = undef,
-  $manage_service          = undef
-) inherits mysql::params {
-
-  # Deprecated parameters.
-  if $enabled {
-    crit('This parameter has been renamed to service_enabled.')
-    $real_service_enabled = $enabled
-  } else {
-    $real_service_enabled = $service_enabled
-  }
-  if $manage_service {
-    crit('This parameter has been renamed to service_manage.')
-    $real_service_manage = $manage_service
-  } else {
-    $real_service_manage = $service_manage
-  }
-
-  # Create a merged together set of options.  Rightmost hashes win over left.
-  $options = mysql_deepmerge($mysql::params::default_options, $override_options)
-
-  Class['mysql::server::root_password'] -> Mysql::Db <| |>
-
-  include '::mysql::server::install'
-  include '::mysql::server::config'
-  include '::mysql::server::service'
-  include '::mysql::server::root_password'
-  include '::mysql::server::providers'
-
-  if $remove_default_accounts {
-    class { '::mysql::server::account_security':
-      require => Anchor['mysql::server::end'],
-    }
-  }
-
-  anchor { 'mysql::server::start': }
-  anchor { 'mysql::server::end': }
-
-  if $restart {
-    Anchor['mysql::server::start'] ->
-    Class['mysql::server::install'] ->
-    # Only difference between the blocks is that we use ~> to restart if
-    # restart is set to true.
-    Class['mysql::server::config'] ~>
-    Class['mysql::server::service'] ->
-    Class['mysql::server::root_password'] ->
-    Class['mysql::server::providers'] ->
-    Anchor['mysql::server::end']
-  } else {
-    Anchor['mysql::server::start'] ->
-    Class['mysql::server::install'] ->
-    Class['mysql::server::config'] ->
-    Class['mysql::server::service'] ->
-    Class['mysql::server::root_password'] ->
-    Class['mysql::server::providers'] ->
-    Anchor['mysql::server::end']
-  }
-
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp
deleted file mode 100644
index 36d943757c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class mysql::server::account_security {
-  mysql_user {
-    [ "root@${::fqdn}",
-      'root@127.0.0.1',
-      'root@::1',
-      "@${::fqdn}",
-      '@localhost',
-      '@%']:
-    ensure  => 'absent',
-    require => Anchor['mysql::server::end'],
-  }
-  if ($::fqdn != $::hostname) {
-    mysql_user { ["root@${::hostname}", "@${::hostname}"]:
-      ensure  => 'absent',
-      require => Anchor['mysql::server::end'],
-    }
-  }
-  mysql_database { 'test':
-    ensure  => 'absent',
-    require => Anchor['mysql::server::end'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp
deleted file mode 100644
index a33b2b03b40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-# See README.me for usage.
-class mysql::server::backup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupdirmode = '0700',
-  $backupdirowner = 'root',
-  $backupdirgroup = 'root',
-  $backupcompress = true,
-  $backuprotate = 30,
-  $ignore_events = true,
-  $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-  $postscript = false,
-) {
-
-  mysql_user { "${backupuser}@localhost":
-    ensure        => $ensure,
-    password_hash => mysql_password($backuppassword),
-    provider      => 'mysql',
-    require       => Class['mysql::server::root_password'],
-  }
-
-  mysql_grant { "${backupuser}@localhost/*.*":
-    ensure     => present,
-    user       => "${backupuser}@localhost",
-    table      => '*.*',
-    privileges => [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW' ],
-    require    => Mysql_user["${backupuser}@localhost"],
-  }
-
-  cron { 'mysql-backup':
-    ensure  => $ensure,
-    command => '/usr/local/sbin/mysqlbackup.sh',
-    user    => 'root',
-    hour    => $time[0],
-    minute  => $time[1],
-    require => File['mysqlbackup.sh'],
-  }
-
-  file { 'mysqlbackup.sh':
-    ensure  => $ensure,
-    path    => '/usr/local/sbin/mysqlbackup.sh',
-    mode    => '0700',
-    owner   => 'root',
-    group   => 'root',
-    content => template('mysql/mysqlbackup.sh.erb'),
-  }
-
-  file { 'mysqlbackupdir':
-    ensure => 'directory',
-    path   => $backupdir,
-    mode   => $backupdirmode,
-    owner  => $backupdirowner,
-    group  => $backupdirgroup,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp
deleted file mode 100644
index c51f22ff97d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# See README.me for options.
-class mysql::server::config {
-
-  $options = $mysql::server::options
-
-  File {
-    owner  => 'root',
-    group  => $mysql::server::root_group,
-    mode   => '0400',
-  }
-
-  file { '/etc/mysql':
-    ensure => directory,
-    mode   => '0755',
-  }
-
-  file { '/etc/mysql/conf.d':
-    ensure  => directory,
-    mode    => '0755',
-    recurse => $mysql::server::purge_conf_dir,
-    purge   => $mysql::server::purge_conf_dir,
-  }
-
-  if $mysql::server::manage_config_file  {
-    file { $mysql::server::config_file:
-      content => template('mysql/my.cnf.erb'),
-      mode    => '0644',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp
deleted file mode 100644
index dcb04cb1283..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class mysql::server::install {
-
-  package { 'mysql-server':
-    ensure => $mysql::server::package_ensure,
-    name   => $mysql::server::package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp
deleted file mode 100644
index 9e86b92c774..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-#This is a helper class to add a monitoring user to the database
-class mysql::server::monitor (
-  $mysql_monitor_username,
-  $mysql_monitor_password,
-  $mysql_monitor_hostname
-) {
-
-  Anchor['mysql::server::end'] -> Class['mysql::server::monitor']
-
-  mysql_user { "${mysql_monitor_username}@${mysql_monitor_hostname}":
-    ensure        => present,
-    password_hash => mysql_password($mysql_monitor_password),
-    require       => Class['mysql::server::service'],
-  }
-
-  mysql_grant { "${mysql_monitor_username}@${mysql_monitor_hostname}/*.*":
-    ensure     => present,
-    user       => "${mysql_monitor_username}@${mysql_monitor_hostname}",
-    table      => '*.*',
-    privileges => [ 'PROCESS', 'SUPER' ],
-    require    => Mysql_user["${mysql_monitor_username}@${mysql_monitor_hostname}"],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp
deleted file mode 100644
index 23d19a55851..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class mysql::server::mysqltuner($ensure='present') {
-  # mysql performance tester
-  file { '/usr/local/bin/mysqltuner':
-    ensure  => $ensure,
-    mode    => '0550',
-    source  => 'puppet:///modules/mysql/mysqltuner.pl',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp
deleted file mode 100644
index b651172fca3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Convenience class to call each of the three providers with the corresponding
-# hashes provided in mysql::server.
-# See README.md for details.
-class mysql::server::providers {
-  create_resources('mysql_user', $mysql::server::users)
-  create_resources('mysql_grant', $mysql::server::grants)
-  create_resources('mysql_database', $mysql::server::databases)
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp
deleted file mode 100644
index e75412dabee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-class mysql::server::root_password {
-
-  $options = $mysql::server::options
-
-  # manage root password if it is set
-  if $mysql::server::root_password != 'UNSET' {
-    mysql_user { 'root@localhost':
-      ensure        => present,
-      password_hash => mysql_password($mysql::server::root_password),
-    }
-
-    file { "${::root_home}/.my.cnf":
-      content => template('mysql/my.cnf.pass.erb'),
-      owner   => 'root',
-      mode    => '0600',
-      require => Mysql_user['root@localhost'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp
deleted file mode 100644
index c60e0366233..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-class mysql::server::service {
-
-  if $mysql::server::real_service_enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
-  }
-
-  if $mysql::server::real_service_manage {
-    service { 'mysqld':
-      ensure   => $service_ensure,
-      name     => $mysql::server::service_name,
-      enable   => $mysql::server::real_service_enabled,
-      provider => $mysql::server::service_provider,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json
deleted file mode 100644
index e1a8c790534..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-mysql",
-  "version": "2.2.3",
-  "source": "git://github.com/puppetlabs/puppetlabs-mysql.git",
-  "author": "Puppet Labs",
-  "license": "Apache 2.0",
-  "summary": "Mysql module",
-  "description": "Mysql module",
-  "project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 3.2.0"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb
deleted file mode 100644
index 07c99a183cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::account_security class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'running puppet code' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': remove_default_accounts => true }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe 'accounts' do
-      it 'should delete accounts' do
-        shell("mysql -e 'show grants for root@127.0.0.1;'", :acceptable_exit_codes => 1)
-      end
-
-      it 'should delete databases' do
-        shell("mysql -e 'show databases;' |grep test", :acceptable_exit_codes => 1)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
deleted file mode 100644
index 131520661fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::backup class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  context 'should work with no errors' do
-    it 'when configuring mysql backups' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'password' }
-        mysql::db { 'backup1':
-          user     => 'backup',
-          password => 'secret',
-        }
-
-        class { 'mysql::server::backup':
-          backupuser     => 'myuser',
-          backuppassword => 'mypassword',
-          backupdir      => '/tmp/backups',
-          backupcompress => true,
-          postscript     => [
-            'rm -rf /var/tmp/mysqlbackups',
-            'rm -f /var/tmp/mysqlbackups.done',
-            'cp -r /tmp/backups /var/tmp/mysqlbackups',
-            'touch /var/tmp/mysqlbackups.done',
-          ],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  describe 'mysqlbackup.sh' do
-    it 'should run mysqlbackup.sh with no errors' do
-      shell("/usr/local/sbin/mysqlbackup.sh") do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-
-    it 'should dump all databases to single file' do
-      shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r|
-        expect(r.stdout).to match(/1/)
-        expect(r.exit_code).to be_zero
-      end
-    end
-
-    context 'should create one file per database per run' do
-      it 'executes mysqlbackup.sh a second time' do
-        shell('sleep 1')
-        shell('/usr/local/sbin/mysqlbackup.sh')
-      end
-
-      it 'creates at least one backup tarball' do
-        shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r|
-          expect(r.stdout).to match(/2/)
-          expect(r.exit_code).to be_zero
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb
deleted file mode 100644
index b7e25d63d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-require 'spec_helper_acceptance'
-
-osfamily = fact('osfamily')
-operatingsystem = fact('operatingsystem')
-
-case osfamily
-when 'RedHat'
-  java_package   = 'mysql-connector-java'
-  perl_package   = 'perl-DBD-MySQL'
-  php_package    = 'php-mysql'
-  python_package = 'MySQL-python'
-  ruby_package   = 'ruby-mysql'
-when 'Suse'
-  java_package   = 'mysql-connector-java'
-  perl_package   = 'perl-DBD-mysql'
-  php_package    = 'apache2-mod_php53'
-  python_package = 'python-mysql'
-  case operatingsystem
-  when /OpenSuSE/
-    ruby_package = 'rubygem-mysql'
-  when /(SLES|SLED)/
-    ruby_package = 'ruby-mysql'
-  end
-when 'Debian'
-  java_package = 'libmysql-java'
-  perl_package   = 'libdbd-mysql-perl'
-  php_package    = 'php5-mysql'
-  python_package = 'python-mysqldb'
-  ruby_package   = 'libmysql-ruby'
-when 'FreeBSD'
-  java_package = 'databases/mysql-connector-java'
-  perl_package   = 'p5-DBD-mysql'
-  php_package    = 'php5-mysql'
-  python_package = 'databases/py-MySQLdb'
-  ruby_package   = 'ruby-mysql'
-else
-  case operatingsystem
-  when 'Amazon'
-    java_package = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    php_package    = 'php5-mysql'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-  end
-end
-
-describe 'mysql::bindings class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'running puppet code' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe 'all parameters' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings':
-          java_enable             => true,
-          perl_enable             => true,
-          php_enable              => true,
-          python_enable           => true,
-          ruby_enable             => true,
-          java_package_ensure     => present,
-          perl_package_ensure     => present,
-          php_package_ensure      => present,
-          python_package_ensure   => present,
-          ruby_package_ensure     => present,
-          java_package_name       => #{java_package},
-          perl_package_name       => #{perl_package},
-          php_package_name        => #{php_package},
-          python_package_name     => #{python_package},
-          ruby_package_name       => #{ruby_package},
-          java_package_provider   => undef,
-          perl_package_provider   => undef,
-          php_package_provider    => undef,
-          python_package_provider => undef,
-          ruby_package_provider   => undef,
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(java_package) do
-      it { should be_installed }
-    end
-
-    describe package(perl_package) do
-      it { should be_installed }
-    end
-
-    # This package is not available out of the box and adding in other repos
-    # is a bit much for the scope of this test.
-    unless fact('osfamily') == 'RedHat'
-      describe package(php_package) do
-        it { should be_installed }
-      end
-    end
-
-    describe package(python_package) do
-      it { should be_installed }
-    end
-
-    describe package(ruby_package) do
-      it { should be_installed }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
deleted file mode 100644
index 1e8df8a1f4e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::db define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'creating a database' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'password' }
-        mysql::db { 'spec1':
-          user     => 'root1',
-          password => 'password',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      expect(shell("mysql -e 'show databases;'|grep spec1").exit_code).to be_zero
-    end
-  end
-
-  describe 'creating a database with post-sql' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        file { '/tmp/spec.sql':
-          ensure  => file,
-          content => 'CREATE TABLE table1 (id int);',
-          before  => Mysql::Db['spec2'],
-        }
-        mysql::db { 'spec2':
-          user     => 'root1',
-          password => 'password',
-          sql      => '/tmp/spec.sql',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'should have the table' do
-      expect(shell("mysql -e 'show tables;' spec2|grep table1").exit_code).to be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb
deleted file mode 100644
index d327dd29aed..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'config location', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'creates the file elsewhere' do
-    pp = <<-EOS
-        class { 'mysql::server':
-          config_file => '/etc/testmy.cnf',
-        }
-    EOS
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  describe file('/etc/testmy.cnf') do
-    it { should be_file }
-  end
-end
-
-describe 'manage_config_file', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'wont reset the location of my.cnf' do
-    pp = <<-EOS
-      class { 'mysql::server':
-        config_file        => '/etc/my.cnf',
-        manage_config_file => false,
-        service_manage     => false,
-      }
-    EOS
-    # Make sure this doesn't exist so we can test if puppet
-    # readded it.  It may not exist in the first place on
-    # some platforms.
-    shell('rm /etc/my.cnf', :acceptable_exit_codes => [0,1,2])
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  describe file('/etc/my.cnf') do
-    it { should_not be_file }
-  end
-end
-
-describe 'resets', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'cleans up' do
-    pp = <<-EOS
-        class { 'mysql::server': }
-    EOS
-    apply_manifest(pp, :catch_failures => true)
-    shell('rm /etc/testmy.cnf')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb
deleted file mode 100644
index 9c66334e5bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::monitor class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': root_password => 'password' }
-
-      class { 'mysql::server::monitor':
-        mysql_monitor_username => 'monitoruser',
-        mysql_monitor_password => 'monitorpass',
-        mysql_monitor_hostname => 'localhost',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'should run mysqladmin ping with no errors' do
-    expect(shell("mysqladmin -u monitoruser -pmonitorpass -h localhost ping").stdout).to match(/mysqld is alive/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb
deleted file mode 100644
index f6035f0b362..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::root_password class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'reset' do
-    it 'shuts down mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'deletes the /root/.my.cnf password' do
-      shell('rm -rf /root/.my.cnf')
-    end
-
-    it 'deletes all databases' do
-      case fact('osfamily')
-      when 'RedHat', 'Suse'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
-      when 'Debian'
-        shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
-        shell('mysql_install_db')
-      end
-    end
-
-    it 'starts up mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => true }
-      EOS
-
-      puppet_apply(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'when unset' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe 'when set' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'new', old_root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-end
-
-# Debian relies on a debian-sys-maint@ account to do almost everything.
-# Without recreating this account we can't even stop the service in future
-# tests.
-if fact('osfamily') == 'Debian'
-  describe 'readd debian user' do
-    it 'readds the user' do
-      shell("MYSQL_PASSWORD=`head -5 /etc/mysql/debian.cnf | grep password | cut -d' ' -f 3`; mysql -NBe \"GRANT ALL PRIVILEGES ON *.* to 'debian-sys-maint'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD}' WITH GRANT OPTION;\"")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
deleted file mode 100644
index 938368dbf9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
+++ /dev/null
@@ -1,281 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name     = 'mysql-server'
-    service_name     = 'mysqld'
-    service_provider = 'undef'
-    mycnf            = '/etc/my.cnf'
-  when 'Suse'
-    case fact('operatingsystem')
-    when 'OpenSuSE'
-      package_name     = 'mysql-community-server'
-      service_name     = 'mysql'
-      service_provider = 'undef'
-      mycnf            = '/etc/my.cnf'
-    when 'SLES'
-      package_name     = 'mysql'
-      service_name     = 'mysql'
-      service_provider = 'undef'
-      mycnf            = '/etc/my.cnf'
-    end
-  when 'Debian'
-    package_name     = 'mysql-server'
-    service_name     = 'mysql'
-    service_provider = 'undef'
-    mycnf            = '/etc/mysql/my.cnf'
-  when 'Ubuntu'
-    package_name     = 'mysql-server'
-    service_name     = 'mysql'
-    service_provider = 'upstart'
-    mycnf            = '/etc/mysql/my.cnf'
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'mycnf' do
-    it 'should contain sensible values' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer_size = 16M' }
-      it { should contain 'max_binlog_size = 100M' }
-      it { should contain 'query_cache_size = 16M' }
-    end
-  end
-
-  describe 'my.cnf changes' do
-    it 'sets values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'key_buffer'       => '32M',
-              'max_binlog_size'  => '200M',
-              'query_cache_size' => '32M',
-            }
-          }  
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 32M' }
-      it { should contain 'max_binlog_size = 200M' }
-      it { should contain 'query_cache_size = 32M' }
-    end
-  end
-
-  describe 'my.cnf should contain multiple instances of the same option' do
-    it 'sets multiple values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'replicate-do-db' => ['base1', 'base2', 'base3'], }
-          }  
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'replicate-do-db = base1' }
-      it { should contain 'replicate-do-db = base2' }
-      it { should contain 'replicate-do-db = base3' }
-    end
-  end
-
-  describe 'package_ensure => absent' do
-    it 'uninstalls mysql' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          service_enabled => false,
-          package_ensure  => absent,
-          package_name    => #{package_name}
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(package_name) do
-      it { should_not be_installed }
-    end
-  end
-
-  describe 'package_ensure => present' do
-    it 'installs mysql' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          package_ensure => present,
-          package_name   => #{package_name}
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-  end
-
-  describe 'purge_conf_dir' do
-
-    it 'purges the conf dir' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          purge_conf_dir => true
-        }
-      EOS
-      shell('touch /etc/mysql/conf.d/test.conf')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/mysql/conf.d/test.conf') do
-      it { should_not be_file }
-    end
-  end
-
-  describe 'restart' do
-    it 'restart => true' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          restart          => true,
-          override_options => { 'mysqldump' => { 'default-character-set' => 'UTF-8' } }
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.exit_code).to eq(2)
-        expect(r.stdout).to match(/Scheduling refresh/)
-      end
-    end
-    it 'restart => false' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          restart          => false,
-          override_options => { 'mysqldump' => { 'default-character-set' => 'UTF-16' } }
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.exit_code).to eq(2)
-        expect(r.stdout).to_not match(/Scheduling refresh/)
-      end
-    end
-  end
-
-  describe 'root_group' do
-    it 'creates a group' do
-      pp = "group { 'test': ensure => present }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'sets the group of files' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          root_group => 'test',
-          config_file => '/tmp/mysql_group_test',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/tmp/mysql_group_test') do
-      it { should be_grouped_into 'test' }
-    end
-  end
-
-  describe 'service parameters' do
-    it 'calls all parameters' do
-      pp = <<-EOS
-      class { 'mysql::server':
-        service_enabled  => true,
-        service_manage   => true,
-        service_name     => #{service_name},
-        service_provider => #{service_provider}
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'users, grants, and databases' do
-    it 'are created' do
-      pp = <<-EOS
-      class { 'mysql::server':
-        users => {
-          'zerg1@localhost' => {
-            ensure                   => 'present',
-            max_connections_per_hour => '0',
-            max_queries_per_hour     => '0',
-            max_updates_per_hour     => '0',
-            max_user_connections     => '0',
-            password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF',
-          }
-        },
-        grants => {
-          'zerg1@localhost/zergdb.*' => {
-            ensure     => 'present',
-            options    => ['GRANT'],
-            privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
-            table      => 'zergdb.*',
-            user       => 'zerg1@localhost',
-          }
-        },
-        databases => {
-          'zergdb' => {
-            ensure  => 'present',
-            charset => 'utf8',
-          }
-        },
-      }
-    EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'has a user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'zerg1@localhost'\"") do |r|
-        expect(r.stdout).to match(/^1$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'has a grant' do
-      shell("mysql -NBe \"SHOW GRANTS FOR zerg1@localhost\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, INSERT, UPDATE, DELETE ON `zergdb`.* TO 'zerg1'@'localhost' WITH GRANT OPTION/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'has a database' do
-      shell("mysql -NBe \"SHOW DATABASES LIKE 'zergdb'\"") do |r|
-        expect(r.stdout).to match(/zergdb/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
deleted file mode 100644
index c064209916a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_database', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'creating database' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_database { 'spec_db':
-          ensure => present,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the database' do
-      shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r|
-        expect(r.stdout).to match(/^spec_db$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'charset and collate' do
-    it 'should create two db of different types idempotently' do
-      pp = <<-EOS
-        mysql_database { 'spec_latin1':
-          charset => 'latin1',
-          collate => 'latin1_swedish_ci',
-        }
-        mysql_database { 'spec_utf8':
-          charset => 'utf8',
-          collate => 'utf8_general_ci',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'should find latin1 db' do
-      shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_latin1") do |r|
-        expect(r.stdout).to match(/^character_set_database\tlatin1\ncollation_database\tlatin1_swedish_ci$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-
-    it 'should find utf8 db' do
-      shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_utf8") do |r|
-        expect(r.stdout).to match(/^character_set_database\tutf8\ncollation_database\tutf8_general_ci$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
deleted file mode 100644
index df8bea4f319..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
+++ /dev/null
@@ -1,308 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_grant', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'setup' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'missing privileges for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test1@tester/test.*':
-          ensure => 'present',
-          table  => 'test.*',
-          user   => 'test1@tester',
-        }
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/privileges parameter is required/)
-    end
-
-    it 'should not find the user' do
-      expect(shell("mysql -NBe \"SHOW GRANTS FOR test1@tester\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test1' on host 'tester'/)
-    end
-  end
-
-  describe 'missing table for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'atest@tester/test.*':
-          ensure => 'present',
-          user   => 'atest@tester',
-          privileges => ['ALL'],
-        }
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-
-    it 'should not find the user' do
-      expect(shell("mysql -NBe \"SHOW GRANTS FOR atest@tester\"", {:acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'atest' on host 'tester'/)
-    end
-  end
-
-  describe 'adding privileges' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test2@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test2@tester',
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, UPDATE.*TO 'test2'@'tester'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'adding option' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test3@tester/test.*':
-          ensure  => 'present',
-          table   => 'test.*',
-          user    => 'test3@tester',
-          options => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test3@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'adding all privileges without table' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/table parameter is required./)
-    end
-  end
-
-  describe 'adding all privileges' do
-    it 'should only try to apply ALL' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test4@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  # Test combinations of user@host to ensure all cases work.
-  describe 'short hostname' do
-    it 'should apply' do
-      pp = <<-EOS
-        mysql_grant { 'test@short/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@short',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@long.hostname.com/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@long.hostname.com',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@192.168.5.6/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@192.168.5.6',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@2607:f0d0:1002:0051:0000:0000:0000:0004',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@::1/128/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@::1/128',
-          privileges => 'ALL',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'finds short hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test@short\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds long hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds ipv4' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds short ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'complex test' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-      $dbSubnet = '10.10.10.%'
-
-      mysql_database { 'foo':
-        ensure => present,
-      }
-
-      exec { 'mysql-create-table':
-        command     => '/usr/bin/mysql -NBe "CREATE TABLE foo.bar (name VARCHAR(20))"',
-        environment => "HOME=${::root_home}",
-        unless      => '/usr/bin/mysql -NBe "SELECT 1 FROM foo.bar LIMIT 1;"',
-        require     => Mysql_database['foo'],
-      }
-
-      Mysql_grant {
-          ensure     => present,
-          options    => ['GRANT'],
-          privileges => ['ALL'],
-          table      => '*.*',
-          require    => [ Mysql_database['foo'], Exec['mysql-create-table'] ],
-      }
-
-      mysql_grant { "user1@${dbSubnet}/*.*":
-          user       => "user1@${dbSubnet}",
-      }
-      mysql_grant { "user2@${dbSubnet}/foo.bar":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user2@${dbSubnet}",
-          table      => 'foo.bar',
-      }
-      mysql_grant { "user3@${dbSubnet}/foo.*":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user3@${dbSubnet}",
-          table      => 'foo.*',
-      }
-      mysql_grant { 'web@%/*.*':
-          user       => 'web@%',
-      }
-      mysql_grant { "web@${dbSubnet}/*.*":
-          user       => "web@${dbSubnet}",
-      }
-      mysql_grant { "web@${fqdn}/*.*":
-          user       => "web@${fqdn}",
-      }
-      mysql_grant { 'web@localhost/*.*':
-          user       => 'web@localhost',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-
-  describe 'lower case privileges' do
-    it 'create ALL privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'ALL',
-          table      => '*.*',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'create lowercase all privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'all',
-          table      => '*.*',
-      }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to eq(0)
-    end
-  end
-
-  describe 'adding procedure privileges' do
-    it 'should work without errors' do
-       pp = <<-EOS
-       mysql_grant { 'test2@tester/PROCEDURE test.simpleproc':
-         ensure     => 'present',
-         table      => 'PROCEDURE test.simpleproc',
-         user       => 'test2@tester',
-         privileges => ['EXECUTE'],
-       }
-       EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT EXECUTE ON PROCEDURE `test`.`simpleproc` TO 'test2'@'tester'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
deleted file mode 100644
index 65b403f193b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_user', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'adding user' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_user { 'ashp@localhost':
-          password_hash => '6f8c114b58f2ce9e',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r|
-        expect(r.stdout).to match(/^1$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 449f35a63b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'mysql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
deleted file mode 100644
index 8ec4428bb0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::bindings' do
-  let(:params) {{
-    'java_enable'   => true,
-    'perl_enable'   => true,
-    'php_enable'    => true,
-    'python_enable' => true,
-    'ruby_enable'   => true,
-  }}
-
-  shared_examples 'bindings' do |osfamily, operatingsystem, java_name, perl_name, php_name, python_name, ruby_name|
-    let :facts do
-      { :osfamily => osfamily, :operatingsystem => operatingsystem, :root_home => '/root'}
-    end
-    it { should contain_package('mysql-connector-java').with(
-      :name   => java_name,
-      :ensure => 'present'
-    )}
-    it { should contain_package('perl_mysql').with(
-      :name     => perl_name,
-      :ensure   => 'present'
-    )}
-    it { should contain_package('python-mysqldb').with(
-      :name   => python_name,
-      :ensure => 'present'
-    )}
-    it { should contain_package('ruby_mysql').with(
-      :name     => ruby_name,
-      :ensure   => 'present'
-    )}
-  end
-
-  context 'Debian' do
-    it_behaves_like 'bindings', 'Debian', 'Debian', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
-    it_behaves_like 'bindings', 'Debian', 'Ubuntu', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
-  end
-
-  context 'freebsd' do
-    it_behaves_like 'bindings', 'FreeBSD', 'FreeBSD', 'databases/mysql-connector-java', 'p5-DBD-mysql', 'databases/php5-mysql', 'databases/py-MySQLdb', 'databases/ruby-mysql'
-  end
-
-  context 'redhat' do
-    it_behaves_like 'bindings', 'RedHat', 'RedHat', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
-    it_behaves_like 'bindings', 'RedHat', 'OpenSuSE', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
-  end
-
-  describe 'on any other os' do
-    let :facts do
-      {:osfamily => 'foo', :root_home => '/root'}
-    end
-
-    it 'should fail' do
-      expect { subject }.to raise_error(/Unsupported osfamily: foo/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
deleted file mode 100644
index d7386d17a69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-describe 'mysql::client' do
-  let(:facts) {{ :osfamily => 'RedHat' }}
-
-  context 'with defaults' do
-    it { should_not contain_class('mysql::bindings') }
-    it { should contain_package('mysql_client') }
-  end
-
-  context 'with bindings enabled' do
-    let(:params) {{ :bindings_enable => true }}
-
-    it { should contain_class('mysql::bindings') }
-    it { should contain_package('mysql_client') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
deleted file mode 100644
index 1d0e7506c44..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::server::account_security' do
-
-  let :facts do {
-    :fqdn     => 'myhost.mydomain',
-    :hostname => 'myhost',
-    :root_home => '/root'
-  }
-  end
-
-  it 'should remove Mysql_User[root@myhost.mydomain]' do
-    should contain_mysql_user('root@myhost.mydomain').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@myhost]' do
-    should contain_mysql_user('root@myhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@127.0.0.1]' do
-    should contain_mysql_user('root@127.0.0.1').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@::1]' do
-    should contain_mysql_user('root@::1').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@myhost.mydomain]' do
-    should contain_mysql_user('@myhost.mydomain').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@myhost]' do
-    should contain_mysql_user('@myhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@localhost]' do
-    should contain_mysql_user('@localhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@%]' do
-    should contain_mysql_user('@%').with_ensure('absent')
-  end
-
-  it 'should remove Mysql_database[test]' do
-    should contain_mysql_database('test').with_ensure('absent')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
deleted file mode 100644
index c46f95bd790..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::server::backup' do
-
-    let(:default_params) {
-        { 'backupuser'         => 'testuser',
-            'backuppassword'     => 'testpass',
-            'backupdir'          => '/tmp',
-            'backuprotate'       => '25',
-            'delete_before_dump' => true,
-        }
-    }
-    context 'standard conditions' do
-        let(:params) { default_params }
-
-        it { should contain_mysql_user('testuser@localhost').with(
-            :require => 'Class[Mysql::Server::Root_password]'
-        )}
-
-        it { should contain_mysql_grant('testuser@localhost/*.*').with(
-            :privileges => ["SELECT", "RELOAD", "LOCK TABLES", "SHOW VIEW"]
-        )}
-
-        it { should contain_cron('mysql-backup').with(
-            :command => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure  => 'present'
-        )}
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it { should contain_file('mysqlbackupdir').with(
-            :path   => '/tmp',
-            :ensure => 'directory'
-        )}
-
-        it 'should have compression by default' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            ' --all-databases | bzcat -zc > ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql.bz2',
-            ])
-        end
-        it 'should skip backing up events table by default' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'EVENTS="--ignore-table=mysql.event"',
-            ])
-        end
-
-        it 'should have 25 days of rotation' do
-            # MySQL counts from 0 I guess.
-            should contain_file('mysqlbackup.sh').with_content(/.*ROTATE=24.*/)
-        end
-    end
-
-    context 'custom ownership and mode for backupdir' do
-        let(:params) do
-            { :backupdirmode => '0750',
-                :backupdirowner => 'testuser',
-                :backupdirgroup => 'testgrp',
-            }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackupdir').with(
-            :path => '/tmp',
-            :ensure => 'directory',
-            :mode => '0750',
-            :owner => 'testuser',
-            :group => 'testgrp'
-        ) }
-    end
-
-    context 'with compression disabled' do
-        let(:params) do
-            { :backupcompress => false }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should be able to disable compression' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            ' --all-databases > ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql',
-            ])
-        end
-    end
-
-    context 'with mysql.events backedup' do
-        let(:params) do
-            { :ignore_events => false }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should be able to backup events table' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'EVENTS="--events"',
-            ])
-        end
-    end
-
-
-    context 'with database list specified' do
-        let(:params) do
-            { :backupdatabases => ['mysql'] }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should have a backup file for each database' do
-            content = subject.resource('file','mysqlbackup.sh').send(:parameters)[:content]
-            content.should match(' mysql | bzcat -zc \${DIR}\\\${PREFIX}mysql_`date')
-            #      verify_contents(subject, 'mysqlbackup.sh', [
-            #        ' mysql | bzcat -zc ${DIR}/${PREFIX}mysql_`date +%Y%m%d-%H%M%S`.sql',
-            #      ])
-        end 
-    end
-
-    context 'with file per database' do
-        let(:params) do
-            default_params.merge({ :file_per_database => true })
-        end
-
-        it 'should loop through backup all databases' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'mysql -s -r -N -e \'SHOW DATABASES\' | while read dbname',
-                            'do',
-                            '  mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \\',
-                            '    ${EVENTS} \\',
-                            '    ${dbname} | bzcat -zc > ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql.bz2',
-                            'done',
-            ])
-        end
-
-        context 'with compression disabled' do
-            let(:params) do
-                default_params.merge({ :file_per_database => true, :backupcompress => false })
-            end
-
-            it 'should loop through backup all databases without compression' do
-                verify_contents(subject, 'mysqlbackup.sh', [
-                                '    ${dbname} > ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql',
-                ])
-            end
-        end
-    end
-
-		context 'with postscript' do
-			let(:params) do
-				default_params.merge({ :postscript => 'rsync -a /tmp backup01.local-lan:' })
-			end
-
-			it 'should be add postscript' do
-				verify_contents(subject, 'mysqlbackup.sh', [
-					'rsync -a /tmp backup01.local-lan:',
-				])
-			end
-		end
-
-		context 'with postscripts' do
-			let(:params) do
-				default_params.merge({ :postscript => [
-					'rsync -a /tmp backup01.local-lan:',
-					'rsync -a /tmp backup02.local-lan:',
-				]})
-			end
-
-			it 'should be add postscript' do
-				verify_contents(subject, 'mysqlbackup.sh', [
-					'rsync -a /tmp backup01.local-lan:',
-					'rsync -a /tmp backup02.local-lan:',
-				])
-			end
-		end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
deleted file mode 100644
index 8df9530f0a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-describe 'mysql::server::monitor' do
-  let :facts do
-    { :osfamily => 'Debian', :root_home => '/root' }
-  end
-  let :pre_condition do
-    "include 'mysql::server'"
-  end
-
-  let :default_params do
-    {
-      :mysql_monitor_username   => 'monitoruser',
-      :mysql_monitor_password   => 'monitorpass',
-      :mysql_monitor_hostname   => 'monitorhost',
-    }
-  end
-
-  let :params do
-    default_params
-  end
-
-  it { should contain_mysql_user('monitoruser@monitorhost')}
-
-  it { should contain_mysql_grant('monitoruser@monitorhost/*.*').with(
-    :ensure     => 'present',
-    :user       => 'monitoruser@monitorhost',
-    :table      => '*.*',
-    :privileges => ["PROCESS", "SUPER"],
-    :require    => 'Mysql_user[monitoruser@monitorhost]'
-  )}
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
deleted file mode 100644
index 7e9499a65ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-describe 'mysql::server::mysqltuner' do
-
-  it { should contain_file('/usr/local/bin/mysqltuner') }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
deleted file mode 100644
index c14b70f7c66..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'spec_helper'
-describe 'mysql::server' do
-  let(:facts) {{:osfamily => 'RedHat', :root_home => '/root'}}
-
-  context 'with defaults' do
-    it { should contain_class('mysql::server::install') }
-    it { should contain_class('mysql::server::config') }
-    it { should contain_class('mysql::server::service') }
-    it { should contain_class('mysql::server::root_password') }
-    it { should contain_class('mysql::server::providers') }
-  end
-
-  # make sure that overriding the mysqld settings keeps the defaults for everything else
-  context 'with overrides' do
-    let(:params) {{ :override_options => { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } }}
-    it do
-      should contain_file('/etc/my.cnf').with({
-        :mode => '0644',
-      }).with_content(/basedir/)
-    end
-  end
-
-  describe 'with multiple instance of an option' do
-    let(:params) {{ :override_options => { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2', 'base3'], } }}}
-    it do
-      should contain_file('/etc/my.cnf').with_content(
-        /^replicate-do-db = base1$/
-      ).with_content(
-        /^replicate-do-db = base2$/
-      ).with_content(
-        /^replicate-do-db = base3$/
-      )
-    end
-  end
-
-  describe 'an option set to true' do
-    let(:params) {
-      { :override_options => { 'mysqld' => { 'ssl' => true } }}
-    }
-    it do
-      should contain_file('/etc/my.cnf').with_content(/^\s*ssl\s*(?:$|= true)/m)
-    end
-  end
-
-  describe 'an option set to false' do
-    let(:params) {
-      { :override_options => { 'mysqld' => { 'ssl' => false } }}
-    }
-    it do
-      should contain_file('/etc/my.cnf').with_content(/^\s*ssl = false/m)
-    end
-  end
-
-  context 'with remove_default_accounts set' do
-    let (:params) {{ :remove_default_accounts => true }}
-    it { should contain_class('mysql::server::account_security') }
-  end
-
-  context 'mysql::server::install' do
-    let(:params) {{ :package_ensure => 'present', :name => 'mysql-server' }}
-    it do
-      should contain_package('mysql-server').with({
-      :ensure => :present,
-      :name   => 'mysql-server',
-    })
-    end
-  end
-
-  context 'mysql::server::config' do
-    it do
-      should contain_file('/etc/mysql').with({
-        :ensure => :directory,
-        :mode   => '0755',
-      })
-    end
-
-    it do
-      should contain_file('/etc/mysql/conf.d').with({
-        :ensure => :directory,
-        :mode   => '0755',
-      })
-    end
-
-    it do
-      should contain_file('/etc/my.cnf').with({
-        :mode => '0644',
-      })
-    end
-  end
-
-  context 'mysql::server::service' do
-    context 'with defaults' do
-      it { should contain_service('mysqld') }
-    end
-
-    context 'service_enabled set to false' do
-      let(:params) {{ :service_enabled => false }}
-
-      it do
-        should contain_service('mysqld').with({
-          :ensure => :stopped
-        })
-      end
-    end
-  end
-
-  context 'mysql::server::root_password' do
-    describe 'when defaults' do
-      it { should_not contain_mysql_user('root@localhost') }
-      it { should_not contain_file('/root/.my.cnf') }
-    end
-    describe 'when set' do
-      let(:params) {{:root_password => 'SET' }}
-      it { should contain_mysql_user('root@localhost') }
-      it { should contain_file('/root/.my.cnf') }
-    end
-
-  end
-
-  context 'mysql::server::providers' do
-    describe 'with users' do
-      let(:params) {{:users => {
-        'foo@localhost' => {
-          'max_connections_per_hour' => '1',
-          'max_queries_per_hour'     => '2',
-          'max_updates_per_hour'     => '3',
-          'max_user_connections'     => '4',
-          'password_hash'            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-        },
-        'foo2@localhost' => {}
-      }}}
-      it { should contain_mysql_user('foo@localhost').with(
-        :max_connections_per_hour => '1',
-        :max_queries_per_hour     => '2',
-        :max_updates_per_hour     => '3',
-        :max_user_connections     => '4',
-        :password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-      )}
-      it { should contain_mysql_user('foo2@localhost').with(
-        :max_connections_per_hour => nil,
-        :max_queries_per_hour     => nil,
-        :max_updates_per_hour     => nil,
-        :max_user_connections     => nil,
-        :password_hash            => ''
-      )}
-    end
-
-    describe 'with grants' do
-      let(:params) {{:grants => {
-        'foo@localhost/somedb.*' => {
-          'user'       => 'foo@localhost',
-          'table'      => 'somedb.*',
-          'privileges' => ["SELECT", "UPDATE"],
-          'options'    => ["GRANT"],
-        },
-        'foo2@localhost/*.*' => {
-          'user'       => 'foo2@localhost',
-          'table'      => '*.*',
-          'privileges' => ["SELECT"],
-        },
-      }}}
-      it { should contain_mysql_grant('foo@localhost/somedb.*').with(
-        :user       => 'foo@localhost',
-        :table      => 'somedb.*',
-        :privileges => ["SELECT", "UPDATE"],
-        :options    => ["GRANT"]
-      )}
-      it { should contain_mysql_grant('foo2@localhost/*.*').with(
-        :user       => 'foo2@localhost',
-        :table      => '*.*',
-        :privileges => ["SELECT"],
-        :options    => nil
-      )}
-    end
-
-    describe 'with databases' do
-      let(:params) {{:databases => {
-        'somedb' => {
-          'charset' => 'latin1',
-          'collate' => 'latin1',
-        },
-        'somedb2' => {}
-      }}}
-      it { should contain_mysql_database('somedb').with(
-        :charset => 'latin1',
-        :collate => 'latin1'
-      )}
-      it { should contain_mysql_database('somedb2')}
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
deleted file mode 100644
index a7ee31ff8b7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::db', :type => :define do
-  let(:facts) {{ :osfamily => 'RedHat' }}
-  let(:title) { 'test_db' }
-
-  let(:params) {
-    { 'user'     => 'testuser',
-      'password' => 'testpass',
-    }
-  }
-
-  it 'should report an error when ensure is not present or absent' do
-    params.merge!({'ensure' => 'invalid_val'})
-    expect { subject }.to raise_error(Puppet::Error,
-      /invalid_val is not supported for ensure\. Allowed values are 'present' and 'absent'\./)
-  end
-
-  it 'should not notify the import sql exec if no sql script was provided' do
-    should contain_mysql_database('test_db').without_notify
-  end
-
-  it 'should subscribe to database if sql script is given' do
-    params.merge!({'sql' => 'test_sql'})
-    should contain_exec('test_db-import').with_subscribe('Mysql_database[test_db]')
-  end
-
-  it 'should only import sql script on creation if not enforcing' do
-    params.merge!({'sql' => 'test_sql', 'enforce_sql' => false})
-    should contain_exec('test_db-import').with_refreshonly(true)
-  end
-
-  it 'should import sql script on creation if enforcing' do
-    params.merge!({'sql' => 'test_sql', 'enforce_sql' => true})
-    should contain_exec('test_db-import').with_refreshonly(false)
-  end
-
-  it 'should not create database and database user' do
-    params.merge!({'ensure' => 'absent', 'host' => 'localhost'})
-    should contain_mysql_database('test_db').with_ensure('absent')
-    should contain_mysql_user('testuser@localhost').with_ensure('absent')
-  end
-
-  it 'should create with an appropriate collate and charset' do
-    params.merge!({'charset' => 'utf8', 'collate' => 'utf8_danish_ci'})
-    should contain_mysql_database('test_db').with({
-      'charset' => 'utf8',
-      'collate' => 'utf8_danish_ci',
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb
deleted file mode 100644
index 1fd2563f597..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/spec/"
-end
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb
deleted file mode 100644
index a76c2e58338..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mysql')
-    hosts.each do |host|
-      # Required for binding tests.
-      if fact('osfamily') == 'RedHat'
-        version = fact("operatingsystemmajrelease")
-        shell("yum localinstall -y http://yum.puppetlabs.com/puppetlabs-release-el-#{version}.noarch.rpm")
-        if version == '6'
-          shell("yum localinstall -y http://mirror.pnl.gov/epel/6/i386/epel-release-6-8.noarch.rpm")
-        elsif version == '5'
-          shell("yum localinstall -y http://mirrors.servercentral.net/fedora/epel/5/i386/epel-release-5-4.noarch.rpm")
-        else
-          puts "Sorry, this version is not supported."
-          exit
-        end
-      end
-
-      shell("/bin/touch #{default['distmoduledir']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb
deleted file mode 100644
index de20690c51e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mysql')
-    shell('puppet module install puppetlabs-stdlib')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb
deleted file mode 100644
index 11f776a05c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::account_security class' do
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': remove_default_accounts => true }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe 'accounts' do
-      it 'should delete accounts' do
-        shell("mysql -e 'show grants for root@127.0.01;'") do |s|
-          s.exit_code.should == 1
-        end
-      end
-
-     it 'should delete databases' do
-      shell("mysql -e 'show databases;' |grep test") do |s|
-        s.exit_code.should == 1
-      end
-     end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb
deleted file mode 100644
index cdbf4ed2789..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::backup class' do
-  context 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-      mysql::db { 'backup1':
-        user     => 'backup',
-        password => 'secret',
-      }
-      
-      class { 'mysql::server::backup':
-        backupuser     => 'myuser',
-        backuppassword => 'mypassword',
-        backupdir      => '/tmp/backups',
-        backupcompress => true,
-        postscript     => [
-          'rm -rf /var/tmp/mysqlbackups',
-          'rm -f /var/tmp/mysqlbackups.done',
-          'cp -r /tmp/backups /var/tmp/mysqlbackups',
-          'touch /var/tmp/mysqlbackups.done',
-        ],
-      }
-    EOS
-
-    context puppet_apply(pp) do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-  end
-
-  describe 'mysqlbackup.sh' do
-    context 'should run mysqlbackup.sh with no errors' do
-      context shell("/usr/local/sbin/mysqlbackup.sh") do
-        its(:exit_code) { should be_zero }
-        its(:stderr) { should be_empty }
-      end
-    end
-
-    context 'should dump all databases to single file' do
-      describe command('ls /tmp/backups/ | grep -c "mysql_backup_[0-9][0-9]*-[0-9][0-9]*.sql.bz2"') do
-        it { should return_stdout /1/ }
-        it { should return_exit_status 0 }
-      end
-    end
-
-    context 'should create one file per database per run' do
-      context shell("/usr/local/sbin/mysqlbackup.sh") do
-        its(:exit_code) { should be_zero }
-        its(:stderr) { should be_empty }
-      end
-
-      describe command('ls /tmp/backups/ | grep -c "mysql_backup_backup1_[0-9][0-9]*-[0-9][0-9]*.sql.bz2"') do
-        it { should return_stdout /2/ }
-        it { should return_exit_status 0 }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb
deleted file mode 100644
index 694cf574d43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::bindings class' do
-  let(:os) {
-    node.facts['osfamily']
-  }
-
-  case node.facts['osfamily']
-  when 'RedHat'
-    java_package   = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-  when 'Suse'
-    java_package   = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'python-mysql'
-    case node.facts['operatingsystem']
-    when /OpenSuSE/
-      ruby_package = 'rubygem-mysql'
-    when /(SLES|SLED)/
-      ruby_package = 'ruby-mysql'
-    end
-  when 'Debian'
-    java_package = 'libmysql-java'
-    perl_package   = 'libdbd-mysql-perl'
-    python_package = 'python-mysqldb'
-    ruby_package   = 'libmysql-ruby'
-  when 'FreeBSD'
-    java_package = 'databases/mysql-connector-java'
-    perl_package   = 'p5-DBD-mysql'
-    python_package = 'databases/py-MySQLdb'
-    ruby_package   = 'ruby-mysql'
-  else
-    case node.facts['operatingsystem']
-    when 'Amazon'
-      java_package = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-    end
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings': }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'enabling bindings' do
-    it 'should work with no errors' do
-      puppet_apply(%{
-      class { 'mysql::bindings':
-        java_enable   => true,
-        perl_enable   => true,
-        python_enable => true,
-        ruby_enable   => true,
-      }
-      })
-    end
-
-    describe package(java_package) do
-      it { should be_installed }
-    end
-
-    describe package(perl_package) do
-      it { should be_installed }
-    end
-
-    describe package(python_package) do
-      it { should be_installed }
-    end
-
-    describe package(ruby_package) do
-      it { should be_installed }
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb
deleted file mode 100644
index 49299e1ddb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::db define' do
-  describe 'creating a database' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        mysql::db { 'spec1':
-          user     => 'root1',
-          password => 'password',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    it 'should have the database' do
-      shell("mysql -e 'show databases;'|grep spec1") do |s|
-        s.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'creating a database with post-sql' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        file { '/tmp/spec.sql':
-          ensure  => file,
-          content => 'CREATE TABLE table1 (id int);',
-          before  => Mysql::Db['spec2'],
-        }
-        mysql::db { 'spec2':
-          user     => 'root1',
-          password => 'password',
-          sql      => '/tmp/spec.sql',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    it 'should have the table' do
-      shell("mysql -e 'show tables;' spec2|grep table1") do |s|
-        s.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb
deleted file mode 100644
index b7ebd0dffd5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::monitor class' do
-  context 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': root_password => 'password' } 
-      
-      class { 'mysql::server::monitor':
-        mysql_monitor_username => 'monitoruser',
-        mysql_monitor_password => 'monitorpass',
-        mysql_monitor_hostname => 'localhost',
-      }
-    EOS
-
-    context puppet_apply(pp) do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-
-    context 'should run mysqladmin ping with no errors' do
-      describe command("mysqladmin -u monitoruser -pmonitorpass -h localhost ping") do
-        it { should return_stdout /mysqld is alive/ }
-        it { should return_exit_status 0 }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb
deleted file mode 100644
index ea9cafad56c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::root_password class' do
-
-  describe 'reset' do
-    it 'shuts down mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => false }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    it 'deletes the /root/.my.cnf password' do
-      shell('rm -rf /root/.my.cnf')
-    end
-
-    it 'deletes all databases' do
-      case node.facts['osfamily']
-      when 'RedHat'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
-      when 'Debian'
-        shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
-        shell('mysql_install_db')
-      end
-    end
-
-    it 'starts up mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => true }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-  end
-
-  describe 'when unset' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'when set' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'new', old_root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb
deleted file mode 100644
index b9ecabdce23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql class' do
-  case node.facts['osfamily']
-  when 'RedHat'
-    package_name = 'mysql-server'
-    service_name = 'mysqld'
-    mycnf        = '/etc/my.cnf'
-  when 'Suse'
-    package_name = 'mysql-community-server'
-    service_name = 'mysql'
-    mycnf        = '/etc/my.cnf'
-  when 'Debian'
-    package_name = 'mysql-server'
-    service_name = 'mysql'
-    mycnf        = '/etc/mysql/my.cnf'
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'mycnf' do
-    it 'should contain sensible values' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 16M' }
-      it { should contain 'max_binlog_size = 100M' }
-      it { should contain 'query_cache_size = 16M' }
-    end
-  end
-
-  describe 'my.cnf changes' do
-    it 'sets values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'key_buffer'       => '32M',
-              'max_binlog_size'  => '200M',
-              'query_cache_size' => '32M',
-            }
-          }  
-        }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 32M' }
-      it { should contain 'max_binlog_size = 200M' }
-      it { should contain 'query_cache_size = 32M' }
-    end
-  end
-
-  describe 'my.cnf should contain multiple instances of the same option' do
-    it 'sets multiple values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'replicate-do-db' => ['base1', 'base2', 'base3'], }
-          }  
-        }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'replicate-do-db = base1' }
-      it { should contain 'replicate-do-db = base2' }
-      it { should contain 'replicate-do-db = base3' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb
deleted file mode 100644
index a3bdf8282fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql_grant' do
-
-  describe 'setup' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      puppet_apply(pp)
-    end
-  end
-
-  describe 'missing privileges for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test1@tester/test.*':
-          ensure => 'present',
-          table  => 'test.*',
-          user   => 'test1@tester',
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.stderr.should =~ /privileges parameter is required/
-      end
-    end
-
-    it 'should not find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test1@tester\"") do |r|
-        r.stderr.should =~ /There is no such grant defined for user 'test1' on host 'tester'/
-        r.exit_code.should eq 1
-      end
-    end
-  end
-
-  describe 'missing table for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'atest@tester/test.*':
-          ensure => 'present',
-          user   => 'atest@tester',
-          privileges => ['ALL'],
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should eq 1
-      end
-    end
-
-    it 'should not find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR atest@tester\"") do |r|
-        r.stderr.should =~ /There is no such grant defined for user 'atest' on host 'tester'/
-        r.exit_code.should eq 1
-      end
-    end
-  end
-
-  describe 'adding privileges' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test2@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test2@tester',
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        r.stdout.should =~ /GRANT SELECT, UPDATE.*TO 'test2'@'tester'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'adding option' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test3@tester/test.*':
-          ensure  => 'present',
-          table   => 'test.*',
-          user    => 'test3@tester',
-          options => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test3@tester\"") do |r|
-        r.stdout.should =~ /GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'adding all privileges without table' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.stderr.should =~ /table parameter is required./
-      end
-    end
-
-  end
-
-
-  describe 'adding all privileges' do
-    it 'should only try to apply ALL' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test4@tester\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  # Test combinations of user@host to ensure all cases work.
-  describe 'short hostname' do
-    it 'should apply' do
-      pp = <<-EOS
-        mysql_grant { 'test@short/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@short',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@long.hostname.com/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@long.hostname.com',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@192.168.5.6/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@192.168.5.6',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@2607:f0d0:1002:0051:0000:0000:0000:0004',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@::1/128/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@::1/128',
-          privileges => 'ALL',
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'finds short hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test@short\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds long hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds ipv4' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds short ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'complex test' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-      $dbSubnet = '10.10.10.%'
-
-      mysql_database { 'foo':
-        ensure => present,
-      }
-
-      exec { 'mysql-create-table':
-        command     => '/usr/bin/mysql -NBe "CREATE TABLE foo.bar (name VARCHAR(20))"',
-        environment => "HOME=${::root_home}",
-        unless      => '/usr/bin/mysql -NBe "SELECT 1 FROM foo.bar LIMIT 1;"',
-        require     => Mysql_database['foo'],
-      }
-
-      Mysql_grant {
-          ensure     => present,
-          options    => ['GRANT'],
-          privileges => ['ALL'],
-          table      => '*.*',
-          require    => [ Mysql_database['foo'], Exec['mysql-create-table'] ],
-      }
-
-      mysql_grant { "user1@${dbSubnet}/*.*":
-          user       => "user1@${dbSubnet}",
-      }
-      mysql_grant { "user2@${dbSubnet}/foo.bar":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user2@${dbSubnet}",
-          table      => 'foo.bar',
-      }
-      mysql_grant { "user3@${dbSubnet}/foo.*":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user3@${dbSubnet}",
-          table      => 'foo.*',
-      }
-      mysql_grant { 'web@%/*.*':
-          user       => 'web@%',
-      }
-      mysql_grant { "web@${dbSubnet}/*.*":
-          user       => "web@${dbSubnet}",
-      }
-      mysql_grant { "web@${fqdn}/*.*":
-          user       => "web@${fqdn}",
-      }
-      mysql_grant { 'web@localhost/*.*':
-          user       => 'web@localhost',
-      }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'lower case privileges' do
-    it 'create ALL privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'ALL',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'create lowercase all privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'all',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb
deleted file mode 100644
index 7aaa9797e40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql_user' do
-
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      puppet_apply(pp)
-    end
-  end
-
-  describe 'adding user' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_user { 'ashp@localhost':
-          password_hash => '6f8c114b58f2ce9e',
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r|
-        r.stdout.should =~ /^1$/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb
deleted file mode 100644
index 07369100496..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'the mysql_password function' do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'should exist' do
-    Puppet::Parser::Functions.function('mysql_password').should == 'function_mysql_password'
-  end
-
-  it 'should raise a ParseError if there is less than 1 arguments' do
-    lambda { scope.function_mysql_password([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should raise a ParseError if there is more than 1 arguments' do
-    lambda { scope.function_mysql_password(%w(foo bar)) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should convert password into a hash' do
-    result = scope.function_mysql_password(%w(password))
-    result.should(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19'))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
deleted file mode 100644
index fa9c72b787f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:mysql_deepmerge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling mysql_deepmerge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = mysql_deepmerge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = mysql_deepmerge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling mysql_deepmerge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_mysql_deepmerge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to mysql_deepmerge two hashes' do
-      new_hash = scope.function_mysql_deepmerge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should mysql_deepmerge multiple hashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_mysql_deepmerge([{},{},{}]).should == {}
-    end
-
-    it 'should mysql_deepmerge subhashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1}, {'two' => 2, 'three' => { 'four' => 4 } }])
-      hash['one'].should == 1
-      hash['two'].should == 2
-      hash['three'].should == { 'four' => 4 }
-    end
-
-    it 'should append to subhashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } }])
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should append to subhashes 2' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, {'two' => 'dos', 'three' => { 'five' => 5 } }])
-      hash['one'].should == 1
-      hash['two'].should == 'dos'
-      hash['three'].should == { 'four' => 4, 'five' => 5 }
-    end
-
-    it 'should append to subhashes 3' do
-      hash = scope.function_mysql_deepmerge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }])
-      hash['key1'].should == { 'a' => 1, 'b' => 99 }
-      hash['key2'].should == { 'c' => 3 }
-    end
-
-    it 'should equate keys mod dash and underscore' do
-      hash = scope.function_mysql_deepmerge([{  'a-b-c' => 1 } , { 'a_b_c' => 10 }])
-      hash['a_b_c'].should == 10
-      hash.should_not have_key('a-b-c')
-    end
-
-    it 'should keep style of the last when keys are euqal mod dash and underscore' do
-      hash = scope.function_mysql_deepmerge([{  'a-b-c' => 1,  'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 }} , { 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 } }])
-      hash['a_b_c'].should == 10
-      hash.should_not have_key('a-b-c')
-      hash['b-c-d'].should == { 'e-f-g' => 3, 'c_d_e' => 12 }
-      hash.should_not have_key('b_c_d')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb
deleted file mode 100644
index e2557fc35d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:database).provider(:mysql)
-
-describe provider_class do
-  subject { provider_class }
-
-  let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-
-  let(:raw_databases) do
-    <<-SQL_OUTPUT
-information_schema
-mydb
-mysql
-performance_schema
-test
-    SQL_OUTPUT
-  end
-
-  let(:parsed_databases) { %w(information_schema mydb mysql performance_schema test) }
-
-  before :each do
-    @resource = Puppet::Type::Database.new(
-      { :charset => 'utf8', :name => 'new_database' }
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
-  end
-
-  describe 'self.instances' do
-    it 'returns an array of databases' do
-      subject.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases)
-
-      databases = subject.instances.collect {|x| x.name }
-      parsed_databases.should match_array(databases)
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{@resource[:charset]}"])
-      @provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      subject.expects(:mysqladmin).with([defaults_file, '-f', 'drop', "#{@resource[:name]}"])
-      @provider.destroy
-    end
-  end
-
-  describe 'charset' do
-    it 'returns a charset' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "show create database `#{@resource[:name]}`"]).returns('mydbCREATE DATABASE `mydb` /*!40100 DEFAULT CHARACTER SET utf8 */')
-      @provider.charset.should == 'utf8'
-    end
-  end
-
-  describe 'charset=' do
-    it 'changes the charset' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{@resource[:name]}` CHARACTER SET blah"]).returns('0')
-
-      @provider.charset=('blah')
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', 'show databases']).returns('information_schema\nmydb\nmysql\nperformance_schema\ntest')
-      @provider.exists?
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb
deleted file mode 100644
index 4d9484d04f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require 'puppet'
-require 'mocha/api'
-require 'spec_helper'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:database_grant).provider(:mysql)
-describe provider_class do
-  let(:root_home) { '/root' }
-
-  before :each do
-    @resource = Puppet::Type::Database_grant.new(
-      { :privileges => 'all', :provider => 'mysql', :name => 'user@host'}
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    File.stubs(:file?).with("#{root_home}/.my.cnf").returns(true)
-  end
-
-  it 'should query privileges from the database' do
-    provider_class.expects(:mysql) .with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe user']).returns <<-EOT
-Field	Type	Null	Key	Default	Extra
-Host	char(60)	NO	PRI		
-User	char(16)	NO	PRI		
-Password	char(41)	NO			
-Select_priv	enum('N','Y')	NO		N	
-Insert_priv	enum('N','Y')	NO		N	
-Update_priv	enum('N','Y')	NO		N
-EOT
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe db']).returns <<-EOT
-Field	Type	Null	Key	Default	Extra
-Host	char(60)	NO	PRI		
-Db	char(64)	NO	PRI		
-User	char(16)	NO	PRI		
-Select_priv	enum('N','Y')	NO		N	
-Insert_priv	enum('N','Y')	NO		N	
-Update_priv	enum('N','Y')	NO		N
-EOT
-    provider_class.user_privs.should == %w(Select_priv Insert_priv Update_priv)
-    provider_class.db_privs.should == %w(Select_priv Insert_priv Update_priv)
-  end
-
-  it 'should query set privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	N	Y
-EOT
-    @provider.privileges.should == %w(Select_priv Update_priv)
-  end
-
-  it 'should recognize when all privileges are set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	Y	Y
-EOT
-    @provider.all_privs_set?.should == true
-  end
-
-  it 'should recognize when all privileges are not set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	N	Y
-EOT
-    @provider.all_privs_set?.should == false
-  end
-
-  it 'should be able to set all privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
-    @provider.privileges=(%w(all))
-  end
-
-  it 'should be able to set partial privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
-    @provider.privileges=(%w(Select_priv Update_priv))
-  end
-
-  it 'should be case insensitive' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'flush-privileges'])
-    @provider.privileges=(%w(SELECT_PRIV insert_priv UpDaTe_pRiV))
-  end
-
-  it 'should not pass --defaults-extra-file if $root_home/.my.cnf is absent' do
-    File.stubs(:file?).with("#{root_home}/.my.cnf").returns(false)
-    provider_class.expects(:mysql).with(['mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(['mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%w(flush-privileges))
-    @provider.privileges=(%w(Select_priv Update_priv))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb
deleted file mode 100644
index 0939fdd224d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:database_user).provider(:mysql)
-
-describe provider_class do
-  subject { provider_class }
-
-  let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-  let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
-
-  let(:raw_users) do
-    <<-SQL_OUTPUT
-root@127.0.0.1
-root@::1
-@localhost
-debian-sys-maint@localhost
-root@localhost
-usvn_user@localhost
-@vagrant-ubuntu-raring-64
-    SQL_OUTPUT
-  end
-
-  let(:parsed_users) { %w(root@127.0.0.1 root@::1 debian-sys-maint@localhost root@localhost usvn_user@localhost) }
-
-  before :each do
-    # password hash = mypass
-    @resource = Puppet::Type::Database_user.new(
-      { :password_hash => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4',
-        :name => 'joe@localhost',
-        :max_user_connections => '10'
-      }
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
-  end
-
-  describe 'self.instances' do
-    it 'returns an array of users' do
-      subject.stubs(:mysql).with([defaults_file, 'mysql', "-BNeselect concat(User, '@',Host) as User from mysql.user"]).returns(raw_users)
-
-      usernames = subject.instances.collect {|x| x.name }
-      parsed_users.should match_array(usernames)
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' identified by PASSWORD
-      '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' with max_user_connections 10"])
-      @provider.expects(:exists?).returns(true)
-      @provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "drop user 'joe'@'localhost'"])
-      @provider.expects(:exists?).returns(false)
-      @provider.destroy.should be_true
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a hash' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select password from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4')
-      @provider.password_hash.should == '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes the hash' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'"]).returns('0')
-
-      @provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-      @provider.password_hash=('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-    end
-  end
-
-  describe 'max_user_connections' do
-    it 'returns max user connections' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select max_user_connections from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10')
-      @provider.max_user_connections.should == '10'
-    end
-  end
-
-  describe 'max_user_connections=' do
-    it 'changes max user connections' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' with max_user_connections 42"]).returns('0')
-      @provider.expects(:max_user_connections).returns('42')
-      @provider.max_user_connections=('42')
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('1')
-      @provider.exists?.should be_true
-    end
-  end
-
-  describe 'flush' do
-    it 'removes cached privileges' do
-      subject.expects(:mysqladmin).with([defaults_file, 'flush-privileges'])
-      @provider.flush
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
deleted file mode 100644
index 10f061f5d8f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mysql_database).provider(:mysql) do
-
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-
-  let(:raw_databases) do
-    <<-SQL_OUTPUT
-information_schema
-mydb
-mysql
-performance_schema
-test
-    SQL_OUTPUT
-  end
-
-  let(:parsed_databases) { %w(information_schema mydb mysql performance_schema test) }
-
-  let(:resource) { Puppet::Type.type(:mysql_database).new(
-    { :ensure   => :present,
-      :charset  => 'latin1',
-      :collate  => 'latin1_swedish_ci',
-      :name     => 'new_database',
-      :provider => described_class.name
-    }
-  )}
-  let(:provider) { resource.provider }
-
-  before :each do
-    Facter.stubs(:value).with(:root_home).returns('/root')
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns('new_database')
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", 'new_database']).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
-  end
-
-  let(:instance) { provider.class.instances.first }
-
-  describe 'self.instances' do
-    it 'returns an array of databases' do
-      provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases)
-      raw_databases.each_line do |db|
-        provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", db.chomp]).returns("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF")
-      end
-      databases = provider.class.instances.collect {|x| x.name }
-      parsed_databases.should match_array(databases)
-    end
-  end
-
-  describe 'self.prefetch' do
-    it 'exists' do
-      provider.class.instances
-      provider.class.prefetch({})
-    end
-  end
-
-  describe 'create' do
-    it 'makes a database' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "create database if not exists `#{resource[:name]}` character set #{resource[:charset]} collate #{resource[:collate]}"])
-      provider.expects(:exists?).returns(true)
-      provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a database if present' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "drop database `#{resource[:name]}`"])
-      provider.expects(:exists?).returns(false)
-      provider.destroy.should be_true
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if database exists' do
-      instance.exists?.should be_true
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
-    end
-    it 'fails if file missing' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(false)
-      provider.defaults_file.should be_nil
-    end
-  end
-
-  describe 'charset' do
-    it 'returns a charset' do
-      instance.charset.should == 'latin1'
-    end
-  end
-
-  describe 'charset=' do
-    it 'changes the charset' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET blah"]).returns('0')
-
-      provider.charset=('blah')
-    end
-  end
-
-  describe 'collate' do
-    it 'returns a collate' do
-      instance.collate.should == 'latin1_swedish_ci'
-    end
-  end
-
-  describe 'collate=' do
-    it 'changes the collate' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE blah"]).returns('0')
-
-      provider.collate=('blah')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
deleted file mode 100644
index 34639c920fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mysql_user).provider(:mysql) do
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-  let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
-
-  let(:raw_users) do
-    <<-SQL_OUTPUT
-root@127.0.0.1
-root@::1
-@localhost
-debian-sys-maint@localhost
-root@localhost
-usvn_user@localhost
-@vagrant-ubuntu-raring-64
-    SQL_OUTPUT
-  end
-
-  let(:parsed_users) { %w(root@127.0.0.1 root@::1 @localhost debian-sys-maint@localhost root@localhost usvn_user@localhost @vagrant-ubuntu-raring-64) }
-
-  let(:resource) { Puppet::Type.type(:mysql_user).new(
-      { :ensure                   => :present,
-        :password_hash            => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4',
-        :name                     => 'joe@localhost',
-        :max_user_connections     => '10',
-        :max_connections_per_hour => '10',
-        :max_queries_per_hour     => '10',
-        :max_updates_per_hour     => '10',
-        :provider                 => described_class.name
-      }
-  )}
-  let(:provider) { resource.provider }
-
-  before :each do
-    # Set up the stubs for an instances call.
-    Facter.stubs(:value).with(:root_home).returns('/root')
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns('joe@localhost')
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10 10 10 10 *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4')
-  end
-
-  let(:instance) { provider.class.instances.first }
-
-  describe 'self.instances' do
-    it 'returns an array of users' do
-      provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns(raw_users)
-      parsed_users.each do |user|
-        provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'"]).returns('10 10 10 10 ')
-      end
-
-      usernames = provider.class.instances.collect {|x| x.name }
-      parsed_users.should match_array(usernames)
-    end
-  end
-
-  describe 'self.prefetch' do
-    it 'exists' do
-      provider.class.instances
-      provider.class.prefetch({})
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      provider.expects(:mysql).with([defaults_file, '-e', "GRANT USAGE ON *.* TO 'joe'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10"])
-      provider.expects(:exists?).returns(true)
-      provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      provider.expects(:mysql).with([defaults_file, '-e', "DROP USER 'joe'@'localhost'"])
-      provider.expects(:exists?).returns(false)
-      provider.destroy.should be_true
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      instance.exists?.should be_true
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
-    end
-    it 'fails if file missing' do
-      File.expects(:file?).with('/root/.my.cnf').returns(false)
-      provider.defaults_file.should be_nil
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a hash' do
-      instance.password_hash.should == '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes the hash' do
-      provider.expects(:mysql).with([defaults_file, '-e', "SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'"]).returns('0')
-
-      provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-      provider.password_hash=('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-    end
-  end
-
-  ['max_user_connections', 'max_connections_per_hour', 'max_queries_per_hour',
-   'max_updates_per_hour'].each do |property|
-
-    describe property do
-      it "returns #{property}" do
-        instance.send("#{property}".to_sym).should == '10'
-      end
-    end
-
-    describe "#{property}=" do
-      it "changes #{property}" do
-        provider.expects(:mysql).with([defaults_file, '-e', "GRANT USAGE ON *.* TO 'joe'@'localhost' WITH #{property.upcase} 42"]).returns('0')
-        provider.expects(property.to_sym).returns('42')
-        provider.send("#{property}=".to_sym, '42')
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
deleted file mode 100644
index e2ebd90d4e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_database'
-describe Puppet::Type.type(:mysql_database) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_database).new(:name => 'test', :charset => 'utf8', :collate => 'utf8_blah_ci')
-  end
-
-  it 'should accept a database name' do
-    @user[:name].should == 'test'
-  end
-
-  it 'should accept a charset' do
-    @user[:charset] = 'latin1'
-    @user[:charset].should == 'latin1'
-  end
-
-  it 'should accept a collate' do
-    @user[:collate] = 'latin1_swedish_ci'
-    @user[:collate].should == 'latin1_swedish_ci'
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_database).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
deleted file mode 100644
index d56ba241a49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_grant'
-describe Puppet::Type.type(:mysql_grant) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_grant).new(:name => 'foo@localhost/*.*', :privileges => ['ALL', 'PROXY'], :table => ['*.*','@'], :user => 'foo@localhost')
-  end
-
-  it 'should accept a grant name' do
-    @user[:name].should == 'foo@localhost/*.*'
-  end
-  
-  it 'should accept ALL privileges' do
-    @user[:privileges] = 'ALL'
-    @user[:privileges].should == ['ALL']
-  end
-
-  it 'should accept PROXY privilege' do
-    @user[:privileges] = 'PROXY'
-    @user[:privileges].should == ['PROXY']
-  end
-  
-  it 'should accept a table' do
-    @user[:table] = '*.*'
-    @user[:table].should == '*.*'
-  end
-  
-  it 'should accept @ for table' do
-    @user[:table] = '@'
-    @user[:table].should == '@'
-  end
-  
-  it 'should accept a user' do
-    @user[:user] = 'foo@localhost'
-    @user[:user].should == 'foo@localhost'
-  end
-  
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_grant).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
deleted file mode 100644
index 62aad7aef3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_user'
-describe Puppet::Type.type(:mysql_user) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_user).new(:name => 'foo@localhost', :password_hash => 'pass')
-  end
-
-  it 'should accept a user name' do
-    @user[:name].should == 'foo@localhost'
-  end
-
-  it 'should fail with a long user name' do
-    expect {
-      Puppet::Type.type(:mysql_user).new({:name => '12345678901234567@localhost', :password_hash => 'pass'})
-      }.to raise_error /MySQL usernames are limited to a maximum of 16 characters/
-  end
-
-  it 'should accept a password' do
-    @user[:password_hash] = 'foo'
-    @user[:password_hash].should == 'foo'
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb
deleted file mode 100644
index 5aa959ba0bf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% @options.sort.map do |k,v| -%>
-<%   if v.is_a?(Hash) -%>
-[<%=   k %>]
-<%     v.sort.map do |ki, vi| -%>
-<%       if vi == true or v == '' -%>
-<%=        ki %>
-<%       elsif vi.is_a?(Array) -%>
-<%         vi.each do |vii| -%>
-<%=          ki %> = <%= vii %>
-<%         end -%>
-<%       elsif vi != :undef -%>
-<%=        ki %> = <%= vi %>
-<%       end -%>
-<%     end -%>
-<%   end %>
-<% end -%>
-
-!includedir /etc/mysql/conf.d/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb
deleted file mode 100644
index 99663fccdc2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-[client]
-user=root
-host=localhost
-<% unless scope.lookupvar('mysql::server::root_password') == 'UNSET' -%>
-password='<%= scope.lookupvar('mysql::server::root_password') %>'
-<% end -%>
-socket=<%= @options['client']['socket'] -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb
deleted file mode 100644
index 04d2974294f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-### MANAGED BY PUPPET ###
-<% @settings.sort.each do |section, content|      -%>
-[<%= section %>]
-<%   content.sort.each do |key, values|          -%>
-<%     [values].flatten.sort.each do |value|     -%>
-<%= !value ? '#' : '' %><%= key -%><%=
-         case value
-         when true, false
-           ''
-         else
-           " = #{value}"
-         end
-%>
-<%     end                                       -%>
-<%   end                                         -%>
-
-<% end                                           -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb
deleted file mode 100755
index ff38b23af03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-# MySQL Backup Script
-#  Dumps mysql databases to a file for another backup tool to pick up.
-#
-# MySQL code:
-# GRANT SELECT, RELOAD, LOCK TABLES ON *.* TO 'user'@'localhost'
-# IDENTIFIED BY 'password';
-# FLUSH PRIVILEGES;
-#
-##### START CONFIG ###################################################
-
-USER=<%= @backupuser %>
-PASS=<%= @backuppassword %>
-DIR=<%= @backupdir %>
-ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %>
-
-PREFIX=mysql_backup_
-<% if @ignore_events %>
-EVENTS="--ignore-table=mysql.event"
-<% else %>
-EVENTS="--events"
-<% end %>
-
-##### STOP CONFIG ####################################################
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
-
-
-
-set -o pipefail
-
-cleanup()
-{
-    find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f
-}
-
-<% if @delete_before_dump -%>
-cleanup
-
-<% end -%>
-<% if @backupdatabases.empty? -%>
-<% if @file_per_database -%>
-mysql -s -r -N -e 'SHOW DATABASES' | while read dbname
-do
-  mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \
-    ${EVENTS} \
-    ${dbname} <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-done
-<% else -%>
-mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \
- ${EVENTS} \
- --all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-<% end -%>
-<% else -%>
-<% @backupdatabases.each do |db| -%>
-mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ 
-    ${EVENTS} \
- <%= db %><% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}<%= db %>_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-<% end -%>
-<% end -%>
-
-<% unless @delete_before_dump -%>
-if [ $? -eq 0 ] ; then
-    cleanup
-fi
-<% end -%>
-
-<% if @postscript -%>
-  <%- [@postscript].flatten.compact.each do |script|%>
-<%= script %>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp
deleted file mode 100644
index cb669e6db80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
-}
-class { 'mysql::backup':
-  backupuser     => 'myuser',
-  backuppassword => 'mypassword',
-  backupdir      => '/tmp/backups',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp
deleted file mode 100644
index 83af3713a9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mysql::bindings':
-  php_enable => 'true',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp
deleted file mode 100644
index 846121b7df5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp
deleted file mode 100644
index 0fc009a6da8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'mysql::java':}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp
deleted file mode 100644
index 8747f707d57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
-}
-database{ ['test1', 'test2', 'test3']:
-  ensure  => present,
-  charset => 'utf8',
-  require => Class['mysql::server'],
-}
-database{ 'test4':
-  ensure  => present,
-  charset => 'latin1',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp
deleted file mode 100644
index 20fe78d6a7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-mysql_grant{'test1@localhost/redmine.*':
-  user       => 'test1@localhost',
-  table      => 'redmine.*',
-  privileges => ['UPDATE'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp
deleted file mode 100644
index f63908431b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-$mysql_root_pw = 'password'
-
-class { 'mysql::server':
-  config_hash => {
-    root_password => 'password',
-  }
-}
-
-database_user{ 'redmine@localhost':
-  ensure        => present,
-  password_hash => mysql_password('redmine'),
-  require       => Class['mysql::server'],
-}
-
-database_user{ 'dan@localhost':
-  ensure        => present,
-  password_hash => mysql_password('blah')
-}
-
-database_user{ 'dan@%':
-  ensure        => present,
-  password_hash => mysql_password('blah'),
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp
deleted file mode 100644
index 87e941751a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql::perl
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp
deleted file mode 100644
index 04f7ffa1ac1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'mysql::python':}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp
deleted file mode 100644
index e84c046a31c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql::ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp
deleted file mode 100644
index 8afdd00d24c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mysql::server':
-  root_password => 'password',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp
deleted file mode 100644
index de393cce4d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'mysql::server':
-  config_hash => { 'root_password' => 'password', },
-}
-class { 'mysql::server::account_security': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp
deleted file mode 100644
index fe8d86e9058..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-mysql::server::config { 'testfile':
-  settings => {
-    'mysqld' => {
-      'bind-address' => '0.0.0.0',
-      'read-only'    => true,
-    },
-    'client' => {
-      'port' => '3306'
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml
deleted file mode 100644
index 439f1aba9d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-fixtures:
-  symlinks:
-    nginx: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml
deleted file mode 100644
index 61c92863a11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-script: "bundle exec rake --rakefile $PWD/.travis/Rakefile spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.9.3
-  - 2.0.0
-gemfile: .travis/Gemfile
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
-notifications:
-  email: false  
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile
deleted file mode 100644
index 8af652f2516..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-group :rake do
-  gem 'puppetlabs_spec_helper'
-  gem 'librarian-puppet-maestrodev'
-  gem 'open3_backport', :platforms => :ruby_18
-  gem 'json',           :platforms => :ruby_18
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile
deleted file mode 100644
index 500bd023a98..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
-  sh "librarian-puppet install --path=$PWD/spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile
deleted file mode 100644
index 513b910ae92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-group :rake do
-  gem 'puppet',       '>=3.0.1'
-  gem 'rspec-puppet', '>=1.0.1'
-  gem 'rake',         '>=0.9.2.2'
-  gem 'puppet-lint',  '>=0.1.12'
-  gem 'puppetlabs_spec_helper'
-  gem 'puppet-blacksmith'
-  gem 'librarian-puppet-maestrodev'
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE
deleted file mode 100644
index d955a86d742..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile
deleted file mode 100644
index 8754662feff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name    'jfryman-nginx'
-version '0.0.9'
-source 'http://github.com/jfryman/puppet-nginx'
-author 'James Fryman'
-license 'Apache License Version 2.0'
-summary 'Puppet NGINX management module'
-description 'This module can be used for basic NGINX Management'
-project_page 'http://github.com/jfryman/puppet-nginx'
-
-dependency 'puppetlabs/stdlib', '>= 0.1.6'
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile
deleted file mode 100644
index 7a314f2e9a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile
+++ /dev/null
@@ -1,5 +0,0 @@
-forge 'http://forge.puppetlabs.com'
-
-mod 'puppetlabs/stdlib', '>=0.1.6'
-mod 'puppetlabs/apt', '>=1.0.0'
-mod 'puppetlabs/concat', '>=1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock
deleted file mode 100644
index aac666e4036..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-FORGE
-  remote: http://forge.puppetlabs.com
-  specs:
-    puppetlabs/apt (1.2.0)
-      puppetlabs/stdlib (>= 2.2.1)
-    puppetlabs/concat (1.0.0)
-    puppetlabs/stdlib (4.1.0)
-
-DEPENDENCIES
-  puppetlabs/apt (>= 1.0.0)
-  puppetlabs/concat (>= 1.0.0)
-  puppetlabs/stdlib (>= 0.1.6)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown
deleted file mode 100644
index a640f039687..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown
+++ /dev/null
@@ -1,240 +0,0 @@
-# NGINX Module
-
-[![Build Status](https://travis-ci.org/jfryman/puppet-nginx.png)](https://travis-ci.org/jfryman/puppet-nginx)
-
-James Fryman <james@frymanet.com>
-
-This module manages NGINX configuration.
-
-## Quick Start
-
-### Requirements
-
-* Puppet-2.7.0 or later
-* Ruby-1.9.3 or later (Ruby-1.8.7 does not work)
-
-### Install and bootstrap an NGINX instance
-
-```puppet
-class { 'nginx': }
-```
-
-### Setup a new virtual host
-
-```puppet
-nginx::resource::vhost { 'www.puppetlabs.com':
-  www_root => '/var/www/www.puppetlabs.com',
-}
-```
-
-### Add a Proxy Server
-
-```puppet
-nginx::resource::upstream { 'puppet_rack_app':
-  members => [
-    'localhost:3000',
-    'localhost:3001',
-    'localhost:3002',
-  ],
-}
-
-nginx::resource::vhost { 'rack.puppetlabs.com':
-  proxy => 'http://puppet_rack_app',
-}
-```
-
-### Add a smtp proxy
-
-```puppet
-class { 'nginx':
-  mail => true,
-}
-
-nginx::resource::mailhost { 'domain1.example':
-  auth_http   => 'server2.example/cgi-bin/auth',
-  protocol    => 'smtp',
-  listen_port => 587,
-  ssl_port    => 465,
-  starttls    => 'only',
-  xclient     => 'off',
-  ssl         => true,
-  ssl_cert    => '/tmp/server.crt',
-  ssl_key     => '/tmp/server.pem',
-}
-```
-
-## SSL configuration
-
-By default, creating a vhost resource will only create a HTTP vhost. To also create a HTTPS (SSL-enabled) vhost, set `ssl => true` on the vhost. You will have a HTTP server listening on `listen_port` (port `80` by default) and a HTTPS server listening on `ssl_port` (port `443` by default). Both vhosts will have the same `server_name` and a similar configuration.
-
-To create only a HTTPS vhost, set `ssl => true` and also set `listen_port` to the same value as `ssl_port`. Setting these to the same value disables the HTTP vhost. The resulting vhost will be listening on `ssl_port`.
-
-### Locations
-
-Locations require specific settings depending on whether they should be included in the HTTP, HTTPS or both vhosts.
-
-#### HTTP only vhost (default)
-If you only have a HTTP vhost (i.e. `ssl => false` on the vhost) maks sure you don't set `ssl => true` on any location you associate with the vhost.
-
-#### HTTP and HTTPS vhost
-If you set `ssl => true` and also set `listen_port` and `ssl_port` to different values on the vhost you will need to be specific with the location settings since you will have a HTTP vhost listening on `listen_port` and a HTTPS vhost listening on `ssl_port`:
-
-* To add a location to only the HTTP server, set `ssl => false` on the location (this is the default).
-* To add a location to both the HTTP and HTTPS server, set `ssl => true` on the location, and ensure `ssl_only => false` (which is the default value for `ssl_only`).
-* To add a location only to the HTTPS server, set both `ssl => true` and `ssl_only => true` on the location.
-
-#### HTTPS only vhost
-If you have set `ssl => true` and also set `listen_port` and `ssl_port` to the same value on the vhost, you will have a single HTTPS vhost listening on `ssl_port`. To add a location to this vhost set `ssl => true` and `ssl_only => true` on the location.
-
-## Hiera Support
-
-Defining nginx resources in Hiera.
-
-```yaml
-nginx::nginx_upstreams:
-  'puppet_rack_app':
-    ensure: present
-    members:
-      - localhost:3000
-      - localhost:3001
-      - localhost:3002
-nginx::nginx_vhosts:
-  'www.puppetlabs.com':
-    www_root: '/var/www/www.puppetlabs.com'
-  'rack.puppetlabs.com':
-    proxy: 'http://puppet_rack_app'
-nginx::nginx_locations:
-  'static':
-    location: '~ "^/static/[0-9a-fA-F]{8}\/(.*)$"'
-    vhost: www.puppetlabs.com
-  'userContent':
-    location: /userContent
-    vhost: www.puppetlabs.com
-    www_root: /var/www/html
-```
-
-## Nginx with precompiled Passenger
-
-Currently this works only for Debian family.
-
-```puppet
-class { 'nginx':
-  package_source  => 'passenger',
-  http_cfg_append => {
-    'passenger_root' => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
-  }
-}
-```
-
-Package source `passenger` will add [Phusion Passenger repository](https://oss-binaries.phusionpassenger.com/apt/passenger) to APT sources.
-For each virtual host you should specify which ruby should be used.
-
-```puppet
-nginx::resource::vhost { 'www.puppetlabs.com':
-  www_root         => '/var/www/www.puppetlabs.com',
-  vhost_cfg_append => {
-    'passenger_enabled' => 'on',
-    'passenger_ruby'    => '/usr/bin/ruby',
-  }
-}
-```
-
-### Puppet master served by Nginx and Passenger
-
-Virtual host config for serving puppet master:
-
-```puppet
-nginx::resource::vhost { 'puppet':
-  ensure               => present,
-  server_name          => ['puppet'],
-  listen_port          => 8140,
-  ssl                  => true,
-  ssl_cert             => '/var/lib/puppet/ssl/certs/example.com.pem',
-  ssl_key              => '/var/lib/puppet/ssl/private_keys/example.com.pem',
-  ssl_port             => 8140,
-  vhost_cfg_append     => {
-    'passenger_enabled'      => 'on',
-    'passenger_ruby'         => '/usr/bin/ruby',
-    'ssl_crl'                => '/var/lib/puppet/ssl/ca/ca_crl.pem',
-    'ssl_client_certificate' => '/var/lib/puppet/ssl/certs/ca.pem',
-    'ssl_verify_client'      => 'optional',
-    'ssl_verify_depth'       => 1,
-  },
-  www_root             => '/etc/puppet/rack/public',
-  use_default_location => false,
-  access_log           => '/var/log/nginx/puppet_access.log',
-  error_log            => '/var/log/nginx/puppet_error.log',
-  passenger_cgi_param  => {
-    'HTTP_X_CLIENT_DN'     => '$ssl_client_s_dn',
-    'HTTP_X_CLIENT_VERIFY' => '$ssl_client_verify',
-  },
-}
-```
-
-### Example puppet class calling nginx::vhost with HTTPS FastCGI and redirection of HTTP
-
-```puppet
-
-$full_web_path = '/var/www'
-
-define web::nginx_ssl_with_redirect (
-  $backend_port         = 9000,
-  $php                  = true,
-  $proxy                = undef,
-  $www_root             = "${full_web_path}/${name}/",
-  $location_cfg_append  = undef,
-) {
-  nginx::resource::vhost { "${name}.${::domain}":
-    ensure              => present,
-    www_root            => "${full_web_path}/${name}/",
-    location_cfg_append => { 'rewrite' => '^ https://$server_name$request_uri? permanent' },
-  }
-
-  if !$www_root {
-    $tmp_www_root = undef
-  } else {
-    $tmp_www_root = $www_root
-  }
-   
-  nginx::resource::vhost { "${name}.${::domain} ${name}":
-    ensure                => present,
-    listen_port           => 443,
-    www_root              => $tmp_www_root,
-    proxy                 => $proxy,
-    location_cfg_append   => $location_cfg_append,
-    index_files           => [ 'index.php' ],
-    ssl                   => true,
-    ssl_cert              => 'puppet:///modules/sslkey/whildcard_mydomain.crt',
-    ssl_key               => 'puppet:///modules/sslkey/whildcard_mydomain.key',
-  }
-   
-   
-  if $php {
-    nginx::resource::location { "${name}_root":
-      ensure          => present,
-      ssl             => true,   
-      ssl_only        => true,   
-      vhost           => "${name}.${::domain} ${name}",
-      www_root        => "${full_web_path}/${name}/",  
-      location        => '~ \.php$',
-      index_files     => ['index.php', 'index.html', 'index.htm'],
-      proxy           => undef,
-      fastcgi         => "127.0.0.1:${backend_port}",
-      fastcgi_script  => undef,
-      location_cfg_append => { 
-        fastcgi_connect_timeout => '3m',
-        fastcgi_read_timeout    => '3m',
-        fastcgi_send_timeout    => '3m' 
-      }
-    }  
-  }    
-}      
-```       
-
-# Call class web::nginx_ssl_with_redirect
-
-```puppet
-web::nginx_ssl_with_redirect { 'sub-domain-name':
-    backend_port => 9001,
-  }
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile
deleted file mode 100644
index e0913e5864a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'bundler'
-Bundler.require(:rake)
-require 'rake/clean'
-
-CLEAN.include('spec/fixtures/', 'doc', 'pkg')
-CLOBBER.include('.tmp', '.librarian')
-
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet_blacksmith/rake_tasks'
-require 'rspec-system/rake_task'
-
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
- sh "librarian-puppet install --path=spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep
-
-task :default => [:clean, :spec]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json
deleted file mode 100644
index 91f362f7034..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "jfryman/puppet-nginx",
-    "type": "project",
-    "description": "Puppet module for nginx installation",
-    "keywords": ["puppet", "nginx"],
-    "license": "Apache-2.0",
-    "require": {
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp
deleted file mode 100644
index f22b3a6895c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp
+++ /dev/null
@@ -1,146 +0,0 @@
-# Class: nginx::config
-#
-# This module manages NGINX bootstrap and configuration
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::config(
-  $worker_processes       = $nginx::params::nx_worker_processes,
-  $worker_connections     = $nginx::params::nx_worker_connections,
-  $worker_rlimit_nofile   = $nginx::params::nx_worker_rlimit_nofile,
-  $confd_purge            = $nginx::params::nx_confd_purge,
-  $vhost_purge            = $nginx::params::nx_vhost_purge,
-  $server_tokens          = $nginx::params::nx_server_tokens,
-  $proxy_set_header       = $nginx::params::nx_proxy_set_header,
-  $proxy_cache_path       = $nginx::params::nx_proxy_cache_path,
-  $proxy_cache_levels     = $nginx::params::nx_proxy_cache_levels,
-  $proxy_cache_keys_zone  = $nginx::params::nx_proxy_cache_keys_zone,
-  $proxy_cache_max_size   = $nginx::params::nx_proxy_cache_max_size,
-  $proxy_cache_inactive   = $nginx::params::nx_proxy_cache_inactive,
-  $proxy_http_version     = $nginx::params::nx_proxy_http_version,
-  $names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
-  $names_hash_max_size    = $nginx::params::nx_names_hash_max_size,
-  $types_hash_max_size    = $nginx::params::nx_types_hash_max_size,
-  $types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
-  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
-  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
-  $nginx_error_log        = $nginx::params::nx_nginx_error_log,
-  $http_access_log        = $nginx::params::nx_http_access_log,
-  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
-  $gzip                   = $nginx::params::nx_gzip,
-  $conf_template          = $nginx::params::nx_conf_template,
-  $proxy_conf_template    = $nginx::params::nx_proxy_conf_template,
-) inherits nginx::params {
-
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  file { $nginx::params::nx_conf_dir:
-    ensure => directory,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d":
-    ensure => directory,
-  }
-  if $confd_purge == true {
-    File["${nginx::params::nx_conf_dir}/conf.d"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.mail.d":
-    ensure => directory,
-  }
-  if $confd_purge == true {
-    File["${nginx::params::nx_conf_dir}/conf.mail.d"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d/vhost_autogen.conf":
-    ensure => absent,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.mail.d/vhost_autogen.conf":
-    ensure => absent,
-  }
-
-  file {$nginx::config::nx_run_dir:
-    ensure => directory,
-  }
-
-  file {$nginx::config::nx_client_body_temp_path:
-    ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
-  }
-
-  file {$nginx::config::nx_proxy_temp_path:
-    ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/sites-available":
-    ensure => directory,
-  }
-
-  if $vhost_purge == true {
-    File["${nginx::params::nx_conf_dir}/sites-available"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/sites-enabled":
-    ensure => directory,
-  }
-
-  if $vhost_purge == true {
-    File["${nginx::params::nx_conf_dir}/sites-enabled"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { '/etc/nginx/sites-enabled/default':
-    ensure => absent,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/nginx.conf":
-    ensure  => file,
-    content => template($conf_template),
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d/proxy.conf":
-    ensure  => file,
-    content => template($proxy_conf_template),
-  }
-
-  file { "${nginx::config::nx_temp_dir}/nginx.d":
-    ensure  => absent,
-    purge   => true,
-    recurse => true,
-    force   => true,
-  }
-
-  file { "${nginx::config::nx_temp_dir}/nginx.mail.d":
-    ensure  => absent,
-    purge   => true,
-    recurse => true,
-    force   => true,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp
deleted file mode 100644
index 9ed41690372..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp
+++ /dev/null
@@ -1,173 +0,0 @@
-# Class: nginx
-#
-# This module manages NGINX.
-#
-# Parameters:
-#
-# There are no default parameters for this class. All module parameters
-# are managed via the nginx::params class
-#
-# Actions:
-#
-# Requires:
-#  puppetlabs-stdlib - https://github.com/puppetlabs/puppetlabs-stdlib
-#
-#  Packaged NGINX
-#    - RHEL: EPEL or custom package
-#    - Debian/Ubuntu: Default Install or custom package
-#    - SuSE: Default Install or custom package
-#
-#  stdlib
-#    - puppetlabs-stdlib module >= 0.1.6
-#    - plugin sync enabled to obtain the anchor type
-#
-# Sample Usage:
-#
-# The module works with sensible defaults:
-#
-# node default {
-#   include nginx
-# }
-class nginx (
-  $worker_processes       = $nginx::params::nx_worker_processes,
-  $worker_connections     = $nginx::params::nx_worker_connections,
-  $worker_rlimit_nofile   = $nginx::params::nx_worker_rlimit_nofile,
-  $package_name           = $nginx::params::package_name,
-  $package_ensure         = $nginx::params::package_ensure,
-  $package_source         = $nginx::params::package_source,
-  $proxy_set_header       = $nginx::params::nx_proxy_set_header,
-  $proxy_http_version     = $nginx::params::nx_proxy_http_version,
-  $confd_purge            = $nginx::params::nx_confd_purge,
-  $vhost_purge            = $nginx::params::nx_vhost_purge,
-  $proxy_cache_path       = $nginx::params::nx_proxy_cache_path,
-  $proxy_cache_levels     = $nginx::params::nx_proxy_cache_levels,
-  $proxy_cache_keys_zone  = $nginx::params::nx_proxy_cache_keys_zone,
-  $proxy_cache_max_size   = $nginx::params::nx_proxy_cache_max_size,
-  $proxy_cache_inactive   = $nginx::params::nx_proxy_cache_inactive,
-  $configtest_enable      = $nginx::params::nx_configtest_enable,
-  $service_restart        = $nginx::params::nx_service_restart,
-  $service_ensure         = $nginx::params::nx_service_ensure,
-  $mail                   = $nginx::params::nx_mail,
-  $server_tokens          = $nginx::params::nx_server_tokens,
-  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
-  $names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
-  $names_hash_max_size    = $nginx::params::nx_names_hash_max_size,
-  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
-  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
-  $nginx_error_log        = $nginx::params::nx_nginx_error_log,
-  $http_access_log        = $nginx::params::nx_http_access_log,
-  $gzip                   = $nginx::params::nx_gzip,
-  $conf_template          = $nginx::params::nx_conf_template,
-  $proxy_conf_template    = $nginx::params::nx_proxy_conf_template,
-  $nginx_vhosts           = {},
-  $nginx_upstreams        = {},
-  $nginx_locations        = {},
-  $manage_repo            = $nginx::params::manage_repo,
-) inherits nginx::params {
-
-  include stdlib
-
-  if (!is_string($worker_processes)) and (!is_integer($worker_processes)) {
-    fail('$worker_processes must be an integer or have value "auto".')
-  }
-  if (!is_integer($worker_connections)) {
-    fail('$worker_connections must be an integer.')
-  }
-  if (!is_integer($worker_rlimit_nofile)) {
-    fail('$worker_rlimit_nofile must be an integer.')
-  }
-  validate_string($package_name)
-  validate_string($package_ensure)
-  validate_string($package_source)
-  validate_array($proxy_set_header)
-  validate_string($proxy_http_version)
-  validate_bool($confd_purge)
-  validate_bool($vhost_purge)
-  if ($proxy_cache_path != false) {
-    validate_string($proxy_cache_path)
-  }
-  if (!is_integer($proxy_cache_levels)) {
-    fail('$proxy_cache_levels must be an integer.')
-  }
-  validate_string($proxy_cache_keys_zone)
-  validate_string($proxy_cache_max_size)
-  validate_string($proxy_cache_inactive)
-  validate_bool($configtest_enable)
-  validate_string($service_restart)
-  validate_bool($mail)
-  validate_string($server_tokens)
-  validate_string($client_max_body_size)
-  if (!is_integer($names_hash_bucket_size)) {
-    fail('$names_hash_bucket_size must be an integer.')
-  }
-  if (!is_integer($names_hash_max_size)) {
-    fail('$names_hash_max_size must be an integer.')
-  }
-  validate_string($proxy_buffers)
-  validate_string($proxy_buffer_size)
-  if ($http_cfg_append != false) {
-    validate_hash($http_cfg_append)
-  }
-  validate_string($nginx_error_log)
-  validate_string($http_access_log)
-  validate_hash($nginx_upstreams)
-  validate_hash($nginx_vhosts)
-  validate_hash($nginx_locations)
-  validate_bool($manage_repo)
-
-  class { 'nginx::package':
-    package_name   => $package_name,
-    package_source => $package_source,
-    package_ensure => $package_ensure,
-    notify         => Class['nginx::service'],
-    manage_repo    => $manage_repo,
-  }
-
-  class { 'nginx::config':
-    worker_processes       => $worker_processes,
-    worker_connections     => $worker_connections,
-    worker_rlimit_nofile   => $worker_rlimit_nofile,
-    proxy_set_header       => $proxy_set_header,
-    proxy_http_version     => $proxy_http_version,
-    proxy_cache_path       => $proxy_cache_path,
-    proxy_cache_levels     => $proxy_cache_levels,
-    proxy_cache_keys_zone  => $proxy_cache_keys_zone,
-    proxy_cache_max_size   => $proxy_cache_max_size,
-    proxy_cache_inactive   => $proxy_cache_inactive,
-    confd_purge            => $confd_purge,
-    vhost_purge            => $vhost_purge,
-    server_tokens          => $server_tokens,
-    client_max_body_size   => $client_max_body_size,
-    names_hash_bucket_size => $names_hash_bucket_size,
-    names_hash_max_size    => $names_hash_max_size,
-    proxy_buffers          => $proxy_buffers,
-    proxy_buffer_size      => $proxy_buffer_size,
-    http_cfg_append        => $http_cfg_append,
-    nginx_error_log        => $nginx_error_log,
-    http_access_log        => $http_access_log,
-    gzip                   => $gzip,
-    conf_template          => $conf_template,
-    proxy_conf_template    => $proxy_conf_template,
-    require                => Class['nginx::package'],
-    notify                 => Class['nginx::service'],
-  }
-
-  class { 'nginx::service':
-  }
-
-  create_resources('nginx::resource::upstream', $nginx_upstreams)
-  create_resources('nginx::resource::vhost', $nginx_vhosts)
-  create_resources('nginx::resource::location', $nginx_locations)
-
-  # Allow the end user to establish relationships to the "main" class
-  # and preserve the relationship to the implementation classes through
-  # a transitive relationship to the composite class.
-  anchor{ 'nginx::begin':
-    before => Class['nginx::package'],
-    notify => Class['nginx::service'],
-  }
-  anchor { 'nginx::end':
-    require => Class['nginx::service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp
deleted file mode 100644
index 74885b2b5ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp
+++ /dev/null
@@ -1,79 +0,0 @@
-# Class: nginx::package
-#
-# This module manages NGINX package installation
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package(
-  $package_name   = 'nginx',
-  $package_source = 'nginx',
-  $package_ensure = 'present',
-  $manage_repo    = true,
-) {
-
-  anchor { 'nginx::package::begin': }
-  anchor { 'nginx::package::end': }
-
-  case $::osfamily {
-    'redhat': {
-      class { 'nginx::package::redhat':
-        manage_repo    => $manage_repo,
-        package_ensure => $package_ensure,
-        package_name   => $package_name,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'debian': {
-      class { 'nginx::package::debian':
-        package_name   => $package_name,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
-        manage_repo    => $manage_repo,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'suse': {
-      class { 'nginx::package::suse':
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
-      }
-    }
-    'Solaris': {
-      class { 'nginx::package::solaris':
-        package_name   => $package_name,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
-      }
-    }
-    default: {
-      case $::operatingsystem {
-        'amazon': {
-          # Amazon was added to osfamily RedHat in 1.7.2
-          # https://github.com/puppetlabs/facter/commit/c12d3b6c557df695a7b2b009da099f6a93c7bd31#lib/facter/osfamily.rb
-          warning("Module ${module_name} support for ${::operatingsystem} with facter < 1.7.2 is deprecated")
-          warning("Please upgrade from facter ${::facterversion} to >= 1.7.2")
-          class { 'nginx::package::redhat':
-            require => Anchor['nginx::package::begin'],
-            before  => Anchor['nginx::package::end'],
-          }
-        }
-        default: {
-          fail("Module ${module_name} is not supported on ${::operatingsystem}")
-        }
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp
deleted file mode 100644
index b87e3c0bed3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Class: nginx::package::debian
-#
-# This module manages NGINX package installation on debian based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::debian(
-    $manage_repo    = true,
-    $package_name   = 'nginx',
-    $package_source = 'nginx',
-    $package_ensure = 'present'
-  ) {
-
-  
-  $distro = downcase($::operatingsystem)
-
-  package { $package_name:
-    ensure  => $package_ensure,
-    require => Anchor['nginx::apt_repo'],
-  }
-
-  anchor { 'nginx::apt_repo' : }
-
-  include '::apt'
-
-  if $manage_repo {
-    case $package_source {
-      'nginx': {
-        apt::source { 'nginx':
-          location   => "http://nginx.org/packages/${distro}",
-          repos      => 'nginx',
-          key        => '7BD9BF62',
-          key_source => 'http://nginx.org/keys/nginx_signing.key',
-          notify     => Exec['apt_get_update_for_nginx'],
-        }
-      }
-      'passenger': {
-        ensure_resource('package', 'apt-transport-https', {'ensure' => 'present' })
-
-        apt::source { 'nginx':
-          location   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
-          repos      => "main",
-          key        => '561F9B9CAC40B2F7',
-          key_source => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
-          notify     => Exec['apt_get_update_for_nginx'],
-        }
-
-        package { 'passenger':
-          ensure  => 'present',
-          require => Anchor['nginx::apt_repo'],
-        }
-      }
-      default: {}
-    }
-
-    exec { 'apt_get_update_for_nginx':
-      command     => '/usr/bin/apt-get update',
-      timeout     => 240,
-      returns     => [ 0, 100 ],
-      refreshonly => true,
-      before      => Anchor['nginx::apt_repo'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp
deleted file mode 100644
index 4cc34eea9ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Class: nginx::package::redhat
-#
-# This module manages NGINX package installation on RedHat based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::redhat (
-  $manage_repo    = true,
-  $package_ensure = 'present',
-  $package_name   = 'nginx',
-) {
-
-  case $::operatingsystem {
-    'fedora': {
-      # nginx.org does not supply RPMs for fedora
-      # fedora 18 provides 1.2.x packages
-      # fedora 19 has 1.4.x packages are in
-
-      # fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
-      if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
-        notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
-      }
-    }
-    default: {
-      case $::lsbmajdistrelease {
-        5, 6: {
-          $os_rel = $::lsbmajdistrelease
-        }
-        default: {
-          # Amazon uses the year as the $::lsbmajdistrelease
-          $os_rel = 6
-        }
-      }
-
-      # as of 2013-07-28
-      # http://nginx.org/packages/centos appears to be identical to
-      # http://nginx.org/packages/rhel
-      # no other dedicated dirs exist for platforms under $::osfamily == redhat
-      if $manage_repo {
-        yumrepo { 'nginx-release':
-          baseurl  => "http://nginx.org/packages/rhel/${os_rel}/\$basearch/",
-          descr    => 'nginx repo',
-          enabled  => '1',
-          gpgcheck => '1',
-          priority => '1',
-          gpgkey   => 'http://nginx.org/keys/nginx_signing.key',
-          before   => Package[$package_name],
-        }
-
-        file { '/etc/yum.repos.d/nginx-release.repo':
-          ensure  => present,
-          require => Yumrepo['nginx-release'],
-        }
-      }
-    }
-  }
-
-  package { $package_name:
-    ensure  => $package_ensure,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp
deleted file mode 100644
index fb1386c95a7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Class: nginx::package::solaris
-#
-# This module manages NGINX package installation on solaris based systems
-#
-# Parameters:
-#
-# *package_name*
-# Needs to be specified. SFEnginx,CSWnginx depending on where you get it.
-#
-# *package_source* 
-# Needed in case of Solaris 10.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::solaris(
-    $package_name   = undef,
-    $package_source = '',
-    $package_ensure = 'present'
-  ){
-  package { $package_name:
-	ensure 		=> $package_ensure,
-  	source 		=> $package_source
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp
deleted file mode 100644
index 0c044b09f18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Class: nginx::package::suse
-#
-# This module manages NGINX package installation for SuSE based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#  This module contains all of the required package for SuSE. Apache and all
-#  other packages listed below are built into the packaged RPM spec for
-#  SuSE and OpenSuSE.
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::suse {
-
-  $suse_packages = [
-    'nginx-0.8', 'apache2', 'apache2-itk', 'apache2-utils', 'gd', 'libapr1',
-    'libapr-util1', 'libjpeg62', 'libpng14-14', 'libxslt', 'rubygem-daemon_controller',
-    'rubygem-fastthread', 'rubygem-file-tail', 'rubygem-passenger',
-    'rubygem-passenger-nginx', 'rubygem-rack', 'rubygem-rake', 'rubygem-spruz',
-  ]
-
-  package { $suse_packages:
-    ensure => $nginx::package_ensure,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp
deleted file mode 100644
index 8ecf1015453..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Class: nginx::param
-#
-# This module manages NGINX paramaters
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::params {
-
-  $nx_temp_dir                = '/tmp'
-  $nx_run_dir                 = '/var/nginx'
-
-  $nx_conf_template           = 'nginx/conf.d/nginx.conf.erb'
-  $nx_proxy_conf_template     = 'nginx/conf.d/proxy.conf.erb'
-  $nx_confd_purge             = false
-  $nx_vhost_purge             = false
-  $nx_worker_processes        = 1
-  $nx_worker_connections      = 1024
-  $nx_worker_rlimit_nofile    = 1024
-  $nx_types_hash_max_size     = 1024
-  $nx_types_hash_bucket_size  = 512
-  $nx_names_hash_bucket_size  = 64
-  $nx_names_hash_max_size     = 512
-  $nx_multi_accept            = off
-  # One of [kqueue|rtsig|epoll|/dev/poll|select|poll|eventport]
-  # or false to use OS default
-  $nx_events_use              = false
-  $nx_sendfile                = on
-  $nx_keepalive_timeout       = 65
-  $nx_tcp_nodelay             = on
-  $nx_gzip                    = on
-  $nx_server_tokens           = on
-  $nx_spdy                    = off
-  $nx_ssl_stapling            = off
-
-  $nx_proxy_redirect          = off
-  $nx_proxy_set_header        = [
-    'Host $host',
-    'X-Real-IP $remote_addr',
-    'X-Forwarded-For $proxy_add_x_forwarded_for',
-  ]
-  $nx_proxy_cache_path        = false
-  $nx_proxy_cache_levels      = 1
-  $nx_proxy_cache_keys_zone   = 'd2:100m'
-  $nx_proxy_cache_max_size    = '500m'
-  $nx_proxy_cache_inactive    = '20m'
-
-  $nx_client_body_temp_path   = "${nx_run_dir}/client_body_temp"
-  $nx_client_body_buffer_size = '128k'
-  $nx_client_max_body_size    = '10m'
-  $nx_proxy_temp_path         = "${nx_run_dir}/proxy_temp"
-  $nx_proxy_connect_timeout   = '90'
-  $nx_proxy_send_timeout      = '90'
-  $nx_proxy_read_timeout      = '90'
-  $nx_proxy_buffers           = '32 4k'
-  $nx_proxy_http_version      = '1.0'
-  $nx_proxy_buffer_size       = '8k'
-
-  $nx_logdir = $::kernel ? {
-    /(?i-mx:linux)/ => '/var/log/nginx',
-    /(?i-mx:sunos)/ => '/var/log/nginx',
-  }
-
-  $nx_pid = $::kernel ? {
-    /(?i-mx:linux)/  => '/var/run/nginx.pid',
-    /(?i-mx:sunos)/  => '/var/run/nginx.pid',
-  }
-
-  $nx_conf_dir = $::kernelversion ? {
-    /(?i-mx:joyent)/ => '/opt/local/etc/nginx',
-    default => '/etc/nginx',
-  }
-
-  if $::osfamily {
-    $solaris_nx_daemon_user = $::kernelversion ? {
-      /(?i-mx:joyent)/ => 'www',
-      default => 'webservd',
-    }
-    $nx_daemon_user = $::osfamily ? {
-      /(?i-mx:redhat|suse|gentoo|linux)/ => 'nginx',
-      /(?i-mx:debian)/                   => 'www-data',
-      /(?i-mx:solaris)/                  => $solaris_nx_daemon_user,
-    }
-  } else {
-    warning('$::osfamily not defined. Support for $::operatingsystem is deprecated')
-    warning("Please upgrade from factor ${::facterversion} to >= 1.7.2")
-    $nx_daemon_user = $::operatingsystem ? {
-      /(?i-mx:debian|ubuntu)/                                                                => 'www-data',
-      /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse|amazon|gentoo|oraclelinux)/ => 'nginx',
-      /(?i-mx:solaris)/                                                                      => 'webservd',
-    }
-  }
-
-  # Service restart after Nginx 0.7.53 could also be just
-  # "/path/to/nginx/bin -s HUP" Some init scripts do a configtest, some don't.
-  # If configtest_enable it's true then service restart will take
-  # $nx_service_restart value, forcing configtest.
-
-  $nx_configtest_enable = false
-  $nx_service_restart = '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'
-  $nx_service_ensure = running
-
-  $nx_mail = false
-
-  $nx_http_cfg_append = false
-
-  $nx_nginx_error_log = "${nx_logdir}/error.log"
-  $nx_http_access_log = "${nx_logdir}/access.log"
-
-  # package name depends on distribution, e.g. for Debian nginx-full | nginx-light
-  $package_name   = 'nginx'
-  $package_ensure = 'present'
-  $package_source = 'nginx'
-  $manage_repo    = true
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp
deleted file mode 100644
index c44a6737931..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp
+++ /dev/null
@@ -1,299 +0,0 @@
-# define: nginx::resource::location
-#
-# This definition creates a new location entry within a virtual host
-#
-# Parameters:
-#   [*ensure*]               - Enables or disables the specified location
-#     (present|absent)
-#   [*vhost*]                - Defines the default vHost for this location
-#     entry to include with
-#   [*location*]             - Specifies the URI associated with this location
-#     entry
-#   [*location_allow*]       - Array: Locations to allow connections from.
-#   [*location_deny*]        - Array: Locations to deny connections from.
-#   [*www_root*]             - Specifies the location on disk for files to be
-#     read from. Cannot be set in conjunction with $proxy
-#   [*autoindex*]            - Set it on 'on' to activate autoindex directory
-#     listing. Undef by default.
-#   [*index_files*]          - Default index files for NGINX to read when
-#     traversing a directory
-#   [*proxy*]                - Proxy server(s) for a location to connect to.
-#     Accepts a single value, can be used in conjunction with
-#     nginx::resource::upstream
-#   [*proxy_read_timeout*]   - Override the default the proxy read timeout
-#     value of 90 seconds
-#   [*fastcgi*]              - location of fastcgi (host:port)
-#   [*fastcgi_params*]       - optional alternative fastcgi_params file to use
-#   [*fastcgi_script*]       - optional SCRIPT_FILE parameter
-#   [*fastcgi_split_path*]   - Allows settings of fastcgi_split_path_info so
-#     that you can split the script_name and path_info via regex
-#   [*ssl*]                  - Indicates whether to setup SSL bindings for
-#     this location.
-#   [*ssl_only*]             - Required if the SSL and normal vHost have the
-#     same port.
-#   [*location_alias*]       - Path to be used as basis for serving requests
-#     for this location
-#   [*stub_status*]          - If true it will point configure module
-#     stub_status to provide nginx stats on location
-#   [*location_custom_cfg*]  - Expects a hash with custom directives, cannot
-#     be used with other location types (proxy, fastcgi, root, or stub_status)
-#   [*location_cfg_prepend*] - Expects a hash with extra directives to put
-#     before anything else inside location (used with all other types except
-#     custom_cfg)
-#   [*location_custom_cfg_prepend*]   - Expects a array with extra directives
-#     to put before anything else inside location (used with all other types
-#     except custom_cfg). Used for logical structures such as if.
-#   [*location_custom_cfg_append*]    - Expects a array with extra directives
-#     to put before anything else inside location (used with all other types
-#     except custom_cfg). Used for logical structures such as if.
-#   [*location_cfg_append*]  - Expects a hash with extra directives to put
-#     after everything else inside location (used with all other types except
-#     custom_cfg)
-#   [*try_files*]            - An array of file locations to try
-#   [*option*]               - Reserved for future use
-#   [*proxy_cache*]           - This directive sets name of zone for caching.
-#     The same zone can be used in multiple places.
-#   [*proxy_cache_valid*]     - This directive sets the time for caching
-#     different replies.
-#   [*proxy_method*]         - If defined, overrides the HTTP method of the
-#     request to be passed to the backend.
-#   [*proxy_set_body*]       - If defined, sets the body passed to the backend.
-#   [*auth_basic*]            - This directive includes testing name and password
-#     with HTTP Basic Authentication.
-#   [*auth_basic_user_file*]  - This directive sets the htpasswd filename for
-#     the authentication realm.
-#   [*priority*]              - Location priority. Default: 500. User priority
-#     401-499, 501-599. If the priority is higher than the default priority,
-#     the location will be defined after root, or before root.
-#
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::location { 'test2.local-bob':
-#    ensure   => present,
-#    www_root => '/var/www/bob',
-#    location => '/bob',
-#    vhost    => 'test2.local',
-#  }
-#
-#  Custom config example to limit location on localhost,
-#  create a hash with any extra custom config you want.
-#  $my_config = {
-#    'access_log' => 'off',
-#    'allow'      => '127.0.0.1',
-#    'deny'       => 'all'
-#  }
-#  nginx::resource::location { 'test2.local-bob':
-#    ensure              => present,
-#    www_root            => '/var/www/bob',
-#    location            => '/bob',
-#    vhost               => 'test2.local',
-#    location_cfg_append => $my_config,
-#  }
-
-define nginx::resource::location (
-  $ensure               = present,
-  $location             = $name,
-  $vhost                = undef,
-  $www_root             = undef,
-  $autoindex            = undef,
-  $index_files          = [
-    'index.html',
-    'index.htm',
-    'index.php'],
-  $proxy                = undef,
-  $proxy_read_timeout   = $nginx::params::nx_proxy_read_timeout,
-  $fastcgi              = undef,
-  $fastcgi_params       = '/etc/nginx/fastcgi_params',
-  $fastcgi_script       = undef,
-  $fastcgi_split_path   = undef,
-  $ssl                  = false,
-  $ssl_only             = false,
-  $location_alias       = undef,
-  $location_allow       = undef,
-  $location_deny        = undef,
-  $option               = undef,
-  $stub_status          = undef,
-  $location_custom_cfg  = undef,
-  $location_cfg_prepend = undef,
-  $location_cfg_append  = undef,
-  $location_custom_cfg_prepend  = undef,
-  $location_custom_cfg_append   = undef,
-  $try_files            = undef,
-  $proxy_cache          = false,
-  $proxy_cache_valid    = false,
-  $proxy_method         = undef,
-  $proxy_set_body       = undef,
-  $auth_basic           = undef,
-  $auth_basic_user_file = undef,
-  $rewrite_rules        = [],
-  $priority             = 500
-) {
-  File {
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($location)
-  if ($vhost != undef) {
-    validate_string($vhost)
-  }
-  if ($www_root != undef) {
-    validate_string($www_root)
-  }
-  if ($autoindex != undef) {
-    validate_string($autoindex)
-  }
-  validate_array($index_files)
-  if ($proxy != undef) {
-    validate_string($proxy)
-  }
-  validate_string($proxy_read_timeout)
-  if ($fastcgi != undef) {
-    validate_string($fastcgi)
-  }
-  validate_string($fastcgi_params)
-  if ($fastcgi_script != undef) {
-    validate_string($fastcgi_script)
-  }
-  if ($fastcgi_split_path != undef) {
-    validate_string($fastcgi_split_path)
-  }
-  validate_bool($ssl)
-  validate_bool($ssl_only)
-  if ($location_alias != undef) {
-    validate_string($location_alias)
-  }
-  if ($location_allow != undef) {
-    validate_array($location_allow)
-  }
-  if ($location_deny != undef) {
-    validate_array($location_deny)
-  }
-  if ($option != undef) {
-    warning('The $option parameter has no effect and is deprecated.')
-  }
-  if ($stub_status != undef) {
-    validate_bool($stub_status)
-  }
-  if ($location_custom_cfg != undef) {
-    validate_hash($location_custom_cfg)
-  }
-  if ($location_cfg_prepend != undef) {
-    validate_hash($location_cfg_prepend)
-  }
-  if ($location_cfg_append != undef) {
-    validate_hash($location_cfg_append)
-  }
-  if ($try_files != undef) {
-    validate_array($try_files)
-  }
-  if ($proxy_cache != false) {
-    validate_string($proxy_cache)
-  }
-  if ($proxy_cache_valid != false) {
-    validate_string($proxy_cache_valid)
-  }
-  if ($proxy_method != undef) {
-    validate_string($proxy_method)
-  }
-  if ($proxy_set_body != undef) {
-    validate_string($proxy_set_body)
-  }
-  if ($auth_basic != undef) {
-    validate_string($auth_basic)
-  }
-  if ($auth_basic_user_file != undef) {
-    validate_string($auth_basic_user_file)
-  }
-  if !is_integer($priority) {
-    fail('$priority must be an integer.')
-  }
-  validate_array($rewrite_rules)
-  if ($priority < 401) or ($priority > 599) {
-    fail('$priority must be in the range 401-599.')
-  }
-
-  # # Shared Variables
-  $ensure_real = $ensure ? {
-    'absent' => absent,
-    default  => file,
-  }
-
-  $vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
-  $config_file = "${nginx::config::nx_conf_dir}/sites-available/${vhost_sanitized}.conf"
-
-  $location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
-  $location_sanitized = regsubst($location_sanitized_tmp, '\\', '_', 'G')
-
-  ## Check for various error conditions
-  if ($vhost == undef) {
-    fail('Cannot create a location reference without attaching to a virtual host')
-  }
-  if (($www_root == undef) and ($proxy == undef) and ($location_alias == undef) and ($stub_status == undef) and ($fastcgi == undef) and ($location_custom_cfg == undef)) {
-    fail('Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, stub_status, or location_custom_cfg defined')
-  }
-  if (($www_root != undef) and ($proxy != undef)) {
-    fail('Cannot define both directory and proxy in a virtual host')
-  }
-
-  # Use proxy or fastcgi template if $proxy is defined, otherwise use directory template.
-  if ($proxy != undef) {
-    $content_real = template('nginx/vhost/vhost_location_proxy.erb')
-  } elsif ($location_alias != undef) {
-    $content_real = template('nginx/vhost/vhost_location_alias.erb')
-  } elsif ($stub_status != undef) {
-    $content_real = template('nginx/vhost/vhost_location_stub_status.erb')
-  } elsif ($fastcgi != undef) {
-    $content_real = template('nginx/vhost/vhost_location_fastcgi.erb')
-  } elsif ($www_root != undef) {
-    $content_real = template('nginx/vhost/vhost_location_directory.erb')
-  } else {
-    $content_real = template('nginx/vhost/vhost_location_empty.erb')
-  }
-
-  if $fastcgi != undef and !defined(File['/etc/nginx/fastcgi_params']) {
-    file { '/etc/nginx/fastcgi_params':
-      ensure  => present,
-      mode    => '0770',
-      content => template('nginx/vhost/fastcgi_params.erb'),
-    }
-  }
-
-  ## Create stubs for vHost File Fragment Pattern
-  if ($ssl_only != true) {
-    concat::fragment { "${vhost_sanitized}-${priority}-${location_sanitized}":
-      ensure  => present,
-      target  => $config_file,
-      content => $content_real,
-      order   => "${priority}",
-    }
-  }
-
-  ## Only create SSL Specific locations if $ssl is true.
-  if ($ssl == true) {
-    $ssl_priority = $priority + 300
-    concat::fragment {"${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl":
-      ensure  => present,
-      target  => $config_file,
-      content => $content_real,
-      order   => "${ssl_priority}",
-    }
-  }
-
-  if ($auth_basic_user_file != undef) {
-    #Generate htpasswd with provided file-locations
-    file { "${nginx::params::nx_conf_dir}/${location_sanitized}_htpasswd":
-      ensure => $ensure,
-      mode   => '0644',
-      source => $auth_basic_user_file,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp
deleted file mode 100644
index 89e0245d70a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp
+++ /dev/null
@@ -1,144 +0,0 @@
-# define: nginx::resource::mailhost
-#
-# This definition creates a virtual host
-#
-# Parameters:
-#   [*ensure*]              - Enables or disables the specified mailhost (present|absent)
-#   [*listen_ip*]           - Default IP Address for NGINX to listen with this vHost on. Defaults to all interfaces (*)
-#   [*listen_port*]         - Default IP Port for NGINX to listen with this vHost on. Defaults to TCP 80
-#   [*listen_options*]      - Extra options for listen directive like 'default' to catchall. Undef by default.
-#   [*ipv6_enable*]         - BOOL value to enable/disable IPv6 support (false|true). Module will check to see if IPv6
-#                             support exists on your system before enabling.
-#   [*ipv6_listen_ip*]      - Default IPv6 Address for NGINX to listen with this vHost on. Defaults to all interfaces (::)
-#   [*ipv6_listen_port*]    - Default IPv6 Port for NGINX to listen with this vHost on. Defaults to TCP 80
-#   [*ipv6_listen_options*] - Extra options for listen directive like 'default' to catchall. Template will allways add ipv6only=on.
-#                             While issue jfryman/puppet-nginx#30 is discussed, default value is 'default'.
-#   [*index_files*]         - Default index files for NGINX to read when traversing a directory
-#   [*ssl*]                 - Indicates whether to setup SSL bindings for this mailhost.
-#   [*ssl_cert*]            - Pre-generated SSL Certificate file to reference for SSL Support. This is not generated by this module.
-#   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL Support. This is not generated by this module.
-#   [*ssl_port*]            - Default IP Port for NGINX to listen with this SSL vHost on. Defaults to TCP 443
-#   [*starttls*]            - enable STARTTLS support: (on|off|only)
-#   [*protocol*]            - Mail protocol to use: (imap|pop3|smtp)
-#   [*auth_http*]           - With this directive you can set the URL to the external HTTP-like server for authorization.
-#   [*xclient*]             - wheter to use xclient for smtp (on|off)
-#   [*server_name*]         - List of mailhostnames for which this mailhost will respond. Default [$name].
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::mailhost { 'domain1.example':
-#    ensure      => present,
-#    auth_http   => 'server2.example/cgi-bin/auth',
-#    protocol    => 'smtp',
-#    listen_port => 587,
-#    ssl_port    => 465,
-#    starttls    => 'only',
-#    xclient     => 'off',
-#    ssl         => true,
-#    ssl_cert    => '/tmp/server.crt',
-#    ssl_key     => '/tmp/server.pem',
-#  }
-define nginx::resource::mailhost (
-  $listen_port,
-  $ensure              = 'present',
-  $listen_ip           = '*',
-  $listen_options      = undef,
-  $ipv6_enable         = false,
-  $ipv6_listen_ip      = '::',
-  $ipv6_listen_port    = '80',
-  $ipv6_listen_options = 'default ipv6only=on',
-  $ssl                 = false,
-  $ssl_cert            = undef,
-  $ssl_key             = undef,
-  $ssl_port            = undef,
-  $starttls            = 'off',
-  $protocol            = undef,
-  $auth_http           = undef,
-  $xclient             = 'on',
-  $server_name         = [$name]) {
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  if !is_integer($listen_port) {
-    fail('$listen_port must be an integer.')
-  }
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($listen_ip)
-  if ($listen_options != undef) {
-    validate_string($listen_options)
-  }
-  validate_bool($ipv6_enable)
-  validate_string($ipv6_listen_ip)
-  if !is_integer($ipv6_listen_port) {
-    fail('$ipv6_listen_port must be an integer.')
-  }
-  validate_string($ipv6_listen_options)
-  validate_bool($ssl)
-  if ($ssl_cert != undef) {
-    validate_string($ssl_cert)
-  }
-  if ($ssl_key != undef) {
-    validate_string($ssl_key)
-  }
-  if ($ssl_port != undef) and (!is_integer($ssl_port)) {
-    fail('$ssl_port must be an integer.')
-  }
-  validate_re($starttls, '^(on|only|off)$',
-    "${starttls} is not supported for starttls. Allowed values are 'on', 'only' and 'off'.")
-  if ($protocol != undef) {
-    validate_string($protocol)
-  }
-  if ($auth_http != undef) {
-    validate_string($auth_http)
-  }
-  validate_string($xclient)
-  validate_array($server_name)
-
-  $config_file = "${nginx::config::nx_conf_dir}/conf.mail.d/${name}.conf"
-
-  # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
-  # and support does not exist for it in the kernel.
-  if ($ipv6_enable and !$::ipaddress6) {
-    warning('nginx: IPv6 support is not enabled or configured properly')
-  }
-
-  # Check to see if SSL Certificates are properly defined.
-  if ($ssl or $starttls == 'on' or $starttls == 'only') {
-    if ($ssl_cert == undef) or ($ssl_key == undef) {
-      fail('nginx: SSL certificate/key (ssl_cert/ssl_cert) and/or SSL Private must be defined and exist on the target system(s)')
-    }
-  }
-
-  concat { $config_file:
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name}-header":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/mailhost/mailhost.erb'),
-      order   => '001',
-    }
-  }
-
-  # Create SSL File Stubs if SSL is enabled
-  if ($ssl) {
-    concat::fragment { "${name}-ssl":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/mailhost/mailhost_ssl.erb'),
-      order   => '700',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp
deleted file mode 100644
index 920aff98a18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp
+++ /dev/null
@@ -1,68 +0,0 @@
-# define: nginx::resource::upstream
-#
-# This definition creates a new upstream proxy entry for NGINX
-#
-# Parameters:
-#   [*members*]               - Array of member URIs for NGINX to connect to. Must follow valid NGINX syntax.
-#   [*ensure*]                - Enables or disables the specified location (present|absent)
-#   [*upstream_cfg_prepend*]  - It expects a hash with custom directives to put before anything else inside upstream
-#   [*upstream_fail_timeout*] - Set the fail_timeout for the upstream. Default is 10 seconds - As that is what Nginx does normally.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::upstream { 'proxypass':
-#    ensure  => present,
-#    members => [
-#      'localhost:3000',
-#      'localhost:3001',
-#      'localhost:3002',
-#    ],
-#  }
-#
-#  Custom config example to use ip_hash, and 20 keepalive connections
-#  create a hash with any extra custom config you want.
-#  $my_config = {
-#    'ip_hash'   => '',
-#    'keepalive' => '20',
-#  }
-#  nginx::resource::upstream { 'proxypass':
-#    ensure              => present,
-#    members => [
-#      'localhost:3000',
-#      'localhost:3001',
-#      'localhost:3002',
-#    ],
-#    upstream_cfg_prepend => $my_config,
-#  }
-define nginx::resource::upstream (
-  $members,
-  $ensure = 'present',
-  $upstream_cfg_prepend = undef,
-  $upstream_fail_timeout = '10s',
-) {
-
-  validate_array($members)
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  if ($upstream_cfg_prepend != undef) {
-    validate_hash($upstream_cfg_prepend)
-  }
-
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  file { "/etc/nginx/conf.d/${name}-upstream.conf":
-    ensure  => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    content => template('nginx/conf.d/upstream.erb'),
-    notify  => Class['nginx::service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp
deleted file mode 100644
index 453984dc26a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp
+++ /dev/null
@@ -1,511 +0,0 @@
-# define: nginx::resource::vhost
-#
-# This definition creates a virtual host
-#
-# Parameters:
-#   [*ensure*]              - Enables or disables the specified vhost
-#     (present|absent)
-#   [*listen_ip*]           - Default IP Address for NGINX to listen with this
-#     vHost on. Defaults to all interfaces (*)
-#   [*listen_port*]         - Default IP Port for NGINX to listen with this
-#     vHost on. Defaults to TCP 80
-#   [*listen_options*]      - Extra options for listen directive like
-#     'default' to catchall. Undef by default.
-#   [*location_allow*]      - Array: Locations to allow connections from.
-#   [*location_deny*]       - Array: Locations to deny connections from.
-#   [*ipv6_enable*]         - BOOL value to enable/disable IPv6 support
-#     (false|true). Module will check to see if IPv6 support exists on your
-#     system before enabling.
-#   [*ipv6_listen_ip*]      - Default IPv6 Address for NGINX to listen with
-#     this vHost on. Defaults to all interfaces (::)
-#   [*ipv6_listen_port*]    - Default IPv6 Port for NGINX to listen with this
-#     vHost on. Defaults to TCP 80
-#   [*ipv6_listen_options*] - Extra options for listen directive like 'default'
-#     to catchall. Template will allways add ipv6only=on. While issue
-#     jfryman/puppet-nginx#30 is discussed, default value is 'default'.
-#   [*add_header*]          - Hash: Adds headers to the HTTP response when
-#     response code is equal to 200, 204, 301, 302 or 304.
-#   [*index_files*]         - Default index files for NGINX to read when
-#     traversing a directory
-#   [*autoindex*]           - Set it on 'on' or 'off 'to activate/deactivate
-#                             autoindex directory listing. Undef by default.
-#   [*proxy*]               - Proxy server(s) for the root location to connect
-#     to.  Accepts a single value, can be used in conjunction with
-#     nginx::resource::upstream
-#   [*proxy_read_timeout*]  - Override the default the proxy read timeout value
-#     of 90 seconds
-#   [*resolver*]            - String: Configures name servers used to resolve
-#     names of upstream servers into addresses.
-#   [*fastcgi*]             - location of fastcgi (host:port)
-#   [*fastcgi_params*]      - optional alternative fastcgi_params file to use
-#   [*fastcgi_script*]      - optional SCRIPT_FILE parameter
-#   [*ssl*]                 - Indicates whether to setup SSL bindings for this
-#     vhost.
-#   [*ssl_cert*]            - Pre-generated SSL Certificate file to reference
-#     for SSL Support. This is not generated by this module.
-#   [*ssl_dhparam*]         - This directive specifies a file containing
-#     Diffie-Hellman key agreement protocol cryptographic parameters, in PEM
-#     format, utilized for exchanging session keys between server and client.
-#   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL
-#     Support. This is not generated by this module.
-#   [*ssl_port*]            - Default IP Port for NGINX to listen with this SSL
-#     vHost on. Defaults to TCP 443
-#   [*ssl_protocols*]       - SSL protocols enabled. Defaults to 'SSLv3 TLSv1
-#     TLSv1.1 TLSv1.2'.
-#   [*ssl_ciphers*]         - SSL ciphers enabled. Defaults to
-#     'HIGH:!aNULL:!MD5'.
-#   [*ssl_stapling*]        - Bool: Enables or disables stapling of OCSP
-#     responses by the server. Defaults to false.
-#   [*ssl_stapling_file*]   - String: When set, the stapled OCSP response
-#     will be taken from the specified file instead of querying the OCSP
-#     responder specified in the server certificate.
-#   [*ssl_stapling_responder*] - String: Overrides the URL of the OCSP
-#     responder specified in the Authority Information Access certificate
-#     extension.
-#   [*ssl_stapling_verify*] - Bool: Enables or disables verification of
-#     OCSP responses by the server. Defaults to false.
-#   [*ssl_trusted_cert*]    - String: Specifies a file with trusted CA
-#     certificates in the PEM format used to verify client certificates and
-#     OCSP responses if ssl_stapling is enabled.
-#   [*spdy*]                - Toggles SPDY protocol.
-#   [*server_name*]         - List of vhostnames for which this vhost will
-#     respond. Default [$name].
-#   [*www_root*]            - Specifies the location on disk for files to be
-#     read from. Cannot be set in conjunction with $proxy
-#   [*rewrite_www_to_non_www*]  - Adds a server directive and rewrite rule to
-#     rewrite www.domain.com to domain.com in order to avoid duplicate
-#     content (SEO);
-#   [*try_files*]               - Specifies the locations for files to be
-#     checked as an array. Cannot be used in conjuction with $proxy.
-#   [*proxy_cache*]             - This directive sets name of zone for caching.
-#     The same zone can be used in multiple places.
-#   [*proxy_cache_valid*]       - This directive sets the time for caching
-#     different replies.
-#   [*proxy_method*]            - If defined, overrides the HTTP method of the
-#     request to be passed to the backend.
-#   [*proxy_set_body*]          - If defined, sets the body passed to the backend.
-#   [*auth_basic*]              - This directive includes testing name and
-#      password with HTTP Basic Authentication.
-#   [*auth_basic_user_file*]    - This directive sets the htpasswd filename for
-#     the authentication realm.
-#   [*client_max_body_size*]    - This directive sets client_max_body_size.
-#   [*vhost_cfg_append*]        - It expects a hash with custom directives to
-#     put after everything else inside vhost
-#   [*vhost_cfg_prepend*]       - It expects a hash with custom directives to
-#     put before everything else inside vhost
-#   [*vhost_cfg_ssl_append*]        - It expects a hash with custom directives to
-#     put after everything else inside vhost ssl
-#   [*vhost_cfg_ssl_prepend*]       - It expects a hash with custom directives to
-#     put before everything else inside vhost ssl
-#   [*rewrite_to_https*]        - Adds a server directive and rewrite rule to
-#      rewrite to ssl
-#   [*include_files*]           - Adds include files to vhost
-#   [*access_log*]              - Where to write access log. May add additional
-#      options like log format to the end.
-#   [*error_log*]               - Where to write error log. May add additional
-#      options like error level to the end.
-#   [*passenger_cgi_param*]     - Allows one to define additional CGI environment
-#      variables to pass to the backend application
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::vhost { 'test2.local':
-#    ensure   => present,
-#    www_root => '/var/www/nginx-default',
-#    ssl      => true,
-#    ssl_cert => '/tmp/server.crt',
-#    ssl_key  => '/tmp/server.pem',
-#  }
-define nginx::resource::vhost (
-  $ensure                 = 'present',
-  $listen_ip              = '*',
-  $listen_port            = '80',
-  $listen_options         = undef,
-  $location_allow         = [],
-  $location_deny          = [],
-  $ipv6_enable            = false,
-  $ipv6_listen_ip         = '::',
-  $ipv6_listen_port       = '80',
-  $ipv6_listen_options    = 'default ipv6only=on',
-  $add_header             = undef,
-  $ssl                    = false,
-  $ssl_cert               = undef,
-  $ssl_dhparam            = undef,
-  $ssl_key                = undef,
-  $ssl_port               = '443',
-  $ssl_protocols          = 'SSLv3 TLSv1 TLSv1.1 TLSv1.2',
-  $ssl_ciphers            = 'HIGH:!aNULL:!MD5',
-  $ssl_cache              = 'shared:SSL:10m',
-  $ssl_stapling           = false,
-  $ssl_stapling_file      = undef,
-  $ssl_stapling_responder = undef,
-  $ssl_stapling_verify    = false,
-  $ssl_trusted_cert       = undef,
-  $spdy                   = $nginx::params::nx_spdy,
-  $proxy                  = undef,
-  $proxy_read_timeout     = $nginx::params::nx_proxy_read_timeout,
-  $proxy_set_header       = [],
-  $proxy_cache            = false,
-  $proxy_cache_valid      = false,
-  $proxy_method           = undef,
-  $proxy_set_body         = undef,
-  $resolver               = undef,
-  $fastcgi                = undef,
-  $fastcgi_params         = '/etc/nginx/fastcgi_params',
-  $fastcgi_script         = undef,
-  $index_files            = [
-    'index.html',
-    'index.htm',
-    'index.php'],
-  $autoindex              = undef,
-  $server_name            = [$name],
-  $www_root               = undef,
-  $rewrite_www_to_non_www = false,
-  $rewrite_to_https       = undef,
-  $location_custom_cfg    = undef,
-  $location_cfg_prepend   = undef,
-  $location_cfg_append    = undef,
-  $try_files              = undef,
-  $auth_basic             = undef,
-  $auth_basic_user_file   = undef,
-  $client_max_body_size   = undef,
-  $vhost_cfg_prepend      = undef,
-  $vhost_cfg_append       = undef,
-  $vhost_cfg_ssl_prepend      = undef,
-  $vhost_cfg_ssl_append       = undef,
-  $include_files          = undef,
-  $access_log             = undef,
-  $error_log              = undef,
-  $passenger_cgi_param    = undef,
-  $use_default_location   = true,
-  $rewrite_rules          = [],
-) {
-
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($listen_ip)
-  if !is_integer($listen_port) {
-    fail('$listen_port must be an integer.')
-  }
-  if ($listen_options != undef) {
-    validate_string($listen_options)
-  }
-  validate_array($location_allow)
-  validate_array($location_deny)
-  validate_bool($ipv6_enable)
-  validate_string($ipv6_listen_ip)
-  if !is_integer($ipv6_listen_port) {
-    fail('$ipv6_listen_port must be an integer.')
-  }
-  validate_string($ipv6_listen_options)
-  if ($add_header != undef) {
-    validate_hash($add_header)
-  }
-  validate_bool($ssl)
-  if ($ssl_cert != undef) {
-    validate_string($ssl_cert)
-  }
-  if ($ssl_dhparam != undef) {
-    validate_string($ssl_dhparam)
-  }
-  if ($ssl_key != undef) {
-    validate_string($ssl_key)
-  }
-  if !is_integer($ssl_port) {
-    fail('$ssl_port must be an integer.')
-  }
-  validate_string($ssl_protocols)
-  validate_string($ssl_ciphers)
-  validate_string($ssl_cache)
-  validate_bool($ssl_stapling)
-  if ($ssl_stapling_file != undef) {
-    validate_string($ssl_stapling_file)
-  }
-  if ($ssl_stapling_responder != undef) {
-    validate_string($ssl_stapling_responder)
-  }
-  validate_bool($ssl_stapling_verify)
-  if ($ssl_trusted_cert != undef) {
-    validate_string($ssl_trusted_cert)
-  }
-  validate_string($spdy)
-  if ($proxy != undef) {
-    validate_string($proxy)
-  }
-  validate_string($proxy_read_timeout)
-  validate_array($proxy_set_header)
-  if ($proxy_cache != false) {
-    validate_string($proxy_cache)
-  }
-  if ($proxy_cache_valid != false) {
-    validate_string($proxy_cache_valid)
-  }
-  if ($proxy_method != undef) {
-    validate_string($proxy_method)
-  }
-  if ($proxy_set_body != undef) {
-    validate_string($proxy_set_body)
-  }
-  if ($resolver != undef) {
-    validate_string($resolver)
-  }
-  if ($fastcgi != undef) {
-    validate_string($fastcgi)
-  }
-  validate_string($fastcgi_params)
-  if ($fastcgi_script != undef) {
-    validate_string($fastcgi_script)
-  }
-  validate_array($index_files)
-  if ($autoindex != undef) {
-    validate_string($autoindex)
-  }
-  validate_array($server_name)
-  if ($www_root != undef) {
-    validate_string($www_root)
-  }
-  validate_bool($rewrite_www_to_non_www)
-  if ($rewrite_to_https != undef) {
-    validate_bool($rewrite_to_https)
-  }
-  if ($location_custom_cfg != undef) {
-    validate_hash($location_custom_cfg)
-  }
-  if ($location_cfg_prepend != undef) {
-    validate_hash($location_cfg_prepend)
-  }
-  if ($location_cfg_append != undef) {
-    validate_hash($location_cfg_append)
-  }
-  if ($try_files != undef) {
-    validate_array($try_files)
-  }
-  if ($auth_basic != undef) {
-    validate_string($auth_basic)
-  }
-  if ($auth_basic_user_file != undef) {
-    validate_string($auth_basic_user_file)
-  }
-  if ($vhost_cfg_prepend != undef) {
-    validate_hash($vhost_cfg_prepend)
-  }
-  if ($vhost_cfg_append != undef) {
-    validate_hash($vhost_cfg_append)
-  }
-  if ($vhost_cfg_ssl_prepend != undef) {
-    validate_hash($vhost_cfg_ssl_prepend)
-  }
-  if ($vhost_cfg_ssl_append != undef) {
-    validate_hash($vhost_cfg_ssl_append)
-  }
-  if ($include_files != undef) {
-    validate_array($include_files)
-  }
-  if ($access_log != undef) {
-    validate_string($access_log)
-  }
-  if ($error_log != undef) {
-    validate_string($error_log)
-  }
-  if ($passenger_cgi_param != undef) {
-    validate_hash($passenger_cgi_param)
-  }
-  validate_bool($use_default_location)
-  validate_array($rewrite_rules)
-
-  # Variables
-  $vhost_dir = "${nginx::config::nx_conf_dir}/sites-available"
-  $vhost_enable_dir = "${nginx::config::nx_conf_dir}/sites-enabled"
-  $vhost_symlink_ensure = $ensure ? {
-    'absent' => absent,
-    default  => 'link',
-  }
-
-  $name_sanitized = regsubst($name, ' ', '_', 'G')
-  $config_file = "${vhost_dir}/${name_sanitized}.conf"
-
-  File {
-    ensure => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    notify => Class['nginx::service'],
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-  }
-
-  # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
-  # and support does not exist for it in the kernel.
-  if ($ipv6_enable == true) and (!$ipaddress6) {
-    warning('nginx: IPv6 support is not enabled or configured properly')
-  }
-
-  # Check to see if SSL Certificates are properly defined.
-  if ($ssl == true) {
-    if ($ssl_cert == undef) or ($ssl_key == undef) {
-      fail('nginx: SSL certificate/key (ssl_cert/ssl_cert) and/or SSL Private must be defined and exist on the target system(s)')
-    }
-  }
-
-  # This was a lot to add up in parameter list so add it down here
-  # Also opted to add more logic here and keep template cleaner which
-  # unfortunately means resorting to the $varname_real thing
-  $access_log_real = $access_log ? {
-    undef   => "${nginx::params::nx_logdir}/${name_sanitized}.access.log",
-    default => $access_log,
-  }
-  $error_log_real = $error_log ? {
-    undef   => "${nginx::params::nx_logdir}/${name_sanitized}.error.log",
-    default => $error_log,
-  }
-
-  concat { $config_file:
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  $ssl_only = ($ssl == true) and ($ssl_port == $listen_port)
-
-  if $use_default_location == true {
-    # Create the default location reference for the vHost
-    nginx::resource::location {"${name_sanitized}-default":
-      ensure              => $ensure,
-      vhost               => $name_sanitized,
-      ssl                 => $ssl,
-      ssl_only            => $ssl_only,
-      location            => '/',
-      location_allow      => $location_allow,
-      location_deny       => $location_deny,
-      proxy               => $proxy,
-      proxy_read_timeout  => $proxy_read_timeout,
-      proxy_cache         => $proxy_cache,
-      proxy_cache_valid   => $proxy_cache_valid,
-      proxy_method        => $proxy_method,
-      proxy_set_body      => $proxy_set_body,
-      fastcgi             => $fastcgi,
-      fastcgi_params      => $fastcgi_params,
-      fastcgi_script      => $fastcgi_script,
-      try_files           => $try_files,
-      www_root            => $www_root,
-      autoindex           => $autoindex,
-      index_files         => [],
-      location_custom_cfg => $location_custom_cfg,
-      notify              => Class['nginx::service'],
-      rewrite_rules       => $rewrite_rules,
-    }
-  } else {
-    $root = $www_root
-  }
-
-  # Support location_cfg_prepend and location_cfg_append on default location created by vhost
-  if $location_cfg_prepend {
-    Nginx::Resource::Location["${name_sanitized}-default"] {
-      location_cfg_prepend => $location_cfg_prepend }
-  }
-
-  if $location_cfg_append {
-    Nginx::Resource::Location["${name_sanitized}-default"] {
-      location_cfg_append => $location_cfg_append }
-  }
-
-  if $fastcgi != undef and !defined(File['/etc/nginx/fastcgi_params']) {
-    file { '/etc/nginx/fastcgi_params':
-      ensure  => present,
-      mode    => '0770',
-      content => template('nginx/vhost/fastcgi_params.erb'),
-    }
-  }
-
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name_sanitized}-header":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_header.erb'),
-      order   => '001',
-    }
-  }
-
-  # Create a proper file close stub.
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name_sanitized}-footer":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_footer.erb'),
-      order   => '699',
-    }
-  }
-
-  # Create SSL File Stubs if SSL is enabled
-  if ($ssl == true) {
-    # Access and error logs are named differently in ssl template
-    $ssl_access_log = $access_log ? {
-      undef   => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.access.log",
-      default => $access_log,
-    }
-    $ssl_error_log = $error_log ? {
-      undef   => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.error.log",
-      default => $error_log,
-    }
-
-    concat::fragment { "${name_sanitized}-ssl-header":
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_ssl_header.erb'),
-      order   => '700',
-    }
-    concat::fragment { "${name_sanitized}-ssl-footer":
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_ssl_footer.erb'),
-      order   => '999',
-    }
-
-    #Generate ssl key/cert with provided file-locations
-    $cert = regsubst($name,' ','_')
-
-    # Check if the file has been defined before creating the file to
-    # avoid the error when using wildcard cert on the multiple vhosts
-    ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.crt", {
-      owner  => $nginx::params::nx_daemon_user,
-      mode   => '0444',
-      source => $ssl_cert,
-    })
-    ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.key", {
-      owner  => $nginx::params::nx_daemon_user,
-      mode   => '0440',
-      source => $ssl_key,
-    })
-    if ($ssl_dhparam != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.dh.pem", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_dhparam,
-      })
-    }
-    if ($ssl_stapling_file != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.ocsp.resp", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_stapling_file,
-      })
-    }
-    if ($ssl_trusted_cert != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.trusted.crt", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_trusted_cert,
-      })
-    }
-  }
-
-  file{ "${name_sanitized}.conf symlink":
-    ensure  => $vhost_symlink_ensure,
-    path    => "${vhost_enable_dir}/${name_sanitized}.conf",
-    target  => $config_file,
-    require => Concat[$config_file],
-    notify  => Service['nginx'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp
deleted file mode 100644
index 9ec899395bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Class: nginx::service
-#
-# This module manages NGINX service management and vhost rebuild
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::service(
-  $configtest_enable = $nginx::configtest_enable,
-  $service_restart   = $nginx::service_restart,
-  $service_ensure    = $nginx::service_ensure,
-) {
-  
-  $service_enable = $service_ensure ? {
-    running => true,
-    absent => false,
-    stopped => false,
-    default => true,
-  }
-
-  service { 'nginx':
-    ensure     => $service_ensure,
-    enable     => $service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-  }
-  if $configtest_enable == true {
-    Service['nginx'] {
-      restart => $service_restart,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb
deleted file mode 100644
index 6076e5481e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb
+++ /dev/null
@@ -1,324 +0,0 @@
-require 'spec_helper'
-describe 'nginx::config' do
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'debian', :operatingsystem => 'debian', },
-      { :osfamily => 'debian', :operatingsystem => 'ubuntu', },
-      { :osfamily => 'redhat', :operatingsystem => 'fedora', },
-      { :osfamily => 'redhat', :operatingsystem => 'rhel', },
-      { :osfamily => 'redhat', :operatingsystem => 'redhat', },
-      { :osfamily => 'redhat', :operatingsystem => 'centos', },
-      { :osfamily => 'redhat', :operatingsystem => 'scientific', },
-      { :osfamily => 'redhat', :operatingsystem => 'amazon', },
-      { :osfamily => 'suse',   :operatingsystem => 'suse', },
-      { :osfamily => 'suse',   :operatingsystem => 'opensuse', },
-      { :osfamily => 'gentoo', :operatingsystem => 'gentoo', },
-      { :osfamily => 'linux',  :operatingsystem => 'gentoo', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-
-        it { should contain_class("nginx::params") }
-
-        it { should contain_file("/etc/nginx").only_with(
-          :path   => "/etc/nginx",
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d").only_with(
-          :path   => '/etc/nginx/conf.d',
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.mail.d").only_with(
-          :path   => '/etc/nginx/conf.mail.d',
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d/vhost_autogen.conf").with_ensure('absent') }
-        it { should contain_file("/etc/nginx/conf.mail.d/vhost_autogen.conf").with_ensure('absent') }
-        it { should contain_file("/var/nginx").with(
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/var/nginx/client_body_temp").with(
-          :ensure => 'directory',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/var/nginx/proxy_temp").with(
-          :ensure => 'directory',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file('/etc/nginx/sites-enabled/default').with_ensure('absent') }
-        it { should contain_file("/etc/nginx/nginx.conf").with(
-          :ensure => 'file',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d/proxy.conf").with(
-          :ensure => 'file',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/tmp/nginx.d").with(
-          :ensure => 'absent',
-          :purge => true,
-          :recurse => true
-        )}
-        it { should contain_file("/tmp/nginx.mail.d").with(
-          :ensure => 'absent',
-          :purge => true,
-          :recurse => true
-        )}
-      end
-    end
-  end
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'debian', :operatingsystem => 'debian', },
-      { :osfamily => 'debian', :operatingsystem => 'ubuntu', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-        it { should contain_file("/var/nginx/client_body_temp").with(:owner => 'www-data')}
-        it { should contain_file("/var/nginx/proxy_temp").with(:owner => 'www-data')}
-        it { should contain_file("/etc/nginx/nginx.conf").with_content %r{^user www-data;}}
-      end
-    end
-  end
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'redhat', :operatingsystem => 'fedora', },
-      { :osfamily => 'redhat', :operatingsystem => 'rhel', },
-      { :osfamily => 'redhat', :operatingsystem => 'redhat', },
-      { :osfamily => 'redhat', :operatingsystem => 'centos', },
-      { :osfamily => 'redhat', :operatingsystem => 'scientific', },
-      { :osfamily => 'redhat', :operatingsystem => 'amazon', },
-      { :osfamily => 'suse',   :operatingsystem => 'suse', },
-      { :osfamily => 'suse',   :operatingsystem => 'opensuse', },
-      { :osfamily => 'gentoo', :operatingsystem => 'gentoo', },
-      { :osfamily => 'linux',  :operatingsystem => 'gentoo', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-        it { should contain_file("/var/nginx/client_body_temp").with(:owner => 'nginx')}
-        it { should contain_file("/var/nginx/proxy_temp").with(:owner => 'nginx')}
-        it { should contain_file("/etc/nginx/nginx.conf").with_content %r{^user nginx;}}
-      end
-    end
-  end
-
-  describe 'os-independent items' do
-
-    let :facts do
-      {
-        :osfamily        => 'debian',
-        :operatingsystem => 'debian',
-      }
-    end
-
-    describe "nginx.conf template content" do
-      [
-        {
-          :title => 'should set worker_processes',
-          :attr  => 'worker_processes',
-          :value => '4',
-          :match => 'worker_processes 4;',
-        },
-        {
-          :title => 'should set worker_rlimit_nofile',
-          :attr  => 'worker_rlimit_nofile',
-          :value => '10000',
-          :match => 'worker_rlimit_nofile 10000;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'nginx_error_log',
-          :value => '/path/to/error.log',
-          :match => 'error_log  /path/to/error.log;',
-        },
-        {
-          :title => 'should set worker_connections',
-          :attr  => 'worker_connections',
-          :value => '100',
-          :match => '  worker_connections 100;',
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'http_access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log  /path/to/access.log;',
-        },
-        {
-          :title => 'should set server_tokens',
-          :attr  => 'server_tokens',
-          :value => 'on',
-          :match => '  server_tokens on;',
-        },
-        {
-          :title => 'should set proxy_cache_path',
-          :attr  => 'proxy_cache_path',
-          :value => '/path/to/proxy.cache',
-          :match => '  proxy_cache_path    /path/to/proxy.cache levels=1 keys_zone=d2:100m max_size=500m inactive=20m;',
-        },
-        {
-          :title    => 'should not set proxy_cache_path',
-          :attr     => 'proxy_cache_path',
-          :value    => false,
-          :notmatch => /  proxy_cache_path    \/path\/to\/proxy\.cache levels=1 keys_zone=d2:100m max_size=500m inactive=20m;/,
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'http_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do { param[:attr].to_sym => param[:value] } end
-
-          it { should contain_file("/etc/nginx/nginx.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/nginx.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/nginx.conf").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "proxy.conf template content" do
-      [
-        {
-          :title => 'should set client_max_body_size',
-          :attr  => 'client_max_body_size',
-          :value => '5m',
-          :match => 'client_max_body_size      5m;',
-        },
-        {
-          :title => 'should set proxy_buffers',
-          :attr  => 'proxy_buffers',
-          :value => '50 5k',
-          :match => 'proxy_buffers           50 5k;',
-        },
-        {
-          :title => 'should set proxy_buffer_size',
-          :attr  => 'proxy_buffer_size',
-          :value => '2k',
-          :match => 'proxy_buffer_size       2k;',
-        },
-        {
-          :title => 'should set proxy_http_version',
-          :attr  => 'proxy_http_version',
-          :value => '1.1',
-          :match => 'proxy_http_version      1.1;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'proxy_set_header',
-          :value => ['header1','header2'],
-          :match => [
-            'proxy_set_header        header1;',
-            'proxy_set_header        header2;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do { param[:attr].to_sym => param[:value] } end
-
-          it { should contain_file("/etc/nginx/conf.d/proxy.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/conf.d/proxy.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/conf.d/proxy.conf").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context "when confd_purge true" do
-      let(:params) {{:confd_purge => true}}
-      it { should contain_file('/etc/nginx/conf.d').with(
-        :purge => true,
-        :recurse => true
-      )}
-    end
-
-    context "when confd_purge false" do
-      let(:params) {{:confd_purge => false}}
-      it { should contain_file('/etc/nginx/conf.d').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-    end
-
-    context "when vhost_purge true" do
-      let(:params) {{:vhost_purge => true}}
-      it { should contain_file('/etc/nginx/sites-available').with(
-        :purge => true,
-        :recurse => true
-      )}
-      it { should contain_file('/etc/nginx/sites-enabled').with(
-        :purge => true,
-        :recurse => true
-      )}
-    end
-
-    context "when vhost_purge false" do
-      let(:params) {{:vhost_purge => false}}
-      it { should contain_file('/etc/nginx/sites-available').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-      it { should contain_file('/etc/nginx/sites-enabled').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb
deleted file mode 100644
index edebfbcdc15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx' do
-  let :params do
-    {
-      :nginx_upstreams => { 'upstream1' => { 'members' => ['localhost:3000']} },
-      :nginx_vhosts    => { 'test2.local' => { 'www_root' => '/' } },
-      :nginx_locations => { 'test2.local' => { 'vhost' => 'test2.local', 'www_root' => '/'} }
-    }
-  end
-
-  shared_examples "a Linux OS" do
-    it { should compile.with_all_deps }
-    it { should contain_class('nginx') }
-    it { should contain_anchor('nginx::begin') }
-    it { should contain_nginx__package.that_requires('Anchor[nginx::begin]') }
-    it { should contain_nginx__config.that_requires('Class[nginx::package]') }
-    it { should contain_nginx__service.that_subscribes_to('Anchor[nginx::begin]') }
-    it { should contain_nginx__service.that_subscribes_to('Class[nginx::package]') }
-    it { should contain_nginx__service.that_subscribes_to('Class[nginx::config]') }
-    it { should contain_anchor('nginx::end').that_requires('Class[nginx::service]') }
-    it { should contain_class("nginx::params") }
-    it { should contain_nginx__resource__upstream("upstream1") }
-    it { should contain_nginx__resource__vhost("test2.local") }
-    it { should contain_nginx__resource__location("test2.local") }
-  end
-
-  context "Debian OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'Debian',
-          :osfamily        => 'Debian',
-          :lsbdistcodename => 'precise',
-        }
-      end
-    end
-  end
-
-  context "RedHat OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'RedHat',
-          :osfamily        => 'RedHat',
-        }
-      end
-    end
-  end
-
-  context "Suse OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'SuSE',
-          :osfamily        => 'Suse',
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb
deleted file mode 100644
index 0ff2ec6cec0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::package' do
-
-  shared_examples 'redhat' do |operatingsystem|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'RedHat' }}
-
-    context "using defaults" do
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/6/$basearch/',
-        'descr'    => 'nginx repo',
-        'enabled'  => '1',
-        'gpgcheck' => '1',
-        'priority' => '1',
-        'gpgkey'   => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::redhat]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::redhat]') }
-    end
-
-    context "manage_repo => false" do
-      let(:params) {{ :manage_repo => false }}
-      it { should contain_package('nginx') }
-      it { should_not contain_yumrepo('nginx-release') }
-      it { should_not contain_file('/etc/yum.repos.d/nginx-release.repo') }
-    end
-
-    context "lsbmajdistrelease = 5" do
-      let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'RedHat', :lsbmajdistrelease => 5 }}
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/5/$basearch/'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-    end
-
-    describe 'installs the requested package version' do
-      let(:facts) {{ :operatingsystem => 'redhat', :osfamily => 'redhat' }}
-      let(:params) {{ :package_ensure => '3.0.0' }}
-
-      it 'installs 3.0.0 exactly' do
-        should contain_package('nginx').with({
-          'ensure' => '3.0.0'
-        })
-      end
-    end
-  end
-
-  shared_examples 'debian' do |operatingsystem, lsbdistcodename|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'Debian', :lsbdistcodename => lsbdistcodename }}
-
-    context "using defaults" do
-      it { should contain_package('nginx') }
-      it { should_not contain_package('passenger') }
-      it { should contain_apt__source('nginx').with(
-        'location'   => "http://nginx.org/packages/#{operatingsystem}",
-        'repos'      => 'nginx',
-        'key'        => '7BD9BF62',
-        'key_source' => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::debian]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::debian]') }
-    end
-
-    context "package_source => 'passenger'" do
-      let(:params) {{ :package_source => 'passenger' }}
-      it { should contain_package('nginx') }
-      it { should contain_package('passenger') }
-      it { should contain_apt__source('nginx').with(
-        'location'   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
-        'repos'      => "main",
-        'key'        => '561F9B9CAC40B2F7',
-        'key_source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt'
-      )}
-    end
-
-    context "manage_repo => false" do
-      let(:params) {{ :manage_repo => false }}
-      it { should contain_package('nginx') }
-      it { should_not contain_apt__source('nginx') }
-      it { should_not contain_package('passenger') }
-    end
-  end
-
-  shared_examples 'suse' do |operatingsystem|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'Suse'}}
-    [
-      'nginx-0.8',
-      'apache2',
-      'apache2-itk',
-      'apache2-utils',
-      'gd',
-      'libapr1',
-      'libapr-util1',
-      'libjpeg62',
-      'libpng14-14',
-      'libxslt',
-      'rubygem-daemon_controller',
-      'rubygem-fastthread',
-      'rubygem-file-tail',
-      'rubygem-passenger',
-      'rubygem-passenger-nginx',
-      'rubygem-rack',
-      'rubygem-rake',
-      'rubygem-spruz',
-    ].each do |package|
-      it { should contain_package("#{package}") }
-    end
-    it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::suse]') }
-    it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::suse]') }
-  end
-
-
-  context 'redhat' do
-    it_behaves_like 'redhat', 'centos'
-    it_behaves_like 'redhat', 'rhel'
-    it_behaves_like 'redhat', 'redhat'
-    it_behaves_like 'redhat', 'scientific'
-    it_behaves_like 'redhat', 'amazon'
-  end
-
-  context 'debian' do
-    it_behaves_like 'debian', 'debian', 'wheezy'
-    it_behaves_like 'debian', 'ubuntu', 'precise'
-  end
-
-  context 'suse' do
-    it_behaves_like 'suse', 'opensuse'
-    it_behaves_like 'suse', 'suse'
-  end
-
-  context 'amazon with facter < 1.7.2' do
-    let(:facts) {{ :operatingsystem => 'Amazon', :osfamily => 'Linux' }}
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/6/$basearch/',
-        'descr'    => 'nginx repo',
-        'enabled'  => '1',
-        'gpgcheck' => '1',
-        'priority' => '1',
-        'gpgkey'   => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::redhat]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::redhat]') }
-  end
-
-  context 'fedora' do
-    # fedora is identical to the rest of osfamily RedHat except for not
-    # including nginx-release
-    let(:facts) {{ :operatingsystem => 'Fedora', :osfamily => 'RedHat', :lsbmajdistrelease => 6 }}
-    it { should contain_package('nginx') }
-    it { should_not contain_yumrepo('nginx-release') }
-    it { should_not contain_file('/etc/yum.repos.d/nginx-release.repo') }
-  end
-
-  context 'other' do
-    let(:facts) {{ :operatingsystem => 'xxx', :osfamily => 'linux' }}
-    it { expect { subject }.to raise_error(Puppet::Error, /Module nginx is not supported on xxx/) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb
deleted file mode 100644
index a813b3a10c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::params' do
-  context "On a Debian OS" do
-    let :facts do {
-      :osfamily        => 'debian',
-      :operatingsystem => 'debian',
-    } end
-
-    it { should contain_nginx__params }
-    it { should have_class_count(1) }    #only nginx::params itself
-    it { should have_resource_count(0) } #params class should never declare resources
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb
deleted file mode 100644
index 300316e5d83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-describe 'nginx::service' do
-
-  let :facts do {
-    :osfamily        => 'Debian',
-    :operatingsystem => 'debian',
-  } end
-
-  let :params do {
-      :configtest_enable => false,
-      :service_restart => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart',
-      :service_ensure => 'running',
-  } end   
-
-  context "using default parameters" do
-
-    it { should contain_service('nginx').with(
-      :ensure     => 'running',
-      :enable     => true,
-      :hasstatus  => true,
-      :hasrestart => true
-    )}
-
-    it { should contain_service('nginx').without_restart }
-
-  end
-
-  describe "when configtest_enable => true" do
-    let(:params) {{ :configtest_enable => true,  :service_restart => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'}}
-    it { should contain_service('nginx').with_restart('/etc/init.d/nginx configtest && /etc/init.d/nginx restart') }
-
-    context "when service_restart => 'a restart command'" do
-      let(:params) {{ :configtest_enable => true, :service_restart => 'a restart command' }}
-      it { should contain_service('nginx').with_restart('a restart command') }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb
deleted file mode 100644
index 23cc8acf34f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb
+++ /dev/null
@@ -1,621 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::location' do
-  let :title do
-    'rspec-test'
-  end
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'debian',
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::params',
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do {
-        :www_root => "/var/www/rspec",
-        :vhost    => 'vhost1',
-      } end
-
-      it { should contain_class("nginx::params") }
-      it { should contain_class("nginx::config") }
-      it { should contain_concat__fragment("vhost1-500-rspec-test").with_content(/location rspec-test/) }
-      it { should_not contain_file('/etc/nginx/fastcgi_params') }
-      it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      it { should_not contain_file("/etc/nginx/rspec-test_htpasswd") }
-    end
-
-    describe "vhost_location_proxy template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set proxy_cache',
-          :attr  => 'proxy_cache',
-          :value => 'value',
-          :match => '    proxy_cache         value;',
-        },
-        {
-          :title    => 'should not set proxy_cache',
-          :attr     => 'proxy_cache',
-          :value    => false,
-          :notmatch => /proxy_cache/
-        },
-        {
-          :title => 'should set proxy_method',
-          :attr  => 'proxy_method',
-          :value => 'value',
-          :match => '    proxy_method        value;',
-        },
-        {
-          :title => 'should set proxy_set_body',
-          :attr  => 'proxy_set_body',
-          :value => 'value',
-          :match => '    proxy_set_body      value;',
-        },
-        {
-          :title => 'should set proxy_pass',
-          :attr  => 'proxy',
-          :value => 'value',
-          :match => '    proxy_pass          value;',
-        },
-        {
-          :title => 'should set proxy_read_timeout',
-          :attr  => 'proxy_read_timeout',
-          :value => 'value',
-          :match => '    proxy_read_timeout  value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1a;',
-            '    test1 test value 1b;',
-            '    test2 test value 2;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :proxy => 'proxy_value', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-
-      context "when proxy_cache_valid is 10m" do
-        let :params do {
-          :location => 'location',
-          :proxy => 'proxy_value',
-          :vhost => 'vhost1',
-          :proxy_cache => 'true',
-          :proxy_cache_valid => '10m',
-        } end
-
-        it { should contain_concat__fragment("vhost1-500-location").with_content(/proxy_cache_valid   10m;/) }
-      end
-    end
-
-    describe "vhost_location_alias template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set alias',
-          :attr  => 'location_alias',
-          :value => 'value',
-          :match => '    alias      value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :location_alias => 'location_alias_value', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_stub_status template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :stub_status => true, :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_fastcgi template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set www_root',
-          :attr  => 'www_root',
-          :value => '/',
-          :match => '    root  /;'
-        },
-        {
-          :title => 'should set fastcgi_split_path',
-          :attr  => 'fastcgi_split_path',
-          :value => 'value',
-          :match => '    fastcgi_split_path_info value;'
-        },
-        {
-          :title => 'should set try_file(s)',
-          :attr  => 'try_files',
-          :value => ['name1','name2'],
-          :match => '    try_files name1 name2;',
-        },
-        {
-          :title => 'should set fastcgi_params',
-          :attr  => 'fastcgi_params',
-          :value => 'value',
-          :match => '    include value;'
-        },
-        {
-          :title => 'should set fastcgi_pass',
-          :attr  => 'fastcgi',
-          :value => 'value',
-          :match => '    fastcgi_pass value;'
-        },
-        {
-          :title => 'should set fastcgi_param',
-          :attr  => 'fastcgi_script',
-          :value => 'value',
-          :match => '    fastcgi_param SCRIPT_FILENAME value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :fastcgi => 'localhost:9000', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(/#{item}/)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_directory template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should set the allow directive',
-          :attr  => 'location_allow',
-          :value => ['rule1','rule2'],
-          :match => ['    allow rule1;', '    allow rule2;'],
-        },
-        {
-          :title => 'should set the deny directive',
-          :attr  => 'location_deny',
-          :value => ['rule1','rule2'],
-          :match => ['    deny rule1;', '    deny rule2;'],
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set www_root',
-          :attr  => 'www_root',
-          :value => '/',
-          :match => '    root  /;'
-        },
-        {
-          :title => 'should set try_file(s)',
-          :attr  => 'try_files',
-          :value => ['name1','name2'],
-          :match => '    try_files name1 name2;',
-        },
-        {
-          :title => 'should set index_file(s)',
-          :attr  => 'index_files',
-          :value => ['name1','name2'],
-          :match => '    index  name1 name2;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '    auth_basic           "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '    auth_basic_user_file value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :www_root => '/var/www/root', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_empty template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered config directives',
-          :attr  => 'location_custom_cfg',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1a;',
-            '    test1 test value 1b;',
-            '    test2 test value 2;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :location_custom_cfg => {'test1'=>'value1'}, :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      context 'when fastcgi => "localhost:9000"' do
-        let :params do { :fastcgi => 'localhost:9000', :vhost => 'vhost1' } end
-
-        it { should contain_file('/etc/nginx/fastcgi_params').with_mode('0770') }
-      end
-
-      context 'when ssl_only => true' do
-        let :params do { :ssl_only => true, :vhost => 'vhost1', :www_root => '/', } end
-        it { should_not contain_concat__fragment("vhost1-500-rspec-test") }
-      end
-
-      context 'when ssl_only => false' do
-        let :params do { :ssl_only => false, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_concat__fragment("vhost1-500-rspec-test") }
-      end
-
-      context 'when ssl => true' do
-        let :params do { :ssl => true, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      end
-
-      context 'when ssl => false' do
-        let :params do { :ssl => false, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      end
-
-      context 'when auth_basic_user_file => true' do
-        let :params do { :auth_basic_user_file => '/path/to/file', :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_file("/etc/nginx/rspec-test_htpasswd") }
-      end
-
-      context 'when ensure => absent' do
-        let :params do {
-          :www_root             => '/',
-          :vhost                => 'vhost1',
-          :ensure               => 'absent',
-          :ssl                  => true,
-          :auth_basic_user_file => '/path/to/file',
-        } end
-
-        it { should contain_file("/etc/nginx/rspec-test_htpasswd").with_ensure('absent') }
-      end
-
-      context "vhost missing" do
-        let :params do {
-          :www_root => '/',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without attaching to a virtual host/) }
-      end
-
-      context "location type missing" do
-        let :params do {
-          :vhost => 'vhost1',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, stub_status, or location_custom_cfg defined/) }
-      end
-
-      context "www_root and proxy are set" do
-        let :params do {
-          :vhost    => 'vhost1',
-          :www_root => '/',
-          :proxy    => 'http://localhost:8000/uri/',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot define both directory and proxy in a virtual host/) }
-      end
-
-      context 'when vhost name is sanitized' do
-        let :title do 'www.rspec-location.com' end
-        let :params do {
-          :vhost => 'www rspec-vhost com',
-          :www_root => '/',
-          :ssl => true,
-        } end
-
-        it { should contain_concat__fragment("www_rspec-vhost_com-500-www.rspec-location.com").with_target('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-        it { should contain_concat__fragment("www_rspec-vhost_com-800-www.rspec-location.com-ssl").with_target('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb
deleted file mode 100644
index e59adfdabb5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb
+++ /dev/null
@@ -1,401 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::mailhost' do
-  let :title do
-    'www.rspec.example.com'
-  end
-  let :facts do
-    {
-      :osfamily        => 'debian',
-      :operatingsystem => 'debian',
-      :ipaddress6      => '::',
-    }
-  end
-  let :default_params do
-    {
-      :listen_port => 25,
-      :ipv6_enable => true,
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("nginx::config") }
-      it { should contain_concat("/etc/nginx/conf.mail.d/#{title}.conf").with({
-        'owner' => 'root',
-        'group' => 'root',
-        'mode'  => '0644',
-      })}
-      it { should contain_concat__fragment("#{title}-header") }
-      it { should_not contain_concat__fragment("#{title}-ssl") }
-    end
-
-    describe "mailhost template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen                127.0.0.1:25;',
-        },
-        {
-          :title => 'should set the IPv4 listen port',
-          :attr  => 'listen_port',
-          :value => 45,
-          :match => '  listen                *:45;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'spdy default',
-          :match => '  listen                *:25 spdy default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should set protocol',
-          :attr  => 'protocol',
-          :value => 'test-protocol',
-          :match => '  protocol              test-protocol;',
-        },
-        {
-          :title => 'should set xclient',
-          :attr  => 'xclient',
-          :value => 'test-xclient',
-          :match => '  xclient               test-xclient;',
-        },
-        {
-          :title => 'should set auth_http',
-          :attr  => 'auth_http',
-          :value => 'test-auth_http',
-          :match => '  auth_http             test-auth_http;',
-        },
-        {
-          :title => 'should set starttls',
-          :attr  => 'starttls',
-          :value => 'on',
-          :match => '  starttls              on;',
-        },
-        {
-          :title => 'should set starttls',
-          :attr  => 'starttls',
-          :value => 'only',
-          :match => '  starttls              only;',
-        },
-        {
-          :title    => 'should not enable SSL',
-          :attr     => 'starttls',
-          :value    => 'off',
-          :notmatch => /  ssl_session_timeout  5m;/,
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :ipv6_enable => true,
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "mailhost template content (SSL enabled)" do
-      [
-        {
-          :title => 'should enable SSL',
-          :attr  => 'starttls',
-          :value => 'on',
-          :match => '  ssl_session_timeout  5m;',
-        },
-        {
-          :title => 'should enable SSL',
-          :attr  => 'starttls',
-          :value => 'only',
-          :match => '  ssl_session_timeout  5m;',
-        },
-        {
-          :title    => 'should not enable SSL',
-          :attr     => 'starttls',
-          :value    => 'off',
-          :notmatch => /  ssl_session_timeout  5m;/,
-        },
-        {
-          :title => 'should set ssl_certificate',
-          :attr  => 'ssl_cert',
-          :value => 'test-ssl-cert',
-          :match => '  ssl_certificate      test-ssl-cert;',
-        },
-        {
-          :title => 'should set ssl_certificate_key',
-          :attr  => 'ssl_key',
-          :value => 'test-ssl-cert-key',
-          :match => '  ssl_certificate_key  test-ssl-cert-key;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :starttls    => 'on',
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "mailhost_ssl template content" do
-      [
-        {
-          :title => 'should set the IPv4 SSL listen port',
-          :attr  => 'ssl_port',
-          :value => '45',
-          :match => '  listen       45;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should set protocol',
-          :attr  => 'protocol',
-          :value => 'test-protocol',
-          :match => '  protocol              test-protocol;',
-        },
-        {
-          :title => 'should set xclient',
-          :attr  => 'xclient',
-          :value => 'test-xclient',
-          :match => '  xclient               test-xclient;',
-        },
-        {
-          :title => 'should set auth_http',
-          :attr  => 'auth_http',
-          :value => 'test-auth_http',
-          :match => '  auth_http             test-auth_http;',
-        },
-        {
-          :title => 'should set ssl_certificate',
-          :attr  => 'ssl_cert',
-          :value => 'test-ssl-cert',
-          :match => '  ssl_certificate      test-ssl-cert;',
-        },
-        {
-          :title => 'should set ssl_certificate_key',
-          :attr  => 'ssl_key',
-          :value => 'test-ssl-cert-key',
-          :match => '  ssl_certificate_key  test-ssl-cert-key;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :ipv6_enable => true,
-            :ssl         => true,
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-ssl") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      context "SSL cert missing and ssl => true" do
-        let :params do default_params.merge({
-          :ssl     => true,
-          :ssl_key => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and ssl => true" do
-        let :params do default_params.merge({
-          :ssl      => true,
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL cert missing and starttls => 'on'" do
-        let :params do default_params.merge({
-          :starttls => 'on',
-          :ssl_key  => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and starttls => 'on'" do
-        let :params do default_params.merge({
-          :starttls => 'on',
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL cert missing and starttls => 'only'" do
-        let :params do default_params.merge({
-          :starttls => 'only',
-          :ssl_key  => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and starttls => 'only'" do
-        let :params do default_params.merge({
-          :starttls => 'only',
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context 'when listen_port != ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 443,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-      end
-
-      context 'when listen_port == ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 80,
-        }) end
-
-        it { should_not contain_concat__fragment("#{title}-header") }
-      end
-
-      context 'when ssl => true' do
-        let :params do default_params.merge({
-          :ensure   => 'absent',
-          :ssl      => true,
-          :ssl_key  => 'dummy.key',
-          :ssl_cert => 'dummy.cert',
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should contain_concat__fragment("#{title}-ssl") }
-      end
-
-      context 'when ssl => false' do
-        let :params do default_params.merge({
-          :ensure => 'absent',
-          :ssl    => false,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should_not contain_concat__fragment("#{title}-ssl") }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb
deleted file mode 100644
index 8423eb43765..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::upstream' do
-  let :title do
-    'upstream-test'
-  end
-
-  let :default_params do
-    {
-      :members => ['test'],
-    }
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-
-      it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with(
-        {
-          'owner'   => 'root',
-          'group'   => 'root',
-          'mode'    => '0644',
-          'ensure'  => 'file',
-          'content' => /upstream #{title}/,
-        }
-      )}
-    end
-
-    describe "upstream.conf template content" do
-      [
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'upstream_cfg_prepend',
-          :value => {
-            'test3' => 'test value 3',
-            'test1' => 'test value 1',
-            'test2' => 'test value 2',
-            'test4' => ['test value 1', 'test value 2'],
-            'test5' => {'subkey1' => 'subvalue1'},
-            'test6' => {'subkey1' => ['subvalue1', 'subvalue2']},
-          },
-          :match => [
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-            '  test3 test value 3;',
-            '  test4 test value 1;',
-            '  test4 test value 2;',
-            '  test5 subkey1 subvalue1;',
-            '  test6 subkey1 subvalue1;',
-            '  test6 subkey1 subvalue2;',
-          ],
-        },
-        {
-          :title => 'should set server',
-          :attr  => 'members',
-          :value => [
-            'test3',
-            'test1',
-            'test2',
-          ],
-          :match => [
-            '  server     test3  fail_timeout=10s;',
-            '  server     test1  fail_timeout=10s;',
-            '  server     test2  fail_timeout=10s;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/conf.d/#{title}-upstream.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").without_content(item)
-            end
-          end
-        end
-      end
-
-      context 'when ensure => absent' do
-        let :params do default_params.merge(
-          {
-            :ensure => 'absent'
-          }
-        ) end
-
-        it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_ensure('absent') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb
deleted file mode 100644
index 9d4ef3d903b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb
+++ /dev/null
@@ -1,647 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::vhost' do
-  let :title do
-    'www.rspec.example.com'
-  end
-  let :default_params do
-    {
-      :www_root    => '/',
-      :ipv6_enable => true,
-    }
-  end
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'debian',
-      :ipaddress6      => '::',
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::params',
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("nginx::params") }
-      it { should contain_class("nginx::config") }
-      it { should contain_concat("/etc/nginx/sites-available/#{title}.conf").with({
-        'owner' => 'root',
-        'group' => 'root',
-        'mode'  => '0644',
-      })}
-      it { should contain_concat__fragment("#{title}-header").with_content(%r{access_log[ ]+/var/log/nginx/www\.rspec\.example\.com\.access\.log}) }
-      it { should contain_concat__fragment("#{title}-header").with_content(%r{error_log[ ]+/var/log/nginx/www\.rspec\.example\.com\.error\.log}) }
-      it { should contain_concat__fragment("#{title}-footer") }
-      it { should contain_nginx__resource__location("#{title}-default") }
-      it { should_not contain_file("/etc/nginx/fastcgi_params") }
-      it { should contain_file("#{title}.conf symlink").with({
-        'ensure' => 'link',
-        'path'   => "/etc/nginx/sites-enabled/#{title}.conf",
-        'target' => "/etc/nginx/sites-available/#{title}.conf"
-      })}
-    end
-
-    describe "vhost_header template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen                127.0.0.1:80;',
-        },
-        {
-          :title => 'should set the IPv4 listen port',
-          :attr  => 'listen_port',
-          :value => 45,
-          :match => '  listen                *:45;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'spdy default',
-          :match => '  listen                *:80 spdy default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => '  server_name           rspec.example.com;',
-        },
-        {
-          :title => 'should not rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => false,
-          :match => '  server_name           www.rspec.example.com;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '  auth_basic           "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '  auth_basic_user_file value;',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'vhost_cfg_prepend',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1a;',
-            '  test1 test value 1b;',
-            '  test2 test value 2;',
-          ],
-        },
-        {
-          :title => 'should set root',
-          :attr  => 'use_default_location',
-          :value => false,
-          :match => '  root /;',
-        },
-        {
-          :title    => 'should not set root',
-          :attr     => 'use_default_location',
-          :value    => true,
-          :notmatch => /  root \/;/,
-        },
-        {
-          :title => 'should set proxy_set_header',
-          :attr  => 'proxy_set_header',
-          :value => ['header1','header2'],
-          :match => [
-            '  proxy_set_header        header1;',
-            '  proxy_set_header        header2;',
-          ],
-        },
-        {
-          :title => 'should rewrite to HTTPS',
-          :attr  => 'rewrite_to_https',
-          :value => true,
-          :match => [
-            '  if ($ssl_protocol = "") {',
-            '       return 301 https://$host$request_uri;',
-          ],
-        },
-        {
-          :title    => 'should not rewrite to HTTPS',
-          :attr     => 'rewrite_to_https',
-          :value    => false,
-          :notmatch => [
-            /if \(\$ssl_protocol = ""\) \{/,
-            /       return 301 https:\/\/\$host\$request_uri;/,
-          ],
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log            /path/to/access.log;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'error_log',
-          :value => '/path/to/error.log',
-          :match => '  error_log             /path/to/error.log;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_footer template content" do
-      [
-        {
-          :title => 'should contain include directives',
-          :attr  => 'include_files',
-          :value => [ '/file1', '/file2' ],
-          :match => [
-            'include /file1;',
-            'include /file2;',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'vhost_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ],
-        },
-        {
-          :title => 'should contain www to non-www rewrite',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => [
-            '  listen                *:80;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ http://rspec.example.com$uri permanent;',
-          ],
-        },
-        {
-          :title    => 'should not contain www to non-www rewrite',
-          :attr     => 'rewrite_www_to_non_www',
-          :value    => false,
-          :notmatch => [
-            /  listen                \*:80;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ http:\/\/rspec\.example\.com\$uri permanent;/,
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-footer") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-footer").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-footer").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_ssl_header template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen       127.0.0.1:443 ssl;',
-        },
-        {
-          :title => 'should set the IPv4 SSL listen port',
-          :attr  => 'ssl_port',
-          :value => 45,
-          :match => '  listen       *:45 ssl;',
-        },
-        {
-          :title => 'should set SPDY',
-          :attr  => 'spdy',
-          :value => 'on',
-          :match => '  listen       *:443 ssl spdy;',
-        },
-        {
-          :title => 'should not set SPDY',
-          :attr  => 'spdy',
-          :value => 'off',
-          :match => '  listen       *:443 ssl;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'default',
-          :match => '  listen       *:443 ssl default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:443 ssl default ipv6only=on;',
-        },
-        {
-          :title    => 'should disable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:443 ssl default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:443 ssl default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ssl_port',
-          :value => 45,
-          :match => '  listen [::]:45 ssl default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy default',
-          :match => '  listen [::]:443 ssl spdy default;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name  name1 name2;',
-        },
-        {
-          :title => 'should rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => '  server_name  rspec.example.com;',
-        },
-        {
-          :title => 'should not rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => false,
-          :match => '  server_name  www.rspec.example.com;',
-        },
-        {
-          :title => 'should set the SSL cache',
-          :attr  => 'ssl_cache',
-          :value => 'shared:SSL:1m',
-          :match => '  ssl_session_cache         shared:SSL:1m;',
-        },
-        {
-          :title => 'should set the SSL protocols',
-          :attr  => 'ssl_protocols',
-          :value => 'SSLv3',
-          :match => '  ssl_protocols             SSLv3;',
-        },
-        {
-          :title => 'should set the SSL ciphers',
-          :attr  => 'ssl_ciphers',
-          :value => 'HIGH',
-          :match => '  ssl_ciphers               HIGH;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '  auth_basic                "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '  auth_basic_user_file      "value";',
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log            /path/to/access.log;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'error_log',
-          :value => '/path/to/error.log',
-          :match => '  error_log             /path/to/error.log;',
-        },
-        {
-          :title => 'should contain ordered prepend directives',
-          :attr  => 'vhost_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should contain ordered ssl prepend directives',
-          :attr  => 'vhost_cfg_ssl_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should set root',
-          :attr  => 'use_default_location',
-          :value => false,
-          :match => '  root /;',
-        },
-        {
-          :title    => 'should not set root',
-          :attr     => 'use_default_location',
-          :value    => true,
-          :notmatch => /  root \/;/,
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :ssl                => true,
-            :ssl_key            => 'dummy.key',
-            :ssl_cert           => 'dummy.crt',
-          }) end
-          it { should contain_concat__fragment("#{title}-ssl-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_ssl_footer template content" do
-      [
-        {
-          :title => 'should contain include directives',
-          :attr  => 'include_files',
-          :value => [ '/file1', '/file2' ],
-          :match => [
-            'include /file1;',
-            'include /file2;',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'vhost_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-          ]
-        },
-        {
-          :title => 'should contain ordered ssl appended directives',
-          :attr  => 'vhost_cfg_ssl_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should contain www to non-www rewrite',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => [
-            '  listen                *:443 ssl;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ https://rspec.example.com$uri permanent;',
-          ],
-        },
-        {
-          :title    => 'should not contain www to non-www rewrite',
-          :attr     => 'rewrite_www_to_non_www',
-          :value    => false,
-          :notmatch => [
-            /  listen                \*:443 ssl;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ https:\/\/rspec\.example\.com\$uri permanent;/,
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :ssl                => true,
-            :ssl_key            => 'dummy.key',
-            :ssl_cert           => 'dummy.crt',
-          }) end
-
-          it { should contain_concat__fragment("#{title}-ssl-footer") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl-footer").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl-footer").without_content(item)
-            end
-          end
-        end
-      end
-    end
-    context 'attribute resources' do
-      context "SSL cert missing" do
-        let(:params) {{ :ssl => true, :ssl_key => 'key' }}
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing" do
-        let(:params) {{ :ssl => true, :ssl_cert => 'cert' }}
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context 'when use_default_location => true' do
-        let :params do default_params.merge({
-          :use_default_location => true,
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default") }
-      end
-
-      context 'when use_default_location => false' do
-        let :params do default_params.merge({
-          :use_default_location => false,
-        }) end
-
-        it { should_not contain_nginx__resource__location("#{title}-default") }
-      end
-
-      context 'when location_cfg_prepend => { key => value }' do
-        let :params do default_params.merge({
-          :location_cfg_prepend => { 'key' => 'value' },
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_location_cfg_prepend({ 'key' => 'value' }) }
-      end
-
-      context 'when location_cfg_append => { key => value }' do
-        let :params do default_params.merge({
-          :location_cfg_append => { 'key' => 'value' },
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_location_cfg_append({ 'key' => 'value' }) }
-      end
-
-      context 'when fastcgi => "localhost:9000"' do
-        let :params do default_params.merge({
-          :fastcgi => 'localhost:9000',
-        }) end
-
-        it { should contain_file('/etc/nginx/fastcgi_params').with_mode('0770') }
-      end
-
-      context 'when listen_port == ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 80,
-        }) end
-
-        it { should_not contain_concat__fragment("#{title}-header") }
-        it { should_not contain_concat__fragment("#{title}-footer") }
-      end
-
-      context 'when listen_port != ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 443,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should contain_concat__fragment("#{title}-footer") }
-      end
-
-      context 'when ensure => absent' do
-        let :params do default_params.merge({
-          :ensure   => 'absent',
-          :ssl      => true,
-          :ssl_key  => 'dummy.key',
-          :ssl_cert => 'dummy.cert',
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_ensure('absent') }
-        it { should contain_file("#{title}.conf symlink").with_ensure('absent') }
-      end
-
-      context 'when ssl => true and ssl_port == listen_port' do
-        let :params do default_params.merge({
-          :ssl         => true,
-          :listen_port => 80,
-          :ssl_port    => 80,
-          :ssl_key     => 'dummy.key',
-          :ssl_cert    => 'dummy.cert',
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_ssl_only(true) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content(%r{access_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.access\.log}) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content(%r{error_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.error\.log}) }
-        it { should contain_concat__fragment("#{title}-ssl-footer") }
-        it { should contain_file("/etc/nginx/#{title}.crt") }
-        it { should contain_file("/etc/nginx/#{title}.key") }
-      end
-
-      context 'when passenger_cgi_param is set' do
-        let :params do default_params.merge({
-          :passenger_cgi_param => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'test3' => 'test value 3' }
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test1 test value 1;/ ) }
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test2 test value 2;/ ) }
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test3 test value 3;/ ) }
-      end
-
-      context 'when passenger_cgi_param is set and ssl => true' do
-        let :params do default_params.merge({
-          :passenger_cgi_param => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'test3' => 'test value 3' },
-          :ssl                 => true,
-          :ssl_key             => 'dummy.key',
-          :ssl_cert            => 'dummy.cert',
-        }) end
-
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test1 test value 1;/ ) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test2 test value 2;/ ) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test3 test value 3;/ ) }
-      end
-
-      context 'when vhost name is sanitized' do
-        let :title do 'www rspec-vhost com' end
-        let :params do default_params end
-
-        it { should contain_concat('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb
deleted file mode 100644
index a987b6e6caa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.default_facts = {
-    :kernel          => 'Linux',
-    :concat_basedir  => '/var/lib/puppet/concat',
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb
deleted file mode 100644
index bfb7271d0a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'nginx')
-    shell('puppet module install puppetlabs-apt')
-    shell('puppet module install puppetlabs-stdlib')
-    shell('puppet module install puppetlabs-concat')
-
-    # Fake keys.
-    # Valid self-signed SSL key with 10 year expiry.
-    # Required for nginx to start when SSL enabled
-    shell('echo "-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOPchwRZRF4KmU6E
-g7C6Pq9zhdLiQt9owdcLZNiZS+UVRQjeDHSy3titzh5YwSoQonlnSqd0g/PJ6kNA
-O3CNOMVuzAddnAaHzW1J4Rt6sZwOuidtJC4t/hFCgz5NqOMgYOOfratQx00A7ZXK
-TXMgNG79lDP5L/N06Ox53sOxhy4hAgMBAAECgYEAlfktCKi0fe0d8Hb5slUzMwmn
-GCECAMeTZbXDH2jucg4ozOhRbHHaiOUEmCa0pLokJiHdGhBvVQMd5Dufo7nflZzE
-mpZY0lCZE7HSeK6Bcbru/8w3vm3iBQTGK+MCaDtH5nQU7m/3cOXaenOX0ZmsTzRs
-QE/V84S1fuO8bBPSz20CQQD9d4LxrBByosFxRdHsTb/nnqx/rzLEf4M3MC7uydPv
-fDDbSRRSYpNxonQJfU3JrOk1WPWoXY30VQCv395s57X7AkEA5iOBT+ME8/PxuUUC
-ZDjg21tAdkaiCQ5kgeVTmkD1k/gTwreOV2AexWGrrcW/MLaIhpDCpQkw37y5vrYw
-UyDdkwJAAU+j8sIUF7O10nMtAc7pJjaQ59wtJA0QzbFHHN8YZI285vV60G5IGvdf
-KElopJlrX2ZFZwiM2m2yIjbDPMb6DwJAbNoiUbzZHOInVTA0316fzGEu7kKeZZYv
-J9lmX7GV9nUCM7lKVD2ckFOQNlMwCURs8ukJh7H/MfQ8Dt5xoQAMjQJBAOWpK6k6
-b0fTREZFZRGZBJcSu959YyMzhpSFA+lXkLNTWX8j1/D88H731oMSImoQNWcYx2dH
-sCwOCDqu1nZ2LJ8=
------END PRIVATE KEY-----" > /tmp/blah.key')
-    shell('echo "-----BEGIN CERTIFICATE-----
-MIIDRjCCAq+gAwIBAgIJAL9m0V4sHW2tMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
-VQQGEwItLTESMBAGA1UECAwJU29tZVN0YXRlMREwDwYDVQQHDAhTb21lQ2l0eTEZ
-MBcGA1UECgwQU29tZU9yZ2FuaXphdGlvbjEfMB0GA1UECwwWU29tZU9yZ2FuaXph
-dGlvbmFsVW5pdDEeMBwGA1UEAwwVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJ
-KoZIhvcNAQkBFhpyb290QGxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xMzExMzAw
-NzA3NDlaFw0yMzExMjgwNzA3NDlaMIG7MQswCQYDVQQGEwItLTESMBAGA1UECAwJ
-U29tZVN0YXRlMREwDwYDVQQHDAhTb21lQ2l0eTEZMBcGA1UECgwQU29tZU9yZ2Fu
-aXphdGlvbjEfMB0GA1UECwwWU29tZU9yZ2FuaXphdGlvbmFsVW5pdDEeMBwGA1UE
-AwwVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJKoZIhvcNAQkBFhpyb290QGxv
-Y2FsaG9zdC5sb2NhbGRvbWFpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-49yHBFlEXgqZToSDsLo+r3OF0uJC32jB1wtk2JlL5RVFCN4MdLLe2K3OHljBKhCi
-eWdKp3SD88nqQ0A7cI04xW7MB12cBofNbUnhG3qxnA66J20kLi3+EUKDPk2o4yBg
-45+tq1DHTQDtlcpNcyA0bv2UM/kv83To7Hnew7GHLiECAwEAAaNQME4wHQYDVR0O
-BBYEFP5Kkot/7pStLaYPtT+vngE0v6N8MB8GA1UdIwQYMBaAFP5Kkot/7pStLaYP
-tT+vngE0v6N8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAwYYQKVRN
-HaHIWGMBuXApE7t4PNdYWZ5Y56tI+HT59yVoDjc1YSnuzkKlWUPibVYoLpX/ROKr
-aIZ8kxsBjLvpi9KQTHi7Wl6Sw3ecoYdKy+2P8S5xOIpWjs8XVmOWf7Tq1+9KPv3z
-HLw/FDCzntkdq3G4em15CdFlO9BTY4HXiHU=
------END CERTIFICATE-----" > /tmp/blah.cert')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb
deleted file mode 100644
index 775c8b65435..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_system'
-
-# Here we put the more basic fundamental tests, ultra obvious stuff.
-describe "basic tests:" do
-  context 'make sure we have copied the module across' do
-    # No point diagnosing any more if the module wasn't copied properly
-    context shell 'ls /etc/puppet/modules/nginx' do
-      its(:stdout) { should =~ /Modulefile/ }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-  end
-
-  #puppet smoke test
-  context puppet_apply 'notice("foo")' do
-    its(:stdout) { should =~ /foo/ }
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should be_zero }
-  end
-
-  it 'nginx class should work with no errors' do
-    pp = <<-EOS
-      class { 'nginx': }
-    EOS
-
-    # Run it twice and test for idempotency
-    puppet_apply(pp) do |r|
-      [0,2].should include(r.exit_code)
-      r.refresh
-      r.exit_code.should be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb
deleted file mode 100644
index d8eff7c418d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx class:" do
-  case node.facts['osfamily']
-  when 'RedHat'
-    package_name = 'nginx'
-  when 'Debian'
-    package_name = 'nginx'
-  when 'Suse'
-    package_name = 'nginx-0.8'
-  end
-
-  context 'should run successfully' do
-    it 'should run successfully' do
-      pp = "class { 'nginx': }"
-
-      puppet_apply(pp) do |r|
-        #r.stderr.should be_empty
-        [0,2].should include r.exit_code
-        r.refresh
-        #r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe package(package_name) do
-    it { should be_installed }
-  end
-
-  describe service('nginx') do
-    it { should be_running }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb
deleted file mode 100644
index e8cce6cf1c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::mailhost define:" do
-  it 'should run successfully' do
-
-    pp = "
-    class { 'nginx':
-      mail => true,
-    }
-    nginx::resource::vhost { 'www.puppetlabs.com':
-      ensure   => present,
-      www_root => '/var/www/www.puppetlabs.com',
-    }
-    nginx::resource::mailhost { 'domain1.example':
-      ensure      => present,
-      auth_http   => 'localhost/cgi-bin/auth',
-      protocol    => 'smtp',
-      listen_port => 587,
-      ssl_port    => 465,
-      xclient     => 'off',
-    }
-    "
-
-    puppet_apply(pp) do |r|
-      [0,2].should include r.exit_code
-      r.refresh
-      # Not until deprecated variables fixed.
-      #r.stderr.should be_empty
-      r.exit_code.should be_zero
-    end
-  end
-
-  describe file('/etc/nginx/conf.mail.d/domain1.example.conf') do
-   it { should be_file }
-   it { should contain "auth_http             localhost/cgi-bin/auth;" }
-  end
-
-  describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-    it { should be_file }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb
deleted file mode 100644
index 09b18856553..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::upstream define:" do
-  it 'should run successfully' do
-
-    pp = "
-    class { 'nginx': }
-    nginx::resource::upstream { 'puppet_rack_app':
-      ensure  => present,
-      members => [
-        'localhost:3000',
-        'localhost:3001',
-        'localhost:3002',
-      ],
-    }
-    nginx::resource::vhost { 'rack.puppetlabs.com':
-      ensure => present,
-      proxy  => 'http://puppet_rack_app',
-    }
-    "
-
-    puppet_apply(pp) do |r|
-      [0,2].should include r.exit_code
-      r.refresh
-      r.stderr.should be_empty
-      r.exit_code.should be_zero
-    end
-  end
-
-  describe file('/etc/nginx/conf.d/puppet_rack_app-upstream.conf') do
-   it { should be_file }
-   it { should contain "server     localhost:3000" }
-   it { should contain "server     localhost:3001" }
-   it { should contain "server     localhost:3002" }
-   it { should_not contain "server     localhost:3003" }
-  end
-
-  describe file('/etc/nginx/sites-available/rack.puppetlabs.com.conf') do
-    it { should be_file }
-    it { should contain "proxy_pass          http://puppet_rack_app;" }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb
deleted file mode 100644
index d4f34467691..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::vhost define:" do
-  context 'new vhost on port 80' do
-    it 'should configure a nginx vhost' do
-
-      pp = "
-      class { 'nginx': }
-      nginx::resource::vhost { 'www.puppetlabs.com':
-        ensure   => present,
-        www_root => '/var/www/www.puppetlabs.com',
-      }
-      host { 'www.puppetlabs.com': ip => '127.0.0.1', }
-      file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
-      file { '/var/www/www.puppetlabs.com/index.html': ensure  => file, content => 'Hello from www\n', }
-      "
-
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-      it { should be_file }
-      it { should contain "www.puppetlabs.com" }
-    end
-
-    describe file('/etc/nginx/sites-enabled/www.puppetlabs.com.conf') do
-      it { should be_linked_to '/etc/nginx/sites-available/www.puppetlabs.com.conf' }
-    end
-
-    describe service('nginx') do
-      it { should be_running }
-    end
-
-    it 'should answer to www.puppetlabs.com' do
-      shell("/usr/bin/curl http://www.puppetlabs.com:80") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  context 'should run successfully with ssl' do
-    it 'should configure a nginx SSL vhost' do
-
-      pp = "
-      class { 'nginx': }
-      nginx::resource::vhost { 'www.puppetlabs.com':
-        ensure   => present,
-        ssl      => true,
-        ssl_cert => '/tmp/blah.cert',
-        ssl_key  => '/tmp/blah.key',
-        www_root => '/var/www/www.puppetlabs.com',
-      }
-      host { 'www.puppetlabs.com': ip => '127.0.0.1', }
-      file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
-      file { '/var/www/www.puppetlabs.com/index.html': ensure  => file, content => 'Hello from www\n', }
-      "
-
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-      it { should be_file }
-      it { should contain "ssl on;" }
-    end
-
-    describe file('/etc/nginx/sites-enabled/www.puppetlabs.com.conf') do
-      it { should be_linked_to '/etc/nginx/sites-available/www.puppetlabs.com.conf' }
-    end
-
-    describe service('nginx') do
-      it { should be_running }
-    end
-
-    it 'should answer to http://www.puppetlabs.com' do
-      shell("/usr/bin/curl http://www.puppetlabs.com:80") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should == 0
-      end
-    end
-
-    it 'should answer to https://www.puppetlabs.com' do
-      # use --insecure because it's a self-signed cert
-      shell("/usr/bin/curl --insecure https://www.puppetlabs.com:443") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb
deleted file mode 100644
index 62e49e2a31d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-user <%= scope.lookupvar('nginx::config::nx_daemon_user') %>;
-worker_processes <%= @worker_processes %>;
-worker_rlimit_nofile <%= @worker_rlimit_nofile %>;
-
-error_log  <%= @nginx_error_log %>;
-pid        <%= scope.lookupvar('nginx::params::nx_pid')%>;
-
-events {
-  worker_connections <%= @worker_connections -%>;
-<% if scope.lookupvar('nginx::params::nx_multi_accept') == 'on' %>multi_accept on;<% end -%>
-<% if scope.lookupvar('nginx::params::nx_events_use') %>use <%= scope.lookupvar('nginx::params::nx_events_use')%>;<% end -%>
-}
-
-http {
-  include       <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/mime.types;
-  default_type  application/octet-stream;
-
-  access_log  <%= @http_access_log %>;
-
-  sendfile    <%= scope.lookupvar('nginx::params::nx_sendfile')%>;
-
-  server_tokens <%= @server_tokens %>;
-
-  types_hash_max_size <%= scope.lookupvar('nginx::params::nx_types_hash_max_size')%>;
-  types_hash_bucket_size <%= scope.lookupvar('nginx::params::nx_types_hash_bucket_size')%>;
-
-  server_names_hash_bucket_size <%= @names_hash_bucket_size %>;
-  server_names_hash_max_size <%= @names_hash_max_size %>;
-
-  keepalive_timeout  <%= scope.lookupvar('nginx::params::nx_keepalive_timeout')%>;
-  tcp_nodelay        <%= scope.lookupvar('nginx::params::nx_tcp_nodelay')%>;
-
-<% if @gzip == 'on' %>
-  gzip         on;
-  gzip_disable "MSIE [1-6]\.(?!.*SV1)";
-<% end -%>
-
-<% if @proxy_cache_path -%>
-  proxy_cache_path    <%= @proxy_cache_path %> levels=<%= @proxy_cache_levels %> keys_zone=<%= @proxy_cache_keys_zone %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %>;
-<% end -%>
-
-<% if @http_cfg_append -%><% @http_cfg_append.sort_by{|k,v| k}.each do |key,value| -%>
-  <%= key %> <%= value %>;
-<% end -%>
-<% end -%>
-
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.d/*.conf;
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/sites-enabled/*;
-
-}
-<% if scope.lookupvar('nginx::mail') %>
-mail {
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.mail.d/*.conf;
-}
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb
deleted file mode 100644
index fcd7e1d5b92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-proxy_redirect          <%= scope.lookupvar('nginx::params::nx_proxy_redirect') %>;
-client_max_body_size      <%= @client_max_body_size %>;
-client_body_buffer_size <%= scope.lookupvar('nginx::params::nx_client_body_buffer_size') %>;
-proxy_connect_timeout   <%= scope.lookupvar('nginx::params::nx_proxy_connect_timeout') %>;
-proxy_send_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_send_timeout') %>;
-proxy_read_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_read_timeout') %>;
-proxy_buffers           <%= @proxy_buffers %>;
-proxy_buffer_size       <%= @proxy_buffer_size %>;
-proxy_http_version      <%= @proxy_http_version %>;
-<% @proxy_set_header.each do |header| %>
-proxy_set_header        <%= header %>;<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb
deleted file mode 100644
index a96121ab228..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream <%= @name %> {
-<% if @upstream_cfg_prepend -%><% @upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| %>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  <% @members.each do |i| %>
-  server     <%= i %>  fail_timeout=<%= @upstream_fail_timeout %>;<% end %>
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb
deleted file mode 100644
index a6bab3f93be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
-  <% # check to see if ipv6 support exists in the kernel before applying %>
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name           <%= @server_name.join(" ") %>;
-  protocol              <%= @protocol %>;
-  xclient               <%= @xclient %>;
-  auth_http             <%= @auth_http %>;
-  starttls              <%= @starttls %>;
-  <% if @starttls == 'on' || @starttls == 'only' %>
-  ssl_certificate      <%= @ssl_cert %>;
-  ssl_certificate_key  <%= @ssl_key %>;
-
-  ssl_session_timeout  5m;
-
-  ssl_protocols  SSLv3 TLSv1;
-  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-  ssl_prefer_server_ciphers   on;
-  <%- end -%>
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb
deleted file mode 100644
index 98d193f8f5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-server {
-  listen       <%= @ssl_port %>;
-  <% # check to see if ipv6 support exists in the kernel before applying %>
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name           <%= @server_name.join(" ") %>;
-  protocol              <%= @protocol %>;
-  xclient               <%= @xclient %>;
-  auth_http             <%= @auth_http %>;
-
-  ssl on;
-  ssl_certificate      <%= @ssl_cert %>;
-  ssl_certificate_key  <%= @ssl_key %>;
-
-  ssl_session_timeout  5m;
-
-  ssl_protocols  SSLv3 TLSv1;
-  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-  ssl_prefer_server_ciphers   on;
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb
deleted file mode 100644
index fe8bc20f0dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file managed by puppet on host <%= @fqdn %>
-
-fastcgi_param	QUERY_STRING		  $query_string;
-fastcgi_param	REQUEST_METHOD	  $request_method;
-fastcgi_param	CONTENT_TYPE		  $content_type;
-fastcgi_param	CONTENT_LENGTH	  $content_length;
-
-fastcgi_param	SCRIPT_FILENAME	  $request_filename;
-fastcgi_param	SCRIPT_NAME		    $fastcgi_script_name;
-fastcgi_param	REQUEST_URI		    $request_uri;
-fastcgi_param	DOCUMENT_URI		  $document_uri;
-fastcgi_param	DOCUMENT_ROOT		  $document_root;
-fastcgi_param	SERVER_PROTOCOL	  $server_protocol;
-
-fastcgi_param	GATEWAY_INTERFACE	CGI/1.1;
-fastcgi_param	SERVER_SOFTWARE		nginx/$nginx_version;
-
-fastcgi_param	REMOTE_ADDR		    $remote_addr;
-fastcgi_param	REMOTE_PORT		    $remote_port;
-fastcgi_param	SERVER_ADDR		    $server_addr;
-fastcgi_param	SERVER_PORT		    $server_port;
-fastcgi_param	SERVER_NAME		    $server_name;
-
-fastcgi_param	HTTPS			        $https;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param	REDIRECT_STATUS		200;
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb
deleted file mode 100644
index b4a4d7eb64d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% if @include_files %><% @include_files.each do |file| -%>
-include <%= file %>;
-<% end -%><% end -%>
-<%# make sure that allow comes before deny by forcing the allow key (if it -%>
-<%# exists) to be first in the output order.  The hash keys also need to be -%>
-<%# sorted so that the ordering is stable. -%>
-<% if @vhost_cfg_append -%><% @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-}
-<% if @rewrite_www_to_non_www -%>
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %>;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ http://<%= @name.gsub(/^www\./, '') %>$uri permanent;
-}
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb
deleted file mode 100644
index 8fd7615aef8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
-<% # check to see if ipv6 support exists in the kernel before applying %>
-<% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>;
-<% end %>
-  server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-<% if defined? @auth_basic -%>
-  auth_basic           "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-  auth_basic_user_file <%= @auth_basic_user_file %>;
-<% end -%>
-<% if defined? @client_max_body_size -%>
-  client_max_body_size <%= @client_max_body_size %>;
-<% end -%>
-<%# make sure that allow comes before deny by forcing the allow key (if it -%>
-<%# exists) to be first in the output order.  The hash keys also need to be -%>
-<%# sorted so that the ordering is stable. -%>
-<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @root -%>
-  root <%= @root %>;
-<% end -%>
-<% if @passenger_cgi_param -%><% @passenger_cgi_param.keys.sort.each do |key| -%>
-  passenger_set_cgi_param  <%= key %> <%= @passenger_cgi_param[key] %>;
-<% end -%><% end -%>
-<% @proxy_set_header.each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
-<% if @add_header -%><% @add_header.each do |key,value| -%>
-  add_header              <%= key %> <%= value %>;
-<% end -%><% end -%>
-<% if @rewrite_to_https -%>
-  if ($ssl_protocol = "") {
-       return 301 https://$host$request_uri;
-  }
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-
-  access_log            <%= @access_log_real %>;
-  error_log             <%= @error_log_real %>;
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb
deleted file mode 100644
index ccd47f8df5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-    alias      <%= @location_alias %>;
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb
deleted file mode 100644
index c5f6f01af31..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |value| -%>
-    <%= value %>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if defined? @www_root -%>
-    root  <%= @www_root %>;
-<% end -%>
-<% if @try_files -%>
-    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
-<% end -%>
-<% if defined? @autoindex -%>
-     autoindex <%= @autoindex %>;
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-<% @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-<% end -%>
-<% if defined? @auth_basic -%>
-    auth_basic           "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-    auth_basic_user_file <%= @auth_basic_user_file %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb
deleted file mode 100644
index 10f0d3c6cf0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg -%><% @location_custom_cfg.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb
deleted file mode 100644
index 015e1d7d586..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if defined? @www_root -%>
-    root  <%= @www_root %>;
-<% end -%>
-<% if @fastcgi_split_path -%>
-    fastcgi_split_path_info <%= @fastcgi_split_path %>;
-<% end -%>
-<% if @try_files -%>
-    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
-<% end -%>
-    include <%= @fastcgi_params %>;
-    fastcgi_pass <%= @fastcgi %>;
-<% if defined? @fastcgi_script %>
-    fastcgi_param SCRIPT_FILENAME <%= @fastcgi_script %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb
deleted file mode 100644
index 6b8acc2dbd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%=subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @proxy_cache -%>
-    proxy_cache         <%= @proxy_cache %>;
-    proxy_cache_valid   <%= @proxy_cache_valid %>;
-<% end -%>
-    proxy_pass          <%= @proxy %>;
-    proxy_read_timeout  <%= @proxy_read_timeout %>;
-<% if @proxy_method -%>
-    proxy_method        <%= @proxy_method %>;
-<% end -%>
-<% if @proxy_set_body -%>
-    proxy_set_body      <%= @proxy_set_body %>;
-<% end -%>
-<% @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb
deleted file mode 100644
index c560933e88d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-    stub_status on;
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb
deleted file mode 100644
index 86419a232cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% if @include_files %><% @include_files.each do |file| -%>
-include <%= file %>;
-<% end -%><% end -%>
-<% if @vhost_cfg_append -%><% @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @vhost_cfg_ssl_append -%><% @vhost_cfg_ssl_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-}
-<% if @rewrite_www_to_non_www -%>
-server {
-  listen                <%= @listen_ip %>:<%= @ssl_port %> ssl;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ https://<%= @name.gsub(/^www\./, '') %>$uri permanent;
-}
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb
deleted file mode 100644
index e165b712342..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-server {
-  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-
-  ssl on;
-
-  ssl_certificate           <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.crt;
-  ssl_certificate_key       <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.key;
-<% if defined? @ssl_dhparam -%>
-  ssl_dhparam               <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.dh.pem;
-<% end -%>
-  ssl_session_cache         <%= @ssl_cache %>;
-  ssl_session_timeout       5m;
-  ssl_protocols             <%= @ssl_protocols %>;
-  ssl_ciphers               <%= @ssl_ciphers %>;
-  ssl_prefer_server_ciphers on;
-<% if @ssl_stapling -%>
-  ssl_stapling              on;
-<% end -%>
-<% if defined? @ssl_stapling_file -%>
-  ssl_stapling_file         <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.ocsp.resp;
-<% end -%>
-<% if defined? @ssl_stapling_responder -%>
-  ssl_stapling_responder    <%= @ssl_stapling_responder %>;
-<% end -%>
-<% if @ssl_stapling_verify -%>
-  ssl_stapling_verify       on;
-<% end -%>
-<% if defined? @ssl_trusted_cert -%>
-  ssl_trusted_certificate   <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.trusted.crt;
-<% end -%>
-<% if defined? @resolver -%>
-  resolver                  <%= @resolver %>;
-<% end -%>
-<% if defined? @auth_basic -%>
-  auth_basic                "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-  auth_basic_user_file      "<%= @auth_basic_user_file %>";
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-
-  access_log            <%= @ssl_access_log %>;
-  error_log             <%= @ssl_error_log %>;
-  
-<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @vhost_cfg_ssl_prepend -%><% @vhost_cfg_ssl_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @root -%>
-  root <%= @root %>;
-<% end -%>
-<% if @passenger_cgi_param -%><% @passenger_cgi_param.each do |key,value| -%>
-  passenger_set_cgi_param  <%= key %> <%= value %>;
-<% end -%><% end -%>
-<% @proxy_set_header.each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
-<% if @add_header -%><% @add_header.each do |key,value| -%>
-  add_header              <%= key %> <%= value %>;
-<% end -%><% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp
deleted file mode 100644
index 41cc19dec38..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# The notify before should always come BEFORE all resources
-# managed by the nginx class
-# and the notify last should always come AFTER all resources
-# managed by the nginx class.
-node default {
-  notify { 'before': }
-  -> class { 'nginx': }
-  -> notify { 'last': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp
deleted file mode 100644
index ac774bafe92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-include nginx
-
-nginx::resource::location { 'www.test.com-alias':
-    ensure         => present,
-    location       => '/some/url',
-    location_alias => '/new/url/',
-    vhost          => 'www.test.com',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp
deleted file mode 100644
index 8cc323b1cb2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-include nginx
-
-nginx::resource::upstream { 'proxypass':
-  ensure  => present,
-  members => [
-        'localhost:3000',
-        'localhost:3001',
-        'localhost:3002',
-  ],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp
deleted file mode 100644
index cce5657d40a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-include nginx
-
-nginx::resource::vhost { 'test.local test':
-  ensure       => present,
-  ipv6_enable  => true,
-  proxy        => 'http://proxypass',
-}
-
-nginx::resource::vhost { 'test.local:8080':
-  ensure       => present,
-  listen_port  => 8080,
-  server_name  => ['test.local test'],
-  ipv6_enable  => true,
-  proxy        => 'http://proxypass',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp
deleted file mode 100644
index f11c967732b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-include nginx
-
-nginx::resource::vhost { 'test2.local test2':
-  ensure   => present,
-  www_root => '/var/www/nginx-default',
-  ssl      => true,
-  ssl_cert => 'puppet:///modules/sslkey/whildcard_mydomain.crt',
-  ssl_key  => 'puppet:///modules/sslkey/whildcard_mydomain.key' 
-}
-
-nginx::resource::location { 'test2.local-bob':
-  ensure   => present,
-  www_root => '/var/www/bob',
-  location => '/bob',
-  vhost    => 'test2.local test2',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml
deleted file mode 100644
index a4b980143e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    "ntp": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml
deleted file mode 100644
index cbd0d57b83d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml
deleted file mode 100644
index fe5850a5d96..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md
deleted file mode 100644
index cfcac4292e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md
+++ /dev/null
@@ -1,152 +0,0 @@
-##2014-04-09 - Supported Release 3.0.4
-###Summary
-This is a supported release.
-
-The only functional change in this release is to split up the restrict
-defaults to be per operating system so that we can provide safer defaults
-for AIX, to resolve cases where IPv6 are disabled.
-
-####Features
-- Rework restrict defaults.
-
-####Bugfixes
-- Fix up a comment.
-- Fix a test to work better on PE.
-
-#####Known Bugs
-* No known bugs
-
-##2014-03-04 - Supported Release 3.0.3
-###Summary
-This is a supported release. Correct stdlib compatibility
-
-####Bugfixes
-- Remove `dirname()` call for correct stdlib compatibility.
-- Improved tests
-
-####Known Bugs
-* No known bugs
-
-
-## 2014-02-13 - Release 3.0.2
-###Summary
-
-No functional changes: Update the README and allow custom gem sources.
-
-## 2013-12-17 - Release 3.0.1
-### Summary
-
-Work around a packaging bug with symlinks, no other functional changes.
-
-## 2013-12-13 - Release 3.0.0
-### Summary
-
-Final release of 3.0, enjoy!
-
-
-## 2013-10-14 - Version 3.0.0-rc1
-
-###Summary
-
-This release changes the behavior of restrict and adds AIX osfamily support.
-
-####Backwards-incompatible Changes:
-
-`restrict` no longer requires you to pass in parameters as:
-
-restrict => [ 'restrict x', 'restrict y' ]
-
-but just as:
-
-restrict => [ 'x', 'y' ]
-
-As the template now prefixes each line with restrict.
-
-####Features
-- Change the behavior of `restrict` so you no longer need the restrict
-keyword.
-- Add `udlc` parameter to enable undisciplined local clock regardless of the
-machines status as a virtual machine.
-- Add AIX support.
-
-####Fixes
-- Use class{} instead of including and then anchoring. (style)
-- Extend Gentoo coverage to Facter 1.7.
-
----
-##2013-09-05 - Version 2.0.1
-
-###Summary
-
-Correct the LICENSE file.
-
-####Bugfixes
-- Add in the appropriate year and name in LICENSE.
-
-
-##2013-07-31 - Version 2.0.0
-
-###Summary
-
-The 2.0 release focuses on merging all the distro specific
-templates into a single reusable template across all platforms.
-
-To aid in that goal we now allow you to change the driftfile,
-ntp keys, and perferred_servers.
-
-####Backwards-incompatible changes
-
-As all the distro specific templates have been removed and a
-unified one created you may be missing functionality you
-previously relied on.  Please test carefully before rolling
-out globally.
-
-Configuration directives that might possibly be affected:
-- `filegen`
-- `fudge` (for virtual machines)
-- `keys`
-- `logfile`
-- `restrict`
-- `restrictkey`
-- `statistics`
-- `trustedkey`
-
-####Features:
-- All templates merged into a single template.
-- NTP Keys support added.
-- Add preferred servers support.
-- Parameters in `ntp` class:
-  - `driftfile`: path for the ntp driftfile.
-  - `keys_enable`: Enable NTP keys feature.
-  - `keys_file`: Path for the NTP keys file.
-  - `keys_trusted`: Which keys to trust.
-  - `keys_controlkey`: Which key to use for the control key.
-  - `keys_requestkey`: Which key to use for the request key.
-  - `preferred_servers`: Array of servers to prefer.
-  - `restrict`: Array of restriction options to apply.
-
----
-###2013-07-15 - Version 1.0.1
-####Bugfixes
-- Fix deprecated warning in `autoupdate` parameter.
-- Correctly quote is_virtual fact.
-
-
-##2013-07-08 - Version 1.0.0
-####Features
-- Completely refactored to split across several classes.
-- rspec-puppet tests rewritten to cover more options.
-- rspec-system tests added.
-- ArchLinux handled via osfamily instead of special casing.
-- parameters in `ntp` class:
-  - `autoupdate`: deprecated in favor of directly setting package_ensure.
-  - `panic`: set to false if you wish to allow large clock skews. 
-
----
-##2011-11-10 Dan Bode <dan@puppetlabs.com> - 0.0.4
-* Add Amazon Linux as a supported platform
-* Add unit tests
-
-
-##2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.0.3
-* Initial release under puppetlabs
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md
deleted file mode 100644
index a2b1d77bc8e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions
-are essential for keeping them great. We can’t access the huge number of platforms and
-myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work
-in your environment. There are a few guidelines that we need contributors to follow so
-that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile
deleted file mode 100644
index 7f86b2d6bdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile
+++ /dev/null
@@ -1,19 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'specinfra', '>=0.7.0'
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE
deleted file mode 100644
index bc1c718de57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2013] [Puppet Labs]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile
deleted file mode 100644
index fc436324af8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'puppetlabs-ntp'
-version '3.0.4'
-source 'git://github.com/puppetlabs/puppetlabs-ntp'
-author 'Puppet Labs'
-license 'Apache Version 2.0'
-summary 'NTP Module'
-description 'NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.'
-project_page 'http://github.com/puppetlabs/puppetlabs-ntp'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 0.1.6'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown
deleted file mode 100644
index e25e3c43ba8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown
+++ /dev/null
@@ -1,227 +0,0 @@
-#ntp
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with ntp](#setup)
-    * [What ntp affects](#what-ntp-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with ntp](#beginning-with-ntp)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-The ntp module installs, configures, and manages the NTP service.
-
-##Module Description
-
-The ntp module handles installing, configuring, and running NTP across a range of operating systems and distributions.
-
-##Setup
-
-###What ntp affects
-
-* ntp package.
-* ntp configuration file.
-* ntp service.
-
-###Beginning with ntp
-
-`include '::ntp'` is enough to get you up and running.  If you wish to pass in
-parameters specifying which servers to use, then:
-
-```puppet
-class { '::ntp':
-  servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-}
-```
-
-##Usage
-
-All interaction with the ntp module can do be done through the main ntp class.
-This means you can simply toggle the options in `::ntp` to have full functionality of the module.
-
-###I just want NTP, what's the minimum I need?
-
-```puppet
-include '::ntp'
-```
-
-###I just want to tweak the servers, nothing else.
-
-```puppet
-class { '::ntp':
-  servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-}
-```
-
-###I'd like to make sure I restrict who can connect as well.
-
-```puppet
-class { '::ntp':
-  servers  => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict => ['127.0.0.1'],
-}
-```
-
-###I'd like to opt out of having the service controlled; we use another tool for that.
-
-```puppet
-class { '::ntp':
-  servers        => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict       => ['127.0.0.1'],
-  manage_service => false,
-}
-```
-
-###Looks great!  But I'd like a different template; we need to do something unique here.
-
-```puppet
-class { '::ntp':
-  servers         => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict        => ['127.0.0.1'],
-  manage_service  => false,
-  config_template => 'different/module/custom.template.erb',
-}
-```
-
-##Reference
-
-###Classes
-
-####Public Classes
-
-* ntp: Main class, includes all other classes.
-
-####Private Classes
-
-* ntp::install: Handles the packages.
-* ntp::config: Handles the configuration file.
-* ntp::service: Handles the service.
-
-###Parameters
-
-The following parameters are available in the ntp module:
-
-####`autoupdate`
-
-**Deprecated:** This parameter determined whether the ntp module should be
-automatically updated to the latest version available.  Replaced by `package_ensure`.
-
-####`config`
-
-Sets the file that ntp configuration is written into.
-
-####`config_template`
-
-Determines which template Puppet should use for the ntp configuration.
-
-####`driftfile`
-
-Sets the location of the drift file for ntp.
-
-####`keys_controlkey`
-
-The key to use as the control key.
-
-####`keys_enable`
-
-Whether the ntp keys functionality is enabled.
-
-####`keys_file`
-
-Location of the keys file.
-
-####`keys_requestkey`
-
-Which of the keys is the request key.
-
-#### `keys_trusted`
-
-Array of trusted keys.
-
-####`package_ensure`
-
-Sets the ntp package to be installed. Can be set to 'present', 'latest', or a specific version. 
-
-####`package_name`
-
-Determines the name of the package to install.
-
-####`panic`
-
-Determines if ntp should 'panic' in the event of a very large clock skew.
-This defaults to false for virtual machines, as they don't do a great job with keeping time.
-
-####`preferred_servers`
-
-List of ntp servers to prefer.  Will append 'prefer' for any server in this list
-that also appears in the servers list.
-
-####`restrict`
-
-Sets the restrict options in the ntp configuration.  The lines are
-prefixed with 'restrict', so you just need to list the rest of the restriction.
-
-####`servers`
-
-Selects the servers to use for ntp peers.
-
-####`service_enable`
-
-Determines if the service should be enabled at boot.
-
-####`service_ensure`
-
-Determines if the service should be running or not.
-
-####`service_manage`
-
-Selects whether Puppet should manage the service.
-
-####`service_name`
-
-Selects the name of the ntp service for Puppet to manage.
-
-####`udlc`
-
-Enables configs for undisciplined local clock, regardless of
-status as a virtual machine. 
-
-
-##Limitations
-
-This module has been built on and tested against Puppet 2.7 and higher.
-
-The module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-* Gentoo
-* Arch Linux
-* FreeBSD
-
-Testing on other platforms has been light and cannot be guaranteed. 
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Contributors
-
-The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-ntp/graphs/contributors](https://github.com/puppetlabs/puppetlabs-ntp/graphs/contributors)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp
deleted file mode 100644
index fbb01fe8ead..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-class ntp::config inherits ntp {
-
-  if $keys_enable {
-    # Workaround for the lack of dirname() in stdlib 3.2.
-    $directory = inline_template('<%= File.dirname(keys_file) %>')
-    file { $directory:
-      ensure  => directory,
-      owner   => 0,
-      group   => 0,
-      mode    => '0755',
-      recurse => true,
-    }
-  }
-
-  file { $config:
-    ensure  => file,
-    owner   => 0,
-    group   => 0,
-    mode    => '0644',
-    content => template($config_template),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp
deleted file mode 100644
index 74c9d7c4f92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-class ntp (
-  $autoupdate        = $ntp::params::autoupdate,
-  $config            = $ntp::params::config,
-  $config_template   = $ntp::params::config_template,
-  $driftfile         = $ntp::params::driftfile,
-  $keys_enable       = $ntp::params::keys_enable,
-  $keys_file         = $ntp::params::keys_file,
-  $keys_controlkey   = $ntp::params::keys_controlkey,
-  $keys_requestkey   = $ntp::params::keys_requestkey,
-  $keys_trusted      = $ntp::params::keys_trusted,
-  $package_ensure    = $ntp::params::package_ensure,
-  $package_name      = $ntp::params::package_name,
-  $panic             = $ntp::params::panic,
-  $preferred_servers = $ntp::params::preferred_servers,
-  $restrict          = $ntp::params::restrict,
-  $servers           = $ntp::params::servers,
-  $service_enable    = $ntp::params::service_enable,
-  $service_ensure    = $ntp::params::service_ensure,
-  $service_manage    = $ntp::params::service_manage,
-  $service_name      = $ntp::params::service_name,
-  $udlc              = $ntp::params::udlc
-) inherits ntp::params {
-
-  validate_absolute_path($config)
-  validate_string($config_template)
-  validate_absolute_path($driftfile)
-  validate_bool($keys_enable)
-  validate_re($keys_controlkey, ['^\d+$', ''])
-  validate_re($keys_requestkey, ['^\d+$', ''])
-  validate_array($keys_trusted)
-  validate_string($package_ensure)
-  validate_array($package_name)
-  validate_bool($panic)
-  validate_array($preferred_servers)
-  validate_array($restrict)
-  validate_array($servers)
-  validate_bool($service_enable)
-  validate_string($service_ensure)
-  validate_bool($service_manage)
-  validate_string($service_name)
-  validate_bool($udlc)
-
-  if $autoupdate {
-    notice('autoupdate parameter has been deprecated and replaced with package_ensure.  Set this to latest for the same behavior as autoupdate => true.')
-  }
-
-  # Anchor this as per #8040 - this ensures that classes won't float off and
-  # mess everything up.  You can read about this at:
-  # http://docs.puppetlabs.com/puppet/2.7/reference/lang_containment.html#known-issues
-  anchor { 'ntp::begin': } ->
-  class { '::ntp::install': } ->
-  class { '::ntp::config': } ~>
-  class { '::ntp::service': } ->
-  anchor { 'ntp::end': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp
deleted file mode 100644
index 098949c398e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class ntp::install inherits ntp {
-
-  package { 'ntp':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp
deleted file mode 100644
index b8ae5032ca2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp
+++ /dev/null
@@ -1,185 +0,0 @@
-class ntp::params {
-
-  $autoupdate        = false
-  $config_template   = 'ntp/ntp.conf.erb'
-  $keys_enable       = false
-  $keys_controlkey   = ''
-  $keys_requestkey   = ''
-  $keys_trusted      = []
-  $package_ensure    = 'present'
-  $preferred_servers = []
-  $service_enable    = true
-  $service_ensure    = 'running'
-  $service_manage    = true
-  $udlc              = false
-
-  # On virtual machines allow large clock skews.
-  $panic = str2bool($::is_virtual) ? {
-    true    => false,
-    default => true,
-  }
-
-  case $::osfamily {
-    'AIX': {
-      $config = '/etc/ntp.conf'
-      $keysfile = '/etc/ntp.keys'
-      $driftfile = '/etc/ntp.drift'
-      $package_name = [ 'bos.net.tcp.client' ]
-      $restrict          = [
-        'default nomodify notrap nopeer noquery',
-        '127.0.0.1',
-      ]
-      $service_name = 'xntpd'
-      $servers = [
-        '0.debian.pool.ntp.org iburst',
-        '1.debian.pool.ntp.org iburst',
-        '2.debian.pool.ntp.org iburst',
-        '3.debian.pool.ntp.org iburst',
-      ]
-    }
-    'Debian': {
-      $config          = '/etc/ntp.conf'
-      $keys_file       = '/etc/ntp/keys'
-      $driftfile       = '/var/lib/ntp/drift'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntp'
-      $servers         = [
-        '0.debian.pool.ntp.org iburst',
-        '1.debian.pool.ntp.org iburst',
-        '2.debian.pool.ntp.org iburst',
-        '3.debian.pool.ntp.org iburst',
-      ]
-    }
-    'RedHat': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.centos.pool.ntp.org',
-        '1.centos.pool.ntp.org',
-        '2.centos.pool.ntp.org',
-      ]
-    }
-    'SuSE': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift/ntp.drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntp'
-      $servers         = [
-        '0.opensuse.pool.ntp.org',
-        '1.opensuse.pool.ntp.org',
-        '2.opensuse.pool.ntp.org',
-        '3.opensuse.pool.ntp.org',
-      ]
-    }
-    'FreeBSD': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/db/ntpd.drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = ['net/ntp']
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.freebsd.pool.ntp.org iburst maxpoll 9',
-        '1.freebsd.pool.ntp.org iburst maxpoll 9',
-        '2.freebsd.pool.ntp.org iburst maxpoll 9',
-        '3.freebsd.pool.ntp.org iburst maxpoll 9',
-      ]
-    }
-    'Archlinux': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.pool.ntp.org',
-        '1.pool.ntp.org',
-        '2.pool.ntp.org',
-      ]
-    }
-    # Gentoo was added as its own $::osfamily in Facter 1.7.0
-    'Gentoo': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = ['net-misc/ntp']
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.gentoo.pool.ntp.org',
-        '1.gentoo.pool.ntp.org',
-        '2.gentoo.pool.ntp.org',
-        '3.gentoo.pool.ntp.org',
-      ]
-    }
-    'Linux': {
-      # Account for distributions that don't have $::osfamily specific settings.
-      # Before Facter 1.7.0 Gentoo did not have its own $::osfamily
-      case $::operatingsystem {
-        'Gentoo': {
-          $config          = '/etc/ntp.conf'
-          $driftfile       = '/var/lib/ntp/drift'
-          $keys_file       = '/etc/ntp/keys'
-          $package_name    = ['net-misc/ntp']
-          $restrict          = [
-            'default kod nomodify notrap nopeer noquery',
-            '-6 default kod nomodify notrap nopeer noquery',
-            '127.0.0.1',
-            '-6 ::1',
-          ]
-          $service_name    = 'ntpd'
-          $servers         = [
-            '0.gentoo.pool.ntp.org',
-            '1.gentoo.pool.ntp.org',
-            '2.gentoo.pool.ntp.org',
-            '3.gentoo.pool.ntp.org',
-          ]
-        }
-        default: {
-          fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution.")
-        }
-      }
-    }
-    default: {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp
deleted file mode 100644
index 3f1ada0b72d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-class ntp::service inherits ntp {
-
-  if ! ($service_ensure in [ 'running', 'stopped' ]) {
-    fail('service_ensure parameter must be running or stopped')
-  }
-
-  if $service_manage == true {
-    service { 'ntp':
-      ensure     => $service_ensure,
-      enable     => $service_enable,
-      name       => $service_name,
-      hasstatus  => true,
-      hasrestart => true,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json
deleted file mode 100644
index 81b2675dbbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    },
-    {
-      "operatingsystem": "AIX",
-      "operatingsystemrelease": [
-        "5.3",
-        "6.1",
-        "7.1"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-ntp",
-  "version": "3.0.4",
-  "source": "git://github.com/puppetlabs/puppetlabs-ntp",
-  "author": "Puppet Labs",
-  "license": "Apache Version 2.0",
-  "summary": "NTP Module",
-  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.",
-  "project_page": "http://github.com/puppetlabs/puppetlabs-ntp",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 0.1.6"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb
deleted file mode 100644
index e61f9db5bc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'ntp class:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should run successfully' do
-    pp = "class { 'ntp': }"
-
-    # Apply twice to ensure no errors the second time.
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-      expect(r.exit_code).to be_zero
-    end
-  end
-
-  context 'service_ensure => stopped:' do
-    it 'runs successfully' do
-      pp = "class { 'ntp': service_ensure => stopped }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  context 'service_ensure => running:' do
-    it 'runs successfully' do
-      pp = "class { 'ntp': service_ensure => running }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
deleted file mode 100644
index 196ba76584a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  line = '0.freebsd.pool.ntp.org iburst maxpoll 9'
-when 'Debian'
-  line = '0.debian.pool.ntp.org iburst'
-when 'RedHat'
-  line = '0.centos.pool.ntp.org'
-when 'SuSE'
-  line = '0.opensuse.pool.ntp.org'
-when 'Gentoo'
-  line = '0.gentoo.pool.ntp.org'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    line = '0.pool.ntp.org'
-  when 'Gentoo'
-    line = '0.gentoo.pool.ntp.org'
-  end
-when 'AIX'
-  line = '0.debian.pool.ntp.org iburst'
-end
-
-describe 'ntp::config class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'sets up ntp.conf' do
-    apply_manifest(%{
-      class { 'ntp': }
-    }, :catch_failures => true)
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should be_file }
-    it { should contain line }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
deleted file mode 100644
index 1a451bbb23f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  packagename = 'net/ntp'
-when 'Gentoo'
-  packagename = 'net-misc/ntp'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    packagename = 'ntp'
-  when 'Gentoo'
-    packagename = 'net-misc/ntp'
-  end
-when 'AIX'
-  packagename = 'bos.net.tcp.client'
-else
-  packagename = 'ntp'
-end
-
-describe 'ntp::install class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'installs the package' do
-    apply_manifest(%{
-      class { 'ntp': }
-    }, :catch_failures => true)
-  end
-
-  describe package(packagename) do
-    it { should be_installed }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
deleted file mode 100644
index 71a6b202aa0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  packagename = 'net/ntp'
-when 'Gentoo'
-  packagename = 'net-misc/ntp'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    packagename = 'ntp'
-  when 'Gentoo'
-    packagename = 'net-misc/ntp'
-  end
-when 'AIX'
-  packagename = 'bos.net.tcp.client'
-else
-  packagename = 'ntp'
-end
-
-describe "ntp class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'applies successfully' do
-    pp = "class { 'ntp': }"
-
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-  end
-
-  describe 'autoconfig' do
-    it 'raises a deprecation warning' do
-      pp = "class { 'ntp': autoupdate => true }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/autoupdate parameter has been deprecated and replaced with package_ensure/)
-      end
-    end
-  end
-
-  describe 'config' do
-    it 'sets the ntp.conf location' do
-      pp = "class { 'ntp': config => '/etc/antp.conf' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/antp.conf') do
-      it { should be_file }
-    end
-  end
-
-  describe 'config_template' do
-    it 'sets up template' do
-      modulepath = default['distmoduledir']
-      shell("mkdir -p #{modulepath}/test/templates")
-      shell("echo 'testcontent' >> #{modulepath}/test/templates/ntp.conf")
-    end
-
-    it 'sets the ntp.conf location' do
-      pp = "class { 'ntp': config_template => 'test/ntp.conf' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'testcontent' }
-    end
-  end
-
-  describe 'driftfile' do
-    it 'sets the driftfile location' do
-      pp = "class { 'ntp': driftfile => '/tmp/driftfile' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'driftfile /tmp/driftfile' }
-    end
-  end
-
-  describe 'keys' do
-    it 'enables the key parameters' do
-      pp = <<-EOS
-      class { 'ntp':
-        keys_enable     => true,
-        keys_file       => '/etc/ntp/keys',
-        keys_controlkey => '/etc/ntp/controlkey',
-        keys_requestkey => '1',
-        keys_trusted    => [ '1', '2' ],
-      }
-      EOS
-      # Rely on a shell command instead of a file{} here to avoid loops
-      # within puppet when it tries to manage /etc/ntp/keys before /etc/ntp.
-      shell("mkdir -p /etc/ntp && echo '1 M AAAABBBB' >> /etc/ntp/keys")
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'keys /etc/ntp/keys' }
-      it { should contain 'controlkey /etc/ntp/controlkey' }
-      it { should contain 'requestkey 1' }
-      it { should contain 'trustedkey 1 2' }
-    end
-  end
-
-  describe 'package' do
-    it 'installs the right package' do
-      pp = <<-EOS
-      class { 'ntp':
-        package_ensure => present,
-        package_name   => ['#{packagename}'],
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(packagename) do
-      it { should be_installed }
-    end
-  end
-
-  describe 'panic => false' do
-    it 'enables the tinker panic setting' do
-      pp = <<-EOS
-      class { 'ntp':
-        panic => false,
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should contain 'tinker panic' }
-    end
-  end
-
-  describe 'panic => true' do
-    it 'disables the tinker panic setting' do
-      pp = <<-EOS
-      class { 'ntp':
-        panic => true,
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should_not contain 'tinker panic 0' }
-    end
-  end
-
-  describe 'udlc' do
-    it 'adds a udlc' do
-      pp = "class { 'ntp': udlc => true }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain '127.127.1.0' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
deleted file mode 100644
index cac12de5dcf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat', 'FreeBSD', 'Linux', 'Gentoo'
-  servicename = 'ntpd'
-when 'AIX'
-  servicename = 'xntpd'
-else
-  servicename = 'ntp'
-end
-
-describe 'ntp::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'basic test' do
-    it 'sets up the service' do
-      apply_manifest(%{
-        class { 'ntp': }
-      }, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  describe 'service parameters' do
-    it 'starts the service' do
-      pp = <<-EOS
-      class { 'ntp':
-        service_enable => true,
-        service_ensure => running,
-        service_manage => true,
-        service_name   => '#{servicename}'
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'service is unmanaged' do
-    it 'shouldnt stop the service' do
-      pp = <<-EOS
-      class { 'ntp':
-        service_enable => false,
-        service_ensure => stopped,
-        service_manage => false,
-        service_name   => '#{servicename}'
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
deleted file mode 100644
index 7994acedbec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'preferred servers', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  pp = <<-EOS
-      class { '::ntp':
-        servers           => ['a', 'b', 'c', 'd'],
-        preferred_servers => ['c', 'd'],
-      }
-  EOS
-
-  it 'applies cleanly' do
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should be_file }
-    it { should contain 'server a' }
-    it { should contain 'server b' }
-    it { should contain 'server c prefer' }
-    it { should contain 'server d prefer' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
deleted file mode 100644
index 753b1b3d011..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "ntp class with restrict:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'should run successfully' do
-    pp = "class { 'ntp': restrict => ['test restrict']}"
-
-    it 'runs twice' do
-      2.times do
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stderr).to be_empty
-        end
-      end
-    end
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should contain('test restrict') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 5f4490dee61..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'ntp': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/is not supported on an/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb
deleted file mode 100644
index 5535d9b25ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb
+++ /dev/null
@@ -1,272 +0,0 @@
-require 'spec_helper'
-
-describe 'ntp' do
-
-  ['Debian', 'RedHat','SuSE', 'FreeBSD', 'Archlinux', 'Gentoo', 'Gentoo (Facter < 1.7)'].each do |system|
-    if system == 'Gentoo (Facter < 1.7)'
-      let(:facts) {{ :osfamily => 'Linux', :operatingsystem => 'Gentoo' }}
-    else
-      let(:facts) {{ :osfamily => system }}
-    end
-
-    it { should include_class('ntp::install') }
-    it { should include_class('ntp::config') }
-    it { should include_class('ntp::service') }
-
-    describe "ntp::config on #{system}" do
-      it { should contain_file('/etc/ntp.conf').with_owner('0') }
-      it { should contain_file('/etc/ntp.conf').with_group('0') }
-      it { should contain_file('/etc/ntp.conf').with_mode('0644') }
-
-      describe 'allows template to be overridden' do
-        let(:params) {{ :config_template => 'my_ntp/ntp.conf.erb' }}
-        it { should contain_file('/etc/ntp.conf').with({
-          'content' => /server foobar/})
-        }
-      end
-
-      describe "keys for osfamily #{system}" do
-        context "when enabled" do
-          let(:params) {{
-            :keys_enable     => true,
-            :keys_file       => '/etc/ntp/ntp.keys',
-            :keys_trusted    => ['1', '2', '3'],
-            :keys_controlkey => '2',
-            :keys_requestkey => '3',
-          }}
-
-          it { should contain_file('/etc/ntp').with({
-            'ensure'  => 'directory'})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /trustedkey 1 2 3/})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /controlkey 2/})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /requestkey 3/})
-          }
-        end
-      end
-
-      context "when disabled" do
-        let(:params) {{
-          :keys_enable     => false,
-          :keys_file       => '/etc/ntp/ntp.keys',
-          :keys_trusted    => ['1', '2', '3'],
-          :keys_controlkey => '2',
-          :keys_requestkey => '3',
-        }}
-
-        it { should_not contain_file('/etc/ntp').with({
-          'ensure'  => 'directory'})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /trustedkey 1 2 3/})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /controlkey 2/})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /requestkey 3/})
-        }
-      end
-
-      describe 'preferred servers' do
-        context "when set" do
-          let(:params) {{
-            :servers           => ['a', 'b', 'c', 'd'],
-            :preferred_servers => ['a', 'b']
-          }}
-
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /server a prefer\nserver b prefer\nserver c\nserver d/})
-          }
-        end
-        context "when not set" do
-          let(:params) {{
-            :servers           => ['a', 'b', 'c', 'd'],
-            :preferred_servers => []
-          }}
-
-          it { should_not contain_file('/etc/ntp.conf').with({
-            'content' => /server a prefer/})
-          }
-        end
-      end
-
-      describe "ntp::install on #{system}" do
-        let(:params) {{ :package_ensure => 'present', :package_name => ['ntp'], }}
-
-        it { should contain_package('ntp').with(
-          :ensure => 'present',
-          :name   => 'ntp'
-        )}
-
-        describe 'should allow package ensure to be overridden' do
-          let(:params) {{ :package_ensure => 'latest', :package_name => ['ntp'] }}
-          it { should contain_package('ntp').with_ensure('latest') }
-        end
-
-        describe 'should allow the package name to be overridden' do
-          let(:params) {{ :package_ensure => 'present', :package_name => ['hambaby'] }}
-          it { should contain_package('ntp').with_name('hambaby') }
-        end
-      end
-
-      describe 'ntp::service' do
-        let(:params) {{
-          :service_manage => true,
-          :service_enable => true,
-          :service_ensure => 'running',
-          :service_name   => 'ntp'
-        }}
-
-        describe 'with defaults' do
-          it { should contain_service('ntp').with(
-            :enable => true,
-            :ensure => 'running',
-            :name   => 'ntp'
-          )}
-        end
-
-        describe 'service_ensure' do
-          describe 'when overridden' do
-            let(:params) {{ :service_name => 'ntp', :service_ensure => 'stopped' }}
-            it { should contain_service('ntp').with_ensure('stopped') }
-          end
-        end
-
-        describe 'service_manage' do
-          let(:params) {{
-            :service_manage => false,
-            :service_enable => true,
-            :service_ensure => 'running',
-            :service_name   => 'ntpd',
-          }}
-
-          it 'when set to false' do
-            should_not contain_service('ntp').with({
-              'enable' => true,
-              'ensure' => 'running',
-              'name'   => 'ntpd'
-            })
-          end
-        end
-      end
-    end
-
-    context 'ntp::config' do
-      describe "for operating system Gentoo (Facter < 1.7)" do
-        let(:facts) {{ :operatingsystem => 'Gentoo',
-                       :osfamily        => 'Linux' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.gentoo.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily Gentoo" do
-        let(:facts) {{ :osfamily => 'Gentoo' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.gentoo.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily Debian" do
-        let(:facts) {{ :osfamily => 'debian' }}
-
-        it 'uses the debian ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.debian.pool.ntp.org iburst/,
-          })
-        end
-      end
-
-      describe "on osfamily RedHat" do
-        let(:facts) {{ :osfamily => 'RedHat' }}
-
-        it 'uses the redhat ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.centos.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily SuSE" do
-        let(:facts) {{ :osfamily => 'SuSE' }}
-
-        it 'uses the opensuse ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.opensuse.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily FreeBSD" do
-        let(:facts) {{ :osfamily => 'FreeBSD' }}
-
-        it 'uses the freebsd ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.freebsd.pool.ntp.org iburst maxpoll 9/,
-          })
-        end
-      end
-
-      describe "on osfamily ArchLinux" do
-        let(:facts) {{ :osfamily => 'ArchLinux' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "for operating system family unsupported" do
-        let(:facts) {{
-          :osfamily  => 'unsupported',
-        }}
-
-        it { expect{ subject }.to raise_error(
-          /^The ntp module is not supported on an unsupported based system./
-        )}
-      end
-    end
-
-    describe 'for virtual machines' do
-      let(:facts) {{ :osfamily        => 'Archlinux',
-                     :is_virtual      => 'true' }}
-
-      it 'should not use local clock as a time source' do
-        should_not contain_file('/etc/ntp.conf').with({
-          'content' => /server.*127.127.1.0.*fudge.*127.127.1.0 stratum 10/,
-        })
-      end
-
-      it 'allows large clock skews' do
-        should contain_file('/etc/ntp.conf').with({
-          'content' => /tinker panic 0/,
-        })
-      end
-    end
-
-    describe 'for physical machines' do
-      let(:facts) {{ :osfamily        => 'Archlinux',
-                     :is_virtual      => 'false' }}
-
-      it 'disallows large clock skews' do
-        should_not contain_file('/etc/ntp.conf').with({
-          'content' => /tinker panic 0/,
-        })
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
deleted file mode 100644
index 40cf67c6d0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-#my uber ntp config
-#
-
-server foobar
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 3d99cc368d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = [ 'windows', 'Solaris' ]
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'ntp')
-    hosts.each do |host|
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib', :acceptable_exit_codes => [0,1])
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
deleted file mode 100644
index 7025850210d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Provider Specs
-==============
-
-Define specs for your providers under this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
deleted file mode 100644
index 1ee19ac840f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Resource Type Specs
-===================
-
-Define specs for your resource types in this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb
deleted file mode 100644
index d24126c2212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-# ntp.conf: Managed by puppet.
-#
-<% if @panic == false -%>
-# Keep ntpd from panicking in the event of a large clock skew
-# when a VM guest is suspended and resumed.
-tinker panic 0
-<% end -%>
-
-<% if @restrict != [] -%>
-# Permit time synchronization with our time source, but do not
-# permit the source to query or modify the service on this system.
-<% @restrict.flatten.each do |restrict| -%>
-restrict <%= restrict %>
-<% end %>
-<% end -%>
-
-<% [@servers].flatten.each do |server| -%>
-server <%= server %><% if @preferred_servers.include?(server) -%> prefer<% end %>
-<% end -%>
-
-<% if scope.lookupvar('::is_virtual') == "false" or @udlc -%>
-# Undisciplined Local Clock. This is a fake driver intended for backup
-# and when no outside source of synchronized time is available. 
-server	127.127.1.0 
-fudge	127.127.1.0 stratum 10
-restrict 127.127.1.0
-<% end -%>
-
-# Driftfile.
-driftfile <%= @driftfile %>
-
-<% if @keys_enable -%>
-keys <%= @keys_file %>
-<% unless @keys_trusted.empty? -%>
-trustedkey <%= @keys_trusted.join(' ') %>
-<% end -%>
-<% if @keys_requestkey != '' -%>
-requestkey <%= @keys_requestkey %>
-<% end -%>
-<% if @keys_controlkey != '' -%>
-controlkey <%= @keys_controlkey %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp
deleted file mode 100644
index e6d9b537fb2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-node default {
-
-  notify { 'enduser-before': }
-  notify { 'enduser-after': }
-
-  class { 'ntp':
-    require => Notify['enduser-before'],
-    before  => Notify['enduser-after'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml
deleted file mode 100644
index ca9960712c4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fixtures:
-  repositories:
-    "puppi": "git://github.com/example42/puppi.git"
-    "monitor": "git://github.com/example42/puppet-monitor.git"
-    "firewall": "git://github.com/example42/puppet-firewall.git"
-    "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat": "git://github.com/example42/puppet-concat.git"
-  symlinks:
-    "php": "#{source_dir}"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile
deleted file mode 100644
index 459723a8e59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project
deleted file mode 100644
index 12b382826a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>php</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile
deleted file mode 100644
index 55ae20813f1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'example42-php'
-version '2.0.17'
-author  'Alessandro Franceschi'
-license 'Apache2'
-project_page 'http://www.example42.com'
-source  'https://github.com/example42/puppet-php'
-summary 'Puppet module for php'
-description 'This module installs and manages php. Check README.rdoc for details. Puppi is required for some common functions: you can install them without using the whole module. Monitor and firewall dependencies are needed only if the relevant features are enabled'
-dependency 'example42/puppi', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md
deleted file mode 100644
index a211dcbc2d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Puppet module: php
-
-This is a Puppet module for php based on the second generation layout ("NextGen") of Example42 Puppet Modules.
-
-Made by ALessandro Franceschi / Lab42
-
-Official site: http://www.example42.com
-
-Official git repository: http://github.com/example42/puppet-php
-
-Released under the terms of Apache 2 License.
-
-This module requires functions provided by the Example42 Puppi module (you need it even if you don't use and install Puppi)
-
-For detailed info about the logic and usage patterns of Example42 modules check the DOCS directory on Example42 main modules set.
-
-## USAGE - Basic management
-
-* Install php with default settings
-
-        class { 'php': }
-
-* Install a specific version of php package
-
-        class { 'php':
-          version => '1.0.1',
-        }
-
-* Remove php package
-
-        class { 'php':
-          absent => true
-        }
-
-* Enable auditing without without making changes on existing php configuration files
-
-        class { 'php':
-          audit_only => true
-        }
-
-* Install php in an nginx environment
-
-        class { 'php':
-          service => 'nginx'
-        }
-
-## USAGE - Module installation
-
-* Install a new module
-
-        php::module { "imagick": }
-
-* Install a specific version of a module:
-
-        php::module { "imagick":
-          version => '1.0.1';
-        }
-
-* Remove php module
-
-        php::module { "imagick":
-            absent => true,
-        }
-
-* By default module package name is php-$title for RedHat and php5-$title . You can override this prefix.
-
-        php::module { "apc":
-          module_prefix => "php-"
-        }
-
-
-## USAGE - Pear Management
-
-* Install a pear package
-
-        php::pear::module { "XML_Util": }
-
-* Install a pear package from a remote repository
-
-        php::pear::module { 'PHPUnit':
-          repository  => 'pear.phpunit.de',
-          use_package => 'no',
-        }
-
-* Install a pear package will all dependencies (--alldeps)
-
-        php::pear::module { 'PHPUnit':
-          repository  => 'pear.phpunit.de',
-          alldeps => 'true',
-        }
-
-* Set a config option
-
-        php::pear::config { http_proxy: value => "myproxy:8080" }
-
-
-## USAGE - Pecl Management
-
-* Install a pecl package
-
-        php::pecl::module { "XML_Util": }
-
-* Install a pecl package from source specifying the preferred state (note that you must have the package 'make' installed on your system)
-
-        php::pecl::module { "xhprof":
-          use_package     => 'false',
-          preferred_state => 'beta',
-        }
-
-* Set a config option
-
-        php::pecl::config { http_proxy: value => "myproxy:8080" }
-
-
-## USAGE - Overrides and Customizations
-* Use custom sources for main config file.
-
-        class { 'php':
-          source => [ "puppet:///modules/lab42/php/php.conf-${hostname}" , "puppet:///modules/lab42/php/php.conf" ],
-        }
-
-* Manage php.ini files on Debian and Suse derivatives. Here the main config file path (managed with the source/template params) defaults to /etc/php5/apache2/php.ini. To manage other files, either set a different path in config_file or use the php::conf define.
-
-        class { 'php':
-          config_file => '/etc/php5/apache2/php.ini',      # Default value on Ubuntu/Suse
-          template    => 'example42/php/php.ini-apache2.erb',
-        }
-
-        php::conf { 'php.ini-cli':
-          path     => '/etc/php5/cli/php.ini',
-          template => 'example42/php/php.ini-cli.erb',
-        }
-
-* Use custom source directory for the whole configuration dir
-
-        class { 'php':
-          source_dir       => 'puppet:///modules/lab42/php/conf/',
-          source_dir_purge => false, # Set to true to purge any existing file not present in $source_dir
-        }
-
-* Use custom template for main config file. Note that template and source arguments are alternative.
-
-        class { 'php':
-          template => 'example42/php/php.conf.erb',
-        }
-
-* Automatically include a custom subclass
-
-        class { 'php':
-          my_class => 'php::example42',
-        }
-
-
-
-
-
-[![Build Status](https://travis-ci.org/example42/puppet-php.png?branch=master)](https://travis-ci.org/example42/puppet-php)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile
deleted file mode 100644
index 1a8a8a0c30e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb
deleted file mode 100644
index 7138a3277ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add("php_fact_extension_dir") do
-  setcode do
-    Facter::Util::Resolution.exec('php-config --extension-dir')    || nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb
deleted file mode 100644
index c164c345f7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add("php_fact_version") do
-  setcode do
-    Facter::Util::Resolution.exec('php-config --version')    || nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp
deleted file mode 100644
index 722d65dd35d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# = Define: php::augeas
-#
-# Manage php.ini through augeas
-#
-# Here's an example how to find the augeas path to a variable:
-#
-#     # augtool --noload
-#     augtool> rm /augeas/load
-#     rm : /augeas/load 781
-#     augtool> set /augeas/load/myfile/lens @PHP
-#     augtool> set /augeas/load/myfile/incl /usr/local/etc/php5/cgi/php.ini
-#     augtool> load
-#     augtool> print
-#     ...
-#     /files/usr/local/etc/php5/cgi/php.ini/soap/soap.wsdl_cache_limit = "5"
-#     /files/usr/local/etc/php5/cgi/php.ini/ldap/ldap.max_links = "-1"
-#     ...
-#     augtool> exit
-#     #
-#
-# The part after 'php.ini/' is what you need to use as 'entry'.
-#
-# == Parameters
-#
-# [*entry*]
-#   Augeas path to entry to be modified.
-#
-# [*ensure*]
-#   Standard puppet ensure variable
-#
-# [*target*]
-#   Which php.ini to manipulate. Default is $php::config_file
-#
-# [*value*]
-#   Value to set
-#
-# == Examples
-#
-# php::augeas {
-#   'php-memorylimit':
-#     entry  => 'PHP/memory_limit',
-#     value  => '128M';
-#   'php-error_log':
-#     entry  => 'PHP/error_log',
-#     ensure => absent;
-#   'php-sendmail_path':
-#     entry  => 'mail function/sendmail_path',
-#     value  => '/usr/sbin/sendmail -t -i -f info@example.com';
-#   'php-date_timezone':
-#     entry  => 'Date/date.timezone',
-#     value  => 'Europe/Amsterdam';
-# }
-#
-define php::augeas (
-  $entry,
-  $ensure = present,
-  $target = $php::config_file,
-  $value  = '',
-  ) {
-
-  include php
-
-  $service = $php::service
-
-  $changes = $ensure ? {
-    present => [ "set '${entry}' '${value}'" ],
-    absent  => [ "rm '${entry}'" ],
-  }
-
-  augeas { "php_ini-${name}":
-    incl    => $target,
-    lens    => 'Php.lns',
-    changes => $changes,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp
deleted file mode 100644
index 12514dbf55a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# = Define: php::conf
-#
-# With this define you can manage any php configuration file
-# You have 3 parameters to provide it: source, template and content.
-#
-# == Parameters
-#
-# [*template*]
-#   String. Optional. Default: undef. Alternative to: source, content.
-#   Sets the module path of a custom template to use as content of
-#   the config file
-#   When defined, config file has: content => content($template),
-#   Example: template => 'site/php/my.conf.erb',
-#
-# [*content*]
-#   String. Optional. Default: undef. Alternative to: template, source.
-#   Sets directly the value of the file's content parameter
-#   When defined, config file has: content => $content,
-#   Example: content => "# File Managed by Puppet \n",
-#
-# [*source*]
-#   String. Optional. Default: undef. Alternative to: template, content.
-#   Sets the value of the file's source parameter
-#   When defined, config file has: source => $source,
-#   Example: source => 'puppet:///site/php/my.conf',
-#
-# [*ensure*]
-#   String. Default: present
-#   Manages config file presence. Possible values:
-#   * 'present' - Create and manages the file.
-#   * 'absent' - Remove the file.
-#
-# [*path*]
-#   String. Optional. Default: $config_dir/$title
-#   The path of the created config file. If not defined a file
-#   name like the  the name of the title a custom template to use as content of configfile
-#   If defined, configfile file has: content => content("$template")
-#
-# [*mode*] [*owner*] [*group*] [*notify*] [*replace*]
-#   String. Optional. Default: undef
-#   All these parameters map directly to the created file attributes.
-#   If not defined the module's defaults are used.
-#   If defined, config file file has, for example: mode => $mode
-#
-# [*options_hash*]
-#   Hash. Default undef. Needs: 'template'.
-#   An hash of custom options to be used in templates to manage any key pairs of
-#   arbitrary settings.
-#
-define php::conf (
-
-  $source       = undef,
-  $template     = undef,
-  $content      = undef,
-
-  $path         = undef,
-  $mode         = undef,
-  $owner        = undef,
-  $group        = undef,
-  $notify       = undef,
-  $replace      = undef,
-
-  $options_hash = undef,
-
-  $ensure       = present ) {
-
-  validate_re($ensure, ['present','absent'], 'Valid values are: present, absent. WARNING: If set to absent the conf file is removed.')
-
-  include php
-
-  $managed_path = $path ? {
-    undef   => "${php::config_dir}/${name}",
-    default => $path,
-  }
-
-  $managed_content = $content ? {
-    undef   => $template ? {
-      undef => undef,
-      default => template($template),
-    },
-    default => $content,
-  }
-
-  $managed_mode = $mode ? {
-    undef   => $php::config_file_mode,
-    default => $mode,
-  }
-
-  $managed_owner = $owner ? {
-    undef   => $php::config_file_owner,
-    default => $owner,
-  }
-
-  $managed_group = $group ? {
-    undef   => $php::config_file_group,
-    default => $group,
-  }
-
-  file { "php_conf_${name}":
-    ensure  => $ensure,
-    source  => $source,
-    content => $managed_content,
-    path    => $managed_path,
-    mode    => $managed_mode,
-    owner   => $managed_owner,
-    group   => $managed_group,
-    notify  => $notify,
-    replace => $replace,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp
deleted file mode 100644
index 634f35ea2de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class php::devel
-#
-# Installs php devel package
-#
-class php::devel {
-
-  if $php::package_devel != ''
-  and ! defined(Package[$php::package_devel]) {
-    package { $php::package_devel :
-      ensure => $php::manage_package,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp
deleted file mode 100644
index 2851aa4c67e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# = Define: php::ini
-#
-define php::ini (
-    $value       = '',
-    $template    = 'extra-ini.erb',
-    $target      = 'extra.ini',
-    $service     = $php::service,
-    $config_dir  = $php::config_dir
-) {
-
-  include php
-
-  file { "${config_dir}/conf.d/${target}":
-    ensure  => 'present',
-    content => template("php/${template}"),
-    require => Package['php'],
-    notify  => Service[$service],
-  }
-
-  file { "${config_dir}/cli/conf.d/${target}":
-    ensure  => 'present',
-    content => template("php/${template}"),
-    require => Package['php'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp
deleted file mode 100644
index 7370528657a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp
+++ /dev/null
@@ -1,298 +0,0 @@
-# = Class: php
-#
-# This is the main php class
-#
-#
-# == Parameters
-#
-# Module specific parameters
-# [*package_devel*]
-#   Name of the php-devel package
-#
-# [*package_pear*]
-#   Name of the php-pear package
-#
-# Standard class parameters
-# Define the general class behaviour and customizations
-#
-# [*my_class*]
-#   Name of a custom class to autoload to manage module's customizations
-#   If defined, php class will automatically "include $my_class"
-#   Can be defined also by the (top scope) variable $php_myclass
-#
-# [*service*]
-#   The service that runs the php interpreter. Defines what service gets
-#   notified. Default: apache2|httpd.
-#
-# [*source*]
-#   Sets the content of source parameter for main configuration file
-#   If defined, php main config file will have the param: source => $source
-#   Can be defined also by the (top scope) variable $php_source
-#
-# [*source_dir*]
-#   If defined, the whole php configuration directory content is retrieved
-#   recursively from the specified source
-#   (source => $source_dir , recurse => true)
-#   Can be defined also by the (top scope) variable $php_source_dir
-#
-# [*source_dir_purge*]
-#   If set to true (default false) the existing configuration directory is
-#   mirrored with the content retrieved from source_dir
-#   (source => $source_dir , recurse => true , purge => true, force => true)
-#   Can be defined also by the (top scope) variable $php_source_dir_purge
-#
-# [*template*]
-#   Sets the path to the template to use as content for main configuration file
-#   If defined, php main config file has: content => content("$template")
-#   Note source and template parameters are mutually exclusive: don't use both
-#   Can be defined also by the (top scope) variable $php_template
-#
-# [*augeas*]
-#   If set to true (default false), the php.ini will be managed through
-#   augeas. This will make php::pecl automatically add extensions to the
-#   php.ini.
-#   Can be defined also by the (top scope) variable $php_augeas
-#
-# [*options*]
-#   An hash of custom options to be used in templates for arbitrary settings.
-#   Can be defined also by the (top scope) variable $php_options
-#
-# [*version*]
-#   The package version, used in the ensure parameter of package type.
-#   Default: present. Can be 'latest' or a specific version number.
-#   Note that if the argument absent (see below) is set to true, the
-#   package is removed, whatever the value of version parameter.
-#
-# [*absent*]
-#   Set to 'true' to remove package(s) installed by module
-#   Can be defined also by the (top scope) variable $php_absent
-#
-# [*puppi*]
-#   Set to 'true' to enable creation of module data files that are used by puppi
-#   Can be defined also by the (top scope) variables $php_puppi and $puppi
-#
-# [*puppi_helper*]
-#   Specify the helper to use for puppi commands. The default for this module
-#   is specified in params.pp and is generally a good choice.
-#   You can customize the output of puppi commands for this module using another
-#   puppi helper. Use the define puppi::helper to create a new custom helper
-#   Can be defined also by the (top scope) variables $php_puppi_helper
-#   and $puppi_helper
-#
-# [*debug*]
-#   Set to 'true' to enable modules debugging
-#   Can be defined also by the (top scope) variables $php_debug and $debug
-#
-# [*audit_only*]
-#   Set to 'true' if you don't intend to override existing configuration files
-#   and want to audit the difference between existing files and the ones
-#   managed by Puppet.
-#   Can be defined also by the (top scope) variables $php_audit_only
-#   and $audit_only
-#
-# Default class params - As defined in php::params.
-# Note that these variables are mostly defined and used in the module itself,
-# overriding the default values might not affected all the involved components.
-# Set and override them only if you know what you're doing.
-# Note also that you can't override/set them via top scope variables.
-#
-# [*package*]
-#   The name of php package
-#
-# [*config_dir*]
-#   Main configuration directory. Used by puppi
-#
-# [*config_file*]
-#   Main configuration file path
-#
-# [*config_file_mode*]
-#   Main configuration file path mode
-#
-# [*config_file_owner*]
-#   Main configuration file path owner
-#
-# [*config_file_group*]
-#   Main configuration file path group
-#
-# [*config_file_init*]
-#   Path of configuration file sourced by init script
-#
-# [*pid_file*]
-#   Path of pid file. Used by monitor
-#
-# [*data_dir*]
-#   Path of application data directory. Used by puppi
-#
-# [*log_dir*]
-#   Base logs directory. Used by puppi
-#
-# [*log_file*]
-#   Log file(s). Used by puppi
-#
-# == Examples
-#
-# You can use this class in 2 ways:
-# - Set variables (at top scope level on in a ENC) and "include php"
-# - Call php as a parametrized class
-#
-# See README for details.
-#
-#
-class php (
-  $package_devel       = params_lookup( 'package_devel' ),
-  $package_pear        = params_lookup( 'package_pear' ),
-  $my_class            = params_lookup( 'my_class' ),
-  $service             = params_lookup( 'service' ),
-  $service_autorestart = params_lookup( 'service_autorestart' ),
-  $source              = params_lookup( 'source' ),
-  $source_dir          = params_lookup( 'source_dir' ),
-  $source_dir_purge    = params_lookup( 'source_dir_purge' ),
-  $template            = params_lookup( 'template' ),
-  $augeas              = params_lookup( 'augeas' ),
-  $options             = params_lookup( 'options' ),
-  $version             = params_lookup( 'version' ),
-  $absent              = params_lookup( 'absent' ),
-  $monitor             = params_lookup( 'monitor' , 'global' ),
-  $monitor_tool        = params_lookup( 'monitor_tool' , 'global' ),
-  $monitor_target      = params_lookup( 'monitor_target' , 'global' ),
-  $puppi               = params_lookup( 'puppi' , 'global' ),
-  $puppi_helper        = params_lookup( 'puppi_helper' , 'global' ),
-  $debug               = params_lookup( 'debug' , 'global' ),
-  $audit_only          = params_lookup( 'audit_only' , 'global' ),
-  $package             = params_lookup( 'package' ),
-  $module_prefix       = params_lookup( 'module_prefix' ),
-  $config_dir          = params_lookup( 'config_dir' ),
-  $config_file         = params_lookup( 'config_file' ),
-  $config_file_mode    = params_lookup( 'config_file_mode' ),
-  $config_file_owner   = params_lookup( 'config_file_owner' ),
-  $config_file_group   = params_lookup( 'config_file_group' ),
-  $config_file_init    = params_lookup( 'config_file_init' ),
-  $pid_file            = params_lookup( 'pid_file' ),
-  $data_dir            = params_lookup( 'data_dir' ),
-  $log_dir             = params_lookup( 'log_dir' ),
-  $log_file            = params_lookup( 'log_file' ),
-  $port                = params_lookup( 'port' ),
-  $protocol            = params_lookup( 'protocol' )
-  ) inherits php::params {
-
-  $bool_service_autorestart=any2bool($service_autorestart)
-  $bool_source_dir_purge=any2bool($source_dir_purge)
-  $bool_augeas=any2bool($augeas)
-  $bool_absent=any2bool($absent)
-  $bool_monitor=any2bool($monitor)
-  $bool_puppi=any2bool($puppi)
-  $bool_debug=any2bool($debug)
-  $bool_audit_only=any2bool($audit_only)
-
-  ### Definition of some variables used in the module
-  $manage_package = $php::bool_absent ? {
-    true  => 'absent',
-    false => $php::version,
-  }
-
-  $manage_file = $php::bool_absent ? {
-    true    => 'absent',
-    default => 'present',
-  }
-
-  if $php::bool_absent == true {
-    $manage_monitor = false
-  } else {
-    $manage_monitor = true
-  }
-
-  $manage_audit = $php::bool_audit_only ? {
-    true  => 'all',
-    false => undef,
-  }
-
-  $manage_file_replace = $php::bool_audit_only ? {
-    true  => false,
-    false => true,
-  }
-
-  if ($php::source and $php::template) {
-    fail ('PHP: cannot set both source and template')
-  }
-  if ($php::source and $php::bool_augeas) {
-    fail ('PHP: cannot set both source and augeas')
-  }
-  if ($php::template and $php::bool_augeas) {
-    fail ('PHP: cannot set both template and augeas')
-  }
-
-  $manage_file_source = $php::source ? {
-    ''        => undef,
-    default   => $php::source,
-  }
-
-  $manage_file_content = $php::template ? {
-    ''        => undef,
-    default   => template($php::template),
-  }
-
-  ### Managed resources
-  package { 'php':
-    ensure => $php::manage_package,
-    name   => $php::package,
-  }
-
-  file { 'php.conf':
-    ensure  => $php::manage_file,
-    path    => $php::config_file,
-    mode    => $php::config_file_mode,
-    owner   => $php::config_file_owner,
-    group   => $php::config_file_group,
-    require => Package['php'],
-    source  => $php::manage_file_source,
-    content => $php::manage_file_content,
-    replace => $php::manage_file_replace,
-    audit   => $php::manage_audit,
-  }
-
-  # The whole php configuration directory can be recursively overriden
-  if $php::source_dir {
-    file { 'php.dir':
-      ensure  => directory,
-      path    => $php::config_dir,
-      require => Package['php'],
-      source  => $php::source_dir,
-      recurse => true,
-      purge   => $php::bool_source_dir_purge,
-      force   => $php::bool_source_dir_purge,
-      replace => $php::manage_file_replace,
-      audit   => $php::manage_audit,
-    }
-  }
-
-
-  ### Include custom class if $my_class is set
-  if $php::my_class {
-    include $php::my_class
-  }
-
-
-  ### Provide puppi data, if enabled ( puppi => true )
-  if $php::bool_puppi == true {
-    $classvars=get_class_args()
-    puppi::ze { 'php':
-      ensure    => $php::manage_file,
-      variables => $classvars,
-      helper    => $php::puppi_helper,
-    }
-  }
-
-
-  ### Debugging, if enabled ( debug => true )
-  if $php::bool_debug == true {
-    file { 'debug_php':
-      ensure  => $php::manage_file,
-      path    => "${settings::vardir}/debug-php",
-      mode    => '0640',
-      owner   => 'root',
-      group   => 'root',
-      content => inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*|.*psk.*|.*key)/ }.to_yaml %>'),
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp
deleted file mode 100644
index 714c1de283d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# = Define: php::module
-#
-# This define installs and configures php modules
-# On Debian and derivatives it install module named php5-${name}
-# On RedHat and derivatives it install module named php-${name}
-# If you need a custom prefix you can overload default $module_prefix parameter
-#
-# == Parameters
-#
-# [*version*]
-#   Version to install.
-#
-# [*absent*]
-#   true to ensure package isn't installed.
-#
-# [*notify_service*]
-#   If you want to restart a service automatically when
-#   the module is applied. Default: true
-#
-# [*service_autorestart*]
-#   whatever we want a module installation notify a service to restart.
-#
-# [*service*]
-#   Service to restart.
-#
-# [*module_prefix*]
-#   If package name prefix isn't standard.
-#
-# == Examples
-# php::module { 'gd': }
-#
-# php::module { 'gd':
-#   ensure => absent,
-# }
-#
-# This will install php-apc on debian instead of php5-apc
-#
-# php::module { 'apc':
-#   module_prefix => "php-",
-# }
-#
-# Note that you may include or declare the php class when using
-# the php::module define
-#
-define php::module (
-  $version             = 'present',
-  $service_autorestart = '',
-  $module_prefix       = '',
-  $absent              = ''
-  ) {
-
-  include php
-
-  if $absent {
-    $real_version = 'absent'
-  } else {
-    $real_version = $version
-  }
-
-  $real_service_autorestart = $service_autorestart ? {
-    true    => "Service[${php::service}]",
-    false   => undef,
-    ''      => $php::service_autorestart ? {
-      true    => "Service[${php::service}]",
-      false   => undef,
-    }
-  }
-
-  $real_module_prefix = $module_prefix ? {
-    ''      => $php::module_prefix,
-    default => $module_prefix,
-  }
-
-  $real_install_package = "${real_module_prefix}${name}"
-
-  if defined(Package[$real_install_package]) == false {
-    package { "PhpModule_${name}":
-      ensure  => $real_version,
-      name    => $real_install_package,
-      notify  => $real_service_autorestart,
-      require => Package['php'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp
deleted file mode 100644
index 4db3267d901..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Class: php::params
-#
-# This class defines default parameters used by the main module class php
-# Operating Systems differences in names and paths are addressed here
-#
-# == Variables
-#
-# Refer to php class for the variables defined here.
-#
-# == Usage
-#
-# This class is not intended to be used directly.
-# It may be imported or inherited by other classes
-#
-class php::params {
-
-  $package_devel = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php5-dev',
-    /(?i:SLES|OpenSuSe)/      => 'php5-devel',
-    default                   => 'php-devel',
-  }
-
-  $package_pear = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php-pear',
-    /(?i:SLES|OpenSuSe)/      => 'php5-pear',
-    default                   => 'php-pear',
-  }
-
-  ### Application related parameters
-  $module_prefix = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'php5-',
-    default                                 => 'php-',
-  }
-
-  $pear_module_prefix = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/             => 'php-',
-    /(?i:SLES|OpenSuSe)/                  => 'php5-pear-',
-    /(?i:CentOS|RedHat|Scientific|Linux)/ => 'php-pear-',
-    default                               => 'pear-',
-  }
-
-  $package = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php5',
-    /(?i:SLES|OpenSuSE)/      => [ 'php5','apache2-mod_php5'],
-    default                   => 'php',
-  }
-
-  # Here it's not the php service script name but
-  # web service name like apache2, nginx, etc.
-  $service = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'apache2',
-    default                                 => 'httpd',
-  }
-
-  $config_dir = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => '/etc/php5',
-    default                                   => '/etc/php.d',
-  }
-
-  $config_file = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => '/etc/php5/php.ini',
-    /(?i:SLES|OpenSuSE)/      => '/etc/php5/apache2/php.ini',
-    default                   => '/etc/php.ini',
-  }
-
-  $config_file_mode = $::operatingsystem ? {
-    default => '0644',
-  }
-
-  $config_file_owner = $::operatingsystem ? {
-    default => 'root',
-  }
-
-  $config_file_group = $::operatingsystem ? {
-    default => 'root',
-  }
-
-  $data_dir = $::operatingsystem ? {
-    default => '',
-  }
-
-  $log_dir = $::operatingsystem ? {
-    default => '',
-  }
-
-  $log_file = $::operatingsystem ? {
-    default => '',
-  }
-
-  # General Settings
-  $my_class = ''
-  $source = ''
-  $source_dir = ''
-  $source_dir_purge = false
-  $augeas = false
-  $template = ''
-  $options = ''
-  $version = 'present'
-  $service_autorestart = true
-  $absent = false
-
-  ### General module variables that can have a site or per module default
-  $puppi = false
-  $puppi_helper = 'standard'
-  $debug = false
-  $audit_only = false
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp
deleted file mode 100644
index a333a8448b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Class: php::pear
-#
-# Installs Pear for PHP module
-#
-# Usage:
-# include php::pear
-#
-# == Parameters
-#
-# Standard class parameters
-# Define the general class behaviour and customizations
-#
-# [*package*]
-#   Name of the package to install. Defaults to 'php-pear'
-#
-# [*version*]
-#   Version to install. Defaults to 'present'
-#
-# [*install_package*]
-#   Boolean. Determines if any package should be installed to support the PEAR functionality.
-#   Can be false if PEAR was already provided by another package or module.
-#   Default: true
-#
-class php::pear (
-  $package         = $php::package_pear,
-  $install_package = true,
-  $version         = 'present',
-  $path            = '/usr/bin:/usr/sbin:/bin:/sbin'
-  ) inherits php {
-
-  if ( $install_package ) {
-    package { 'php-pear':
-      ensure => $version,
-      name   => $package,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp
deleted file mode 100644
index 41c5b75091f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# Define: php::pear::config
-#
-# Configures pear
-#
-# Usage:
-# php::pear::config { http_proxy: value => "myproxy:8080" }
-#
-define php::pear::config ($value) {
-
-  include php::pear
-
-  exec { "pear-config-set-${name}":
-    command => "pear config-set ${name} ${value}",
-    path    => $php::pear::path,
-    unless  => "pear config-get ${name} | grep ${value}",
-    require => Package['php-pear'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp
deleted file mode 100644
index 4d11b16f19f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Define: php::pear::module
-#
-# Installs the defined php pear component
-#
-# Variables:
-# [*use_package*]
-#   (default=true) - Tries to install pear module with the relevant OS package
-#   If set to "no" it installs the module via pear command
-#
-# [*preferred_state*]
-#   (default="stable") - Define which preferred state to use when installing
-#   Pear modules via pear via command line (when use_package=false)
-#
-# [*alldeps*]
-#   (default="false") - Define if all the available (optional) modules should
-#   be installed. (when use_package=false)
-#
-# Usage:
-# php::pear::module { packagename: }
-# Example:
-# php::pear::module { Crypt-CHAP: }
-#
-define php::pear::module (
-  $service             = '',
-  $use_package         = true,
-  $preferred_state     = 'stable',
-  $alldeps             = false,
-  $version             = 'present',
-  $repository          = 'pear.php.net',
-  $service_autorestart = '',
-  $module_prefix       = '',
-  $path                = '/usr/bin:/usr/sbin:/bin:/sbin',
-  $ensure              = 'present',
-  $timeout             = 300
-  ) {
-
-  include php::pear
-
-  $bool_use_package = any2bool($use_package)
-  $bool_alldeps = any2bool($alldeps)
-  $manage_alldeps = $bool_alldeps ? {
-    true  => '--alldeps',
-    false => '',
-  }
-
-  $pear_source = $version ? {
-    'present' => "${repository}/${name}",
-    default   => "${repository}/${name}-${version}",
-  }
-
-  $pear_exec_command = $ensure ? {
-    present => "pear -d preferred_state=${preferred_state} install ${manage_alldeps} ${pear_source}",
-    absent  => "pear uninstall -n ${pear_source}",
-  }
-
-  $pear_exec_require = $repository ? {
-    'pear.php.net' => Package['php-pear'],
-    default        => [ Package['php-pear'],Php::Pear::Config['auto_discover'] ],
-  }
-
-  $pear_exec_unless = $ensure ? {
-    present => "pear info ${pear_source}",
-    absent  => undef
-  }
-
-  $pear_exec_onlyif = $ensure ? {
-    present => undef,
-    absent  => "pear info ${pear_source}",
-  }
-
-  $real_service = $service ? {
-    ''      => $php::service,
-    default => $service,
-  }
-
-  $real_service_autorestart = $service_autorestart ? {
-    true    => "Service[${real_service}]",
-    false   => undef,
-    ''      => $php::service_autorestart ? {
-      true    => "Service[${real_service}]",
-      false   => undef,
-    }
-  }
-
-  $real_module_prefix = $module_prefix ? {
-    ''      => $php::pear_module_prefix,
-    default => $module_prefix,
-  }
-  $package_name = "${real_module_prefix}${name}"
-
-
-  case $bool_use_package {
-    true: {
-      package { "pear-${name}":
-        ensure  => $ensure,
-        name    => $package_name,
-        notify  => $real_service_autorestart,
-      }
-    }
-    default: {
-      if $repository != 'pear.php.net' {
-        if !defined (Php::Pear::Config['auto_discover']) {
-          php::pear::config { 'auto_discover':
-            value => '1',
-          }
-        }
-      }
-      exec { "pear-${name}":
-        command => $pear_exec_command,
-        path    => $path,
-        unless  => $pear_exec_unless,
-        onlyif  => $pear_exec_onlyif,
-        require => $pear_exec_require,
-        timeout => $timeout,
-      }
-    }
-  } # End Case
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp
deleted file mode 100644
index 437a2ab10ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Define: php::pecl::config
-#
-# Configures pecl
-#
-# Usage:
-# php::pecl::config { http_proxy: value => "myproxy:8080" }
-#
-define php::pecl::config (
-  $value,
-  $layer = 'user',
-  $path  = '/usr/bin:/bin:/usr/sbin:/sbin'
-  ) {
-
-  include php::pear
-
-  exec { "pecl-config-set-${name}":
-    command => "pecl config-set ${name} ${value} ${layer}",
-    path    => $path,
-    unless  => "pecl config-get ${name} | grep ${value}",
-    require => Package['php-pear'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp
deleted file mode 100644
index b47b10b5d71..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp
+++ /dev/null
@@ -1,126 +0,0 @@
-# Define: php::pecl::module
-#
-# Installs the defined php pecl component
-#
-# == Parameters
-#
-# [*service_autorestart*]
-#   wathever we want a module installation notify a service to restart.
-#
-# [*service*]
-#   Service to restart.
-#
-# [*use_package*]
-#   Tries to install pecl module with the relevant package.
-#   If set to "no" it installs the module via pecl command. Default: true
-#
-# [*preferred_state*]
-#   Define which preferred state to use when installing Pear modules via pecl
-#   command line (when use_package=no). Default: true
-#
-# [*auto_answer*]
-#   The answer(s) to give to pecl prompts for unattended install
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose pecl output during installation.
-#   This can help to debug installation problems (missing packages) during
-#   installation process. Default: false
-#
-# == Examples
-# php::pecl::module { 'intl': }
-#
-# This will install xdebug from pecl source instead of using the package
-#
-# php::pecl::module { 'xdebug':.
-#   use_package => "no",
-# }
-#
-define php::pecl::module (
-  $service_autorestart = $php::bool_service_autorestart,
-  $service             = $php::service,
-  $use_package         = 'yes',
-  $preferred_state     = 'stable',
-  $auto_answer         = '\\n',
-  $ensure              = present,
-  $path                = '/usr/bin:/usr/sbin:/bin:/sbin',
-  $verbose             = false,
-  $version             = '',
-  $config_file         = $php::config_file) {
-
-  include php
-  include php::pear
-  include php::devel
-
-  $manage_service_autorestart = $service_autorestart ? {
-    true    => $service ? {
-      ''      => undef,
-      default => "Service[${service}]",
-    },
-    false   => undef,
-    undef   => undef,
-  }
-
-  $real_package_name = $::operatingsystem ? {
-    ubuntu  => "php5-${name}",
-    debian  => "php5-${name}",
-    default => "php-${name}",
-  }
-
-  case $use_package {
-    yes: {
-      package { "php-${name}":
-        ensure => $ensure,
-        name   => $real_package_name,
-        notify => $manage_service_autorestart,
-      }
-    }
-    default: {
-
-      $bool_verbose = any2bool($verbose)
-
-      $pecl_exec_logoutput = $bool_verbose ? {
-        true  => true,
-        false => undef,
-      }
-
-      if $version != '' {
-        $new_version = "-${version}"
-      } else {
-        $new_version = ''
-      }
-
-      $pecl_exec_command = $ensure ? {
-        present => "printf \"${auto_answer}\" | pecl -d preferred_state=${preferred_state} install ${name}${new_version}",
-        absent  => "pecl uninstall -n ${name}",
-      }
-
-      $pecl_exec_unless = $ensure ? {
-        present => "pecl info ${name}",
-        absent  => undef
-      }
-
-      $pecl_exec_onlyif = $ensure ? {
-        present => undef,
-        absent  => "pecl info ${name}",
-      }
-
-      exec { "pecl-${name}":
-        command   => $pecl_exec_command,
-        unless    => $pecl_exec_unless,
-        onlyif    => $pecl_exec_onlyif,
-        logoutput => $pecl_exec_logoutput,
-        path      => $path,
-        require   => [ Class['php::pear'], Class['php::devel']],
-      }
-      if $php::bool_augeas == true {
-        php::augeas { "augeas-${name}":
-          ensure => $ensure,
-          entry  => "PHP/extension[. = \"${name}.so\"]",
-          value  => "${name}.so",
-          notify => $manage_service_autorestart,
-          target => $config_file,
-        }
-      }
-    }
-  } # End Case
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp
deleted file mode 100644
index 3be06f47f8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Class: php::spec
-#
-# This class is used only for rpsec-puppet tests
-# Can be taken as an example on how to do custom classes but should not
-# be modified.
-#
-# == Usage
-#
-# This class is not intended to be used directly.
-# Use it as reference
-#
-class php::spec inherits php {
-
-  # This just a test to override the arguments of an existing resource
-  # Note that you can achieve this same result with just:
-  # class { "php": template => "php/spec.erb" }
-
-  File['php.conf'] {
-    content => template('php/spec.erb'),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb
deleted file mode 100644
index be9a4e327ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php' do
-
-  let(:title) { 'php' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test standard installation' do
-    it { should contain_package('php').with_ensure('present') }
-    it { should contain_file('php.conf').with_ensure('present') }
-  end
-
-  describe 'Test installation of a specific version' do
-    let(:params) { {:version => '1.0.42' } }
-    it { should contain_package('php').with_ensure('1.0.42') }
-  end
-
-  describe 'Test decommissioning - absent' do
-    let(:params) { {:absent => true, :monitor => true } }
-
-    it 'should remove Package[php]' do should contain_package('php').with_ensure('absent') end 
-    it 'should remove php configuration file' do should contain_file('php.conf').with_ensure('absent') end
-  end
-
-  describe 'Test customizations - template' do
-    let(:params) { {:template => "php/spec.erb" , :options => { 'opt_a' => 'value_a' } } }
-
-    it 'should generate a valid template' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "fqdn: rspec.example42.com"
-    end
-    it 'should generate a template that uses custom options' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "value_a"
-    end
-
-  end
-
-  describe 'Test customizations - source' do
-    let(:params) { {:source => "puppet://modules/php/spec" , :source_dir => "puppet://modules/php/dir/spec" , :source_dir_purge => true } }
-
-    it 'should request a valid source ' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:source]
-      content.should == "puppet://modules/php/spec"
-    end
-    it 'should request a valid source dir' do
-      content = catalogue.resource('file', 'php.dir').send(:parameters)[:source]
-      content.should == "puppet://modules/php/dir/spec"
-    end
-    it 'should purge source dir if source_dir_purge is true' do
-      content = catalogue.resource('file', 'php.dir').send(:parameters)[:purge]
-      content.should == true
-    end
-  end
-
-  describe 'Test customizations - custom class' do
-    let(:params) { {:my_class => "php::spec" } }
-    it 'should automatically include a custom class' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "fqdn: rspec.example42.com"
-    end
-  end
-
-  describe 'Test Puppi Integration' do
-    let(:params) { {:puppi => true, :puppi_helper => "myhelper"} }
-
-    it 'should generate a puppi::ze define' do
-      content = catalogue.resource('puppi::ze', 'php').send(:parameters)[:helper]
-      content.should == "myhelper"
-    end
-  end
-
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb
deleted file mode 100644
index 614f0a10877..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php::module' do
-
-  let(:title) { 'php::module' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { 'operatingsystem' => 'Ubuntu' } }
-
-  describe 'Test standard installation' do
-    let(:params) { { 'name' =>  'ps', } }
-    it 'should create a package with the default OS prefix' do
-      should contain_package('PhpModule_ps').with_name('php5-ps')
-    end
-    it 'should notify the default service' do
-      should contain_package('PhpModule_ps').with_notify('Service[apache2]')
-    end
-  end
-
-  describe 'Test custom params' do
-    let(:params) { { 'name' =>  'ps', 'module_prefix' => 'my-' , 'service_autorestart' => false } }
-    it 'should create a package with custom prefix' do
-      should contain_package('PhpModule_ps').with(
-        'ensure' => 'present',
-        'name'   => 'my-ps'
-      )
-      should contain_package('PhpModule_ps').without('notify')
-    end
-  end
-
-  describe 'Test uninstallation' do
-    let(:params) { { 'name' =>  'ps', 'absent' => 'true' } }
-    it 'should remove the package' do
-      should contain_package('PhpModule_ps').with_ensure('absent')
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb
deleted file mode 100644
index b093a8acfea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php::pear::module' do
-
-  let(:title) { 'php::pear::module' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { 'operatingsystem' => 'Ubuntu' } }
-
-  describe 'Test standard installation' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', } }
-    it 'should install pear module with default OS package' do
-      should contain_package('pear-Crypt-CHAP').with_name('php-Crypt-CHAP')
-    end
-    it 'should notify the default service' do
-      should contain_package('pear-Crypt-CHAP').with_notify('Service[apache2]')
-    end
-  end
-
-  describe 'Test custom params' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'module_prefix' => 'my-' , 'service_autorestart' => false } }
-    it 'should create a package with custom prefix' do
-      should contain_package('pear-Crypt-CHAP').with(
-        'ensure' => 'present',
-        'name'   => 'my-Crypt-CHAP'
-      )
-      should contain_package('pear-Crypt-CHAP').without('notify')
-    end
-  end
-
-  describe 'Test uninstallation' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'ensure' => 'absent' } }
-    it 'should remove the package' do
-      should contain_package('pear-Crypt-CHAP').with_ensure('absent')
-    end
-  end
-
-  describe 'Test installation via exec' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'use_package' => 'false' } }
-    it 'should install pear module with exec commands' do
-      should contain_exec('pear-Crypt-CHAP').with(
-        'command' => 'pear -d preferred_state=stable install  pear.php.net/Crypt-CHAP',
-        'unless'  => 'pear info pear.php.net/Crypt-CHAP'
-      )
-    end
-  end
-
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb
deleted file mode 100644
index e0e7087e892..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-; File Managed by Puppet
-
-<% if @value != "" -%>
-<% if @value.is_a? Array -%>
-<% @value.each do |name| -%>
-<%= name %>
-<% end %>
-<% else -%>
-<%= value %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb
deleted file mode 100644
index 87b8c1e65dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a template used only for rspec tests
-
-# Yaml of the whole scope
-<%= scope.to_hash.reject { |k,v| !( k.is_a?(String) && v.is_a?(String) ) }.to_yaml %>
-
-# Custom Options
-<%= options['opt_a'] %>
-<%= options['opt_b'] %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml
deleted file mode 100644
index 5dbd5d048df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-fixtures:
-  repositories:
-    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
-    concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
-  symlinks:
-    postgresql: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project
deleted file mode 100644
index a680a0bce77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>postgresql</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml
deleted file mode 100644
index 795fa6fcd19..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: jY81Y/csdcDjjXRzX9VA3fbb5db+/KraLRPErHjYANO15DZjh3b9tBwo/ybLCLCGJE8ej1yXzTxs1dJhokySQL12m1VW1i8dM26kMc4x+wOnIFKny7VB78Tcbp8RV1iV1kWN3UcuAbQ5hvMrI3rzoWkD22zF0k3nFEcv1kpix1w=
-matrix:
-  fast_finish: true
-  exclude:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md
deleted file mode 100644
index 5f70a34dcd3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md
+++ /dev/null
@@ -1,550 +0,0 @@
-##2014-03-04 - Supported Release 3.3.3
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* SLES is not supported.
-
-##2014-03-04 - Supported Release 3.3.2
-###Summary
-This is a supported release. It fixes a problem with updating passwords on postgresql.org distributed versions of PostgreSQL.
-
-####Bugfixes
-- Correct psql path when setting password on custom versions.
-- Documentation updates
-- Test updates
-
-####Known Bugs
-* SLES is not supported.
-
-
-##2014-02-12 - Version 3.3.1
-####Bugfix:
-- Allow dynamic rubygems host
-
-
-##2014-01-28 - Version 3.3.0
-
-###Summary
-
-This release rolls up a bunch of bugfixes our users have found and fixed for
-us over the last few months.  This improves things for 9.1 users, and makes
-this module usable on FreeBSD.
-
-This release is dedicated to 'bma', who's suffering with Puppet 3.4.1 issues
-thanks to Puppet::Util::SUIDManager.run_and_capture.
-
-####Features
- - Add lc_ config entry settings
- - Can pass template at database creation.
- - Add FreeBSD support.
- - Add support for customer `xlogdir` parameter.
- - Switch tests from rspec-system to beaker.  (This isn't really a feature)
-
-####Bugfixes
- - Properly fix the deprecated Puppet::Util::SUIDManager.run_and_capture errors.
- - Fix NOREPLICATION option for Postgres 9.1
- - Wrong parameter name: manage_pg_conf -> manage_pg_hba_conf
- - Add $postgresql::server::client_package_name, referred to by install.pp
- - Add missing service_provider/service_name descriptions in ::globals.
- - Fix several smaller typos/issues throughout.
- - Exec['postgresql_initdb'] needs to be done after $datadir exists
- - Prevent defined resources from floating in the catalog.
- - Fix granting all privileges on a table.
- - Add some missing privileges.
- - Remove deprecated and unused concat::fragment parameters.
-
-
-##2013-11-05 - Version 3.2.0
-
-###Summary
-
-Add's support for Ubuntu 13.10 (and 14.04) as well as x, y, z.
-
-####Features
-- Add versions for Ubuntu 13.10 and 14.04.
-- Use default_database in validate_db_connection instead of a hardcoded
-'postgres'
-- Add globals/params layering for default_database.
-- Allow specification of default database name.
-
-####Bugs
-- Fixes to the README.
-
-
-##2013-10-25 - Version 3.1.0
-
-###Summary
-
-This is a minor feature and bug fix release.
-
-Firstly, the postgresql_psql type now includes a new parameter `search_path` which is equivalent to using `set search_path` which allows you to change the default schema search path.
-
-The default version of Fedora 17 has now been added, so that Fedora 17 users can enjoy the module.
-
-And finally we've extended the capabilities of the defined type postgresql::validate_db_connection so that now it can handle retrying and sleeping between retries. This feature has been monopolized to fix a bug we were seeing with startup race conditions, but it can also be used by remote systems to 'wait' for PostgreSQL to start before their Puppet run continues.
-
-####Features
-- Defined $default_version for Fedora 17 (Bret Comnes)
-- add search_path attribute to postgresql_psql resource (Jeremy Kitchen)
-- (GH-198) Add wait and retry capability to validate_db_connection (Ken Barber)
-
-####Bugs
-- enabling defined postgres user password without resetting on every puppet run (jonoterc)
-- periods are valid in configuration variables also (Jeremy Kitchen)
-- Add zero length string to join() function (Jarl Stefansson)
-- add require of install to reload class (cdenneen)
-- (GH-198) Fix race condition on postgresql startup (Ken Barber)
-- Remove concat::setup for include in preparation for the next concat release (Ken Barber)
-
-
-##2013-10-14 - Version 3.0.0
-
-Final release of 3.0, enjoy!
-
-
-##2013-10-14 - Version 3.0.0-rc3
-
-###Summary
-
-Add a parameter to unmanage pg_hba.conf to fix a regression from 2.5, as well
-as allowing owner to be passed into x.
-
-####Features
-- `manage_pg_hba_conf` parameter added to control pg_hba.conf management.
-- `owner` parameter added to server::db.
-
-
-##2013-10-09 - Version 3.0.0-rc2
-
-###Summary
-
-A few bugfixes have been found since -rc1.
-
-####Fixes
-- Special case for $datadir on Amazon
-- Fix documentation about username/password for the postgresql_hash function
-
-
-##2013-10-01 - Version 3.0.0-rc1
-
-###Summary
-
-Version 3 was a major rewrite to fix some internal dependency issues, and to
-make the new Public API more clear. As a consequence a lot of things have
-changed for version 3 and older revisions that we will try to outline here.
-
-(NOTE:  The format of this CHANGELOG differs to normal in an attempt to
-explain the scope of changes)
-
-* Server specific objects now moved under `postgresql::server::` namespace:
-
-To restructure server specific elements under the `postgresql::server::`
-namespaces the following objects were renamed as such:
-
-`postgresql::database`       -> `postgresql::server::database`
-`postgresql::database_grant` -> `postgresql::server::database_grant`
-`postgresql::db`             -> `postgresql::server::db`
-`postgresql::grant`          -> `postgresql::server::grant`
-`postgresql::pg_hba_rule`    -> `postgresql::server::pg_hba_rule`
-`postgresql::plperl`         -> `postgresql::server::plperl`
-`postgresql::contrib`        -> `postgresql::server::contrib`
-`postgresql::role`           -> `postgresql::server::role`
-`postgresql::table_grant`    -> `postgresql::server::table_grant`
-`postgresql::tablespace`     -> `postgresql::server::tablespace`
-
-* New `postgresql::server::config_entry` resource for managing configuration:
-
-Previously we used the `file_line` resource to modify `postgresql.conf`. This
-new revision now adds a new resource named `postgresql::server::config_entry`
-for managing this file. For example:
-
-```puppet
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-```
-
-If you were using `file_line` for this purpose, you should change to this new
-methodology.
-
-* `postgresql_puppet_extras.conf` has been removed:
-
-Now that we have a methodology for managing `postgresql.conf`, and due to
-concerns over the file management methodology using an `exec { 'touch ...': }`
-as a way to create an empty file the existing postgresql\_puppet\_extras.conf
-file is no longer managed by this module.
-
-If you wish to recreate this methodology yourself, use this pattern:
-
-```puppet
-    class { 'postgresql::server': }
-
-    $extras = "/tmp/include.conf"
-
-    file { $extras:
-      content => 'max_connections = 123',
-      notify  => Class['postgresql::server::service'],
-    }->
-    postgresql::server::config_entry { 'include':
-      value   => $extras,
-    }
-```
-
-* All uses of the parameter `charset` changed to `encoding`:
-
-Since PostgreSQL uses the terminology `encoding` not `charset` the parameter
-has been made consisent across all classes and resources.
-
-* The `postgresql` base class is no longer how you set globals:
-
-The old global override pattern was less then optimal so it has been fixed,
-however we decided to demark this properly by specifying these overrides in
-the class `postgresql::global`. Consult the documentation for this class now
-to see what options are available.
-
-Also, some parameter elements have been moved between this and the
-`postgresql::server` class where it made sense.
-
-* `config_hash` parameter collapsed for the `postgresql::server` class:
-
-Because the `config_hash` was really passing data through to what was in
-effect an internal class (`postgresql::config`). And since we don't want this
-kind of internal exposure the parameters were collapsed up into the
-`postgresql::server` class directly.
-
-* Lots of changes to 'private' or 'undocumented' classes:
-
-If you were using these before, these have changed names. You should only use
-what is documented in this README.md, and if you don't have what you need you
-should raise a patch to add that feature to a public API. All internal classes
-now have a comment at the top indicating them as private to make sure the
-message is clear that they are not supported as Public API.
-
-* `pg_hba_conf_defaults` parameter included to turn off default pg\_hba rules:
-
-The defaults should be good enough for most cases (if not raise a bug) but if
-you simply need an escape hatch, this setting will turn off the defaults. If
-you want to do this, it may affect the rest of the module so make sure you
-replace the rules with something that continues operation.
-
-* `postgresql::database_user` has now been removed:
-
-Use `postgresql::server::role` instead.
-
-* `postgresql::psql` resource has now been removed:
-
-Use `postgresql_psql` instead. In the future we may recreate this as a wrapper
-to add extra capability, but it will not match the old behaviour.
-
-* `postgresql_default_version` fact has now been removed:
-
-It didn't make sense to have this logic in a fact any more, the logic has been
-moved into `postgresql::params`.
-
-* `ripienaar/concat` is no longer used, instead we use `puppetlabs/concat`:
-
-The older concat module is now deprecated and moved into the
-`puppetlabs/concat` namespace. Functionality is more or less identical, but
-you may need to intervene during the installing of this package - as both use
-the same `concat` namespace.
-
----
-##2013-09-09 Release 2.5.0
-
-###Summary
-
-The focus of this release is primarily to capture the fixes done to the
-types and providers to make sure refreshonly works properly and to set
-the stage for the large scale refactoring work of 3.0.0.
-
-####Features
-
-
-####Bugfixes 
-- Use boolean for refreshonly.
-- Fix postgresql::plperl documentation.
-- Add two missing parameters to config::beforeservice
-- Style fixes
-
-
-##2013-08-01 Release 2.4.1
-
-###Summary
-
-This minor bugfix release solves an idempotency issue when using plain text
-passwords for the password_hash parameter for the postgresql::role defined
-type. Without this, users would continually see resource changes everytime
-your run Puppet.
-
-####Bugfixes
-- Alter role call not idempotent with cleartext passwords (Ken Barber)
-
-
-##2013-07-19 Release 2.4.0
-
-###Summary
-
-This updates adds the ability to change permissions on tables, create template
-databases from normal databases, manage PL-Perl's postgres package, and
-disable the management of `pg_hba.conf`.
-
-####Features
-- Add `postgresql::table_grant` defined resource
-- Add `postgresql::plperl` class
-- Add `manage_pg_hba_conf` parameter to the `postgresql::config` class
-- Add `istemplate` parameter to the `postgresql::database` define
-
-####Bugfixes
-- Update `postgresql::role` class to be able to update roles when modified
-instead of only on creation.
-- Update tests
-- Fix documentation of `postgresql::database_grant`
-
-
-##2.3.0
-
-This feature release includes the following changes:
-
-* Add a new parameter `owner` to the `database` type.  This can be used to
-  grant ownership of a new database to a specific user.  (Bruno Harbulot)
-* Add support for operating systems other than Debian/RedHat, as long as the
-  user supplies custom values for all of the required paths, package names, etc.
-  (Chris Price)
-* Improved integration testing (Ken Barber)
-
-
-##2.2.1
-
-This release fixes a bug whereby one of our shell commands (psql) were not ran from a globally accessible directory. This was causing permission denied errors when the command attempted to change user without changing directory.
-
-Users of previous versions might have seen this error:
-
-    Error: Error executing SQL; psql returned 256: 'could not change directory to "/root"
-
-This patch should correct that.
-
-#### Detail Changes
-
-* Set /tmp as default CWD for postgresql_psql
-
-
-##2.2.0
-
-This feature release introduces a number of new features and bug fixes.
-
-First of all it includes a new class named `postgresql::python` which provides you with a convenient way of install the python Postgresql client libraries.
-
-    class { 'postgresql::python':
-    }
-
-You are now able to use `postgresql::database_user` without having to specify a password_hash, useful for different authentication mechanisms that do not need passwords (ie. cert, local etc.).
-
-We've also provided a lot more advanced custom parameters now for greater control of your Postgresql installation. Consult the class documentation for PuppetDB in the README.
-
-This release in particular has largely been contributed by the community members below, a big thanks to one and all.
-
-#### Detailed Changes
-
-* Add support for psycopg installation (Flaper Fesp and Dan Prince)
-* Added default PostgreSQL version for Ubuntu 13.04 (Kamil Szymanski)
-* Add ability to create users without a password (Bruno Harbulot)
-* Three Puppet 2.6 fixes (Dominic Cleal)
-* Add explicit call to concat::setup when creating concat file (Dominic Cleal)
-* Fix readme typo (Jordi Boggiano)
-* Update postgres_default_version for Ubuntu (Kamil Szymanski)
-* Allow to set connection for noew role (Kamil Szymanski)
-* Fix pg_hba_rule for postgres local access (Kamil Szymanski)
-* Fix versions for travis-ci (Ken Barber)
-* Add replication support (Jordi Boggiano)
-* Cleaned up and added unit tests (Ken Barber)
-* Generalization to provide more flexability in postgresql configuration (Karel Brezina)
-* Create dependent directory for sudoers so tests work on Centos 5 (Ken Barber)
-* Allow SQL commands to be run against a specific DB (Carlos Villela)
-* Drop trailing comma to support Puppet 2.6 (Michael Arnold)
-
-
-##2.1.1
-
-
-This release provides a bug fix for RHEL 5 and Centos 5 systems, or specifically systems using PostgreSQL 8.1 or older. On those systems one would have received the error:
-
-    Error: Could not start Service[postgresqld]: Execution of ‘/sbin/service postgresql start’ returned 1:
-
-And the postgresql log entry:
-
-    FATAL: unrecognized configuration parameter "include"
-
-This bug is due to a new feature we had added in 2.1.0, whereby the `include` directive in `postgresql.conf` was not compatible. As a work-around we have added checks in our code to make sure systems running PostgreSQL 8.1 or older do not have this directive added.
-
-#### Detailed Changes
-
-2013-01-21 - Ken Barber <ken@bob.sh>
-* Only install `include` directive and included file on PostgreSQL >= 8.2
-* Add system tests for Centos 5
-
-
-##2.1.0
-
-This release is primarily a feature release, introducing some new helpful constructs to the module.
-
-For starters, we've added the line `include 'postgresql_conf_extras.conf'` by default so extra parameters not managed by the module can be added by other tooling or by Puppet itself. This provides a useful escape-hatch for managing settings that are not currently managed by the module today.
-
-We've added a new defined resource for managing your tablespace, so you can now create new tablespaces using the syntax:
-
-    postgresql::tablespace { 'dbspace':
-      location => '/srv/dbspace',
-    }
-
-We've added a locale parameter to the `postgresql` class, to provide a default. Also the parameter has been added to the `postgresql::database` and `postgresql::db` defined resources for changing the locale per database:
-
-    postgresql::db { 'mydatabase':
-      user     => 'myuser',
-      password => 'mypassword',
-      encoding => 'UTF8',
-      locale   => 'en_NG',
-    }
-
-There is a new class for installing the necessary packages to provide the PostgreSQL JDBC client jars:
-
-    class { 'postgresql::java': }
-
-And we have a brand new defined resource for managing fine-grained rule sets within your pg_hba.conf access lists:
-
-    postgresql::pg_hba { 'Open up postgresql for access from 200.1.2.0/24':
-      type => 'host',
-      database => 'app',
-      user => 'app',
-      address => '200.1.2.0/24',
-      auth_method => 'md5',
-    }
-
-Finally, we've also added Travis-CI support and unit tests to help us iterate faster with tests to reduce regression. The current URL for these tests is here: https://travis-ci.org/puppetlabs/puppet-postgresql. Instructions on how to run the unit tests available are provided in the README for the module.
-
-A big thanks to all those listed below who made this feature release possible :-).
-
-#### Detailed Changes
-
-2013-01-18 - Simão Fontes <simaofontes@gmail.com> & Flaper Fesp <flaper87@gmail.com>
-* Remove trailing commas from params.pp property definition for Puppet 2.6.0 compatibility
-
-2013-01-18 - Lauren Rother <lauren.rother@puppetlabs.com>
-* Updated README.md to conform with best practices template
-
-2013-01-09 - Adrien Thebo <git@somethingsinistral.net>
-* Update postgresql_default_version to 9.1 for Debian 7.0
-
-2013-01-28 - Karel Brezina <karel.brezina@gmail.com>
-* Add support for tablespaces
-
-2013-01-16 - Chris Price <chris@puppetlabs.com> & Karel Brezina <karel.brezina@gmail.com>
-* Provide support for an 'include' config file 'postgresql_conf_extras.conf' that users can modify manually or outside of the module.
-
-2013-01-31 - jv <jeff@jeffvier.com>
-* Fix typo in README.pp for postgresql::db example
-
-2013-02-03 - Ken Barber <ken@bob.sh>
-* Add unit tests and travis-ci support
-
-2013-02-02 - Ken Barber <ken@bob.sh>
-* Add locale parameter support to the 'postgresql' class
-
-2013-01-21 - Michael Arnold <github@razorsedge.org>
-* Add a class for install the packages containing the PostgreSQL JDBC jar
-
-2013-02-06 - fhrbek <filip.hbrek@gmail.com>
-* Coding style fixes to reduce warnings in puppet-lint and Geppetto
-
-2013-02-10 - Ken Barber <ken@bob.sh>
-* Provide new defined resource for managing pg_hba.conf
-
-2013-02-11 - Ken Barber <ken@bob.sh>
-* Fix bug with reload of Postgresql on Redhat/Centos
-
-2013-02-15 - Erik Dalén <dalen@spotify.com>
-* Fix more style issues to reduce warnings in puppet-lint and Geppetto
-
-2013-02-15 - Erik Dalén <dalen@spotify.com>
-* Fix case whereby we were modifying a hash after creation
-
-
-##2.0.1
-
-Minor bugfix release.
-
-2013-01-16 - Chris Price <chris@puppetlabs.com>
- * Fix revoke command in database.pp to support postgres 8.1 (43ded42)
-
-2013-01-15 - Jordi Boggiano <j.boggiano@seld.be>
- * Add support for ubuntu 12.10 status (3504405)
-
-##2.0.0
-
-Many thanks to the following people who contributed patches to this
-release:
-
-* Adrien Thebo
-* Albert Koch
-* Andreas Ntaflos
-* Brett Porter
-* Chris Price
-* dharwood
-* Etienne Pelletier
-* Florin Broasca
-* Henrik
-* Hunter Haugen
-* Jari Bakken
-* Jordi Boggiano
-* Ken Barber
-* nzakaria
-* Richard Arends
-* Spenser Gilliland
-* stormcrow
-* William Van Hevelingen
-
-Notable features:
-
-   * Add support for versions of postgres other than the system default version
-     (which varies depending on OS distro).  This includes optional support for
-     automatically managing the package repo for the "official" postgres yum/apt
-     repos.  (Major thanks to Etienne Pelletier <epelletier@maestrodev.com> and
-     Ken Barber <ken@bob.sh> for their tireless efforts and patience on this
-     feature set!)  For example usage see `tests/official-postgresql-repos.pp`.
-
-   * Add some support for Debian Wheezy and Ubuntu Quantal
-
-   * Add new `postgres_psql` type with a Ruby provider, to replace the old
-     exec-based `psql` type.  This gives us much more flexibility around
-     executing SQL statements and controlling their logging / reports output.
-
-   * Major refactor of the "spec" tests--which are actually more like
-     acceptance tests.  We now support testing against multiple OS distros
-     via vagrant, and the framework is in place to allow us to very easily add
-     more distros.  Currently testing against Cent6 and Ubuntu 10.04.
-
-   * Fixed a bug that was preventing multiple databases from being owned by the
-     same user
-     (9adcd182f820101f5e4891b9f2ff6278dfad495c - Etienne Pelletier <epelletier@maestrodev.com>)
-
-   * Add support for ACLs for finer-grained control of user/interface access
-     (b8389d19ad78b4fb66024897097b4ed7db241930 - dharwood <harwoodd@cat.pdx.edu>)
-
-   * Many other bug fixes and improvements!
-
----
-##1.0.0
-
-2012-09-17 - Version 0.3.0 released
-
-2012-09-14 - Chris Price <chris@puppetlabs.com>
- * Add a type for validating a postgres connection (ce4a049)
-
-2012-08-25 - Jari Bakken <jari.bakken@gmail.com>
- * Remove trailing commas. (e6af5e5)
-
-2012-08-16 - Version 0.2.0 released
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile
deleted file mode 100644
index cb5deeccef1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake'
-  gem 'pry',                    :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '< 1.0'
-  gem 'puppet-lint', '~> 0.3.2'
-  gem 'beaker',                 :require => false
-  gem 'beaker-rspec',           :require => false
-  gem 'serverspec',             :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE
deleted file mode 100644
index 7a29c73c878..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile
deleted file mode 100644
index e0e93541b3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name 'puppetlabs-postgresql'
-version '3.3.3'
-source 'git://github.com/puppetlabs/puppet-postgresql.git'
-author 'Inkling/Puppet Labs'
-description 'PostgreSQL defined resource types'
-summary 'PostgreSQL defined resource types'
-license 'ASL 2.0'
-project_page 'https://github.com/puppetlabs/puppet-postgresql'
-
-dependency 'puppetlabs/stdlib', '>=3.2.0 <5.0.0'
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/apt', '>=1.1.0 <2.0.0'
-dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE
deleted file mode 100644
index c01b4637bc7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-Puppetlabs postgresql module
-
-Copyright 2012 Inkling Systems Inc
-Copyright 2012-2013 Puppet Labs Inc
-Copyright 2012-2013 Camptocamp SA.
-
-This product includes software developed by:
-  The Puppet Labs Inc (http://www.puppetlabs.com/).
-
-This product includes also software developed by:
-  Camptocamp SA (http://www.camptocamp.com/)
-
-This product includes also software developed by:
-  Inkling Systems Inc (https://www.inkling.com/)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md
deleted file mode 100644
index 7a26cb9f4a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md
+++ /dev/null
@@ -1,901 +0,0 @@
-postgresql
-==========
-
-Table of Contents
------------------
-
-1. [Overview - What is the PostgreSQL module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with PostgreSQL module](#setup)
-    * [PE 3.2 supported module](#pe-3.2-supported-module)
-    * [Configuring the server](#configuring-the-server) 
-4. [Usage - How to use the module for various tasks](#usage)
-5. [Upgrading - Guide for upgrading from older revisions of this module](#upgrading)
-6. [Reference - The classes, defines,functions and facts available in this module](#reference)
-7. [Limitations - OS compatibility, etc.](#limitations)
-8. [Development - Guide for contributing to the module](#development)
-9. [Disclaimer - Licensing information](#disclaimer)
-10. [Transfer Notice - Notice of authorship change](#transfer-notice)
-11. [Contributors - List of module contributors](#contributors)
-
-Overview
---------
-
-The PostgreSQL module allows you to easily manage postgres databases with Puppet.
-
-Module Description
--------------------
-
-PostgreSQL is a high-performance, free, open-source relational database server. The postgresql module allows you to manage PostgreSQL packages and services on several operating systems, while also supporting basic management of PostgreSQL databases and users. The module offers support for managing firewall for postgres ports on RedHat-based distros, as well as support for basic management of common security settings.
-
-Setup
------
-
-**What puppetlabs-PostgreSQL affects:**
-
-* package/service/configuration files for PostgreSQL
-* listened-to ports
-* system firewall (optional)
-* IP and mask (optional)
-
-**Introductory Questions**
-
-The postgresql module offers many security configuration settings. Before getting started, you will want to consider:
-
-* Do you want/need to allow remote connections?
-    * If yes, what about TCP connections?
-* Would you prefer to work around your current firewall settings or overwrite some of them?
-* How restrictive do you want the database superuser's permissions to be?
-
-Your answers to these questions will determine which of the module's parameters you'll want to specify values for.
-
-###PE 3.2 supported module
-
-PE 3.2 introduces Puppet Labs supported modules. The version of the postgresql module that ships within PE 3.2 is supported via normal [Puppet Enterprise support](http://puppetlabs.com/services/customer-support) channels. If you would like to access the [supported module](http://forge.puppetlabs.com/supported) version, you will need to uninstall the shipped module and install the supported version from the Puppet Forge. You can do this by first running
-
-    # puppet module uninstall puppetlabs-postgresql
-and then running
-
-    # puppet module install puppetlabs/postgresql
-
-###Configuring the server
-
-The main configuration you'll need to do will be around the `postgresql::server` class. The default parameters are reasonable, but fairly restrictive regarding permissions for who can connect and from where. To manage a PostgreSQL server with sane defaults:
-
-    class { 'postgresql::server': }
-
-For a more customized configuration:
-
-    class { 'postgresql::server':
-      ip_mask_deny_postgres_user => '0.0.0.0/32',
-      ip_mask_allow_all_users    => '0.0.0.0/0',
-      listen_addresses           => '*',
-      ipv4acls                   => ['hostssl all johndoe 192.168.0.0/24 cert'],
-      manage_firewall            => true,
-      postgres_password          => 'TPSrep0rt!',
-    }
-
-Once you've completed your configuration of `postgresql::server`, you can test out your settings from the command line:
-
-    $ psql -h localhost -U postgres
-    $ psql -h my.postgres.server -U
-
-If you get an error message from these commands, it means that your permissions are set in a way that restricts access from where you're trying to connect. That might be a good thing or a bad thing, depending on your goals.
-
-For more details about server configuration parameters consult the [PostgreSQL Runtime Configuration docs](http://www.postgresql.org/docs/9.2/static/runtime-config.html).
-
-Usage
------
-
-###Creating a database
-
-There are many ways to set up a postgres database using the `postgresql::server::db` class. For instance, to set up a database for PuppetDB:
-
-    class { 'postgresql::server': }
-
-    postgresql::server::db { 'mydatabasename':
-      user     => 'mydatabaseuser',
-      password => postgresql_password('mydatabaseuser', 'mypassword'),
-    }
-
-###Managing users, roles and permissions
-
-To manage users, roles and permissions:
-
-    class { 'postgresql::server': }
-
-    postgresql::server::role { 'marmot':
-      password_hash => postgresql_password('marmot', 'mypasswd'),
-    }
-
-    postgresql::server::database_grant { 'test1':
-      privilege => 'ALL',
-      db        => 'test1',
-      role      => 'marmot',
-    }
-
-    postgresql::server::table_grant { 'my_table of test2':
-      privilege => 'ALL',
-      table     => 'my_table',
-      db        => 'test2',
-      role      => 'marmot',
-    }
-
-In this example, you would grant ALL privileges on the test1 database and on the `my_table` table of the test2 database to the user or group specified by dan.
-
-At this point, you would just need to plunk these database name/username/password values into your PuppetDB config files, and you are good to go.
-
-Upgrading
----------
-
-###Upgrading from 2.x to version 3
-
-*Note:* if you are upgrading for 2.x, you *must* read this, as just about everything has changed.
-
-Version 3 was a major rewrite to fix some internal dependency issues, and to make the new Public API more clear. As a consequence a lot of things have changed for version 3 and older revisions that we will try to outline here.
-
-####Server specific objects now moved under `postgresql::server::` namespace
-
-To restructure server specific elements under the `postgresql::server::` namespaces the following objects were renamed as such:
-
-* `postgresql::database`       -> `postgresql::server::database`
-* `postgresql::database_grant` -> `postgresql::server::database_grant`
-* `postgresql::db`             -> `postgresql::server::db`
-* `postgresql::grant`          -> `postgresql::server::grant`
-* `postgresql::pg_hba_rule`    -> `postgresql::server::pg_hba_rule`
-* `postgresql::plperl`         -> `postgresql::server::plperl`
-* `postgresql::contrib`        -> `postgresql::server::contrib`
-* `postgresql::role`           -> `postgresql::server::role`
-* `postgresql::table_grant`    -> `postgresql::server::table_grant`
-* `postgresql::tablespace`     -> `postgresql::server::tablespace`
-
-####New `postgresql::server::config_entry` resource for managing configuration
-
-Previously we used the `file_line` resource to modify `postgresql.conf`. This new revision now adds a new resource named `postgresql::server::config_entry` for managing this file. For example:
-
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-
-If you were using `file_line` for this purpose, you should change to this new methodology.
-
-####`postgresql_puppet_extras.conf` has been removed
-
-Now that we have a methodology for managing `postgresql.conf`, and due to concerns over the file management methodology using an `exec { 'touch ...': }` as a way to create an empty file the existing postgresql\_puppet\_extras.conf file is no longer managed by this module.
-
-If you wish to recreate this methodology yourself, use this pattern:
-
-    class { 'postgresql::server': }
-
-    $extras = "/tmp/include.conf"
-
-    file { $extras:
-      content => 'max_connections = 123',
-      notify  => Class['postgresql::server::service'],
-    }->
-    postgresql::server::config_entry { 'include':
-      value   => $extras,
-    }
-
-####All uses of the parameter `charset` changed to `encoding`
-
-Since PostgreSQL uses the terminology `encoding` not `charset` the parameter has been made consisent across all classes and resources.
-
-####The `postgresql` base class is no longer how you set globals
-
-The old global override pattern was less then optimal so it has been fixed, however we decided to demark this properly by specifying these overrides in the class `postgresql::globals`. Consult the documentation for this class now to see what options are available.
-
-Also, some parameter elements have been moved between this and the `postgresql::server` class where it made sense.
-
-####`config_hash` parameter collapsed for the `postgresql::server` class
-
-Because the `config_hash` was really passing data through to what was in effect an internal class (`postgresql::config`). And since we don't want this kind of internal exposure the parameters were collapsed up into the `postgresql::server` class directly.
-
-####Lots of changes to 'private' or 'undocumented' classes
-
-If you were using these before, these have changed names. You should only use what is documented in this README.md, and if you don't have what you need you should raise a patch to add that feature to a public API. All internal classes now have a comment at the top indicating them as private to make sure the message is clear that they are not supported as Public API.
-
-####`pg_hba_conf_defaults` parameter included to turn off default pg\_hba rules
-
-The defaults should be good enough for most cases (if not raise a bug) but if you simply need an escape hatch, this setting will turn off the defaults. If you want to do this, it may affect the rest of the module so make sure you replace the rules with something that continues operation.
-
-####`postgresql::database_user` has now been removed
-
-Use `postgresql::server::role` instead.
-
-####`postgresql::psql` resource has now been removed
-
-Use `postgresql_psql` instead. In the future we may recreate this as a wrapper to add extra capability, but it will not match the old behaviour.
-
-####`postgresql_default_version` fact has now been removed
-
-It didn't make sense to have this logic in a fact any more, the logic has been moved into `postgresql::params`.
-
-####`ripienaar/concat` is no longer used, instead we use `puppetlabs/concat`
-
-The older concat module is now deprecated and moved into the `puppetlabs/concat` namespace. Functionality is more or less identical, but you may need to intervene during the installing of this package - as both use the same `concat` namespace.
-
-Reference
----------
-
-The postgresql module comes with many options for configuring the server. While you are unlikely to use all of the below settings, they allow you a decent amount of control over your security settings.
-
-Classes:
-
-* [postgresql::client](#class-postgresqlclient)
-* [postgresql::globals](#class-postgresqlglobals)
-* [postgresql::lib::devel](#class-postgresqllibdevel)
-* [postgresql::lib::java](#class-postgresqllibjava)
-* [postgresql::lib::python](#class-postgresqllibpython)
-* [postgresql::server](#class-postgresqlserver)
-* [postgresql::server::plperl](#class-postgresqlserverplperl)
-* [postgresql::server::contrib](#class-postgresqlservercontrib)
-
-Resources:
-
-* [postgresql::server::config_entry](#resource-postgresqlserverconfigentry)
-* [postgresql::server::db](#resource-postgresqlserverdb)
-* [postgresql::server::database](#resource-postgresqlserverdatabase)
-* [postgresql::server::database_grant](#resource-postgresqlserverdatabasegrant)
-* [postgresql::server::pg_hba_rule](#resource-postgresqlserverpghbarule)
-* [postgresql::server::role](#resource-postgresqlserverrole)
-* [postgresql::server::table_grant](#resource-postgresqlservertablegrant)
-* [postgresql::server::tablespace](#resource-postgresqlservertablespace)
-* [postgresql::validate_db_connection](#resource-postgresqlvalidatedbconnection)
-
-Functions:
-
-* [postgresql\_password](#function-postgresqlpassword)
-* [postgresql\_acls\_to\_resources\_hash](#function-postgresqlaclstoresourceshashaclarray-id-orderoffset)
-
-
-###Class: postgresql::globals
-*Note:* most server specific defaults should be overriden in the `postgresql::server` class. This class should only be used if you are using a non-standard OS or if you are changing elements such as `version` or `manage_package_repo` that can only be changed here.
-
-This class allows you to configure the main settings for this module in a global way, to be used by the other classes and defined resources. On its own it does nothing.
-
-For example, if you wanted to overwrite the default `locale` and `encoding` for all classes you could use the following combination:
-
-    class { 'postgresql::globals':
-      encoding => 'UTF8',
-      locale   => 'en_NG',
-    }->
-    class { 'postgresql::server':
-    }
-
-That would make the `encoding` and `locale` the default for all classes and defined resources in this module.
-
-If you want to use the upstream PostgreSQL packaging, and be specific about the version you wish to download, you could use something like this:
-
-    class { 'postgresql::globals':
-      manage_package_repo => true,
-      version             => '9.2',
-    }->
-    class { 'postgresql::server': }
-
-####`client_package_name`
-This setting can be used to override the default postgresql client package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`server_package_name`
-This setting can be used to override the default postgresql server package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`contrib_package_name`
-This setting can be used to override the default postgresql contrib package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`devel_package_name`
-This setting can be used to override the default postgresql devel package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`java_package_name`
-This setting can be used to override the default postgresql java package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`plperl_package_name`
-This setting can be used to override the default postgresql PL/perl package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`python_package_name`
-This setting can be used to override the default postgresql Python package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`service_name`
-This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_provider`
-This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service provider is the default for your OS distro.
-
-####`service_status`
-This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service status is the default for your OS distro.
-
-####`default_database`
-This setting is used to specify the name of the default database to connect with. On most systems this will be "postgres".
-
-####`initdb_path`
-Path to the `initdb` command.
-
-####`createdb_path`
-Path to the `createdb` command.
-
-####`psql_path`
-Path to the `psql` command.
-
-####`pg_hba_conf_path`
-Path to your `pg\_hba.conf` file.
-
-####`postgresql_conf_path`
-Path to your `postgresql.conf` file.
-
-####`pg_hba_conf_defaults`
-If false, disables the defaults supplied with the module for `pg\_hba.conf`. This is useful if you disagree with the defaults and wish to override them yourself. Be sure that your changes of course align with the rest of the module, as some access is required to perform basic `psql` operations for example.
-
-####`datadir`
-This setting can be used to override the default postgresql data directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`confdir`
-This setting can be used to override the default postgresql configuration directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`bindir`
-This setting can be used to override the default postgresql binaries directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`xlogdir`
-This setting can be used to override the default postgresql xlog directory. If not specified the module will use initdb's default path.
-
-####`user`
-This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
-
-####`group`
-This setting can be used to override the default postgresql user group to be used for related files in the file system. If not specified, the module will use the group name 'postgres'.
-
-####`version`
-The version of PostgreSQL to install/manage. This is a simple way of providing a specific version such as '9.2' or '8.4' for example.
-
-Defaults to your operating system default.
-
-####`needs_initdb`
-This setting can be used to explicitly call the initdb operation after server package is installed and before the postgresql service is started. If not specified, the module will decide whether to call initdb or not depending on your OS distro.
-
-####`encoding`
-This will set the default encoding encoding for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to the operating system default.
-
-####`locale`
-This will set the default database locale for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to `undef` which is effectively `C`.
-
-#####Debian
-
-On Debian you'll need to ensure that the 'locales-all' package is installed for full functionality of Postgres.
-
-####`firewall_supported`
-This allows you to override the automated detection to see if your OS supports the `firewall` module.
-
-####`manage_package_repo`
-If `true` this will setup the official PostgreSQL repositories on your host. Defaults to `false`.
-
-###Class: postgresql::server
-The following list are options that you can set in the `config_hash` parameter of `postgresql::server`.
-
-####`ensure`
-This value default to `present`. When set to `absent` it will remove all packages, configuration and data so use this with extreme caution.
-
-####`version`
-This will set the version of the PostgreSQL software to install. Defaults to your operating systems default.
-
-####`postgres_password`
-This value defaults to `undef`, meaning the super user account in the postgres database is a user called `postgres` and this account does not have a password. If you provide this setting, the module will set the password for the `postgres` user to your specified value.
-
-####`package_name`
-The name of the package to use for installing the server software. Defaults to the default for your OS distro.
-
-####`package_ensure`
-Value to pass through to the `package` resource when creating the server instance. Defaults to `undef`.
-
-####`plperl_package_name`
-This sets the default package name for the PL/Perl extension. Defaults to utilising the operating system default.
-
-####`service_name`
-This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_name`
-This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_status`
-This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`default_database`
-This setting is used to specify the name of the default database to connect with. On most systems this will be "postgres".
-
-####`listen_addresses`
-This value defaults to `localhost`, meaning the postgres server will only accept connections from localhost. If you'd like to be able to connect to postgres from remote machines, you can override this setting. A value of `*` will tell postgres to accept connections from any remote machine. Alternately, you can specify a comma-separated list of hostnames or IP addresses. (For more info, have a look at the `postgresql.conf` file from your system's postgres package).
-
-####`ip_mask_deny_postgres_user`
-This value defaults to `0.0.0.0/0`. Sometimes it can be useful to block the superuser account from remote connections if you are allowing other database users to connect remotely. Set this to an IP and mask for which you want to deny connections by the postgres superuser account. So, e.g., the default value of `0.0.0.0/0` will match any remote IP and deny access, so the postgres user won't be able to connect remotely at all. Conversely, a value of `0.0.0.0/32` would not match any remote IP, and thus the deny rule will not be applied and the postgres user will be allowed to connect.
-
-####`ip_mask_allow_all_users`
-This value defaults to `127.0.0.1/32`. By default, Postgres does not allow any database user accounts to connect via TCP from remote machines. If you'd like to allow them to, you can override this setting. You might set it to `0.0.0.0/0` to allow database users to connect from any remote machine, or `192.168.0.0/16` to allow connections from any machine on your local 192.168 subnet.
-
-####`ipv4acls`
-List of strings for access control for connection method, users, databases, IPv4 addresses; see [postgresql documentation](http://www.postgresql.org/docs/9.2/static/auth-pg-hba-conf.html) about `pg_hba.conf` for information (please note that the link will take you to documentation for the most recent version of Postgres, however links for earlier versions can be found on that page).
-
-####`ipv6acls`
-List of strings for access control for connection method, users, databases, IPv6 addresses; see [postgresql documentation](http://www.postgresql.org/docs/9.2/static/auth-pg-hba-conf.html) about `pg_hba.conf` for information (please note that the link will take you to documentation for the most recent version of Postgres, however links for earlier versions can be found on that page).
-
-####`initdb_path`
-Path to the `initdb` command.
-
-####`createdb_path`
-Path to the `createdb` command.
-
-####`psql_path`
-Path to the `psql` command.
-
-####`pg_hba_conf_path`
-Path to your `pg\_hba.conf` file.
-
-####`postgresql_conf_path`
-Path to your `postgresql.conf` file.
-
-####`pg_hba_conf_defaults`
-If false, disables the defaults supplied with the module for `pg\_hba.conf`. This is useful if you di
-sagree with the defaults and wish to override them yourself. Be sure that your changes of course alig
-n with the rest of the module, as some access is required to perform basic `psql` operations for exam
-ple.
-
-####`user`
-This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
-
-####`group`
-This setting can be used to override the default postgresql user group to be used for related files in the file system. If not specified, the module will use the group name 'postgres'.
-
-####`needs_initdb`
-This setting can be used to explicitly call the initdb operation after server package is installed and before the postgresql service is started. If not specified, the module will decide whether to call initdb or not depending on your OS distro.
-
-####`encoding`
-This will set the default encoding encoding for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to the operating system default.
-
-####`locale`
-This will set the default database locale for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to `undef` which is effectively `C`.
-
-#####Debian
-
-On Debian you'll need to ensure that the 'locales-all' package is installed for full functionality of Postgres.
-
-####`manage_firewall`
-This value defaults to `false`. Many distros ship with a fairly restrictive firewall configuration which will block the port that postgres tries to listen on. If you'd like for the puppet module to open this port for you (using the [puppetlabs-firewall](http://forge.puppetlabs.com/puppetlabs/firewall) module), change this value to true. Check the documentation for `puppetlabs/firewall` to ensure the rest of the global setup is applied, to ensure things like persistence and global rules are set correctly.
-
-####`manage_pg_hba_conf`
-This value defaults to `true`. Whether or not manage the pg_hba.conf. If set to `true`, puppet will overwrite this file. If set to `false`, puppet will not modify the file.
-
-
-###Class: postgresql::client
-
-This class installs postgresql client software. Alter the following parameters if you have a custom version you would like to install (Note: don't forget to make sure to add any necessary yum or apt repositories if specifying a custom version):
-
-####`package_name`
-The name of the postgresql client package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql client package resource.
-
-
-###Class: postgresql::server::contrib
-Installs the postgresql contrib package.
-
-####`package_name`
-The name of the postgresql contrib package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql contrib package resource.
-
-
-###Class: postgresql::lib::devel
-Installs the packages containing the development libraries for PostgreSQL.
-
-####`package_ensure`
-Override for the `ensure` parameter during package installation. Defaults to `present`.
-
-####`package_name`
-Overrides the default package name for the distribution you are installing to. Defaults to `postgresql-devel` or `postgresql<version>-devel` depending on your distro.
-
-
-###Class: postgresql::lib::java
-This class installs postgresql bindings for Java (JDBC). Alter the following parameters if you have a custom version you would like to install (Note: don't forget to make sure to add any necessary yum or apt repositories if specifying a custom version):
-
-####`package_name`
-The name of the postgresql java package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql java package resource.
-
-
-###Class: postgresql::lib::python
-This class installs the postgresql Python libraries. For customer requirements you can customise the following parameters:
-
-####`package_name`
-The name of the postgresql python package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql python package resource.
-
-
-###Class: postgresql::server::plperl
-This class installs the PL/Perl procedural language for postgresql.
-
-####`package_name`
-The name of the postgresql PL/Perl package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql PL/Perl package resource.
-
-
-###Resource: postgresql::server::config\_entry
-This resource can be used to modify your `postgresql.conf` configuration file.
-
-Each resource maps to a line inside your `postgresql.conf` file, for example:
-
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-
-####`namevar`
-Name of the setting to change.
-
-####`ensure`
-Set to `absent` to remove an entry.
-
-####`value`
-Value for the setting.
-
-
-###Resource: postgresql::server::db
-This is a convenience resource that creates a database, user and assigns necessary permissions in one go.
-
-For example, to create a database called `test1` with a corresponding user of the same name, you can use:
-
-    postgresql::server::db { 'test1':
-      user     => 'test1',
-      password => 'test1',
-    }
-
-####`namevar`
-The namevar for the resource designates the name of the database.
-
-####`user`
-User to create and assign access to the database upon creation. Mandatory.
-
-####`password`
-Password for the created user. Mandatory.
-
-####`encoding`
-Override the character set during creation of the database. Defaults to the default defined during installation.
-
-####`locale`
-Override the locale during creation of the database. Defaults to the default defined during installation.
-
-####`grant`
-Grant permissions during creation. Defaults to `ALL`.
-
-####`tablespace`
-The name of the tablespace to allocate this database to. If not specifies, it defaults to the PostgreSQL default.
-
-####`istemplate`
-Define database as a template. Defaults to `false`.
-
-
-###Resource: postgresql::server::database
-This defined type can be used to create a database with no users and no permissions, which is a rare use case.
-
-####`namevar`
-The name of the database to create.
-
-####`dbname`
-The name of the database, defaults to the namevar.
-
-####`owner`
-Name of the database user who should be set as the owner of the database. Defaults to the $user variable set in `postgresql::server` or `postgresql::globals`.
-
-####`tablespace`
-Tablespace for where to create this database. Defaults to the defaults defined during PostgreSQL installation.
-
-####`encoding`
-Override the character set during creation of the database. Defaults to the default defined during installation.
-
-####`locale`
-Override the locale during creation of the database. Defaults to the default defined during installation.
-
-####`istemplate`
-Define database as a template. Defaults to `false`.
-
-
-###Resource: postgresql::server::database\_grant
-This defined type manages grant based access privileges for users, wrapping the `postgresql::server::database_grant` for database specific permissions. Consult the PostgreSQL documentation for `grant` for more information.
-
-####`namevar`
-Used to uniquely identify this resource, but functionality not used during grant.
-
-####`privilege`
-Can be one of `SELECT`, `TEMPORARY`, `TEMP`, `CONNECT`. `ALL` is used as a synonym for `CREATE`. If you need to add multiple privileges, a space delimited string can be used.
-
-####`db`
-Database to grant access to.
-
-####`role`
-Role or user whom you are granting access for.
-
-####`psql_db`
-Database to execute the grant against. This should not ordinarily be changed from the default, which is `postgres`.
-
-####`psql_user`
-OS user for running `psql`. Defaults to the default user for the module, usually `postgres`.
-
-
-###Resource: postgresql::server::pg\_hba\_rule
-This defined type allows you to create an access rule for `pg_hba.conf`. For more details see the [PostgreSQL documentation](http://www.postgresql.org/docs/8.2/static/auth-pg-hba-conf.html).
-
-For example:
-
-    postgresql::server::pg_hba_rule { 'allow application network to access app database':
-      description => "Open up postgresql for access from 200.1.2.0/24",
-      type => 'host',
-      database => 'app',
-      user => 'app',
-      address => '200.1.2.0/24',
-      auth_method => 'md5',
-    }
-
-This would create a ruleset in `pg_hba.conf` similar to:
-
-    # Rule Name: allow application network to access app database
-    # Description: Open up postgresql for access from 200.1.2.0/24
-    # Order: 150
-    host  app  app  200.1.2.0/24  md5
-
-####`namevar`
-A unique identifier or short description for this rule. The namevar doesn't provide any functional usage, but it is stored in the comments of the produced `pg_hba.conf` so the originating resource can be identified.
-
-####`description`
-A longer description for this rule if required. Defaults to `none`. This description is placed in the comments above the rule in `pg_hba.conf`.
-
-####`type`
-The type of rule, this is usually one of: `local`, `host`, `hostssl` or `hostnossl`.
-
-####`database`
-A comma separated list of databases that this rule matches.
-
-####`user`
-A comma separated list of database users that this rule matches.
-
-####`address`
-If the type is not 'local' you can provide a CIDR based address here for rule matching.
-
-####`auth_method`
-The `auth_method` is described further in the `pg_hba.conf` documentation, but it provides the method that is used for authentication for the connection that this rule matches.
-
-####`auth_option`
-For certain `auth_method` settings there are extra options that can be passed. Consult the PostgreSQL `pg_hba.conf` documentation for further details.
-
-####`order`
-An order for placing the rule in `pg_hba.conf`. Defaults to `150`.
-
-####`target`
-This provides the target for the rule, and is generally an internal only property. Use with caution.
-
-
-###Resource: postgresql::server::role
-This resource creates a role or user in PostgreSQL.
-
-####`namevar`
-The role name to create.
-
-####`password_hash`
-The hash to use during password creation. If the password is not already pre-encrypted in a format that PostgreSQL supports, use the `postgresql_password` function to provide an MD5 hash here, for example:
-
-    postgresql::role { "myusername":
-      password_hash => postgresql_password('myusername', 'mypassword'),
-    }
-
-####`createdb`
-Whether to grant the ability to create new databases with this role. Defaults to `false`.
-
-####`createrole`
-Whether to grant the ability to create new roles with this role. Defaults to `false`.
-
-####`login`
-Whether to grant login capability for the new role. Defaults to `false`.
-
-####`superuser`
-Whether to grant super user capability for the new role. Defaults to `false`.
-
-####`replication`
-If `true` provides replication capabilities for this role. Defaults to `false`.
-
-####`connection_limit`
-Specifies how many concurrent connections the role can make. Defaults to `-1` meaning no limit.
-
-####`username`
-The username of the role to create, defaults to `namevar`.
-
-
-###Resource: postgresql::server::table\_grant
-This defined type manages grant based access privileges for users. Consult the PostgreSQL documentation for `grant` for more information.
-
-####`namevar`
-Used to uniquely identify this resource, but functionality not used during grant.
-
-####`privilege`
-Can be one of `SELECT`, `INSERT`, `UPDATE`, `REFERENCES`. `ALL` is used as a synonym for `CREATE`. If you need to add multiple privileges, a space delimited string can be used.
-
-####`table`
-Table to grant access on.
-
-####`db`
-Database of table.
-
-####`role`
-Role or user whom you are granting access for.
-
-####`psql_db`
-Database to execute the grant against. This should not ordinarily be changed from the default, which is `postgres`.
-
-####`psql_user`
-OS user for running `psql`. Defaults to the default user for the module, usually `postgres`.
-
-
-###Resource: postgresql::server::tablespace
-This defined type can be used to create a tablespace. For example:
-
-    postgresql::tablespace { 'tablespace1':
-      location => '/srv/space1',
-    }
-
-It will create the location if necessary, assigning it the same permissions as your
-PostgreSQL server.
-
-####`namevar`
-The tablespace name to create.
-
-####`location`
-The path to locate this tablespace.
-
-####`owner`
-The default owner of the tablespace.
-
-####`spcname`
-Name of the tablespace. Defaults to `namevar`.
-
-
-###Resource: postgresql::validate\_db\_connection
-This resource can be utilised inside composite manifests to validate that a client has a valid connection with a remote PostgreSQL database. It can be ran from any node where the PostgreSQL client software is installed to validate connectivity before commencing other dependent tasks in your Puppet manifests, so it is often used when chained to other tasks such as: starting an application server, performing a database migration.
-
-Example usage:
-
-    postgresql::validate_db_connection { 'validate my postgres connection':
-      database_host           => 'my.postgres.host',
-      database_username       => 'mydbuser',
-      database_password       => 'mydbpassword',
-      database_name           => 'mydbname',
-    }->
-    exec { 'rake db:migrate':
-      cwd => '/opt/myrubyapp',
-    }
-
-####`namevar`
-Uniquely identify this resource, but functionally does nothing.
-
-####`database_host`
-The hostname of the database you wish to test. Defaults to 'undef' which generally uses the designated local unix socket.
-
-####`database_port`
-Port to use when connecting. Default to 'undef' which generally defaults to 5432 depending on your PostgreSQL packaging.
-
-####`database_name`
-The name of the database you wish to test. Defaults to 'postgres'.
-
-####`database_username`
-Username to connect with. Defaults to 'undef', which when using a unix socket and ident auth will be the user you are running as. If the host is remote you must provide a username.
-
-####`database_password`
-Password to connect with. Can be left blank, but that is not recommended.
-
-####`run_as`
-The user to run the `psql` command with for authenticiation. This is important when trying to connect to a database locally using Unix sockets and `ident` authentication. It is not needed for remote testing.
-
-####`sleep`
-Upon failure, sets the number of seconds to sleep for before trying again.
-
-####`tries`
-Upon failure, sets the number of attempts before giving up and failing the resource.
-
-####`create_db_first`
-This will ensure the database is created before running the test. This only really works if your test is local. Defaults to `true`.
-
-
-###Function: postgresql\_password
-If you need to generate a postgres encrypted password, use `postgresql_password`. You can call it from your production manifests if you don't mind them containing the clear text versions of your passwords, or you can call it from the command line and then copy and paste the encrypted password into your manifest:
-
-    $ puppet apply --execute 'notify { "test": message => postgresql_password("username", "password") }'
-
-###Function: postgresql\_acls\_to\_resources\_hash(acl\_array, id, order\_offset)
-This internal function converts a list of `pg_hba.conf` based acls (passed in as an array of strings) to a format compatible with the `postgresql::pg_hba_rule` resource.
-
-**This function should only be used internally by the module**.
-
-Limitations
-------------
-
-Works with versions of PostgreSQL from 8.1 through 9.2.
-
-Current it is only actively tested with the following operating systems:
-
-* Debian 6.x and 7.x
-* Centos 5.x and 6.x
-* Ubuntu 10.04 and 12.04
-
-Although patches are welcome for making it work with other OS distros, it is considered best effort.
-
-Development
-------------
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Tests
-
-There are two types of tests distributed with the module. Unit tests with rspec-puppet and system tests using rspec-system.
-
-For unit testing, make sure you have:
-
-* rake
-* bundler
-
-Install the necessary gems:
-
-    bundle install --path=vendor
-
-And then run the unit tests:
-
-    bundle exec rake spec
-
-The unit tests are ran in Travis-CI as well, if you want to see the results of your own tests regsiter the service hook through Travis-CI via the accounts section for your Github clone of this project.
-
-If you want to run the system tests, make sure you also have:
-
-* vagrant > 1.2.x
-* Virtualbox > 4.2.10
-
-Then run the tests using:
-
-    bundle exec rake spec:system
-
-To run the tests on different operating systems, see the sets available in .nodeset.yml and run the specific set with the following syntax:
-
-    RSPEC_SET=debian-607-x64 bundle exec rake spec:system
-
-Transfer Notice
-----------------
-
-This Puppet module was originally authored by Inkling Systems. The maintainer preferred that Puppet Labs take ownership of the module for future improvement and maintenance as Puppet Labs is using it in the PuppetDB module.  Existing pull requests and issues were transferred over, please fork and continue to contribute here instead of Inkling.
-
-Previously: [https://github.com/inkling/puppet-postgresql](https://github.com/inkling/puppet-postgresql)
-
-Contributors
-------------
-
- * Andrew Moon
- * [Kenn Knowles](https://github.com/kennknowles) ([@kennknowles](https://twitter.com/KennKnowles))
- * Adrien Thebo
- * Albert Koch
- * Andreas Ntaflos
- * Bret Comnes
- * Brett Porter
- * Chris Price
- * dharwood
- * Etienne Pelletier
- * Florin Broasca
- * Henrik
- * Hunter Haugen
- * Jari Bakken
- * Jordi Boggiano
- * Ken Barber
- * nzakaria
- * Richard Arends
- * Spenser Gilliland
- * stormcrow
- * William Van Hevelingen
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile
deleted file mode 100644
index 3e7d0059ebc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-Bundler.require :default
-
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-task :default do
-  sh %{rake -T}
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 065274e0d9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh
deleted file mode 100644
index f126d99be4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# usage is: validate_db_connection 2 50 psql
-
-SLEEP=$1
-TRIES=$2
-PSQL=$3
-
-STATE=1
-
-for (( c=1; c<=$TRIES; c++ ))
-do
-  echo $c
-  if [ $c -gt 1 ]
-  then
-    echo 'sleeping'
-    sleep $SLEEP
-  fi
-
-  /bin/echo "SELECT 1" | $PSQL
-  STATE=$?
-
-  if [ $STATE -eq 0 ]
-  then
-    exit 0
-  fi
-done
-
-echo 'Unable to connect to postgresql'
-
-exit 1
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb
deleted file mode 100644
index 7fa785486c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:postgresql_acls_to_resources_hash, :type => :rvalue, :doc => <<-EOS
-    This internal function translates the ipv(4|6)acls format into a resource
-    suitable for create_resources. It is not intended to be used outside of the
-    postgresql internal classes/defined resources.
-
-    This function accepts an array of strings that are pg_hba.conf rules. It
-    will return a hash that can be fed into create_resources to create multiple
-    individual pg_hba_rule resources.
-
-    The second parameter is an identifier that will be included in the namevar
-    to provide uniqueness. It must be a string.
-
-    The third parameter is an order offset, so you can start the order at an
-    arbitrary starting point.
-    EOS
-  ) do |args|
-    func_name = "postgresql_acls_to_resources_hash()"
-
-    raise(Puppet::ParseError, "#{func_name}: Wrong number of arguments " +
-      "given (#{args.size} for 3)") if args.size != 3
-
-    acls = args[0]
-    raise(Puppet::ParseError, "#{func_name}: first argument must be an array") \
-      unless acls.instance_of? Array
-
-    id = args[1]
-    raise(Puppet::ParseError, "#{func_name}: second argument must be a string") \
-      unless id.instance_of? String
-
-    offset = args[2].to_i
-    raise(Puppet::ParseError, "#{func_name}: third argument must be a number") \
-      unless offset.instance_of? Fixnum
-
-    resources = {}
-    acls.each do |acl|
-      index = acls.index(acl)
-
-      parts = acl.split
-
-      raise(Puppet::ParseError, "#{func_name}: acl line #{index} does not " +
-        "have enough parts") unless parts.length >= 4
-
-      resource = {
-        'type' => parts[0],
-        'database' => parts[1],
-        'user' => parts[2],
-        'order' => format('%03d', offset + index),
-      }
-      if parts[0] == 'local' then
-        resource['auth_method'] = parts[3]
-        if parts.length > 4 then
-          resource['auth_option'] = parts.last(parts.length - 4).join(" ")
-        end
-      else
-        if parts[4] =~ /^\d/
-          resource['address'] = parts[3] + ' ' + parts[4]
-          resource['auth_method'] = parts[5]
-
-          if parts.length > 6 then
-            resource['auth_option'] = parts.last(parts.length - 6).join(" ")
-          end
-        else
-          resource['address'] = parts[3]
-          resource['auth_method'] = parts[4]
-
-          if parts.length > 5 then
-            resource['auth_option'] = parts.last(parts.length - 5).join(" ")
-          end
-        end
-      end
-      resources["postgresql class generated rule #{id} #{index}"] = resource
-    end
-    resources
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb
deleted file mode 100644
index 4089a4e94de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:postgresql_escape, :type => :rvalue, :doc => <<-EOS
-    Safely escapes a string using $$ using a random tag which should be consistent
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "postgresql_escape(): Wrong number of arguments " +
-      "given (#{args.size} for 1)") if args.size != 1
-
-    password = args[0]
-
-    if password !~ /\$\$/ 
-      retval = "$$#{password}$$"
-    else
-      escape = Digest::MD5.hexdigest(password)[0..5].gsub(/\d/,'')
-      until password !~ /#{escape}/
-        escape = Digest::MD5.hexdigest(escape)[0..5].gsub(/\d/,'')
-      end
-      retval = "$#{escape}$#{password}$#{escape}$"
-    end
-    retval 
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb
deleted file mode 100644
index 0689e0e5b0f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# hash a string as mysql's "PASSWORD()" function would do it
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:postgresql_password, :type => :rvalue, :doc => <<-EOS
-    Returns the postgresql password hash from the clear text username / password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "postgresql_password(): Wrong number of arguments " +
-      "given (#{args.size} for 2)") if args.size != 2
-
-    username = args[0]
-    password = args[1]
-
-    'md5' + Digest::MD5.hexdigest(password + username)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb
deleted file mode 100644
index c9366b52003..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'puppet/provider/parsedfile'
-
-Puppet::Type.type(:postgresql_conf).provide(
-  :parsed,
-  :parent => Puppet::Provider::ParsedFile,
-  :default_target => '/etc/postgresql.conf',
-  :filetype => :flat
-) do
-  desc "Set key/values in postgresql.conf."
-
-  text_line :comment, :match => /^\s*#/
-  text_line :blank, :match => /^\s*$/
-
-  record_line :parsed,
-    :fields   => %w{name value comment},
-    :optional => %w{comment},
-    :match    => /^\s*([\w\.]+)\s*=?\s*(.*?)(?:\s*#\s*(.*))?\s*$/,
-    :to_line  => proc { |h|
-
-      # simple string and numeric values don't need to be enclosed in quotes
-      dontneedquote = h[:value].match(/^(\w+|[0-9.-]+)$/)
-      dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
-
-      str =  h[:name].downcase # normalize case
-      str += dontneedequal ? ' ' : ' = '
-      str += "'" unless dontneedquote && !dontneedequal
-      str += h[:value]
-      str += "'" unless dontneedquote && !dontneedequal
-      str += " # #{h[:comment]}" unless (h[:comment].nil? or h[:comment] == :absent)
-      str
-    },
-    :post_parse => proc { |h|
-      h[:name].downcase! # normalize case
-      h[:value].gsub!(/(^'|'$)/, '') # strip out quotes
-    }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb
deleted file mode 100644
index b86fb62a6e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-Puppet::Type.type(:postgresql_psql).provide(:ruby) do
-
-  def command()
-    if ((! resource[:unless]) or (resource[:unless].empty?))
-      if (resource.refreshonly?)
-        # So, if there's no 'unless', and we're in "refreshonly" mode,
-        # we need to return the target command here.  If we don't,
-        # then Puppet will generate an event indicating that this
-        # property has changed.
-        return resource[:command]
-      end
-
-      # if we're not in refreshonly mode, then we return nil,
-      # which will cause Puppet to sync this property.  This
-      # is what we want if there is no 'unless' value specified.
-      return nil
-    end
-
-    if Puppet::PUPPETVERSION.to_f < 4
-      output, status = run_unless_sql_command(resource[:unless])
-    else
-      output = run_unless_sql_command(resource[:unless])
-      status = output.exitcode
-    end
-
-    if status != 0
-      puts status
-      self.fail("Error evaluating 'unless' clause: '#{output}'")
-    end
-    result_count = output.strip.to_i
-    if result_count > 0
-      # If the 'unless' query returned rows, then we don't want to execute
-      # the 'command'.  Returning the target 'command' here will cause
-      # Puppet to treat this property as already being 'insync?', so it
-      # won't call the setter to run the 'command' later.
-      return resource[:command]
-    end
-
-    # Returning 'nil' here will cause Puppet to see this property
-    # as out-of-sync, so it will call the setter later.
-    nil
-  end
-
-  def command=(val)
-    output, status = run_sql_command(val)
-
-    if status != 0
-      self.fail("Error executing SQL; psql returned #{status}: '#{output}'")
-    end
-  end
-
-
-  def run_unless_sql_command(sql)
-    # for the 'unless' queries, we wrap the user's query in a 'SELECT COUNT',
-    # which makes it easier to parse and process the output.
-    run_sql_command('SELECT COUNT(*) FROM (' <<  sql << ') count')
-  end
-
-  def run_sql_command(sql)
-    if resource[:search_path]
-      sql = "set search_path to #{Array(resource[:search_path]).join(',')}; #{sql}"
-    end
-
-    command = [resource[:psql_path]]
-    command.push("-d", resource[:db]) if resource[:db]
-    command.push("-t", "-c", sql)
-
-    if resource[:cwd]
-      Dir.chdir resource[:cwd] do
-        run_command(command, resource[:psql_user], resource[:psql_group])
-      end
-    else
-      run_command(command, resource[:psql_user], resource[:psql_group])
-    end
-  end
-
-  def run_command(command, user, group)
-    if Puppet::PUPPETVERSION.to_f < 3.4
-      Puppet::Util::SUIDManager.run_and_capture(command, user, group)
-    else
-      output = Puppet::Util::Execution.execute(command, {
-        :uid                => user,
-        :gid                => group,
-        :failonfail         => false,
-        :combine            => true,
-        :override_locale    => true,
-        :custom_environment => {}
-      })
-      [output, $CHILD_STATUS.dup]
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb
deleted file mode 100644
index f227fd7824d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Puppet
-  newtype(:postgresql_conf) do
-
-    @doc = "This type allows puppet to manage postgresql.conf parameters."
-
-    ensurable
-
-    newparam(:name) do
-      desc "The postgresql parameter name to manage."
-      isnamevar
-
-      newvalues(/^[\w\.]+$/)
-    end
-
-    newproperty(:value) do
-      desc "The value to set for this parameter."
-    end
-
-    newproperty(:target) do
-      desc "The path to postgresql.conf"
-      defaultto {
-        if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-          @resource.class.defaultprovider.default_target
-        else
-          nil
-        end
-      }
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb
deleted file mode 100644
index 8646914d6e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-Puppet::Type.newtype(:postgresql_psql) do
-
-  newparam(:name) do
-    desc "An arbitrary tag for your own reference; the name of the message."
-    isnamevar
-  end
-
-  newproperty(:command) do
-    desc 'The SQL command to execute via psql.'
-
-    defaultto { @resource[:name] }
-
-    def sync(refreshing = false)
-      # We're overriding 'sync' here in order to do some magic
-      # in support of providing a 'refreshonly' parameter.  This
-      # is kind of hacky because the logic for 'refreshonly' is
-      # spread between the type and the provider, but this is
-      # the least horrible way that I could determine to accomplish
-      # it.
-      #
-      # Note that our overridden version of 'sync' takes a parameter,
-      # 'refreshing', which the parent version doesn't take.  This
-      # allows us to call the sync method directly from the 'refresh'
-      # method, and then inside of the body of 'sync' we can tell
-      # whether or not we're refreshing.
-
-      if (!@resource.refreshonly? || refreshing)
-        # If we're not in 'refreshonly' mode, or we're not currently
-        # refreshing, then we just call the parent method.
-        super()
-      else
-        # If we get here, it means we're in 'refreshonly' mode and
-        # we're not being called by the 'refresh' method, so we
-        # just no-op.  We'll be called again by the 'refresh'
-        # method momentarily.
-        nil
-      end
-    end
-  end
-
-  newparam(:unless) do
-    desc "An optional SQL command to execute prior to the main :command; " +
-        "this is generally intended to be used for idempotency, to check " +
-        "for the existence of an object in the database to determine whether " +
-        "or not the main SQL command needs to be executed at all."
-  end
-
-  newparam(:db) do
-    desc "The name of the database to execute the SQL command against."
-  end
-
-  newparam(:search_path) do
-    desc "The schema search path to use when executing the SQL command"
-  end
-
-  newparam(:psql_path) do
-    desc "The path to psql executable."
-    defaultto("psql")
-  end
-
-  newparam(:psql_user) do
-    desc "The system user account under which the psql command should be executed."
-    defaultto("postgres")
-  end
-
-  newparam(:psql_group) do
-    desc "The system user group account under which the psql command should be executed."
-    defaultto("postgres")
-  end
-
-  newparam(:cwd, :parent => Puppet::Parameter::Path) do
-    desc "The working directory under which the psql command should be executed."
-    defaultto("/tmp")
-  end
-
-  newparam(:refreshonly, :boolean => true) do
-    desc "If 'true', then the SQL will only be executed via a notify/subscribe event."
-
-    defaultto(:false)
-    newvalues(:true, :false)
-  end
-
-  def refresh()
-    # All of the magic for this type is attached to the ':command' property, so
-    # we just need to sync it to accomplish a 'refresh'.
-    self.property(:command).sync(true)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp
deleted file mode 100644
index bdb821d73bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Install client cli tool. See README.md for more details.
-class postgresql::client (
-  $package_name   = $postgresql::params::client_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-  validate_string($package_name)
-
-  package { 'postgresql-client':
-    ensure  => $package_ensure,
-    name    => $package_name,
-    tag     => 'postgresql',
-  }
-
-  $file_ensure = $package_ensure ? {
-    'present' => 'file',
-    true      => 'file',
-    'absent'  => 'absent',
-    false     => 'absent',
-    default   => 'file',
-  }
-  file { "/usr/local/bin/validate_postgresql_connection.sh":
-    ensure => $file_ensure,
-    source => "puppet:///modules/postgresql/validate_postgresql_connection.sh",
-    owner  => 0,
-    group  => 0,
-    mode   => 0755,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp
deleted file mode 100644
index ebc117d47ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Class for setting cross-class global overrides. See README.md for more
-# details.
-class postgresql::globals (
-  $ensure               = undef,
-
-  $client_package_name  = undef,
-  $server_package_name  = undef,
-  $contrib_package_name = undef,
-  $devel_package_name   = undef,
-  $java_package_name    = undef,
-  $plperl_package_name  = undef,
-  $python_package_name  = undef,
-
-  $service_name         = undef,
-  $service_provider     = undef,
-  $service_status       = undef,
-  $default_database     = undef,
-
-  $initdb_path          = undef,
-  $createdb_path        = undef,
-  $psql_path            = undef,
-  $pg_hba_conf_path     = undef,
-  $postgresql_conf_path = undef,
-
-  $pg_hba_conf_defaults = undef,
-
-  $datadir              = undef,
-  $confdir              = undef,
-  $bindir               = undef,
-  $xlogdir              = undef,
-
-  $user                 = undef,
-  $group                = undef,
-
-  $version              = undef,
-
-  $needs_initdb         = undef,
-
-  $encoding             = undef,
-  $locale               = undef,
-
-  $manage_firewall      = undef,
-  $manage_pg_hba_conf   = undef,
-  $firewall_supported   = undef,
-
-  $manage_package_repo  = undef
-) {
-  # We are determining this here, because it is needed by the package repo
-  # class.
-  $default_version = $::osfamily ? {
-    /^(RedHat|Linux)/ => $::operatingsystem ? {
-      'Fedora' => $::operatingsystemrelease ? {
-        /^(18|19|20)$/ => '9.2',
-        /^(17)$/ => '9.1',
-        default => undef,
-      },
-      'Amazon' => '9.2',
-      default => $::operatingsystemrelease ? {
-        /^6\./ => '8.4',
-        /^5\./ => '8.1',
-        default => undef,
-      },
-    },
-    'Debian' => $::operatingsystem ? {
-      'Debian' => $::operatingsystemrelease ? {
-        /^6\./ => '8.4',
-        /^(wheezy|7\.)/ => '9.1',
-        default => undef,
-      },
-      'Ubuntu' => $::operatingsystemrelease ? {
-        /^(14.04)$/ => '9.3',
-        /^(11.10|12.04|12.10|13.04|13.10)$/ => '9.1',
-        /^(10.04|10.10|11.04)$/ => '8.4',
-        default => undef,
-      },
-      default => undef,
-    },
-    'Archlinux' => $::operatingsystem ? {
-      /Archlinux/ => '9.2',
-      default => '9.2',
-    },
-    'FreeBSD' => '93',
-    default => undef,
-  }
-  $globals_version = pick($version, $default_version, 'unknown')
-
-  # Setup of the repo only makes sense globally, so we are doing this here.
-  if($manage_package_repo) {
-    class { 'postgresql::repo':
-      ensure  => $ensure,
-      version => $globals_version
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp
deleted file mode 100644
index 0c446d439cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# This class installs postgresql development libraries. See README.md for more
-# details.
-class postgresql::lib::devel(
-  $package_name   = $postgresql::params::devel_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  validate_string($package_name)
-
-  package { 'postgresql-devel':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp
deleted file mode 100644
index e9ee53dabee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# This class installs the postgresql jdbc connector. See README.md for more
-# details.
-class postgresql::lib::java (
-  $package_name   = $postgresql::params::java_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  validate_string($package_name)
-
-  package { 'postgresql-jdbc':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp
deleted file mode 100644
index bfe05854875..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# This class installs the python libs for postgresql. See README.md for more
-# details.
-class postgresql::lib::python(
-  $package_name   = $postgresql::params::python_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  package { 'python-psycopg2':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp
deleted file mode 100644
index 4f5ae97eba7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp
+++ /dev/null
@@ -1,175 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::params inherits postgresql::globals {
-  $ensure                     = true
-  $version                    = $globals_version
-  $listen_addresses           = 'localhost'
-  $ip_mask_deny_postgres_user = '0.0.0.0/0'
-  $ip_mask_allow_all_users    = '127.0.0.1/32'
-  $ipv4acls                   = []
-  $ipv6acls                   = []
-  $user                       = pick($user, 'postgres')
-  $group                      = pick($group, 'postgres')
-  $encoding                   = $encoding
-  $locale                     = $locale
-  $service_provider           = $service_provider
-  $manage_firewall            = $manage_firewall
-  $manage_pg_hba_conf         = pick($manage_pg_hba_conf, true)
-
-  # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      $needs_initdb       = pick($needs_initdb, true)
-      $firewall_supported = pick($firewall_supported, true)
-
-      if $version == $default_version {
-        $client_package_name  = pick($client_package_name, 'postgresql')
-        $server_package_name  = pick($server_package_name, 'postgresql-server')
-        $contrib_package_name = pick($contrib_package_name,'postgresql-contrib')
-        $devel_package_name   = pick($devel_package_name, 'postgresql-devel')
-        $java_package_name    = pick($java_package_name, 'postgresql-jdbc')
-        $plperl_package_name  = pick($plperl_package_name, 'postgresql-plperl')
-        $service_name         = pick($service_name, 'postgresql')
-        $bindir               = pick($bindir, '/usr/bin')
-        $datadir              = $::operatingsystem ? {
-          'Amazon' => pick($datadir, '/var/lib/pgsql9/data'),
-          default  => pick($datadir, '/var/lib/pgsql/data'),
-        }
-        $confdir              = pick($confdir, $datadir)
-      } else {
-        $version_parts        = split($version, '[.]')
-        $package_version      = "${version_parts[0]}${version_parts[1]}"
-        $client_package_name  = pick($client_package_name, "postgresql${package_version}")
-        $server_package_name  = pick($server_package_name, "postgresql${package_version}-server")
-        $contrib_package_name = pick($contrib_package_name,"postgresql${package_version}-contrib")
-        $devel_package_name   = pick($devel_package_name, "postgresql${package_version}-devel")
-        $java_package_name    = pick($java_package_name, "postgresql${package_version}-jdbc")
-        $plperl_package_name  = pick($plperl_package_name, "postgresql${package_version}-plperl")
-        $service_name         = pick($service_name, "postgresql-${version}")
-        $bindir               = pick($bindir, "/usr/pgsql-${version}/bin")
-        $datadir              = $::operatingsystem ? {
-          'Amazon' => pick($datadir, "/var/lib/pgsql9/${version}/data"),
-          default  => pick($datadir, "/var/lib/pgsql/${version}/data"),
-        }
-        $confdir              = pick($confdir, $datadir)
-      }
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $service_status      = $service_status
-      $python_package_name = pick($python_package_name, 'python-psycopg2')
-    }
-
-    'Archlinux': {
-      # Based on the existing version of the firewall module, this is normally
-      # true for Archlinux, but archlinux users want more control.
-      # so they can set it themself
-      $firewall_supported = pick($firewall_supported, true)
-      $needs_initdb       = pick($needs_initdb, true)
-
-      # Archlinux doesn't have a client-package but has a libs package which
-      # pulls in postgresql server
-      $client_package_name  = pick($client_package_name, 'postgresql')
-      $server_package_name  = pick($server_package_name, 'postgresql-libs')
-      $java_package_name    = pick($java_package_name, 'postgresql-jdbc')
-      # Archlinux doesn't have develop packages
-      $devel_package_name   = pick($devel_package_name, 'postgresql-devel')
-      # Archlinux does have postgresql-contrib but it isn't maintained
-      $contrib_package_name = pick($contrib_package_name,'undef')
-      # Archlinux postgresql package provides plperl
-      $plperl_package_name  = pick($plperl_package_name, 'undef')
-      $service_name         = pick($service_name, 'postgresql')
-      $bindir               = pick($bindir, '/usr/bin')
-      $datadir              = pick($datadir, '/var/lib/postgres/data')
-      $confdir              = pick($confdir, $datadir)
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $service_status      = $service_status
-      $python_package_name = pick($python_package_name, 'python-psycopg2')
-    }
-
-    'Debian': {
-
-      if $manage_package_repo == true {
-        $needs_initdb = pick($needs_initdb, true)
-        $service_name = pick($service_name, 'postgresql')
-      } else {
-        $needs_initdb = pick($needs_initdb, false)
-        $service_name = $::operatingsystem ? {
-          'Debian' => pick($service_name, 'postgresql'),
-          'Ubuntu' => $::lsbmajdistrelease ? {
-            '10' => pick($service_name, "postgresql-${version}"),
-            default => pick($service_name, 'postgresql'),
-          },
-          default => undef
-        }
-      }
-
-      $client_package_name  = pick($client_package_name, "postgresql-client-${version}")
-      $server_package_name  = pick($server_package_name, "postgresql-${version}")
-      $contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
-      $devel_package_name   = pick($devel_package_name, 'libpq-dev')
-      $java_package_name    = pick($java_package_name, 'libpostgresql-jdbc-java')
-      $plperl_package_name  = pick($plperl_package_name, "postgresql-plperl-${version}")
-      $python_package_name  = pick($python_package_name, 'python-psycopg2')
-
-      $bindir               = pick($bindir, "/usr/lib/postgresql/${version}/bin")
-      $datadir              = pick($datadir, "/var/lib/postgresql/${version}/main")
-      $confdir              = pick($confdir, "/etc/postgresql/${version}/main")
-      $service_status       = pick($service_status, "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'")
-      $psql_path            = pick($psql_path, "/usr/bin/psql")
-
-      $firewall_supported   = pick($firewall_supported, true)
-    }
-
-    'FreeBSD': {
-
-      $client_package_name  = pick($client_package_name, "databases/postgresql${version}-client")
-      $server_package_name  = pick($server_package_name, "databases/postgresql${version}-server")
-      $contrib_package_name = pick($contrib_package_name, "databases/postgresql${version}-contrib")
-      $devel_package_name   = pick($devel_package_name, 'databases/postgresql-libpqxx3')
-      $java_package_name    = pick($java_package_name, 'databases/postgresql-jdbc')
-      $plperl_package_name  = pick($plperl_package_name, "databases/postgresql${version}-plperl")
-      $python_package_name  = pick($python_package_name, 'databases/py-psycopg2')
-
-      $service_name         = pick($service_name, 'postgresql')
-      $bindir               = pick($bindir, '/usr/local/bin')
-      $datadir              = pick($datadir, '/usr/local/pgsql/data')
-      $confdir              = pick($confdir, '/usr/local/share/postgresql')
-      $service_status       = pick($service_status, "/usr/local/etc/rc.d/${service_name} status")
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $firewall_supported   = pick($firewall_supported, false)
-      $needs_initdb         = pick($needs_initdb, true)
-    }
-
-    default: {
-      # Based on the existing version of the firewall module, this is normally
-      # false for other OS, but this allows an escape hatch to override it.
-      $firewall_supported = pick($firewall_supported, false)
-
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      # Since we can't determine defaults on our own, we rely on users setting
-      # parameters with the postgresql::globals class. Here we are checking
-      # that the mandatory minimum is set for the module to operate.
-      $err_prefix = "Module ${module_name} does not provide defaults for osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}; please specify a value for ${module_name}::globals::"
-      if ($needs_initdb == undef) { fail("${err_prefix}needs_initdb") }
-      if ($service_name == undef) { fail("${err_prefix}service_name") }
-      if ($client_package_name == undef) { fail("${err_prefix}client_package_name") }
-      if ($server_package_name == undef) { fail("${err_prefix}server_package_name") }
-      if ($bindir == undef) { fail("${err_prefix}bindir") }
-      if ($datadir == undef) { fail("${err_prefix}datadir") }
-      if ($confdir == undef) { fail("${err_prefix}confdir") }
-    }
-  }
-
-  $initdb_path          = pick($initdb_path, "${bindir}/initdb")
-  $createdb_path        = pick($createdb_path, "${bindir}/createdb")
-  $pg_hba_conf_path     = pick($pg_hba_conf_path, "${confdir}/pg_hba.conf")
-  $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
-  $postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
-  $default_database     = pick($default_database, 'postgres')
-
-  if($version == 'unknown') {
-    fail('No preferred version defined or automatically detected.')
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp
deleted file mode 100644
index 2e2cbd3f41a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo (
-  $ensure  = $postgresql::params::ensure,
-  $version = undef
-) inherits postgresql::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      if $version == undef {
-        fail("The parameter 'version' for 'postgresql::repo' is undefined. You must always define it when osfamily == Redhat or Linux")
-      }
-      class { 'postgresql::repo::yum_postgresql_org': }
-    }
-
-    'Debian': {
-      class { 'postgresql::repo::apt_postgresql_org': }
-    }
-
-    default: {
-      fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily RedHat and Debian")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp
deleted file mode 100644
index 610eb4724b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo::apt_postgresql_org inherits postgresql::repo {
-  if($ensure == 'present' or $ensure == true) {
-    # Here we have tried to replicate the instructions on the PostgreSQL site:
-    #
-    # http://www.postgresql.org/download/linux/debian/
-    #
-    apt::pin { 'apt.postgresql.org':
-      originator => 'apt.postgresql.org',
-      priority   => 500,
-    }->
-    apt::source { 'apt.postgresql.org':
-      location          => 'http://apt.postgresql.org/pub/repos/apt/',
-      release           => "${::lsbdistcodename}-pgdg",
-      repos             => "main ${version}",
-      key               => 'ACCC4CF8',
-      key_source        => 'http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc',
-      include_src       => false,
-    }
-
-    Apt::Source['apt.postgresql.org']->Package<|tag == 'postgresql'|>
-  } else {
-    apt::source { 'apt.postgresql.org':
-      ensure => absent,
-    }
-    apt::pin { 'apt.postgresql.org':
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp
deleted file mode 100644
index 9cdfd4af66c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo::yum_postgresql_org inherits postgresql::repo {
-  $version_parts   = split($version, '[.]')
-  $package_version = "${version_parts[0]}${version_parts[1]}"
-  $gpg_key_path    = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
-
-  if ($ensure == 'present' or $ensure == true) {
-    file { $gpg_key_path:
-      source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG',
-      before => Yumrepo['yum.postgresql.org']
-    }
-
-    if($::operatingsystem == 'Fedora') {
-      $label1 = 'fedora'
-      $label2 = $label1
-    } else {
-      $label1 = 'redhat'
-      $label2 = 'rhel'
-    }
-
-    yumrepo { 'yum.postgresql.org':
-      descr    => "PostgreSQL ${version} \$releasever - \$basearch",
-      baseurl  => "http://yum.postgresql.org/${version}/${label1}/${label2}-\$releasever-\$basearch",
-      enabled  => 1,
-      gpgcheck => 1,
-      gpgkey   => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}",
-    }
-
-    Yumrepo['yum.postgresql.org'] -> Package<|tag == 'postgresql'|>
-  } else {
-    yumrepo { 'yum.postgresql.org':
-      enabled => absent,
-    }->
-    file { $gpg_key_path:
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp
deleted file mode 100644
index 4d5baab4976..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# This installs a PostgreSQL server. See README.md for more details.
-class postgresql::server (
-  $ensure                     = $postgresql::params::ensure,
-
-  $version                    = $postgresql::params::version,
-
-  $postgres_password          = undef,
-
-  $package_name               = $postgresql::params::server_package_name,
-  $client_package_name        = $postgresql::params::client_package_name,
-  $package_ensure             = $ensure,
-
-  $plperl_package_name        = $postgresql::params::plperl_package_name,
-
-  $service_name               = $postgresql::params::service_name,
-  $service_provider           = $postgresql::params::service_provider,
-  $service_status             = $postgresql::params::service_status,
-  $default_database           = $postgresql::params::default_database,
-
-  $listen_addresses           = $postgresql::params::listen_addresses,
-  $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
-  $ip_mask_allow_all_users    = $postgresql::params::ip_mask_allow_all_users,
-  $ipv4acls                   = $postgresql::params::ipv4acls,
-  $ipv6acls                   = $postgresql::params::ipv6acls,
-
-  $initdb_path                = $postgresql::params::initdb_path,
-  $createdb_path              = $postgresql::params::createdb_path,
-  $psql_path                  = $postgresql::params::psql_path,
-  $pg_hba_conf_path           = $postgresql::params::pg_hba_conf_path,
-  $postgresql_conf_path       = $postgresql::params::postgresql_conf_path,
-
-  $datadir                    = $postgresql::params::datadir,
-  $xlogdir                    = $postgresql::params::xlogdir,
-
-  $pg_hba_conf_defaults       = $postgresql::params::pg_hba_conf_defaults,
-
-  $user                       = $postgresql::params::user,
-  $group                      = $postgresql::params::group,
-
-  $needs_initdb               = $postgresql::params::needs_initdb,
-
-  $encoding                   = $postgresql::params::encoding,
-  $locale                     = $postgresql::params::locale,
-
-  $manage_firewall            = $postgresql::params::manage_firewall,
-  $manage_pg_hba_conf         = $postgresql::params::manage_pg_hba_conf,
-  $firewall_supported         = $postgresql::params::firewall_supported
-) inherits postgresql::params {
-  $pg = 'postgresql::server'
-
-  if ($ensure == 'present' or $ensure == true) {
-    # Reload has its own ordering, specified by other defines
-    class { "${pg}::reload": require => Class["${pg}::install"] }
-
-    anchor { "${pg}::start": }->
-    class { "${pg}::install": }->
-    class { "${pg}::initdb": }->
-    class { "${pg}::config": }->
-    class { "${pg}::service": }->
-    class { "${pg}::passwd": }->
-    class { "${pg}::firewall": }->
-    anchor { "${pg}::end": }
-  } else {
-    anchor { "${pg}::start": }->
-    class { "${pg}::firewall": }->
-    class { "${pg}::passwd": }->
-    class { "${pg}::service": }->
-    class { "${pg}::install": }->
-    class { "${pg}::initdb": }->
-    class { "${pg}::config": }->
-    anchor { "${pg}::end": }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp
deleted file mode 100644
index a59f1793d29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::config {
-  $ensure                     = $postgresql::server::ensure
-  $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user
-  $ip_mask_allow_all_users    = $postgresql::server::ip_mask_allow_all_users
-  $listen_addresses           = $postgresql::server::listen_addresses
-  $ipv4acls                   = $postgresql::server::ipv4acls
-  $ipv6acls                   = $postgresql::server::ipv6acls
-  $pg_hba_conf_path           = $postgresql::server::pg_hba_conf_path
-  $postgresql_conf_path       = $postgresql::server::postgresql_conf_path
-  $pg_hba_conf_defaults       = $postgresql::server::pg_hba_conf_defaults
-  $user                       = $postgresql::server::user
-  $group                      = $postgresql::server::group
-  $version                    = $postgresql::server::version
-  $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
-
-  if ($ensure == 'present' or $ensure == true) {
-
-    if ($manage_pg_hba_conf == true) {
-      # Prepare the main pg_hba file
-      concat { $pg_hba_conf_path:
-        owner  => 0,
-        group  => $group,
-        mode   => '0640',
-        warn   => true,
-        notify => Class['postgresql::server::reload'],
-      }
-
-      if $pg_hba_conf_defaults {
-        Postgresql::Server::Pg_hba_rule {
-          database => 'all',
-          user => 'all',
-        }
-
-        # Lets setup the base rules
-        $local_auth_option = $version ? {
-          '8.1'   => 'sameuser',
-          default => undef,
-        }
-        postgresql::server::pg_hba_rule { 'local access as postgres user':
-          type        => 'local',
-          user        => $user,
-          auth_method => 'ident',
-          auth_option => $local_auth_option,
-          order       => '001',
-        }
-        postgresql::server::pg_hba_rule { 'local access to database with same name':
-          type        => 'local',
-          auth_method => 'ident',
-          auth_option => $local_auth_option,
-          order       => '002',
-        }
-        postgresql::server::pg_hba_rule { 'allow localhost TCP access to postgresql user':
-          type        => 'host',
-          user        => $user,
-          address     => '127.0.0.1/32',
-          auth_method => 'md5',
-          order       => '003',
-        }
-        postgresql::server::pg_hba_rule { 'deny access to postgresql user':
-          type        => 'host',
-          user        => $user,
-          address     => $ip_mask_deny_postgres_user,
-          auth_method => 'reject',
-          order       => '004',
-        }
-
-        # ipv4acls are passed as an array of rule strings, here we transform
-        # them into a resources hash, and pass the result to create_resources
-        $ipv4acl_resources = postgresql_acls_to_resources_hash($ipv4acls,
-        'ipv4acls', 10)
-        create_resources('postgresql::server::pg_hba_rule', $ipv4acl_resources)
-
-        postgresql::server::pg_hba_rule { 'allow access to all users':
-          type        => 'host',
-          address     => $ip_mask_allow_all_users,
-          auth_method => 'md5',
-          order       => '100',
-        }
-        postgresql::server::pg_hba_rule { 'allow access to ipv6 localhost':
-          type        => 'host',
-          address     => '::1/128',
-          auth_method => 'md5',
-          order       => '101',
-        }
-
-        # ipv6acls are passed as an array of rule strings, here we transform
-        # them into a resources hash, and pass the result to create_resources
-        $ipv6acl_resources = postgresql_acls_to_resources_hash($ipv6acls,
-        'ipv6acls', 102)
-        create_resources('postgresql::server::pg_hba_rule', $ipv6acl_resources)
-      }
-    }
-
-    # We must set a "listen_addresses" line in the postgresql.conf if we
-    # want to allow any connections from remote hosts.
-    postgresql::server::config_entry { 'listen_addresses':
-      value => $listen_addresses,
-    }
-  } else {
-    file { $pg_hba_conf_path:
-      ensure => absent,
-    }
-    file { $postgresql_conf_path:
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp
deleted file mode 100644
index c6cd1a7adf6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Manage a postgresql.conf entry. See README.md for more details.
-define postgresql::server::config_entry (
-  $ensure = 'present',
-  $value  = undef,
-  $path   = false
-) {
-  $postgresql_conf_path = $postgresql::server::postgresql_conf_path
-
-  $target = $path ? {
-    false   => $postgresql_conf_path,
-    default => $path,
-  }
-
-  case $name {
-    /data_directory|hba_file|ident_file|include|listen_addresses|port|max_connections|superuser_reserved_connections|unix_socket_directory|unix_socket_group|unix_socket_permissions|bonjour|bonjour_name|ssl|ssl_ciphers|shared_buffers|max_prepared_transactions|max_files_per_process|shared_preload_libraries|wal_level|wal_buffers|archive_mode|max_wal_senders|hot_standby|logging_collector|silent_mode|track_activity_query_size|autovacuum_max_workers|autovacuum_freeze_max_age|max_locks_per_transaction|max_pred_locks_per_transaction|restart_after_crash|lc_messages|lc_monetary|lc_numeric|lc_time/: {
-      Postgresql_conf {
-        notify => Class['postgresql::server::service'],
-        before => Class['postgresql::server::reload'],
-      }
-    }
-
-    default: {
-      Postgresql_conf {
-        notify => Class['postgresql::server::reload'],
-      }
-    }
-  }
-
-  case $ensure {
-    /present|absent/: {
-      postgresql_conf { $name:
-        ensure  => $ensure,
-        target  => $target,
-        value   => $value,
-        require => Class['postgresql::server::initdb'],
-      }
-    }
-
-    default: {
-      fail("Unknown value for ensure '${ensure}'.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp
deleted file mode 100644
index fe6309e17b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Install the contrib postgresql packaging. See README.md for more details.
-class postgresql::server::contrib (
-  $package_name   = $postgresql::params::contrib_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-  validate_string($package_name)
-
-  package { 'postgresql-contrib':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-
-  if($package_ensure == 'present' or $package_ensure == true) {
-    anchor { 'postgresql::server::contrib::start': }->
-    Class['postgresql::server::install']->
-    Package['postgresql-contrib']->
-    Class['postgresql::server::service']->
-    anchor { 'postgresql::server::contrib::end': }
-  } else {
-    anchor { 'postgresql::server::contrib::start': }->
-    Class['postgresql::server::service']->
-    Package['postgresql-contrib']->
-    Class['postgresql::server::install']->
-    anchor { 'postgresql::server::contrib::end': }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp
deleted file mode 100644
index adeabde7970..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# Define for creating a database. See README.md for more details.
-define postgresql::server::database(
-  $dbname     = $title,
-  $owner      = $postgresql::server::user,
-  $tablespace = undef,
-  $template   = 'template0',
-  $encoding   = $postgresql::server::encoding,
-  $locale     = $postgresql::server::locale,
-  $istemplate = false
-) {
-  $createdb_path = $postgresql::server::createdb_path
-  $user          = $postgresql::server::user
-  $group         = $postgresql::server::group
-  $psql_path     = $postgresql::server::psql_path
-  $version       = $postgresql::server::version
-
-  # Set the defaults for the postgresql_psql resource
-  Postgresql_psql {
-    psql_user  => $user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-  }
-
-  # Optionally set the locale switch. Older versions of createdb may not accept
-  # --locale, so if the parameter is undefined its safer not to pass it.
-  if ($version != '8.1') {
-    $locale_option = $locale ? {
-      undef   => '',
-      default => "--locale=${locale} ",
-    }
-    $public_revoke_privilege = 'CONNECT'
-  } else {
-    $locale_option = ''
-    $public_revoke_privilege = 'ALL'
-  }
-
-  $encoding_option = $encoding ? {
-    undef   => '',
-    default => "--encoding '${encoding}' ",
-  }
-
-  $tablespace_option = $tablespace ? {
-    undef   => '',
-    default => "--tablespace='${tablespace}' ",
-  }
-
-  $createdb_command = "${createdb_path} --owner='${owner}' --template=${template} ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
-
-  postgresql_psql { "Check for existence of db '${dbname}'":
-    command => 'SELECT 1',
-    unless  => "SELECT datname FROM pg_database WHERE datname='${dbname}'",
-    require => Class['postgresql::server::service']
-  }~>
-  exec { $createdb_command :
-    refreshonly => true,
-    user        => $user,
-    logoutput   => on_failure,
-  }~>
-
-  # This will prevent users from connecting to the database unless they've been
-  #  granted privileges.
-  postgresql_psql {"REVOKE ${public_revoke_privilege} ON DATABASE \"${dbname}\" FROM public":
-    db          => $user,
-    refreshonly => true,
-  }
-
-  Exec [ $createdb_command ]->
-  postgresql_psql {"UPDATE pg_database SET datistemplate = ${istemplate} WHERE datname = '${dbname}'":
-    unless => "SELECT datname FROM pg_database WHERE datname = '${dbname}' AND datistemplate = ${istemplate}",
-  }
-
-  # Build up dependencies on tablespace
-  if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
-    Postgresql::Server::Tablespace[$tablespace]->Exec[$createdb_command]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp
deleted file mode 100644
index 5973144127a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Manage a database grant. See README.md for more details.
-define postgresql::server::database_grant(
-  $privilege,
-  $db,
-  $role,
-  $psql_db   = undef,
-  $psql_user = undef
-) {
-  postgresql::server::grant { "database:${name}":
-    role        => $role,
-    db          => $db,
-    privilege   => $privilege,
-    object_type => 'DATABASE',
-    object_name => $db,
-    psql_db     => $psql_db,
-    psql_user   => $psql_user,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp
deleted file mode 100644
index 5cc7954c3eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Define for conveniently creating a role, database and assigning the correct
-# permissions. See README.md for more details.
-define postgresql::server::db (
-  $user,
-  $password,
-  $encoding   = $postgresql::server::encoding,
-  $locale     = $postgresql::server::locale,
-  $grant      = 'ALL',
-  $tablespace = undef,
-  $template   = 'template0',
-  $istemplate = false,
-  $owner      = undef
-) {
-  postgresql::server::database { $name:
-    encoding   => $encoding,
-    tablespace => $tablespace,
-    template   => $template,
-    locale     => $locale,
-    istemplate => $istemplate,
-    owner      => $owner,
-  }
-
-  if ! defined(Postgresql::Server::Role[$user]) {
-    postgresql::server::role { $user:
-      password_hash => $password,
-    }
-  }
-
-  postgresql::server::database_grant { "GRANT ${user} - ${grant} - ${name}":
-    privilege => $grant,
-    db        => $name,
-    role      => $user,
-  }
-
-  if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
-    Postgresql::Server::Tablespace[$tablespace]->Postgresql::Server::Database[$name]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp
deleted file mode 100644
index afe3797415d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::server::firewall {
-  $ensure             = $postgresql::server::ensure
-  $manage_firewall    = $postgresql::server::manage_firewall
-  $firewall_supported = $postgresql::server::firewall_supported
-
-  if ($manage_firewall and $firewall_supported) {
-    if ($ensure == 'present' or $ensure == true) {
-      # TODO: get rid of hard-coded port
-      firewall { '5432 accept - postgres':
-        port   => '5432',
-        proto  => 'tcp',
-        action => 'accept',
-      }
-    } else {
-      firewall { '5432 accept - postgres':
-        ensure => absent,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp
deleted file mode 100644
index d24130ca28b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Define for granting permissions to roles. See README.md for more details.
-define postgresql::server::grant (
-  $role,
-  $db,
-  $privilege   = undef,
-  $object_type = 'database',
-  $object_name = $db,
-  $psql_db     = $postgresql::server::user,
-  $psql_user   = $postgresql::server::user
-) {
-  $group     = $postgresql::server::group
-  $psql_path = $postgresql::server::psql_path
-
-  ## Munge the input values
-  $_object_type = upcase($object_type)
-  $_privilege   = upcase($privilege)
-
-  ## Validate that the object type is known
-  validate_string($_object_type,
-    #'COLUMN',
-    'DATABASE',
-    #'FOREIGN SERVER',
-    #'FOREIGN DATA WRAPPER',
-    #'FUNCTION',
-    #'PROCEDURAL LANGUAGE',
-    #'SCHEMA',
-    #'SEQUENCE',
-    'TABLE',
-    #'TABLESPACE',
-    #'VIEW',
-  )
-
-  ## Validate that the object type's privilege is acceptable
-  # TODO: this is a terrible hack; if they pass "ALL" as the desired privilege,
-  #  we need a way to test for it--and has_database_privilege does not
-  #  recognize 'ALL' as a valid privilege name. So we probably need to
-  #  hard-code a mapping between 'ALL' and the list of actual privileges that
-  #  it entails, and loop over them to check them.  That sort of thing will
-  #  probably need to wait until we port this over to ruby, so, for now, we're
-  #  just going to assume that if they have "CREATE" privileges on a database,
-  #  then they have "ALL".  (I told you that it was terrible!)
-  case $_object_type {
-    'DATABASE': {
-      $unless_privilege = $_privilege ? {
-        'ALL'   => 'CREATE',
-        default => $_privilege,
-      }
-      validate_string($unless_privilege,'CREATE','CONNECT','TEMPORARY','TEMP',
-        'ALL','ALL PRIVILEGES')
-      $unless_function = 'has_database_privilege'
-      $on_db = $psql_db
-    }
-    'TABLE': {
-      $unless_privilege = $_privilege ? {
-        'ALL'   => 'INSERT',
-        default => $_privilege,
-      }
-      validate_string($unless_privilege,'SELECT','INSERT','UPDATE','DELETE',
-        'TRUNCATE','REFERENCES','TRIGGER','ALL','ALL PRIVILEGES')
-      $unless_function = 'has_table_privilege'
-      $on_db = $db
-    }
-    default: {
-      fail("Missing privilege validation for object type ${_object_type}")
-    }
-  }
-
-  $grant_cmd = "GRANT ${_privilege} ON ${_object_type} \"${object_name}\" TO \"${role}\""
-  postgresql_psql { $grant_cmd:
-    db         => $on_db,
-    psql_user  => $psql_user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-    unless     => "SELECT 1 WHERE ${unless_function}('${role}', '${object_name}', '${unless_privilege}')",
-    require    => Class['postgresql::server']
-  }
-
-  if($role != undef and defined(Postgresql::Server::Role[$role])) {
-    Postgresql::Server::Role[$role]->Postgresql_psql[$grant_cmd]
-  }
-
-  if($db != undef and defined(Postgresql::Server::Database[$db])) {
-    Postgresql::Server::Database[$db]->Postgresql_psql[$grant_cmd]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp
deleted file mode 100644
index a56f19c39b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::initdb {
-  $ensure       = $postgresql::server::ensure
-  $needs_initdb = $postgresql::server::needs_initdb
-  $initdb_path  = $postgresql::server::initdb_path
-  $datadir      = $postgresql::server::datadir
-  $xlogdir      = $postgresql::server::xlogdir
-  $encoding     = $postgresql::server::encoding
-  $locale       = $postgresql::server::locale
-  $group        = $postgresql::server::group
-  $user         = $postgresql::server::user
-
-  if($ensure == 'present' or $ensure == true) {
-    # Make sure the data directory exists, and has the correct permissions.
-    file { $datadir:
-      ensure => directory,
-      owner  => $user,
-      group  => $group,
-      mode   => '0700',
-    }
-
-    if($xlogdir) {
-      # Make sure the xlog directory exists, and has the correct permissions.
-      file { $xlogdir:
-        ensure => directory,
-        owner  => $user,
-        group  => $group,
-        mode   => '0700',
-      }
-    }
-
-    if($needs_initdb) {
-      # Build up the initdb command.
-      #
-      # We optionally add the locale switch if specified. Older versions of the
-      # initdb command don't accept this switch. So if the user didn't pass the
-      # parameter, lets not pass the switch at all.
-      $ic_base = "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'"
-      $ic_xlog = $xlogdir ? {
-        undef   => $ic_base,
-        default => "${ic_base} --xlogdir '${xlogdir}'"
-      }
-      $initdb_command = $locale ? {
-        undef   => $ic_xlog,
-        default => "${ic_xlog} --locale '${locale}'"
-      }
-
-      # This runs the initdb command, we use the existance of the PG_VERSION
-      # file to ensure we don't keep running this command.
-      exec { 'postgresql_initdb':
-        command   => $initdb_command,
-        creates   => "${datadir}/PG_VERSION",
-        user      => $user,
-        group     => $group,
-        logoutput => on_failure,
-        require   => File[$datadir],
-      }
-    }
-  } else {
-    # Purge data directory if ensure => absent
-    file { $datadir:
-      ensure  => absent,
-      recurse => true,
-      force   => true,
-    }
-
-    if($xlogdir) {
-      # Make sure the xlog directory exists, and has the correct permissions.
-      file { $xlogdir:
-        ensure  => absent,
-        recurse => true,
-        force   => true,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp
deleted file mode 100644
index 1e912a8b1dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::install {
-  $package_ensure      = $postgresql::server::package_ensure
-  $package_name        = $postgresql::server::package_name
-  $client_package_name = $postgresql::server::client_package_name
-
-  # This is necessary to ensure that the extra client package that was
-  # installed automatically by the server package is removed and all
-  # of its dependencies are removed also. Without this later installation
-  # of the native Ubuntu packages will fail.
-  if($::operatingsystem == 'Ubuntu' and $package_ensure == 'absent') {
-    # This is an exec, because we want to invoke autoremove.
-    #
-    # An alternative would be to have a full list of packages, but that seemed
-    # more problematic to maintain, not to mention the conflict with the
-    # client class will create duplicate resources.
-    exec { 'apt-get-autoremove-postgresql-client-XX':
-      command   => "apt-get autoremove --purge --yes ${client_package_name}",
-      onlyif    => "dpkg -l ${client_package_name} | grep -e '^ii'",
-      logoutput => on_failure,
-      path      => '/usr/bin:/bin:/usr/sbin/:/sbin',
-    }
-
-    # This will clean up anything we miss
-    exec { 'apt-get-autoremove-postgresql-client-brute':
-      command   => "dpkg -P postgresql*",
-      onlyif    => "dpkg -l postgresql* | grep -e '^ii'",
-      logoutput => on_failure,
-      path      => '/usr/bin:/bin:/usr/sbin/:/sbin',
-    }
-  }
-
-  $_package_ensure = $package_ensure ? {
-    true     => 'present',
-    false    => 'purged',
-    'absent' => 'purged',
-    default => $package_ensure,
-  }
-
-  package { 'postgresql-server':
-    ensure => $_package_ensure,
-    name   => $package_name,
-
-    # This is searched for to create relationships with the package repos, be
-    # careful about its removal
-    tag    => 'postgresql',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp
deleted file mode 100644
index 5777b03354a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::passwd {
-  $ensure            = $postgresql::server::ensure
-  $postgres_password = $postgresql::server::postgres_password
-  $user              = $postgresql::server::user
-  $group             = $postgresql::server::group
-  $psql_path         = $postgresql::server::psql_path
-
-  if($ensure == 'present' or $ensure == true) {
-    if ($postgres_password != undef) {
-      # NOTE: this password-setting logic relies on the pg_hba.conf being
-      #  configured to allow the postgres system user to connect via psql
-      #  without specifying a password ('ident' or 'trust' security). This is
-      #  the default for pg_hba.conf.
-      $escaped = postgresql_escape($postgres_password)
-      $env = "env PGPASSWORD='${postgres_password}'"
-      exec { 'set_postgres_postgrespw':
-        # This command works w/no password because we run it as postgres system
-        # user
-        command     => "${psql_path} -c 'ALTER ROLE \"${user}\" PASSWORD ${escaped}'",
-        user        => $user,
-        group       => $group,
-        logoutput   => true,
-        cwd         => '/tmp',
-        # With this command we're passing -h to force TCP authentication, which
-        # does require a password.  We specify the password via the PGPASSWORD
-        # environment variable. If the password is correct (current), this
-        # command will exit with an exit code of 0, which will prevent the main
-        # command from running.
-        unless      => "${env} ${psql_path} -h localhost -c 'select 1' > /dev/null",
-        path        => '/usr/bin:/usr/local/bin:/bin',
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp
deleted file mode 100644
index ea300d1baa5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp
+++ /dev/null
@@ -1,52 +0,0 @@
-# This resource manages an individual rule that applies to the file defined in
-# $target. See README.md for more details.
-define postgresql::server::pg_hba_rule(
-  $type,
-  $database,
-  $user,
-  $auth_method,
-  $address     = undef,
-  $description = 'none',
-  $auth_option = undef,
-  $order       = '150',
-
-  # Needed for testing primarily, support for multiple files is not really
-  # working.
-  $target      = $postgresql::server::pg_hba_conf_path
-) {
-
-  if $postgresql::server::manage_pg_hba_conf == false {
-      fail('postgresql::server::manage_pg_hba_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests')
-  } else {
-    validate_re($type, '^(local|host|hostssl|hostnossl)$',
-    "The type you specified [${type}] must be one of: local, host, hostssl, hostnosssl")
-
-    if($type =~ /^host/ and $address == undef) {
-      fail('You must specify an address property when type is host based')
-    }
-
-    $allowed_auth_methods = $postgresql::server::version ? {
-      '9.3' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.2' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.1' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.0' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'radius', 'cert', 'pam'],
-      '8.4' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'cert', 'pam'],
-      '8.3' => ['trust', 'reject', 'md5', 'sha1', 'crypt', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'pam'],
-      '8.2' => ['trust', 'reject', 'md5', 'crypt', 'password', 'krb5', 'ident', 'ldap', 'pam'],
-      '8.1' => ['trust', 'reject', 'md5', 'crypt', 'password', 'krb5', 'ident', 'pam'],
-      default => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam', 'crypt']
-    }
-
-    $auth_method_regex = join(['^(', join($allowed_auth_methods, '|'), ')$'],'')
-    validate_re($auth_method, $auth_method_regex,
-    join(["The auth_method you specified [${auth_method}] must be one of: ", join($allowed_auth_methods, ', ')],''))
-
-    # Create a rule fragment
-    $fragname = "pg_hba_rule_${name}"
-    concat::fragment { $fragname:
-      target  => $target,
-      content => template('postgresql/pg_hba_rule.conf'),
-      order   => $order,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp
deleted file mode 100644
index c338f165701..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# This class installs the PL/Perl procedural language for postgresql. See
-# README.md for more details.
-class postgresql::server::plperl(
-  $package_ensure = 'present',
-  $package_name   = $postgresql::server::plperl_package_name
-) {
-  package { 'postgresql-plperl':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-
-  if($package_ensure == 'present' or $package_ensure == true) {
-    anchor { 'postgresql::server::plperl::start': }->
-    Class['postgresql::server::install']->
-    Package['postgresql-plperl']->
-    Class['postgresql::server::service']->
-    anchor { 'postgresql::server::plperl::end': }
-  } else {
-    anchor { 'postgresql::server::plperl::start': }->
-    Class['postgresql::server::service']->
-    Package['postgresql-plperl']->
-    Class['postgresql::server::install']->
-    anchor { 'postgresql::server::plperl::end': }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp
deleted file mode 100644
index 6b11ebfc1b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::server::reload {
-  $ensure         = $postgresql::server::ensure
-  $service_name   = $postgresql::server::service_name
-  $service_status = $postgresql::server::service_status
-
-  if($ensure == 'present' or $ensure == true) {
-    exec { 'postgresql_reload':
-      path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-      command     => "service ${service_name} reload",
-      onlyif      => $service_status,
-      refreshonly => true,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp
deleted file mode 100644
index 971191f5d54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Define for creating a database role. See README.md for more information
-define postgresql::server::role(
-  $password_hash    = false,
-  $createdb         = false,
-  $createrole       = false,
-  $db               = $postgresql::server::user,
-  $login            = true,
-  $superuser        = false,
-  $replication      = false,
-  $connection_limit = '-1',
-  $username         = $title
-) {
-  $psql_user  = $postgresql::server::user
-  $psql_group = $postgresql::server::group
-  $psql_path  = $postgresql::server::psql_path
-  $version    = $postgresql::server::version
-
-  $login_sql       = $login       ? { true => 'LOGIN',       default => 'NOLOGIN' }
-  $createrole_sql  = $createrole  ? { true => 'CREATEROLE',  default => 'NOCREATEROLE' }
-  $createdb_sql    = $createdb    ? { true => 'CREATEDB',    default => 'NOCREATEDB' }
-  $superuser_sql   = $superuser   ? { true => 'SUPERUSER',   default => 'NOSUPERUSER' }
-  $replication_sql = $replication ? { true => 'REPLICATION', default => '' }
-  if ($password_hash != false) {
-    $password_sql = "ENCRYPTED PASSWORD '${password_hash}'"
-  } else {
-    $password_sql = ''
-  }
-
-  Postgresql_psql {
-    db         => $db,
-    psql_user  => $psql_user,
-    psql_group => $psql_group,
-    psql_path  => $psql_path,
-    require    => [ Postgresql_psql["CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}"], Class['postgresql::server'] ],
-  }
-
-  postgresql_psql {"CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}":
-    unless  => "SELECT rolname FROM pg_roles WHERE rolname='${username}'",
-    require => Class['Postgresql::Server'],
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${superuser_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolsuper=${superuser}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${createdb_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcreatedb=${createdb}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${createrole_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcreaterole=${createrole}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${login_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcanlogin=${login}",
-  }
-
-  if(versioncmp($version, '9.1') >= 0) {
-    if $replication_sql == '' {
-      postgresql_psql {"ALTER ROLE \"${username}\" NOREPLICATION":
-        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
-      }
-    } else {
-      postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
-        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
-      }
-    }
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" CONNECTION LIMIT ${connection_limit}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolconnlimit=${connection_limit}",
-  }
-
-  if $password_hash {
-    if($password_hash =~ /^md5.+/) {
-      $pwd_hash_sql = $password_hash
-    } else {
-      $pwd_md5 = md5("${password_hash}${username}")
-      $pwd_hash_sql = "md5${pwd_md5}"
-    }
-    postgresql_psql {"ALTER ROLE \"${username}\" ${password_sql}":
-      unless => "SELECT usename FROM pg_shadow WHERE usename='${username}' and passwd='${pwd_hash_sql}'",
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp
deleted file mode 100644
index 598acd876a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::service {
-  $ensure           = $postgresql::server::ensure
-  $service_name     = $postgresql::server::service_name
-  $service_provider = $postgresql::server::service_provider
-  $service_status   = $postgresql::server::service_status
-  $user             = $postgresql::server::user
-  $default_database = $postgresql::server::default_database
-
-  $service_ensure = $ensure ? {
-    present => true,
-    absent  => false,
-    default => $ensure
-  }
-
-  anchor { 'postgresql::server::service::begin': }
-
-  service { 'postgresqld':
-    ensure    => $service_ensure,
-    name      => $service_name,
-    enable    => $service_ensure,
-    provider  => $service_provider,
-    hasstatus => true,
-    status    => $service_status,
-  }
-
-  if($service_ensure) {
-    # This blocks the class before continuing if chained correctly, making
-    # sure the service really is 'up' before continuing.
-    #
-    # Without it, we may continue doing more work before the database is
-    # prepared leading to a nasty race condition.
-    postgresql::validate_db_connection { 'validate_service_is_running':
-      run_as          => $user,
-      database_name   => $default_database,
-      sleep           => 1,
-      tries           => 60,
-      create_db_first => false,
-      require         => Service['postgresqld'],
-      before          => Anchor['postgresql::server::service::end']
-    }
-  }
-
-  anchor { 'postgresql::server::service::end': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp
deleted file mode 100644
index 643416e0d06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# This resource wraps the grant resource to manage table grants specifically.
-# See README.md for more details.
-define postgresql::server::table_grant(
-  $privilege,
-  $table,
-  $db,
-  $role,
-  $psql_db   = undef,
-  $psql_user = undef
-) {
-  postgresql::server::grant { "table:${name}":
-    role        => $role,
-    db          => $db,
-    privilege   => $privilege,
-    object_type => 'TABLE',
-    object_name => $table,
-    psql_db     => $psql_db,
-    psql_user   => $psql_user,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp
deleted file mode 100644
index 22523773c1f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# This module creates tablespace. See README.md for more details.
-define postgresql::server::tablespace(
-  $location,
-  $owner   = undef,
-  $spcname = $title
-) {
-  $user      = $postgresql::server::user
-  $group     = $postgresql::server::group
-  $psql_path = $postgresql::server::psql_path
-
-  Postgresql_psql {
-    psql_user  => $user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-  }
-
-  if ($owner == undef) {
-    $owner_section = ''
-  } else {
-    $owner_section = "OWNER \"${owner}\""
-  }
-
-  $create_tablespace_command = "CREATE TABLESPACE \"${spcname}\" ${owner_section} LOCATION '${location}'"
-
-  file { $location:
-    ensure => directory,
-    owner  => $user,
-    group  => $group,
-    mode   => '0700',
-  }
-
-  $create_ts = "Create tablespace '${spcname}'"
-  postgresql_psql { "Create tablespace '${spcname}'":
-    command => $create_tablespace_command,
-    unless  => "SELECT spcname FROM pg_tablespace WHERE spcname='${spcname}'",
-    require => [Class['postgresql::server'], File[$location]],
-  }
-
-  if($owner != undef and defined(Postgresql::Server::Role[$owner])) {
-    Postgresql::Server::Role[$owner]->Postgresql_psql[$create_ts]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp
deleted file mode 100644
index f70af1e4efd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp
+++ /dev/null
@@ -1,75 +0,0 @@
-# This type validates that a successful postgres connection can be established
-# between the node on which this resource is run and a specified postgres
-# instance (host/port/user/password/database name).
-#
-# See README.md for more details.
-define postgresql::validate_db_connection(
-  $database_host     = undef,
-  $database_name     = undef,
-  $database_password = undef,
-  $database_username = undef,
-  $database_port     = undef,
-  $run_as            = undef,
-  $sleep             = 2,
-  $tries             = 10,
-  $create_db_first   = true
-) {
-  require postgresql::client
-  include postgresql::params
-
-  $psql_path = $postgresql::params::psql_path
-
-  $cmd_init = "${psql_path} --tuples-only --quiet "
-  $cmd_host = $database_host ? {
-    default => "-h ${database_host} ",
-    undef   => "",
-  }
-  $cmd_user = $database_username ? {
-    default => "-U ${database_username} ",
-    undef   => "",
-  }
-  $cmd_port = $database_port ? {
-    default => "-p ${database_port} ",
-    undef   => "",
-  }
-  $cmd_dbname = $database_name ? {
-    default => "--dbname ${database_name} ",
-    undef   => "--dbname ${postgresql::params::default_database} ",
-  }
-  $env = $database_password ? {
-    default => "PGPASSWORD=${database_password}",
-    undef   => undef,
-  }
-  $cmd = join([$cmd_init, $cmd_host, $cmd_user, $cmd_port, $cmd_dbname])
-  $validate_cmd = "/usr/local/bin/validate_postgresql_connection.sh ${sleep} ${tries} '${cmd}'"
-
-  # This is more of a safety valve, we add a little extra to compensate for the
-  # time it takes to run each psql command.
-  $timeout = (($sleep + 2) * $tries)
-
-  $exec_name = "validate postgres connection for ${database_host}/${database_name}"
-  exec { $exec_name:
-    command     => "echo 'Unable to connect to defined database using: ${cmd}' && false",
-    unless      => $validate_cmd,
-    cwd         => '/tmp',
-    environment => $env,
-    logoutput   => 'on_failure',
-    user        => $run_as,
-    path        => '/bin',
-    timeout     => $timeout,
-    require     => Package['postgresql-client'],
-  }
-
-  # This is a little bit of puppet magic.  What we want to do here is make
-  # sure that if the validation and the database instance creation are being
-  # applied on the same machine, then the database resource is applied *before*
-  # the validation resource.  Otherwise, the validation is guaranteed to fail
-  # on the first run.
-  #
-  # We accomplish this by using Puppet's resource collection syntax to search
-  # for the Database resource in our current catalog; if it exists, the
-  # appropriate relationship is created here.
-  if($create_db_first) {
-    Postgresql::Server::Database<|title == $database_name|> -> Exec[$exec_name]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json
deleted file mode 100644
index 3da197dcc97..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-postgresql",
-  "version": "3.3.3",
-  "source": "git://github.com/puppetlabs/puppet-postgresql.git",
-  "author": "Inkling/Puppet Labs",
-  "license": "ASL 2.0",
-  "summary": "PostgreSQL defined resource types",
-  "description": "PostgreSQL defined resource types",
-  "project_page": "https://github.com/puppetlabs/puppet-postgresql",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">=3.2.0 <5.0.0"
-    },
-    {
-      "name": "puppetlabs/firewall",
-      "version_requirement": ">= 0.0.4"
-    },
-    {
-      "name": "puppetlabs/apt",
-      "version_requirement": ">=1.1.0 <2.0.0"
-    },
-    {
-      "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0 <2.0.0"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb
deleted file mode 100644
index eaff5263d4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::client:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::client': package_ensure => purged }",
-                   :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::client': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb
deleted file mode 100644
index 441da70e86c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'common patterns:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'postgresql.conf include pattern' do
-    after :all do
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': ensure => absent }
-
-        file { '/tmp/include.conf':
-          ensure => absent
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it "should support an 'include' directive at the end of postgresql.conf" do
-      pending('no support for include directive with centos 5/postgresql 8.1',
-        :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': }
-
-        $extras = "/etc/postgresql-include.conf"
-
-        file { $extras:
-          content => 'max_connections = 123',
-          seltype => 'postgresql_db_t',
-          seluser => 'system_u',
-          notify  => Class['postgresql::server::service'],
-        }
-
-        postgresql::server::config_entry { 'include':
-          value   => $extras,
-          require => File[$extras],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="show max_connections" -t', 'postgres') do |r|
-        expect(r.stdout).to match(/123/)
-        expect(r.stderr).to eq('')
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb
deleted file mode 100644
index d6dbb956a3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::contrib:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran, remove both contrib and server as contrib
-    # pulls in the server based packages.
-    pp = <<-EOS.unindent
-      class { 'postgresql::server':
-        ensure => absent,
-      }
-      class { 'postgresql::server::contrib':
-        package_ensure => purged,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      class { 'postgresql::server::contrib': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb
deleted file mode 100644
index 51a5ea988e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::devel:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::devel': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::devel': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb
deleted file mode 100644
index c943bed54e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::java:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::java': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('libpostgresql-java-jdbc not available natively for Ubuntu 10.04 and Debian 6',
-      :if => (fact('osfamily') == 'Debian' and ['6', '10'].include?(fact('lsbmajdistrelease'))))
-
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::java': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb
deleted file mode 100644
index 173204e7153..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::python:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::python': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('psycopg2 not available natively for centos 5', :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::python': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml
deleted file mode 100644
index 12c9e7893a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-510-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-510-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-510-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 06398354907..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index 3e31a827602..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 06398354907..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5047017e623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index 1c7a34ccbaa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb
deleted file mode 100644
index 5c03a7a8745..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql_psql:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should run some SQL when the unless query returns no rows' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql_psql { 'foobar':
-        db        => 'postgres',
-        psql_user => 'postgres',
-        command   => 'select 1',
-        unless    => 'select 1 where 1=2',
-        require   => Class['postgresql::server'],
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should not run SQL when the unless query returns rows' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql_psql { 'foobar':
-        db        => 'postgres',
-        psql_user => 'postgres',
-        command   => 'select * from pg_database limit 1',
-        unless    => 'select 1 where 1=1',
-        require   => Class['postgresql::server'],
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb
deleted file mode 100644
index a58903acb56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::config_entry:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should change setting and reflect it in show all' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql::server::config_entry { 'check_function_bodies':
-        value => 'off',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    psql('--command="show all" postgres') do |r|
-      expect(r.stdout).to match(/check_function_bodies.+off/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb
deleted file mode 100644
index 99ce44ddae7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::database_grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant access so a user can create objects in a database' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgres'
-        $user = 'psql_grant_tester'
-        $password = 'psql_grant_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        postgresql::server::database_grant { 'grant create test':
-          privilege => 'CREATE',
-          db        => $db,
-          role      => $user,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      # Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb
deleted file mode 100644
index 7f227d1686b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::database:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a db that we can connect to' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::database { $db: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb
deleted file mode 100644
index 0287976a857..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::db', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a db that we can connect to' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user     => $db,
-          password => postgresql_password($db, $db),
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-
-  it 'should take a locale parameter' do
-    pending('no support for locale parameter with centos 5', :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-    begin
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': }
-        postgresql::server::db { 'test1':
-          user     => 'test1',
-          password => postgresql_password('test1', 'test1'),
-          encoding => 'UTF8',
-          locale   => 'en_NG.UTF-8',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('-c "show lc_ctype" test1') do |r|
-        expect(r.stdout).to match(/en_NG/)
-      end
-
-      psql('-c "show lc_collate" test1') do |r|
-        expect(r.stdout).to match(/en_NG/)
-      end
-    ensure
-      psql('--command="drop database test1" postgres')
-    end
-  end
-
-  it 'should take an istemplate parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'template2'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          password   => postgresql_password($db, $db),
-          istemplate => true,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" template2') do |r|
-        expect(r.stdout).to match(/template2/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database template2" postgres', 'postgres', [1,2]) do |r|
-        expect(r.stdout).to eq('')
-        expect(r.stderr).to match(/cannot drop a template database/)
-      end
-    end
-  end
-
-  it 'should update istemplate parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'template2'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          password   => postgresql_password($db, $db),
-          istemplate => false,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" template2') do |r|
-        expect(r.stdout).to match(/template2/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database template2" postgres')
-    end
-  end
-
-  it 'should take a template parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          template   => 'template1',
-          password   => postgresql_password($db, $db),
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb
deleted file mode 100644
index d34523a60fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant access so a user can create in a database' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgres'
-        $user = 'psql_grant_tester'
-        $password = 'psql_grant_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        postgresql::server::grant { 'grant create test':
-          object_type => 'database',
-          privilege   => 'CREATE',
-          db          => $db,
-          role        => $user,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      # Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb
deleted file mode 100644
index bbc8e9464f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::pg_hba_rule:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should create a ruleset in pg_hba.conf' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      postgresql::server::pg_hba_rule { "allow application network to access app database":
-        type        => "host",
-        database    => "app",
-        user        => "app",
-        address     => "200.1.2.0/24",
-        auth_method => md5,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_failures => true)
-
-    shell("grep '200.1.2.0/24' /etc/postgresql/*/*/pg_hba.conf || grep '200.1.2.0/24' /var/lib/pgsql/data/pg_hba.conf")
-  end
-
-  it 'should create a ruleset in pg_hba.conf that denies db access to db test1' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql::server::db { "test1":
-        user     => "test1",
-        password => postgresql_password('test1', 'test1'),
-        grant    => "all",
-      }
-
-      postgresql::server::pg_hba_rule { "allow anyone to have access to db test1":
-        type        => "local",
-        database    => "test1",
-        user        => "test1",
-        auth_method => reject,
-        order       => '001',
-      }
-
-      user { "test1":
-        shell      => "/bin/bash",
-        managehome => true,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-
-    shell('su - test1 -c \'psql -U test1 -c "\q" test1\'', :acceptable_exit_codes => [2])
-  end
-
-  it 'should fail catalogue if postgresql::server::manage_pga_conf is disabled' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server':
-        manage_pg_hba_conf => false,
-      }
-      postgresql::server::pg_hba_rule { 'foo':
-        type        => "local",
-        database    => "test1",
-        user        => "test1",
-        auth_method => reject,
-        order       => '001',
-      }
-    EOS
-
-    apply_manifest(pp, :expect_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb
deleted file mode 100644
index 73312845259..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'server plperl:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': ensure => absent }
-      class { 'postgresql::server::plperl': package_ensure => purged }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('no support for plperl with default version on centos 5',
-      :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      class { 'postgresql::server::plperl': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb
deleted file mode 100644
index 2bd2b70db0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::role:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a user who can log in' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user"
-      $password = "postgresql_test_password"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-
-  it 'should idempotently alter a user who can log in' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user"
-      $password = "postgresql_test_password2"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-
-  it 'should idempotently create a user with a cleartext password' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user2"
-      $password = "postgresql_test_password2"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => $password,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user2') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb
deleted file mode 100644
index 6a779d9f631..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::table_grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant all accesses to a user' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'table_grant'
-        $user = 'psql_grant_tester'
-        $password = 'psql_table_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        # Create a rule for the user
-        postgresql::server::pg_hba_rule { "allow ${user}":
-          type        => 'local',
-          database    => $db,
-          user        => $user,
-          auth_method => 'ident',
-          order       => 1,
-        }
-
-        postgresql_psql { 'Create testing table':
-          command => 'CREATE TABLE "test_table" (field integer NOT NULL)',
-          db      => $db,
-          unless  => "SELECT * FROM pg_tables WHERE tablename = 'test_table'",
-          require => Postgresql::Server::Database[$db],
-        }
-
-        postgresql::server::table_grant { 'grant insert test':
-          privilege => 'ALL',
-          table     => 'test_table',
-          db        => $db,
-          role      => $user,
-          require   => Postgresql_psql['Create testing table'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      ## Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-
-  it 'should grant access so a user can insert in a table' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'table_grant'
-        $user = 'psql_grant_tester'
-        $password = 'psql_table_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        # Create a rule for the user
-        postgresql::server::pg_hba_rule { "allow ${user}":
-          type        => 'local',
-          database    => $db,
-          user        => $user,
-          auth_method => 'ident',
-          order       => 1,
-        }
-
-        postgresql_psql { 'Create testing table':
-          command => 'CREATE TABLE "test_table" (field integer NOT NULL)',
-          db      => $db,
-          unless  => "SELECT * FROM pg_tables WHERE tablename = 'test_table'",
-          require => Postgresql::Server::Database[$db],
-        }
-
-        postgresql::server::table_grant { 'grant insert test':
-          privilege => 'INSERT',
-          table     => 'test_table',
-          db        => $db,
-          role      => $user,
-          require   => Postgresql_psql['Create testing table'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      ## Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb
deleted file mode 100644
index c633d6da7b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::tablespace:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create tablespaces and databases that are using them' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      file { '/tmp/postgres/pg_tablespaces':
-        ensure => 'directory',
-        owner  => 'postgres',
-        group  => 'postgres',
-        mode   => '0700',
-      }
-
-      postgresql::server::tablespace { 'tablespace1':
-        location => '/tmp/postgres/pg_tablespaces/space1',
-      }
-      postgresql::server::database { 'tablespacedb1':
-        encoding   => 'utf8',
-        tablespace => 'tablespace1',
-      }
-      postgresql::server::db { 'tablespacedb2':
-        user       => 'dbuser2',
-        password   => postgresql_password('dbuser2', 'dbuser2'),
-        tablespace => 'tablespace1',
-      }
-
-      postgresql::server::role { 'spcuser':
-        password_hash => postgresql_password('spcuser', 'spcuser'),
-      }
-      postgresql::server::tablespace { 'tablespace2':
-        location => '/tmp/postgres/pg_tablespaces/space2',
-        owner    => 'spcuser',
-      }
-      postgresql::server::database { 'tablespacedb3':
-        encoding   => 'utf8',
-        tablespace => 'tablespace2',
-      }
-    EOS
-
-    shell('mkdir -p /tmp/postgres')
-    # Apply appropriate selinux labels
-    if fact('osfamily') == 'RedHat'
-      if shell('getenforce').stdout =~ /Enforcing/
-        shell('chcon -Rv --type=postgresql_db_t /tmp/postgres')
-      end
-    end
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that databases use correct tablespaces
-    psql('--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb1\'"\'"') do |r|
-      expect(r.stdout).to match(/tablespace1/)
-      expect(r.stderr).to eq('')
-    end
-
-    psql('--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb3\'"\'"') do |r|
-      expect(r.stdout).to match(/tablespace2/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb
deleted file mode 100644
index b8456ee76d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'server:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-  describe port(5432) do
-    it { should be_listening }
-  end
-
-  describe 'setting postgres password' do
-    it 'should install and successfully adjust the password' do
-      pp = <<-EOS.unindent
-        class { 'postgresql::server':
-          postgres_password          => 'foobarbaz',
-          ip_mask_deny_postgres_user => '0.0.0.0/32',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/\[set_postgres_postgrespw\]\/returns: executed successfully/)
-      end
-      apply_manifest(pp, :catch_changes => true)
-
-      pp = <<-EOS.unindent
-        class { 'postgresql::server':
-          postgres_password          => 'TPSR$$eports!',
-          ip_mask_deny_postgres_user => '0.0.0.0/32',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/\[set_postgres_postgrespw\]\/returns: executed successfully/)
-      end
-      apply_manifest(pp, :catch_changes => true)
-
-    end
-  end
-end
-
-describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'test installing non-default version of postgresql' do
-    after :all do
-      psql('--command="drop database postgresql_test_db" postgres', 'postgres')
-      pp = <<-EOS.unindent
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-          # XXX Need to purge postgresql-common after uninstalling 9.3 because
-          # it leaves the init script behind. Poor packaging.
-          package { 'postgresql-common':
-            ensure  => purged,
-            require => Class['postgresql::server'],
-          }
-        }
-        class { 'postgresql::globals':
-          ensure              => absent,
-          manage_package_repo => true,
-          version             => '9.3',
-        }
-        class { 'postgresql::server':
-          ensure => absent,
-        }
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('')
-    end
-
-    it 'perform installation and create a db' do
-      pp = <<-EOS.unindent
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-        }
-        class { "postgresql::globals":
-          version             => "9.3",
-          manage_package_repo => true,
-          encoding            => 'UTF8',
-          locale              => 'en_US.UTF-8',
-          xlogdir             => '/tmp/pg_xlogs',
-        }
-        class { "postgresql::server": }
-        postgresql::server::db { "postgresql_test_db":
-          user     => "foo1",
-          password => postgresql_password('foo1', 'foo1'),
-        }
-        postgresql::server::config_entry { 'port':
-          value => '5432',
-        }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('')
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('test -d /tmp/pg_xlogs') do |r|
-        expect(r.stdout).to eq('')
-        expect(r.stderr).to eq('')
-      end
-
-      psql('postgresql_test_db --command="select datname from pg_database limit 1"')
-    end
-
-    describe port(5432) do
-      it { should be_listening }
-    end
-  end
-
-  unless ((fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5') ||
-    fact('osfamily') == 'Debian')
-
-    context 'override locale and encoding' do
-      after :each do
-        apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-      end
-
-      it 'perform installation with different locale and encoding' do
-        pp = <<-EOS.unindent
-          class { 'postgresql::server':
-            locale   => 'en_NG',
-            encoding => 'UTF8',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-
-        # Remove db first, if it exists for some reason
-        shell('su postgres -c "dropdb test1"', :acceptable_exit_codes => [0,1,2])
-        shell('su postgres -c "createdb test1"')
-        shell('su postgres -c \'psql -c "show lc_ctype" test1\'') do |r|
-          expect(r.stdout).to match(/en_NG/)
-        end
-
-        shell('su postgres -c \'psql -c "show lc_collate" test1\'') do |r|
-          expect(r.stdout).to match(/en_NG/)
-        end
-      end
-    end
-  end
-end
-
-describe 'server with firewall:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  context 'test installing postgresql with firewall management on' do
-    it 'perform installation and make sure it is idempotent' do
-      pending('no support for firewall with fedora', :if => (fact('operatingsystem') == 'Fedora'))
-      pp = <<-EOS.unindent
-        class { 'firewall': }
-        class { "postgresql::server":
-          manage_firewall => true,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-end
-
-describe 'server without pg_hba.conf:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  context 'test installing postgresql without pg_hba.conf management on' do
-    it 'perform installation and make sure it is idempotent' do
-      pp = <<-EOS.unindent
-        class { "postgresql::server":
-          manage_pg_hba_conf => false,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 1f64a1fa5e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail for client' do
-    pp = <<-EOS
-    class { 'postgresql::client': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
-  end
-  it 'should fail for server' do
-    pp = <<-EOS
-    class { 'postgresql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb
deleted file mode 100644
index 0bfe509d273..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::validate_db_connection:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  before :all do
-    # Setup postgresql server and a sample database for tests to use.
-    pp = <<-EOS.unindent
-      $db = 'foo'
-      class { 'postgresql::server': }
-
-      postgresql::server::db { $db:
-        user     => $db,
-        password => postgresql_password($db, $db),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  after :all do
-    # Remove postgresql server after all tests have ran.
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should run puppet with no changes declared if socket connectivity works' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_name => 'foo',
-        run_as        => 'postgres',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should keep retrying if database is down' do
-    # So first we shut the db down, then background a startup routine with a
-    # sleep 10 in front of it. That way the tests should continue while
-    # the pause and db startup happens in the background.
-    shell("/etc/init.d/postgresql* stop")
-    shell('nohup bash -c "sleep 10; /etc/init.d/postgresql* start" > /dev/null 2>&1 &')
-
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_name => 'foo',
-        tries         => 30,
-        sleep         => 1,
-        run_as        => 'postgres',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should run puppet with no changes declared if db ip connectivity works' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_host     => 'localhost',
-        database_name     => 'foo',
-        database_username => 'foo',
-        database_password => 'foo',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should fail catalogue if database connectivity fails' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foobarbaz':
-        database_host     => 'localhost',
-        database_name     => 'foobarbaz',
-        database_username => 'foobarbaz',
-        database_password => 'foobarbaz',
-      }
-    EOS
-
-    apply_manifest(pp, :expect_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb
deleted file mode 100644
index b4c44aa851e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.mock_with :rspec do |mock|
-    mock.syntax = [:expect, :should]
-  end
-  c.include PuppetlabsSpec::Files
-
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
-    # Store any environment variables away to be restored later
-    @old_env = {}
-    ENV.each_key {|k| @old_env[k] = ENV[k]}
-  end
-
-  c.after :each do
-    PuppetlabsSpec::Files.cleanup
-  end
-end
-
-# Convenience helper for returning parameters for a type from the
-# catalogue.
-def param(type, title, param)
-  param_value(catalogue, type, title, param)
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 4984da6b523..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-class String
-  # Provide ability to remove indentation from strings, for the purpose of
-  # left justifying heredoc blocks.
-  def unindent
-    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
-  end
-end
-
-def shellescape(str)
-  str = str.to_s
-
-  # An empty argument will be skipped, so return empty quotes.
-  return "''" if str.empty?
-
-  str = str.dup
-
-  # Treat multibyte characters as is.  It is caller's responsibility
-  # to encode the string in the right encoding for the shell
-  # environment.
-  str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
-
-  # A LF cannot be escaped with a backslash because a backslash + LF
-  # combo is regarded as line continuation and simply ignored.
-  str.gsub!(/\n/, "'\n'")
-
-  return str
-end
-
-def psql(psql_cmd, user = 'postgres', exit_codes = [0], &block)
-  psql = "psql #{psql_cmd}"
-  shell("su #{shellescape(user)} -c #{shellescape(psql)}", :acceptable_exit_codes => exit_codes, &block)
-end
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['AIX','windows','Solaris','Suse']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'postgresql')
-    hosts.each do |host|
-      on host, "/bin/touch #{default['puppetpath']}/hiera.yaml"
-      on host, 'chmod 755 /root'
-      if fact('osfamily') == 'Debian'
-        on host, "echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen"
-        on host, '/usr/sbin/locale-gen'
-        on host, '/usr/sbin/update-locale'
-      end
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-firewall'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb
deleted file mode 100644
index dd24dbfd4ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::client', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  describe 'with parameters' do
-    let :params do
-      {
-        :package_ensure => 'absent',
-        :package_name => 'mypackage',
-      }
-    end
-
-    it 'should modify package' do
-      should contain_package("postgresql-client").with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with no parameters' do
-    it 'should create package with postgresql tag' do
-      should contain_package('postgresql-client').with({
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb
deleted file mode 100644
index f8feb2f7825..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::globals', :type => :class do
-  let :facts do
-    {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :lsbdistid              => 'Debian',
-    }
-  end
-
-  describe 'with no parameters' do
-    it 'should work' do
-      should contain_class("postgresql::globals")
-    end
-  end
-
-  describe 'manage_package_repo => true' do
-    let(:params) do
-      {
-        :manage_package_repo => true,
-      }
-    end
-    it 'should pull in class postgresql::repo' do
-      should contain_class("postgresql::repo")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb
deleted file mode 100644
index 8c289fc54ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::devel', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  it { should contain_class("postgresql::lib::devel") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb
deleted file mode 100644
index 7541bf586f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::java', :type => :class do
-
-  describe 'on a debian based os' do
-    let :facts do {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-    end
-    it { should contain_package('postgresql-jdbc').with(
-      :name   => 'libpostgresql-jdbc-java',
-      :ensure => 'present'
-    )}
-  end
-
-  describe 'on a redhat based os' do
-    let :facts do {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-    end
-    it { should contain_package('postgresql-jdbc').with(
-      :name => 'postgresql-jdbc',
-      :ensure => 'present'
-    )}
-    describe 'when parameters are supplied' do
-      let :params do
-        {:package_ensure => 'latest', :package_name => 'somepackage'}
-      end
-      it { should contain_package('postgresql-jdbc').with(
-        :name => 'somepackage',
-        :ensure => 'latest'
-      )}
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb
deleted file mode 100644
index ab3fd3207dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::python', :type => :class do
-
-  describe 'on a redhat based os' do
-    let :facts do {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-    end
-    it { should contain_package('python-psycopg2').with(
-      :name => 'python-psycopg2',
-      :ensure => 'present'
-    )}
-  end
-
-  describe 'on a debian based os' do
-    let :facts do {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-    end
-    it { should contain_package('python-psycopg2').with(
-      :name => 'python-psycopg2',
-      :ensure => 'present'
-    )}
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb
deleted file mode 100644
index 730fd1097a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::params', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  it { should contain_class("postgresql::params") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb
deleted file mode 100644
index e7e286f6421..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::repo', :type => :class do
-  let :facts do
-    {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :lsbdistid              => 'Debian',
-    }
-  end
-
-  describe 'with no parameters' do
-    it 'should instantiate apt_postgresql_org class' do
-      should contain_class('postgresql::repo::apt_postgresql_org')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb
deleted file mode 100644
index 9fbab060f05..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::contrib', :type => :class do
-  let :pre_condition do
-    "class { 'postgresql::server': }"
-  end
-
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :kernel => 'Linux',
-      :concat_basedir => tmpfilename('contrib'),
-    }
-  end
-
-  describe 'with parameters' do
-    let(:params) do
-      {
-        :package_name => 'mypackage',
-        :package_ensure => 'absent',
-      }
-    end
-
-    it 'should create package with correct params' do
-      should contain_package('postgresql-contrib').with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with no parameters' do
-    it 'should create package with postgresql tag' do
-      should contain_package('postgresql-contrib').with({
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb
deleted file mode 100644
index bcf2dbe1bc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::initdb', :type => :class do
-  let (:pre_condition) do
-    "include postgresql::server"
-  end
-  describe 'on RedHat' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'CentOS',
-        :operatingsystemrelease => '6.0',
-        :concat_basedir => tmpfilename('server'),
-      }
-    end
-    it { should contain_file('/var/lib/pgsql/data').with_ensure('directory') }
-  end
-  describe 'on Amazon' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'Amazon',
-        :concat_basedir => tmpfilename('server'),
-      }
-    end
-    it { should contain_file('/var/lib/pgsql9/data').with_ensure('directory') }
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb
deleted file mode 100644
index 785ed9a7f00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::plperl', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :kernel => 'Linux',
-      :concat_basedir => tmpfilename('plperl'),
-    }
-  end
-
-  let :pre_condition do
-    "class { 'postgresql::server': }"
-  end
-
-  describe 'with no parameters' do
-    it { should contain_class("postgresql::server::plperl") }
-    it 'should create package' do
-      should contain_package('postgresql-plperl').with({
-        :ensure => 'present',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with parameters' do
-    let :params do
-      {
-        :package_ensure => 'absent',
-        :package_name => 'mypackage',
-      }
-    end
-
-    it { should contain_class("postgresql::server::plperl") }
-    it 'should create package with correct params' do
-      should contain_package('postgresql-plperl').with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb
deleted file mode 100644
index 203eecb51d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :concat_basedir => tmpfilename('server'),
-      :kernel => 'Linux',
-    }
-  end
-
-  describe 'with no parameters' do
-    it { should contain_class("postgresql::params") }
-    it { should contain_class("postgresql::server") }
-    it 'should validate connection' do
-      should contain_postgresql__validate_db_connection('validate_service_is_running')
-    end
-  end
-
-  describe 'manage_firewall => true' do
-    let(:params) do
-      {
-        :manage_firewall => true,
-        :ensure => true,
-      }
-    end
-
-    it 'should create firewall rule' do
-      should contain_firewall("5432 accept - postgres")
-    end
-  end
-
-  describe 'ensure => absent' do
-    let(:params) do
-      {
-        :ensure => 'absent',
-        :datadir => '/my/path',
-        :xlogdir => '/xlog/path',
-      }
-    end
-
-    it 'should make package purged' do
-      should contain_package('postgresql-server').with({
-        :ensure => 'purged',
-      })
-    end
-
-    it 'stop the service' do
-      should contain_service('postgresqld').with({
-        :ensure => false,
-      })
-    end
-
-    it 'should remove datadir' do
-      should contain_file('/my/path').with({
-        :ensure => 'absent',
-      })
-    end
-
-    it 'should remove xlogdir' do
-      should contain_file('/xlog/path').with({
-        :ensure => 'absent',
-      })
-    end
-  end
-
-  describe 'package_ensure => absent' do
-    let(:params) do
-      {
-        :package_ensure => 'absent',
-      }
-    end
-
-    it 'should remove the package' do
-      should contain_package('postgresql-server').with({
-        :ensure => 'purged',
-      })
-    end
-
-    it 'should still enable the service' do
-      should contain_service('postgresqld').with({
-        :ensure => true,
-      })
-    end
-  end
-
-  describe 'needs_initdb => true' do
-    let(:params) do
-      {
-        :needs_initdb => true,
-      }
-    end
-
-    it 'should contain proper initdb exec' do
-      should contain_exec('postgresql_initdb')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb
deleted file mode 100644
index 4c25c67916e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::config_entry', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-  end
-
-  let(:title) { 'config_entry'}
-
-  let :target do
-    tmpfilename('postgresql_conf')
-  end
-
-  context "syntax check" do
-    let(:params) { { :ensure => 'present'} }
-    it { should contain_postgresql__server__config_entry('config_entry') }
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb
deleted file mode 100644
index 2e481df9fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::database_grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :privilege => 'ALL',
-      :db => 'test',
-      :role => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__database_grant('test') }
-  it { should contain_postgresql__server__grant('database:test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb
deleted file mode 100644
index a703827fec1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::database', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  let :title do
-    'test'
-  end
-  it { should contain_postgresql__server__database('test') }
-  it { should contain_postgresql_psql("Check for existence of db 'test'") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb
deleted file mode 100644
index 60fa9a9315d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::db', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :user => 'test',
-      :password => 'test',
-      :owner => 'tester',
-    }
-  end
-
-  it { should contain_postgresql__server__db('test') }
-  it { should contain_postgresql__server__database('test').with_owner('tester') }
-  it { should contain_postgresql__server__role('test') }
-  it { should contain_postgresql__server__database_grant('GRANT test - ALL - test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb
deleted file mode 100644
index 43eeb8c01de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :db => 'test',
-      :role => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__grant('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb
deleted file mode 100644
index b01e338a4bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::pg_hba_rule', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :concat_basedir => tmpfilename('pg_hba'),
-    }
-  end
-  let :title do
-    'test'
-  end
-  let :target do
-    tmpfilename('pg_hba_rule')
-  end
-
-  context 'test template 1' do
-    let :params do
-      {
-        :type => 'host',
-        :database => 'all',
-        :user => 'all',
-        :address => '1.1.1.1/24',
-        :auth_method => 'md5',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /host\s+all\s+all\s+1\.1\.1\.1\/24\s+md5/
-    end
-  end
-
-  context 'test template 2' do
-    let :params do
-      {
-        :type => 'local',
-        :database => 'all',
-        :user => 'all',
-        :auth_method => 'ident',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /local\s+all\s+all\s+ident/
-    end
-  end
-
-  context 'test template 3' do
-    let :params do
-      {
-        :type => 'host',
-        :database => 'all',
-        :user => 'all',
-        :address => '0.0.0.0/0',
-        :auth_method => 'ldap',
-        :auth_option => 'foo=bar',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /host\s+all\s+all\s+0\.0\.0\.0\/0\s+ldap\s+foo=bar/
-    end
-  end
-
-  context 'validation' do
-    context 'validate type test 1' do
-      let :params do
-        {
-          :type => 'invalid',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'ldap',
-          :target => target,
-        }
-      end
-      it 'should fail parsing when type is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The type you specified \[invalid\] must be one of/)
-      end
-    end
-
-    context 'validate auth_method' do
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'invalid',
-          :target => target,
-        }
-      end
-
-      it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The auth_method you specified \[invalid\] must be one of/)
-      end
-    end
-
-    context 'validate unsupported auth_method' do
-      let :pre_condition do
-        <<-EOS
-          class { 'postgresql::globals':
-            version => '9.0',
-          }
-          class { 'postgresql::server': }
-        EOS
-      end
-
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'peer',
-          :target => target,
-        }
-      end
-
-      it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The auth_method you specified \[peer\] must be one of: trust, reject, md5, sha1, password, gss, sspi, krb5, ident, ldap, radius, cert, pam/)
-      end
-    end
-
-    context 'validate supported auth_method' do
-      let :pre_condition do
-        <<-EOS
-          class { 'postgresql::globals':
-            version => '9.2',
-          }
-          class { 'postgresql::server': }
-        EOS
-      end
-
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'peer',
-          :target => target,
-        }
-      end
-
-      it do
-        content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-        content.should =~ /local\s+all\s+all\s+0\.0\.0\.0\/0\s+peer/
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb
deleted file mode 100644
index a50ca1448ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::role', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :password_hash => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__role('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb
deleted file mode 100644
index 15136a71e25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::table_grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :privilege => 'ALL',
-      :db => 'test',
-      :role => 'test',
-      :table => 'foo',
-    }
-  end
-
-  it { should contain_postgresql__server__table_grant('test') }
-  it { should contain_postgresql__server__grant('table:test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb
deleted file mode 100644
index eb29f1e5773..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::tablespace', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :location => '/srv/data/foo',
-    }
-  end
-
-  it { should contain_postgresql__server__tablespace('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb
deleted file mode 100644
index 7a248f6c09a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::validate_db_connection', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  describe 'should work with only default parameters' do
-    it { should contain_postgresql__validate_db_connection('test') }
-  end
-
-  describe 'should work with all parameters' do
-    let :params do
-      {
-        :database_host => 'test',
-        :database_name => 'test',
-        :database_password => 'test',
-        :database_username => 'test',
-        :database_port => 5432,
-        :run_as => 'postgresq',
-        :sleep => 4,
-        :tries => 30,
-      }
-    end
-    it { should contain_postgresql__validate_db_connection('test') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb
deleted file mode 100644
index 0ac1d1bfdab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_acls_to_resources_hash', :type => :puppet_function do
-  context 'individual transform tests' do
-    it do
-      input = 'local   all             postgres                                ident'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"postgres",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'local   all             root                                ident'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"root",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input_array = [
-        'local   all             all                                     ident',
-      ]
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"all",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params(input_array, 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             127.0.0.1/32            md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"127.0.0.1/32",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             0.0.0.0/0            md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"0.0.0.0/0",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             ::1/128                 md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"::1/128",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             1.1.1.1 255.255.255.0    md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"1.1.1.1 255.255.255.0",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             1.1.1.1 255.255.255.0   ldap ldapserver=ldap.example.net ldapprefix="cn=" ldapsuffix=", dc=example, dc=net"'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"1.1.1.1 255.255.255.0",
-          "auth_method"=>"ldap",
-          "auth_option"=>"ldapserver=ldap.example.net ldapprefix=\"cn=\" ldapsuffix=\", dc=example, dc=net\"",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-  end
-
-  it 'should return an empty hash when input is empty array' do
-    should run.with_params([], 'test', 100).and_return({})
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb
deleted file mode 100644
index ee1157d0e7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_escape', :type => :puppet_function do
-  it { should run.with_params('foo').
-    and_return('$$foo$$') }
-end
-describe 'postgresql_escape', :type => :puppet_function do
-  it { should run.with_params('fo$$o').
-    and_return('$ed$fo$$o$ed$') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb
deleted file mode 100644
index 0d043f87340..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_password', :type => :puppet_function do
-  it { should run.with_params('foo', 'bar').
-    and_return('md596948aad3fcae80c08a35c9b5958cd89') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb
deleted file mode 100644
index 2e2bfbe2d01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-require "tempfile"
-
-provider_class = Puppet::Type.type(:postgresql_conf).provider(:parsed)
-
-describe provider_class do
-  let(:title) { 'postgresql_conf' }
-  let(:provider) {
-    conf_class = Puppet::Type.type(:postgresql_conf)
-    provider = conf_class.provider(:parsed)
-    conffile = tmpfilename('postgresql.conf')
-    provider.any_instance.stubs(:target).returns conffile
-    provider
-  }
-
-  before do
-  end
-
-  after :each do
-    provider.initvars
-  end
-
-  describe "simple configuration that should be allowed" do
-    it "should parse a simple ini line" do
-      provider.parse_line("listen_addreses = '*'").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should parse a simple ini line (2)" do
-      provider.parse_line("   listen_addreses = '*'").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should parse a simple ini line (3)" do
-      provider.parse_line("listen_addreses = '*' # dont mind me").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>"dont mind me", :record_type=>:parsed }
-    end
-
-    it "should parse a comment" do
-      provider.parse_line("# dont mind me").should ==
-        { :line=>"# dont mind me", :record_type=>:comment }
-    end
-
-    it "should parse a comment (2)" do
-      provider.parse_line(" \t# dont mind me").should ==
-        { :line=>" \t# dont mind me", :record_type=>:comment }
-    end
-
-    it "should allow includes" do
-      provider.parse_line("include puppetextra").should ==
-        { :name=>"include", :value=>"puppetextra", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should allow numbers thorugh without quotes" do
-      provider.parse_line("wal_keep_segments = 32").should ==
-        { :name=>"wal_keep_segments", :value=>"32", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should allow blanks thorugh " do
-      provider.parse_line("").should ==
-        { :line=>"", :record_type=>:blank }
-    end
-
-    it "should parse keys with dots " do
-      provider.parse_line("auto_explain.log_min_duration = 1ms").should ==
-        { :name => "auto_explain.log_min_duration", :value => "1ms", :comment => nil, :record_type => :parsed }
-    end
-  end
-
-  describe "configuration that should be set" do
-    it "should set comment lines" do
-      provider.to_line({ :line=>"# dont mind me", :record_type=>:comment }).should ==
-        '# dont mind me'
-    end
-
-    it "should set blank lines" do
-      provider.to_line({ :line=>"", :record_type=>:blank }).should ==
-        ''
-    end
-
-    it "should set simple configuration" do
-      provider.to_line({:name=>"listen_addresses", :value=>"*", :comment=>nil, :record_type=>:parsed }).should ==
-        "listen_addresses = '*'"
-    end
-
-    it "should set simple configuration with period in name" do
-      provider.to_line({:name => "auto_explain.log_min_duration", :value => '100ms', :comment => nil, :record_type => :parsed }).should ==
-        "auto_explain.log_min_duration = 100ms"
-    end
-
-    it "should set simple configuration even with comments" do
-      provider.to_line({:name=>"listen_addresses", :value=>"*", :comment=>'dont mind me', :record_type=>:parsed }).should ==
-        "listen_addresses = '*' # dont mind me"
-    end
-
-    it 'should quote includes' do
-      provider.to_line( {:name=>"include", :value=>"puppetextra", :comment=>nil, :record_type=>:parsed }).should ==
-        "include 'puppetextra'"
-    end
-
-    it 'should quote multiple words' do
-      provider.to_line( {:name=>"archive_command", :value=>"rsync up", :comment=>nil, :record_type=>:parsed }).should ==
-        "archive_command = 'rsync up'"
-    end
-
-    it 'shouldn\'t quote numbers' do
-      provider.to_line( {:name=>"wal_segments", :value=>"32", :comment=>nil, :record_type=>:parsed }).should ==
-        "wal_segments = 32"
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
deleted file mode 100644
index 325e3dbd4bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_psql).provider(:ruby) do
-  let(:name) { 'rspec psql test' }
-  let(:resource) do
-    Puppet::Type.type(:postgresql_psql).new({ :name => name, :provider => :ruby }.merge attributes)
-  end
-
-  let(:provider) { resource.provider }
-
-  context("#run_sql_command") do
-    describe "with default attributes" do
-      let(:attributes) do { :db => 'spec_db' } end
-
-      it "executes with the given psql_path on the given DB" do
-        expect(provider).to receive(:run_command).with(['psql', '-d',
-          attributes[:db], '-t', '-c', 'SELECT something'], 'postgres',
-          'postgres')
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with psql_path and db" do
-      let(:attributes) do {
-        :psql_path  => '/opt/postgres/psql',
-        :psql_user  => 'spec_user',
-        :psql_group => 'spec_group',
-        :cwd        => '/spec',
-        :db         => 'spec_db'
-      } end
-
-      it "executes with the given psql_path on the given DB" do
-        expect(Dir).to receive(:chdir).with(attributes[:cwd]).and_yield
-        expect(provider).to receive(:run_command).with([attributes[:psql_path],
-          '-d', attributes[:db], '-t', '-c', 'SELECT something'],
-          attributes[:psql_user], attributes[:psql_group])
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with search_path string" do
-      let(:attributes) do {
-        :search_path => "schema1"
-      } end
-
-      it "executes with the given search_path" do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
-          'set search_path to schema1; SELECT something'],
-          'postgres', 'postgres')
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with search_path array" do
-      let(:attributes) do {
-        :search_path => ['schema1','schema2'],
-      } end
-
-      it "executes with the given search_path" do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
-          'set search_path to schema1,schema2; SELECT something'],
-          'postgres',
-          'postgres'
-        )
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-
-  end
-
-  context("#command") do
-    context "when unless is specified" do
-      [:true, :false, true, false].each do |refresh|
-        context "and refreshonly is #{refresh}" do
-          let(:attributes) { {
-            :command     => 'SELECT something',
-            :db          => 'spec_db',
-            :unless      => 'SELECT something',
-            :refreshonly => refresh
-          } }
-
-          it "does not fail when the status is successful" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["1 row returned", 0]
-            provider.command
-          end
-
-          it "returns the given command when rows are returned" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["1 row returned", 0]
-            expect(provider.command).to eq("SELECT something")
-          end
-
-          it "does not return the given command when no rows are returned" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["0 rows returned", 0]
-            expect(provider.command).to_not eq("SELECT something")
-          end
-
-          it "raises an error when the sql command fails" do
-            allow(provider).to receive(:run_unless_sql_command).and_return ["Something went wrong", 1]
-            expect { provider.command }.to raise_error(Puppet::Error, /Something went wrong/)
-          end
-        end
-      end
-    end
-
-    context "when unless is not specified" do
-      context "and refreshonly is true" do
-        let(:attributes) do {
-          :command     => 'SELECT something',
-          :db          => 'spec_db',
-          :refreshonly => :true
-        } end
-        it "does not run unless sql command" do
-          expect(provider).to_not receive(:run_unless_sql_command)
-          provider.command
-        end
-
-        it "returns the given command do disable sync" do
-          expect(provider.command).to eq("SELECT something")
-        end
-      end
-
-      context "and refreshonly is false" do
-        let(:attributes) do {
-          :command     => 'SELECT something',
-          :db          => 'spec_db',
-          :refreshonly => :false
-        } end
-        it "does not run unless sql command" do
-          expect(provider).to_not receive(:run_unless_sql_command)
-          provider.command
-        end
-
-        it "does not return the command so as to enable sync" do
-          expect(provider.command).to_not eq("SELECT something")
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb
deleted file mode 100644
index e89c05fedf8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_psql), "when validating attributes" do
-  [:name, :unless, :db, :psql_path, :psql_user, :psql_group].each do |attr|
-    it "should have a #{attr} parameter" do
-      expect(Puppet::Type.type(:postgresql_psql).attrtype(attr)).to eq(:param)
-    end
-  end
-
-  [:command].each do |attr|
-    it "should have a #{attr} property" do
-      expect(Puppet::Type.type(:postgresql_psql).attrtype(attr)).to eq(:property)
-    end
-  end
-end
-
-describe Puppet::Type.type(:postgresql_psql), :unless => Puppet.features.microsoft_windows? do
-  subject do
-    Puppet::Type.type(:postgresql_psql).new({:name => 'rspec'}.merge attributes)
-  end
-
-  describe "available attributes" do
-    {
-      :name        => "rspec",
-      :command     => "SELECT stuff",
-      :unless      => "SELECT other,stuff",
-      :db          => "postgres",
-      :psql_path   => "/bin/false",
-      :psql_user   => "postgres",
-      :psql_group  => "postgres",
-      :cwd         => "/var/lib",
-      :refreshonly => :true,
-      :search_path => [ "schema1", "schema2"]
-    }.each do |attr, value|
-      context attr do
-        let(:attributes) do { attr => value } end
-        its([attr]) { should == value }
-      end
-    end
-
-    context "default values" do
-      let(:attributes) do {} end
-      its([:psql_path]) { should eq("psql") }
-      its([:psql_user]) { should eq("postgres") }
-      its([:psql_group]) { should eq("postgres") }
-      its([:cwd]) { should eq("/tmp") }
-      its(:refreshonly?) { should be_false }
-    end
-  end
-
-  describe "#refreshonly" do
-    [true, :true].each do |refreshonly|
-      context "=> #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "has a value of true" do
-          expect(subject.refreshonly?).to be_true
-        end
-        it "will not enforce command on sync because refresh() will be called" do
-          expect(subject.provider).to_not receive(:command=)
-          subject.property(:command).sync
-        end
-      end
-    end
-
-    [false, :false].each do |refreshonly|
-      context "=> #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "has a value of false" do
-          expect(subject.refreshonly?).to be_false
-        end
-        it "will enforce command on sync because refresh() will not be called" do
-          expect(subject.provider).to receive(:command=)
-          subject.property(:command).sync
-        end
-      end
-    end
-  end
-
-  ## If we refresh the resource, the command should always be run regardless of
-  ## refreshonly
-  describe "when responding to refresh" do
-    [true, :true, false, :false].each do |refreshonly|
-      context "with refreshonly => #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "will enforce command on sync" do
-          expect(subject.provider).to receive(:command=)
-          subject.refresh
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb
deleted file mode 100644
index 45242033a09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env ruby
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_conf) do
-  before do
-    @provider_class = described_class.provide(:simple) { mk_resource_methods }
-    @provider_class.stubs(:suitable?).returns true
-    described_class.stubs(:defaultprovider).returns @provider_class
-  end
-
-  describe "namevar validation" do
-    it "should have :name as its namevar" do
-      described_class.key_attributes.should == [:name]
-    end
-    it "should not invalid names" do
-      expect { described_class.new(:name => 'foo bar') }.to raise_error(Puppet::Error, /Invalid value/)
-    end
-    it "should allow dots in names" do
-      expect { described_class.new(:name => 'foo.bar') }.to_not raise_error
-    end
-  end
-
-  describe "when validating attributes" do
-    [:name, :provider].each do |param|
-      it "should have a #{param} parameter" do
-        described_class.attrtype(param).should == :param
-      end
-    end
-
-    [:value, :target].each do |property|
-      it "should have a #{property} property" do
-        described_class.attrtype(property).should == :property
-      end
-    end
-  end
-
-  describe "when validating values" do
-    describe "ensure" do
-      it "should support present as a value for ensure" do
-        expect { described_class.new(:name => 'foo', :ensure => :present) }.to_not raise_error
-      end
-      it "should support absent as a value for ensure" do
-        expect { described_class.new(:name => 'foo', :ensure => :absent) }.to_not raise_error
-      end
-      it "should not support other values" do
-        expect { described_class.new(:name => 'foo', :ensure => :foo) }.to raise_error(Puppet::Error, /Invalid value/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf
deleted file mode 100644
index af54db5b2a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# Rule Name: <%=@name%>
-# Description: <%=@description%>
-# Order: <%=@order%>
-<%=@type%>	<%=@database%>	<%=@user%>	<%=@address%>	<%=@auth_method%>	<%=@auth_option%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE
deleted file mode 100644
index 9914a458b9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Juan Treminio and other contributors
-https://puphpet.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md
deleted file mode 100644
index 6f3403c1b35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Puppet module: puphpet
-
-This is a Puppet module for [PuPHPet](https://puphpet.com)-related code
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb
deleted file mode 100644
index 4d0967e8880..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-XDEBUG_CONFIG="idekey=xdebug" php -dxdebug.remote_host=`echo $SSH_CLIENT | cut -d "=" -f 2 | awk '{print $1}'` "$@"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb
deleted file mode 100644
index 118c4b64870..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# hash_key_equals.rb
-#
-
-module Puppet::Parser::Functions
-
-  newfunction(:hash_key_equals, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Returns true if the variable passed to this function is a hash,
-    it contains the key requested, and the key matches value.
-    ENDHEREDOC
-
-    unless args.length == 3
-      raise Puppet::ParseError, ("hash_key_equals(): wrong number of arguments (#{args.length}; must be 3)")
-    end
-
-    hashVar       = args[0]
-    keyVar        = args[1]
-    expectedValue = args[2]
-
-    unless hashVar.is_a?(Hash)
-      return false
-    end
-
-    unless hashVar.has_key?(keyVar)
-      return false
-    end
-
-    unless hashVar[keyVar].to_i == expectedValue.to_i
-      return false
-    end
-
-    return true
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb
deleted file mode 100644
index 90401172eb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# hash_key_true.rb
-#
-
-module Puppet::Parser::Functions
-
-  newfunction(:hash_key_true, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Returns true if the key within hash is truthy
-    ENDHEREDOC
-
-    unless args.length == 2
-      raise Puppet::ParseError, ("hash_key_true(): wrong number of arguments (#{args.length}; must be 2)")
-    end
-
-    arr = args[0]
-    key = args[1]
-
-    unless arr.is_a?(Hash)
-      return false
-    end
-
-    unless arr.has_key?(key)
-      return false
-    end
-
-    if arr[key].nil?
-      return false
-    end
-
-    if arr[key] == false
-      return false
-    end
-
-    if arr[key] == 'false'
-      return false
-    end
-
-    if arr[key].empty?
-      return false
-    end
-
-    return true
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb
deleted file mode 100644
index d50c2d8304b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# value_true.rb
-#
-
-module Puppet::Parser::Functions
-
-  newfunction(:value_true, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Returns true if value is truthy
-    ENDHEREDOC
-
-    unless args.length == 1
-      raise Puppet::ParseError, ("value_true(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    value = args[0]
-
-    if value.nil?
-      return false
-    end
-
-    if value == false
-      return false
-    end
-
-    if value == 0
-      return false
-    end
-
-    if value == '0'
-      return false
-    end
-
-    if value == 'false'
-      return false
-    end
-
-    if value.empty?
-      return false
-    end
-
-    return true
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp
deleted file mode 100644
index 0d23275bcca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class puphpet::adminer(
-  $location,
-  $owner       = 'www-data',
-  $php_package = 'php'
-) {
-
-  if ! defined(File[$location]) {
-    file { $location:
-      replace => no,
-      ensure  => directory,
-      mode    => 775,
-      require => Package[$php_package]
-    }
-  }
-
-  exec{ "download adminer to ${location}":
-    command => "wget http://www.adminer.org/latest.php -O ${location}/index.php",
-    require => File[$location],
-    creates => "${location}/index.php",
-    returns => [ 0, 4 ],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp
deleted file mode 100644
index 95979499049..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# This depends on puppetlabs/apache: https://github.com/puppetlabs/puppetlabs-apache
-
-class puphpet::apache::modpagespeed (
-  $url     = $puphpet::params::apache_mod_pagespeed_url,
-  $package = $puphpet::params::apache_mod_pagespeed_package,
-  $ensure  = 'present'
-) {
-
-  $download_location = $::osfamily ? {
-    'Debian' => '/.puphpet-stuff/mod-pagespeed.deb',
-    'Redhat' => '/.puphpet-stuff/mod-pagespeed.rpm'
-  }
-
-  $provider = $::osfamily ? {
-    'Debian' => 'dpkg',
-    'Redhat' => 'yum'
-  }
-
-  exec { "download apache mod-pagespeed to ${download_location}":
-    creates => $download_location,
-    command => "wget ${url} -O ${download_location}",
-    timeout => 30,
-    path    => '/usr/bin'
-  }
-
-  package { $package:
-    ensure   => $ensure,
-    provider => $provider,
-    source   => $download_location,
-    notify   => Service['httpd']
-  }
-
-  file { [
-    "${apache::params::mod_dir}/pagespeed.load",
-    "${apache::params::mod_dir}/pagespeed.conf",
-    "${apache::params::confd_dir}/pagespeed_libraries.conf"
-  ] :
-    purge => false,
-  }
-
-  if $apache::params::mod_enable_dir != undef {
-    file { [
-      "${apache::params::mod_enable_dir}/pagespeed.load",
-      "${apache::params::mod_enable_dir}/pagespeed.conf"
-    ] :
-      purge => false,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp
deleted file mode 100644
index 6cee775b50e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp
+++ /dev/null
@@ -1,86 +0,0 @@
-# This depends on puppetlabs/apache: https://github.com/puppetlabs/puppetlabs-apache
-
-class puphpet::apache::modspdy (
-  $url         = $puphpet::params::apache_mod_spdy_url,
-  $package     = $puphpet::params::apache_mod_spdy_package,
-  $php_package = 'php',
-  $ensure      = 'present'
-) {
-
-  class { 'apache::mod::php':
-    package_ensure => 'purged'
-  }
-
-  if $php_package == 'php' and ! defined(Package[$puphpet::params::apache_mod_spdy_cgi]) {
-    package { $puphpet::params::apache_mod_spdy_cgi:
-      ensure => present,
-      notify => Service[$apache::params::service_name]
-    }
-  }
-
-  if ! defined(Class['apache::mod::fastcgi']) {
-    class { 'apache::mod::fastcgi': }
-  }
-
-  if ! defined(Class['apache::mod::cgi']) {
-    class { 'apache::mod::cgi': }
-  }
-
-  $download_location = $::osfamily ? {
-    'Debian' => '/.puphpet-stuff/mod-spdy.deb',
-    'Redhat' => '/.puphpet-stuff/mod-spdy.rpm'
-  }
-
-  $provider = $::osfamily ? {
-    'Debian' => 'dpkg',
-    'Redhat' => 'yum'
-  }
-
-  exec { "download apache mod-spdy to ${download_location}":
-    creates => $download_location,
-    command => "wget ${url} -O ${download_location}",
-    timeout => 30,
-    path    => '/usr/bin'
-  }
-
-  package { $package:
-    ensure   => $ensure,
-    provider => $provider,
-    source   => $download_location,
-    notify   => Service[$apache::params::service_name]
-  }
-
-  file { [
-    "${apache::params::mod_dir}/spdy.load",
-    "${apache::params::mod_dir}/spdy.conf",
-    "${apache::params::mod_dir}/php5filter.conf"
-  ] :
-    purge => false,
-  }
-
-  if $apache::params::mod_enable_dir != undef {
-    file { [
-      "${apache::params::mod_enable_dir}/spdy.load",
-      "${apache::params::mod_enable_dir}/spdy.conf",
-      "${apache::params::mod_enable_dir}/php5filter.conf"
-    ] :
-      purge => false,
-    }
-  }
-
-  file { "${apache::params::confd_dir}/spdy.conf":
-    content => template("${module_name}/apache/mod/spdy/spdy_conf.erb"),
-    ensure  => $ensure,
-    purge   => false,
-    require => Package[$package]
-  }
-
-  file { '/usr/local/bin/php-wrapper':
-    content => template("${module_name}/apache/mod/spdy/php-wrapper.erb"),
-    ensure  => $ensure,
-    mode    => 0775,
-    purge   => false,
-    require => Package[$package]
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
deleted file mode 100644
index 7a35d19efe9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
+++ /dev/null
@@ -1,151 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-#   example42/puppet-yum: https://github.com/example42/puppet-yum
-#   puppetlabs/puppetlabs-apache: https://github.com/puppetlabs/puppetlabs-apache (if apache)
-
-class puphpet::hhvm(
-  $nightly = false,
-  $webserver
-) {
-
-  $real_webserver = $webserver ? {
-    'apache'  => 'apache2',
-    'httpd'   => 'apache2',
-    'apache2' => 'apache2',
-    'nginx'   => 'nginx',
-    'fpm'     => 'fpm',
-    'cgi'     => 'cgi',
-    'fcgi'    => 'cgi',
-    'fcgid'   => 'cgi',
-    undef     => undef,
-  }
-
-  if $nightly == true {
-    $package_name_base = $puphpet::params::hhvm_package_name_nightly
-  } else {
-    $package_name_base = $puphpet::params::hhvm_package_name
-  }
-
-  if $nightly == true and $::osfamily == 'Redhat' {
-    warning('HHVM-nightly is not available for RHEL distros. Falling back to normal release')
-  }
-
-  case $::operatingsystem {
-    'debian': {
-      if $::lsbdistcodename != 'wheezy' {
-        fail('Sorry, HHVM currently only works with Debian 7+.')
-      }
-
-      $sources_list = '/etc/apt/sources.list'
-
-      $deb_srcs = [
-        'deb http://http.us.debian.org/debian wheezy main',
-        'deb-src http://http.us.debian.org/debian wheezy main',
-        'deb http://security.debian.org/ wheezy/updates main',
-        'deb-src http://security.debian.org/ wheezy/updates main',
-        'deb http://http.us.debian.org/debian wheezy-updates main',
-        'deb-src http://http.us.debian.org/debian wheezy-updates main',
-        'deb http://http.debian.net/debian wheezy main',
-        'deb-src http://http.debian.net/debian wheezy main',
-        'deb http://http.debian.net/debian wheezy-updates main',
-        'deb-src http://http.debian.net/debian wheezy-updates main',
-      ]
-
-      each( $deb_srcs ) |$value| {
-        exec { "add contrib non-free to ${value}":
-          cwd     => '/etc/apt',
-          command => "perl -p -i -e 's#${value}#${value} contrib non-free#gi' ${sources_list}",
-          unless  => "grep -Fxq '${value} contrib non-free' ${sources_list}",
-          path    => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ],
-          notify  => Exec['apt_update']
-        }
-      }
-    }
-    'ubuntu': {
-      if ! ($lsbdistcodename in ['precise', 'raring', 'trusty']) {
-        fail('Sorry, HHVM currently only works with Ubuntu 12.04, 13.10 and 14.04.')
-      }
-
-      apt::key { '5D50B6BA': key_server => 'hkp://keyserver.ubuntu.com:80' }
-
-      if $lsbdistcodename in ['lucid', 'precise'] {
-        apt::ppa { 'ppa:mapnik/boost': require => Apt::Key['5D50B6BA'], options => '' }
-      }
-    }
-    'centos': {
-      $jemalloc_url = 'http://files.puphpet.com/centos6/jemalloc-3.6.0-1.el6.x86_64.rpm'
-      $jemalloc_download_location = '/.puphpet-stuff/jemalloc-3.6.0-1.el6.x86_64.rpm'
-
-      $require = defined(Class['my_fw::post']) ? {
-        true    => Class['my_fw::post'],
-        default => [],
-      }
-
-      exec { "download jemalloc to ${download_location}":
-        creates => $download_location,
-        command => "wget --quiet --tries=5 --connect-timeout=10 -O '${jemalloc_download_location}' '${jemalloc_url}'",
-        timeout => 30,
-        path    => '/usr/bin',
-        require => $require
-      }
-
-      package { 'jemalloc':
-        ensure   => latest,
-        provider => yum,
-        source   => $download_location,
-        require  => Exec["download jemalloc to ${download_location}"],
-      }
-
-      yum::managed_yumrepo { 'hop5':
-        descr    => 'hop5 repository',
-        baseurl  => 'http://www.hop5.in/yum/el6/',
-        gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-HOP5',
-        enabled  => 1,
-        gpgcheck => 0,
-        priority => 1,
-      }
-    }
-  }
-  if $real_webserver == 'apache2' {
-    if ! defined(Class['apache::mod::mime']) {
-      class { 'apache::mod::mime': }
-    }
-    if ! defined(Class['apache::mod::fastcgi']) {
-      class { 'apache::mod::fastcgi': }
-    }
-    if ! defined(Class['apache::mod::alias']) {
-      class { 'apache::mod::alias': }
-    }
-    if ! defined(Class['apache::mod::proxy']) {
-      class { 'apache::mod::proxy': }
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      class { 'apache::mod::proxy_http': }
-    }
-    if ! defined(Apache::Mod['actions']) {
-      apache::mod{ 'actions': }
-    }
-  }
-
-  $os = downcase($::operatingsystem)
-
-  case $::osfamily {
-    'debian': {
-      apt::key { 'hhvm':
-        key        => '16d09fb4',
-        key_source => 'http://dl.hhvm.com/conf/hhvm.gpg.key',
-      }
-
-      apt::source { 'hhvm':
-        location          => "http://dl.hhvm.com/${os}",
-        repos             => 'main',
-        required_packages => 'debian-keyring debian-archive-keyring',
-        include_src       => false,
-        require           => Apt::Key['hhvm']
-      }
-    }
-  }
-
-  ensure_packages( [ $package_name_base ] )
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp
deleted file mode 100644
index 50f471bacbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp
+++ /dev/null
@@ -1,305 +0,0 @@
-# Defines where we can expect PHP ini files and paths to be located.
-#
-# Different OS, OS version, webserver and PHP versions all contributes
-# to making a mess of where we can expect INI files to be found.
-#
-# I have listed a bunch of places:
-#
-# 5.3
-#     DEBIAN 6 - squeeze
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     DEBIAN 7 - wheezy
-#         APACHE
-#             NOT CORRECT; PHP 5.4 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.4 INSTALLED
-#     UBUNTU 10.04 - lucid
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     UBUNTU 14.04 - trusty
-#         APACHE
-#             NOT CORRECT; PHP 5.5 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.5 INSTALLED
-# 5.4
-#     CENTOS 6
-#         CLI
-#             /etc/php.d
-#         APACHE
-#             /etc/php.d
-#     DEBIAN 6 - squeeze
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     DEBIAN 7 - wheezy
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 10.04 - lucid
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 14.04 - trusty
-#         APACHE
-#             NOT CORRECT; PHP 5.5 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.5 INSTALLED
-# 5.5
-#     DEBIAN 6 - squeeze
-#         APACHE
-#             NOT A VALID OPTION
-#         NGINX
-#             NOT A VALID OPTION
-#     DEBIAN 7 - wheezy
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d/*  -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#     UBUNTU 10.04 - lucid
-#         APACHE
-#             NOT A VALID OPTION
-#         NGINX
-#             NOT A VALID OPTION
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: cli/  apache2/  mods-available/
-#             /etc/php5/apache2/conf.d/*      -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#     UBUNTU 14.04 - trusty
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/conf.d/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  mods-available/  php.ini
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#             /etc/php5/apache2/conf.d/*  -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#
-# This depends on example42/puppet-php: https://github.com/example42/puppet-php
-#
-define puphpet::ini (
-  $php_version,
-  $webserver,
-  $ini_filename = 'zzzz_custom.ini',
-  $entry,
-  $value  = '',
-  $ensure = present
-  ) {
-
-  $real_webserver = $webserver ? {
-    'apache'   => 'apache2',
-    'httpd'    => 'apache2',
-    'apache2'  => 'apache2',
-    'nginx'    => 'fpm',
-    'php5-fpm' => 'fpm',
-    'php-fpm'  => 'fpm',
-    'fpm'      => 'fpm',
-    'cgi'      => 'cgi',
-    'fcgi'     => 'cgi',
-    'fcgid'    => 'cgi',
-    undef      => undef,
-  }
-
-  case $php_version {
-    '5.3', '53': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/conf.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.3!') }
-      }
-    }
-    '5.4', '54': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/mods-available'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-
-          $symlink = "/etc/php5/conf.d/${ini_filename}"
-
-          if ! defined(File[$symlink]) {
-            file { $symlink:
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.4!') }
-      }
-    }
-    '5.5', '55': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/mods-available'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          $webserver_ini_location = $real_webserver ? {
-              'apache2' => '/etc/php5/apache2/conf.d',
-              'cgi'     => '/etc/php5/cgi/conf.d',
-              'fpm'     => '/etc/php5/fpm/conf.d',
-              undef     => undef,
-          }
-          $cli_ini_location = '/etc/php5/cli/conf.d'
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-
-          if $webserver_ini_location != undef and ! defined(File["${webserver_ini_location}/${ini_filename}"]) {
-            file { "${webserver_ini_location}/${ini_filename}":
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-
-          if ! defined(File["${cli_ini_location}/${ini_filename}"]) {
-            file { "${cli_ini_location}/${ini_filename}":
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.5!') }
-      }
-    }
-    default: { fail('Unrecognized PHP version') }
-  }
-
-  if $real_webserver != undef {
-    if $real_webserver == 'cgi' {
-      $webserver_service = 'apache2'
-    } else {
-      $webserver_service = $webserver
-    }
-
-    $notify_service = Service[$webserver_service]
-  } else {
-    $notify_service = []
-  }
-
-  php::augeas{ "${entry}-${value}" :
-    target  => $target_file,
-    entry   => $entry,
-    value   => $value,
-    ensure  => $ensure,
-    require => File[$target_file],
-    notify  => $notify_service,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp
deleted file mode 100644
index 17c999a761b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class puphpet inherits puphpet::params {}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp
deleted file mode 100644
index e68968f5437..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-#   example42/puppet-yum: https://github.com/example42/puppet-yum
-
-class puphpet::mariadb(
-  $distro  = $::operatingsystem,
-  $release = $::lsbdistcodename,
-  $arch    = $::architecture,
-  $version = '10.0',
-  $url     = $puphpet::params::apache_mod_pagespeed_url,
-  $package = $puphpet::params::apache_mod_pagespeed_package
-) {
-
-  $arch_package_name = $::architecture ? {
-    'i386'   => 'x86',
-    'amd64'  => 'amd64',
-    'x86_64' => 'amd64'
-  }
-
-  case $::osfamily {
-    'debian': {
-      $os = downcase($::operatingsystem)
-
-      apt::source { 'mariadb':
-        location          => "http://mirror.jmu.edu/pub/mariadb/repo/${version}/${os}",
-        release           => $release,
-        repos             => 'main',
-        required_packages => 'debian-keyring debian-archive-keyring',
-        key               => '1BB943DB',
-        key_server        => 'keyserver.ubuntu.com',
-        include_src       => true
-      }
-
-      apt::pin { 'mariadb':
-        packages => '*',
-        priority => 1000,
-        origin   => 'mirror.jmu.edu',
-      }
-    }
-    'redhat': {
-      yum::managed_yumrepo { 'MariaDB':
-        descr         => 'MariaDB - mariadb.org',
-        baseurl       => "http://yum.mariadb.org/${version}/centos6-${arch_package_name}",
-        enabled       => 1,
-        gpgcheck      => 0,
-        priority      => 1
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp
deleted file mode 100644
index 7a28797dfa8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-class puphpet::nginx(
-  $fastcgi_pass = '127.0.0.1:9000',
-  $webroot      = $puphpet::params::nginx_webroot_location
-) inherits puphpet::params {
-
-  $conf_file = $::osfamily ? {
-    'debian' => '/etc/nginx/conf.d/default.conf',
-    'redhat' => '/etc/nginx/conf.d/default.conf',
-    default  => '/etc/nginx/conf.d/default.conf',
-  }
-
-  file { [
-      '/var/log',
-      '/var/log/nginx',
-      '/var/log/nginx/log'
-    ]:
-    ensure  => directory,
-    recurse => true,
-  }
-
-  file { [
-      '/var/log/nginx/log/host.access.log',
-      '/var/log/nginx/log/host.error.log'
-    ]:
-    ensure  => present,
-    mode    => 0777,
-    replace => 'no',
-    require => File['/var/log/nginx/log']
-  }
-
-  file {"${conf_file} puphpet::nginx override":
-    ensure  => present,
-    path    => $conf_file,
-    replace => 'yes',
-    content => template('puphpet/nginx/default_conf.erb')
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
deleted file mode 100644
index e266f862cdb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
+++ /dev/null
@@ -1,92 +0,0 @@
-class puphpet::params {
-
-  $xdebug_package = $::osfamily ? {
-    'Debian' => 'php5-xdebug',
-    'Redhat' => 'php-pecl-xdebug'
-  }
-
-  $xhprof_package = $::osfamily ? {
-    'Debian' => $::operatingsystem ? {
-      'ubuntu' => false,
-      'debian' => 'php5-xhprof'
-    },
-    'Redhat' => 'xhprof'
-  }
-
-  $apache_webroot_location = $::osfamily ? {
-    'Debian' => '/var/www',
-    'Redhat' => '/var/www/html'
-  }
-
-  $apache_mod_pagespeed_url = $::osfamily ? {
-    'Debian' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.deb',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb'
-      },
-    'Redhat' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.rpm',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm'
-      },
-  }
-
-  $apache_mod_pagespeed_package = 'mod-pagespeed-stable'
-
-  $apache_mod_spdy_url = $::osfamily ? {
-    'Debian' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.deb',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_amd64.deb',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_amd64.deb'
-      },
-    'Redhat' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.rpm',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_x86_64.rpm',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_x86_64.rpm'
-      },
-  }
-
-  $apache_mod_spdy_package = 'mod-spdy-beta'
-
-  $apache_mod_spdy_cgi = $::osfamily ? {
-    'Debian' => 'php5-cgi',
-    'Redhat' => 'php-cgi'
-  }
-
-  $nginx_default_conf_location = $::osfamily ? {
-    'Debian' => '/etc/nginx/conf.d/default.conf',
-    'Redhat' => '/etc/nginx/conf.d/default.conf'
-  }
-
-  $nginx_webroot_location = $::osfamily ? {
-    'Debian' => '/var/www/html',
-    'Redhat' => '/var/www/html'
-  }
-
-  $mariadb_package_client_name = $::osfamily ? {
-    'Debian' => 'mariadb-client',
-    'Redhat' => 'MariaDB-client',
-  }
-
-  $mariadb_package_server_name = $::osfamily ? {
-    'Debian' => 'mariadb-server',
-    'Redhat' => 'MariaDB-server',
-  }
-
-  $hhvm_package_name = 'hhvm'
-  $hhvm_package_name_nightly = $::osfamily ? {
-    'Debian' => 'hhvm-nightly',
-    'Redhat' => 'hhvm'
-  }
-
-  $ssl_cert_location = $::osfamily ? {
-    'Debian' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-    'Redhat' => '/etc/ssl/certs/ssl-cert-snakeoil'
-  }
-
-  $ssl_key_location = $::osfamily ? {
-    'Debian' => '/etc/ssl/private/ssl-cert-snakeoil.key',
-    'Redhat' => '/etc/ssl/certs/ssl-cert-snakeoil'
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp
deleted file mode 100644
index 6461f621120..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Some PHP packages require extra repos.
- * ex: PECL mongo is best to fetch Mongo's official repo
- */
-
-define puphpet::php::extra_repos {
-
-  $downcase_name = downcase($name)
-
-  if $downcase_name == 'mongo' and ! defined(Class['mongodb::globals']) {
-    class { 'mongodb::globals':
-      manage_package_repo => true,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp
deleted file mode 100644
index 2d37ad56d51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This "translates" PHP module package names into system-specific names.
- */
-
-define puphpet::php::module (
-  $service_autorestart
-){
-
-  $package = $::osfamily ? {
-    'Debian' => {
-      'mbstring' => false, # Comes packaged with PHP, not available in repos
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($package, $downcase_name) {
-    $package_name = $package[$downcase_name]
-  }
-  else {
-    $package_name = $name
-  }
-
-  if $package_name and ! defined(::Php::Module[$package_name]) {
-    ::php::module { $package_name:
-      service_autorestart => $service_autorestart,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
deleted file mode 100644
index f570dcd4fc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This returns PEAR packages requiring beta stability
- */
-
-define puphpet::php::pear (
-  $service_name        = '',
-  $service_autorestart,
-){
-
-  $package = {
-    'auth_sasl2'                => 'beta',
-    'config_lite'               => 'beta',
-    'console_getoptplus'        => 'beta',
-    'mdb2_driver_mysql'         => false,
-    'mdb2_driver_mysqli'        => false,
-    'pear_command_packaging'    => 'alpha',
-    'pear_frontend_gtk2'        => false,
-    'php_beautifier'            => 'beta',
-    'php_parser'                => 'alpha',
-    'php_parser_docblockparser' => 'alpha',
-    'soap'                      => 'beta',
-    'testing_selenium'          => 'beta',
-    'versioncontrol_git'        => 'alpha',
-    'versioncontrol_svn'        => 'alpha',
-    'xml_parser2'               => 'beta',
-    'xml_util2'                 => 'alpha',
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($package, $downcase_name) {
-    $package_name    = $name
-    $preferred_state = $package[$downcase_name]
-  }
-  else {
-    $package_name    = $name
-    $preferred_state = 'stable'
-  }
-
-  if $package_name and $preferred_state and ! defined(::Php::Pear::Module[$package_name]) {
-    ::php::pear::module { $name:
-      use_package         => false,
-      preferred_state     => $preferred_state,
-      service             => $service_name,
-      service_autorestart => $service_autorestart,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
deleted file mode 100644
index dfa04232f42..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * This "translates" PECL package names into system-specific names.
- * For example, APCu does not install correctly on CentOS via PECL,
- * but there is a system package for it that works well. Use that
- * instead of the PECL package.
- */
-
-define puphpet::php::pecl (
-  $service_autorestart
-){
-
-  $ignore = {
-    'date_time' => true,
-    'mysql'     => true,
-  }
-
-  $pecl = $::osfamily ? {
-    'Debian' => {
-      'mongo' => $::lsbdistcodename ? {
-        'precise' => 'mongo',
-        default   => false,
-      },
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $pecl_beta = $::osfamily ? {
-    'Debian' => {
-      'augeas'      => 'augeas',
-      'zendopcache' => $::operatingsystem ? {
-        'debian' => false,
-        'ubuntu' => 'ZendOpcache',
-      },
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $package = $::osfamily ? {
-    'Debian' => {
-      'apc'         => $::operatingsystem ? {
-        'debian' => 'php5-apc',
-        'ubuntu' => 'php5-apcu',
-      },
-      'apcu'        => 'php5-apcu',
-      'imagick'     => 'php5-imagick',
-      'memcache'    => 'php5-memcache',
-      'memcached'   => 'php5-memcached',
-      'mongo'       => $::lsbdistcodename ? {
-        'precise' => false,
-        default   => 'php5-mongo',
-      },
-      'zendopcache' => 'php5-zendopcache',
-    },
-    'Redhat' => {
-      'apc'         => 'php-pecl-apcu',
-      'apcu'        => 'php-pecl-apcu',
-      'imagick'     => 'php-pecl-imagick',
-      'memcache'    => 'php-pecl-memcache',
-      'memcached'   => 'php-pecl-memcached',
-      'mongo'       => 'php-pecl-mongo',
-      'zendopcache' => 'php-pecl-zendopcache',
-    }
-  }
-
-  $auto_answer_hash = {
-    'mongo' => 'no\n'
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($auto_answer_hash, $downcase_name) {
-    $auto_answer = $auto_answer_hash[$downcase_name]
-  } else {
-    $auto_answer = '\\n'
-  }
-
-  if has_key($ignore, $downcase_name) and $ignore[$downcase_name] {
-    $pecl_name       = $pecl[$downcase_name]
-    $package_name    = false
-    $preferred_state = 'stable'
-  }
-  elsif has_key($pecl, $downcase_name) and $pecl[$downcase_name] {
-    $pecl_name       = $pecl[$downcase_name]
-    $package_name    = false
-    $preferred_state = 'stable'
-  }
-  elsif has_key($pecl_beta, $downcase_name) and $pecl_beta[$downcase_name] {
-    $pecl_name       = $pecl_beta[$downcase_name]
-    $package_name    = false
-    $preferred_state = 'beta'
-  }
-  elsif has_key($package, $downcase_name) and $package[$downcase_name] {
-    $pecl_name    = false
-    $package_name = $package[$downcase_name]
-  }
-  else {
-    $pecl_name    = $name
-    $package_name = false
-  }
-
-  if $pecl_name and ! defined(::Php::Pecl::Module[$pecl_name]) {
-    ::php::pecl::module { $pecl_name:
-      use_package         => false,
-      preferred_state     => $preferred_state,
-      auto_answer         => $auto_answer,
-      service_autorestart => $service_autorestart,
-    }
-  }
-  elsif $package_name and ! defined(Package[$package_name]) {
-    package { $package_name:
-      ensure  => present,
-      require => Class['Php::Devel'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp
deleted file mode 100644
index e227aaa9780..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-
-class puphpet::phpmyadmin(
-  $dbms             = 'mysql::server',
-  $webroot_location = '/var/www'
-) inherits puphpet::params {
-
-  if $::osfamily == 'debian' {
-    if $::operatingsystem == 'ubuntu' {
-      apt::key { '80E7349A06ED541C': key_server => 'hkp://keyserver.ubuntu.com:80' }
-      apt::ppa { 'ppa:nijel/phpmyadmin': require => Apt::Key['80E7349A06ED541C'] }
-    }
-
-    $phpMyAdmin_package = 'phpmyadmin'
-    $phpMyAdmin_folder  = 'phpmyadmin'
-  } elsif $::osfamily == 'redhat' {
-    $phpMyAdmin_package = 'phpMyAdmin.noarch'
-    $phpMyAdmin_folder  = 'phpMyAdmin'
-  } else {
-    error('phpMyAdmin module currently only works with Debian or RHEL families')
-  }
-
-  if ! defined(Package[$phpMyAdmin_package]) {
-    package { $phpMyAdmin_package:
-      require => Class[$dbms]
-    }
-  }
-
-  if ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      require => Package[$phpMyAdmin_package]
-    }
-  }
-
-  exec { 'cp phpmyadmin to webroot':
-    command => "cp -LR /usr/share/${phpMyAdmin_folder} ${webroot_location}/phpmyadmin",
-    onlyif  => "test ! -d ${mysql_pma_webroot_location}/phpmyadmin",
-    require => [
-      Package[$phpMyAdmin_package],
-      File[$webroot_location]
-    ]
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp
deleted file mode 100644
index 14b13fe08c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class puphpet::python::pip {
-
-  Exec { path => [ '/usr/bin/', '/usr/local/bin', '/bin', '/usr/local/sbin', '/usr/sbin', '/sbin' ] }
-
-  if ! defined(Package['python-setuptools']) {
-    package { 'python-setuptools': }
-  }
-
-  exec { 'easy_install pip':
-    unless  => 'which pip',
-    require => Package['python-setuptools'],
-  }
-
-  if $::osfamily == 'RedHat' {
-    exec { 'rhel pip_provider_name_fix':
-      command     => 'alternatives --install /usr/bin/pip-python pip-python /usr/bin/pip 1',
-      subscribe   => Exec['easy_install pip'],
-      unless      => 'which pip-python',
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp
deleted file mode 100644
index 2389d60af82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-class puphpet::ssl_cert
-  inherits puphpet::params {
-
-  case $::osfamily {
-    'debian': {
-      if ! defined(Package['ssl-cert']) {
-        package { 'ssl-cert':
-          ensure => latest,
-        }
-      }
-
-      exec { 'make-ssl-cert generate-default-snakeoil --force-overwrite':
-        creates => [
-          $puphpet::params::ssl_cert_location,
-          $puphpet::params::ssl_key_location
-        ],
-        require => Package['ssl-cert'],
-        path    => [ '/bin/', '/usr/bin/', '/usr/sbin/' ]
-      }
-    }
-    'redhat': {
-      if ! defined(Package['openssl']) {
-        package { 'openssl':
-          ensure => latest,
-        }
-      }
-
-      exec { "make-dummy-cert ${puphpet::params::ssl_cert_location}":
-        creates => $puphpet::params::ssl_cert_location,
-        require => Package['openssl'],
-        path    => [ '/bin/', '/usr/bin/', '/usr/sbin/', '/etc/pki/tls/certs/' ]
-      }
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/supervisord.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/supervisord.pp
deleted file mode 100644
index a13df08b30b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/supervisord.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# This depends on
-#   ajcrowe/supervisord: https://github.com/ajcrowe/puppet-supervisord
-
-class puphpet::supervisord {
-
-  if ! defined(Class['::supervisord']) {
-    class{ 'puphpet::python::pip': }
-
-    class { '::supervisord':
-      install_pip => false,
-      require     => [
-        Class['::my_fw::post'],
-        Class['puphpet::python::pip'],
-      ],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp
deleted file mode 100644
index 3c1985228e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-class puphpet::xdebug (
-  $install_cli = true,
-  $webserver,
-  $ensure = present
-) inherits puphpet::params {
-
-  if $webserver != undef {
-    $notify_service = Service[$webserver]
-  } else {
-    $notify_service = []
-  }
-
-  if defined(Package[$puphpet::params::xdebug_package]) == false {
-    package { 'xdebug':
-      name    => $puphpet::params::xdebug_package,
-      ensure  => installed,
-      require => Package['php'],
-      notify  => $notify_service,
-    }
-  }
-
-  # shortcut for xdebug CLI debugging
-  if $install_cli and defined(File['/usr/bin/xdebug']) == false {
-    file { '/usr/bin/xdebug':
-      ensure  => present,
-      mode    => '+X',
-      source  => 'puppet:///modules/puphpet/xdebug_cli_alias.erb',
-      require => Package['php']
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp
deleted file mode 100644
index 0649ab684f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-class puphpet::xhprof (
-  $php_version      = '54',
-  $webroot_location = '/var/www',
-  $webserver_service
-) inherits puphpet::params {
-
-  exec { 'delete-xhprof-path-if-empty-folder':
-    command => "rm -rf ${webroot_location}/xhprof",
-    onlyif  => "test ! -f ${webroot_location}/xhprof/extension/config.m4"
-  }
-
-  vcsrepo { "${webroot_location}/xhprof":
-    ensure   => present,
-    provider => git,
-    source   => 'https://github.com/facebook/xhprof.git',
-    require  => Exec['delete-xhprof-path-if-empty-folder']
-  }
-
-  file { "${webroot_location}/xhprof/xhprof_html":
-    ensure  => directory,
-    mode    => 0775,
-    require => Vcsrepo["${webroot_location}/xhprof"]
-  }
-
-  if $::operatingsystem == 'ubuntu' and $php_version != '53' {
-    exec { 'configure xhprof':
-      cwd     => "${webroot_location}/xhprof/extension",
-      command => 'phpize && ./configure && make && make install',
-      require => [
-        Vcsrepo["${webroot_location}/xhprof"],
-        Class['Php::Devel']
-      ],
-      path    => [ '/bin/', '/usr/bin/' ]
-    }
-
-    puphpet::ini { 'add xhprof ini extension':
-      php_version  => $php_version,
-      webserver    => $webserver_service,
-      ini_filename => '20-xhprof-custom.ini',
-      entry        => 'XHPROF/extension',
-      value        => 'xhprof.so',
-      ensure       => 'present',
-      require      => Exec['configure xhprof']
-    }
-
-    puphpet::ini { 'add xhprof ini xhprof.output_dir':
-      php_version  => $php_version,
-      webserver    => $webserver_service,
-      ini_filename => '20-xhprof-custom.ini',
-      entry        => 'XHPROF/xhprof.output_dir',
-      value        => '/tmp',
-      ensure       => 'present',
-      require      => Exec['configure xhprof']
-    }
-
-    composer::exec { 'xhprof-composer-run':
-      cmd     => 'install',
-      cwd     => "${webroot_location}/xhprof",
-      require => [
-        Class['composer'],
-        Exec['configure xhprof']
-      ]
-    }
-  } else {
-    $xhprof_package = $puphpet::params::xhprof_package
-
-    if $webserver_service != undef and is_string($webserver_service) {
-      $xhprof_package_notify = [Service[$webserver_service]]
-    } elsif $webserver_service != undef {
-      $xhprof_package_notify = $webserver_service
-    } else {
-      $xhprof_package_notify = []
-    }
-
-    if ! defined(Package[$xhprof_package]) {
-      package { $xhprof_package:
-        ensure  => installed,
-        require => Package['php'],
-        notify  => $xhprof_package_notify,
-      }
-    }
-
-    composer::exec { 'xhprof-composer-run':
-      cmd     => 'install',
-      cwd     => "${webroot_location}/xhprof",
-      require => [
-        Class['composer'],
-        File["${webroot_location}/xhprof/xhprof_html"]
-      ]
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb
deleted file mode 100644
index 7a1312528b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @vhost['custom_fragment'] %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb
deleted file mode 100644
index af276cbe149..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= scope.function_template(['apache/httpd.conf.erb']) -%>
-
-FastCgiExternalServer <%= @docroot %>/hhvm.external -host <%= @hhvm_values['settings']['host'] %>:<%= @hhvm_values['settings']['port'] %>
-AddHandler hhvm .php
-Action hhvm /usr/lib/cgi-bin/hhvm.external
-Alias /usr/lib/cgi-bin/ <%= @docroot %>/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb
deleted file mode 100644
index 54df3f74795..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PHP_FCGI_MAX_REQUESTS=10000
-export PHP_FCGI_MAX_REQUESTS
-
-exec <%= @phpcgi %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb
deleted file mode 100644
index 64603c101db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# FcgidMaxRequestsPerProcess should be <= PHP_FCGI_MAX_REQUESTS
-FcgidMaxRequestsPerProcess 10000
-
-<Location />
-    AddHandler fcgid-script .php
-    Options +ExecCGI
-    FcgidWrapper /usr/local/bin/php-wrapper .php
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb
deleted file mode 100644
index cc2d6f032ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-server {
-   listen                80;
-   server_name           localhost;
-
-   index index.php index.html index.htm;
-
-   access_log            /var/log/nginx/log/host.access.log;
-   error_log             /var/log/nginx/log/host.error.log;
-
-   location / {
-     root  <%= @webroot %>;
-     try_files  $uri  $uri/  /index.php?$args ;
-     index  index.html index.htm index.php;
-   }
-
-   location ~ \.php$ {
-     root  <%= @webroot %>;
-     try_files  $uri  $uri/  /index.php?$args ;
-     index  index.html index.htm index.php;
-
-     fastcgi_index index.php;
-     fastcgi_param PATH_INFO $fastcgi_path_info;
-     fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
-     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-     fastcgi_pass  <%= @fastcgi_pass %>;
-     fastcgi_split_path_info ^(.+\.php)(/.+)$;
-     include fastcgi_params;
-   }
- }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml
deleted file mode 100644
index 96cb39d1b84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    "concat": "git://github.com/puppetlabs/puppetlabs-concat.git"
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    "puppi": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile
deleted file mode 100644
index 9309493452e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-blacksmith', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project
deleted file mode 100644
index b6061843aa2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile
deleted file mode 100644
index d69331f33a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'example42-puppi'
-version '2.1.8'
-
-author 'lab42'
-license 'Apache'
-project_page 'http://www.example42.com'
-source 'git://github.com/example42/puppi'
-summary 'Installs and configures Puppi'
-description 'This module provides the Puppi libraries required by Example42 modules and, if explicitely included, the puppi command, its working environment, the defines and procedures to deploy applications'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md
deleted file mode 100644
index 1f6ed569ebb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md
+++ /dev/null
@@ -1,257 +0,0 @@
-# Puppi: Puppet Knowledge to the CLI
-
-Puppi One and Puppi module written by Alessandro Franceschi / al @ lab42.it
-
-Puppi Gem by Celso Fernandez / Zertico
-
-Source: http://www.example42.com
-
-Licence: Apache 2
-
-Puppi is a Puppet module and a CLI command.
-It's data is entirely driven by Puppet code.
-It can be used to standardize and automate the deployment of web applications
-or to provides quick and standard commands to query and check your system's resources
-
-Its structure provides FULL flexibility on the actions required for virtually any kind of
-application deployment and information gathering.
-
-The module provides:
-
-* Old-Gen and Next-Gen Puppi implementation
-
-* A set of scripts that can be used in chain to automate any kind of deployment
-
-* Puppet defines that make it easy to prepare a puppi set of commands for a project deployment
-
-* Puppet defines to populate the output of the different actions
-
-
-## HOW TO INSTALL
-
-Download Puppi from GitHub and place it in your modules directory: 
-
-       git clone https://github.com/example42/puppi.git /etc/puppet/modules/puppi
-
-To use the Puppi "Original, old and widely tested" version, just declare or include the puppi class
-
-       class { 'puppi': }
-
-To test the Next-Gen version you can perform the following command. Please note that this module is
-not stable yet:
-        class { 'puppi':
-          version => '2',
-        }
-
-If you have resources conflicts, do not install automatically the Puppi dependencies (commands and packages)
-
-        class { 'puppi':
-          install_dependencies => false,
-        }
-
-
-## HOW TO USE
-
-Once Puppi is installed you can use it to:
-
-* Easily define in Puppet manifests Web Applications deploy procedures. For example:
-
-        puppi::project::war { "myapp":
-            source           => "http://repo.example42.com/deploy/prod/myapp.war",
-            deploy_root      => "/opt/tomcat/myapp/webapps",
-        }
-
-* Integrate with your modules for puppi check, info and log 
-
-* Enable Example42 modules integration
-
-
-## HOW TO USE WITH EXAMPLE42 MODULES
-
-The Example42 modules provide (optional) Puppi integration.
-Once enabled for each module you have puppi check, info and log commands.
-
-To eanble Puppi in OldGen Modules, set in the scope these variables:
-
-        $puppi = yes   # Enables puppi integration.
-        $monitor = yes # Enables automatic monitoring 
-        $monitor_tool = "puppi" # Sets puppi as monitoring tool
-
-For the NextGen modules set the same parameters via Hiera, at Top Scope or as class arguments:
-
-        class { 'openssh':
-          puppi        => yes, 
-          monitor      => yes,
-          monitor_tool => 'puppi', 
-        }
-
-
-## USAGE OF THE PUPPI COMMAND (OLD GEN)
-
-        puppi <action> <project_name> [ -options ]
-
-The puppi command has these possibile actions:
-
-First time initialization of the defined project (if available)
-        puppi init <project>
-
-Deploy the specified project
-        puppi deploy <project>
-
-Rollback to a previous deploy state
-        puppi rollback <project>
-
-Run local checks on system and applications
-        puppi check
-
-Tail system or application logs
-        puppi log
-
-Show system information (for all or only the specified topic)
-        puppi info [topic]
-
-Show things to do (or done) manually on the system (not done via Puppet)
-        puppi todo
-
-In the deploy/rollback/init actions, puppi runs the commands in /etc/puppi/projects/$project/$action, logs their status and then run the commands in /etc/puppi/projects/$project/report to provide reporting, in whatever, pluggable, way.
-
-You can also provide some options:
-
-* -f : Force puppi commands execution also on CRITICAL errors
-
-* -i : Interactively ask confirmation for every command
-
-* -t : Test mode. Just show the commands that should be executed without doing anything
-
-* -d <yes|full>: Debug mode. Show debugging info during execution
-
-* -o "parameter=value parameter2=value2" : Set manual options to override defaults. The options must be in parameter=value syntax, separated by spaces and inside double quotes.
-
-
-Some common puppi commnds when you log for an application deployment:
-
-        puppi check
-        puppi log &    # (More readable if done on another window)
-        puppi deploy myapp
-        puppi check
-        puppi info myapp
-
-
-## THE PUPPI MODULE
-
-The set of commands needed for each of these actions are entirely managed with specific
-Puppet "basic defines":
-
-Create the main project structure. One or more different deployment projects can exist on a node.
-        puppi::project
-
-Create a single command to be placed in the init sequence. It's not required for every project.
-        puppi::initialize
-
-Create a single command to be placed in the deploy sequence. More than one is generally needed for each project.
-        puppi::deploy
-
-Create a single command to be placed in the rollback sequence. More than one is generally needed for each project.
-        puppi::rollback
-
-Create a single check (based on Nagios plugins) for a project or for the whole host (host wide checks are auto generated by Example42 monitor module)
-        puppi::check
-
-Create a reporting command to be placed in the report sequence.
-        puppi::report
-
-Create a log filename entry for a project or the whole hosts.
-        puppi::log
-
-Create an info entry with the commands used to provide info on a topic
-        puppi::info
-
-Read details in the relevant READMEs
-
-
-## FILE PATHS (all of them are provided, and can be configured, in the puppi module):
-
-A link to the actual version of puppi enabled
-        /usr/sbin/puppi
-
-The original puppi bash command.
-        /usr/sbin/puppi.one
-
-Puppi (one) main config file. Various puppi wide paths are defined here.
-        /etc/puppi/puppi.conf
-
-Directory where by default all the host wide checks can be placed. If you use the Example42 monitor module and have "puppi" as $monitor_tool, this directory is automatically filled with Nagios plugins based checks.
-        /etc/puppi/checks/ ($checksdir)
-
-Directory that containts projects subdirs, with the commands to be run for deploy, rollback and check actions. They are completely built (and purged) by the Puppet module.
-        /etc/puppi/projects/ ($projectsdir)
-
-The general-use scripts directory, these are used by the above commands and may require one or more arguments.
-        /etc/puppi/scripts/ ($scriptsdir)
-
-The general-use directory where files are placed which contain the log paths to be used by puppi log
-        /etc/puppi/logs/ ($logssdir)
-
-The general-use directory where files are placed which contain the log paths to be used by puppi log
-        /etc/puppi/info/ ($infodir)
-
-Where all data to rollback is placed.
-        /var/lib/puppi/archive/ ($archivedir)
-
-Where logs and reports of the different commands are placed.
-        /var/log/puppi/ ($logdir)
-
-Temporary, scratchable, directory where Puppi places temporary files.
-        /tmp/puppi/ ($workdir)
-
-A runtime configuration file, which is used by all all the the scripts invoked by puppi to read and write dynamic variables at runtime. This is necessary to mantain "state" information that changes on every puppi run (such as the deploy datetime, used for backups).
-        /tmp/puppi/$project/config
-
-
-## HOW TO CUSTOMIZE
-It should be clear that with puppi you have full flexibility in the definition of a deployment 
-procedure, since the puppi command is basically a wrapper that executes arbitrary scripts with
-a given sequence, in pure KISS logic.
-
-The advantanges though, are various:
-* You have a common syntax to manage deploys and rollbacks on an host
-
-* In your Puppet manifests, you can set in simple, coherent and still flexible and customizable
-  defines all the elements, you need for your application deployments. 
-  Think about it: with just a Puppet define you build the whole deploy logic
-
-* Reporting for each deploy/rollback is built-in and extensible 
-
-* Automatic checks can be built in the deploy procedure
-
-* You have a common, growing, set of general-use scripts for typical actions
-
-* You have quick and useful command to see what's happening on the system (puppi check, log, info)
-
-There are different parts where you can customize the behaviour of puppi:
-
-* The set of general-use scripts in /etc/puppi/scripts/ ( this directory is filled with the content
-  of puppi/files/scripts/ ) can/should be enhanced. These can be arbitrary scripts in whatever
-  language. If you want to follow puppi's logic, though, consider that they should import the
-  common and runtime configuration files and have an exit code logic similar to the one of
-  Nagios plugins: 0 is OK, 1 is WARNING, 2 is CRITICAL. Note that by default a script that 
-  exits with WARNING doesn't block the deploy procedure, on the other hand, if a script exits
-  with CRITICAL (exit 2) by default it blocks the procedure.
-  Take a second, also, to explore the runtime config file created by the puppi command that
-  contains variables that can be set and used by the scripts invoked by puppi.
-
-* The custom project defines that describe deploy templates. These are placed in
-  puppi/manifests/project/ and can request all the arguments you want to feed your scripts with.
-  Generally is a good idea to design a standard enough template that can be used for all the 
-  cases where the deployment procedure involves similar steps. Consider also that you can handle
-  exceptions with variables (see the $loadbalancer_ip usage in puppi/manifests/project/maven.pp)
-
-
-## (NO) DEPENDENCIES AND CONFLICTS
-Puppi is self contained. It doesn't require other modules.
-(And is required by all Example42 modules).
-
-For correct functionality by default some extra packages are installed.
-If you have conflicts with your existing modules, set the argument:
-  install_dependencies => false
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md
deleted file mode 100644
index e63204ca0e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# PUPPI CHECK INSTRUCTIONS
-Documentation and examples related to the puppi action check
-
-## SYNOPSIS (cli)
-        puppi check [project_name] [-r yes|no|fail]
-
-## EXAMPLES (cli)
-Run host-wide checks.
-        puppi check
-Run project "myapp" specific tests AND host-wide checks
-        puppi check myapp
-
-Run checks and send reports only if some of them fail
-        puppi check -r fail
-
-Run checks and send reports
-        puppi check -r yes
-
-Run checks and show only failed ones
-        puppi check -s fail
-
-## EXAMPLES (puppet)
-The basic define related to a check is:
-        puppi::check   - Creates a single command to be placed in the check sequence.
-
-A simple example might be:
-        puppi::check { 'Port_Apache':
-          command  => "check_tcp -H ${fqdn} -p 80" ,
-        }
-
-but also something that uses variables Puppet already knows
-        puppi::check { 'apache_process':
-          command  => "check_procs  -c 1: -C ${apache::params::processname}" ,
-        }
-
-To avoid repetitions you can include the relevant checks in defines you already have
-to manage, for example, virtualhosts, and use the data you already provide to configure
-their local puppi checks. 
-        puppi::check { "Url_$name":
-          enable   => $enable,
-          command  => "check_http -I '${target}' -p '${port}' -u '${url}' -s '${pattern}'" ,
-        }
-
-You can also use custom scripts for your checks. They should behave similarly to Nagios plugins inn their exit codes: 0 for SUCCESS, 1 for WARNINGS, 2 for CRITICAL. In this case you've to specify the directory there the scripts stays:
-        puppi::check { 'my_stack':
-          command  => 'stack_check.sh',
-          bade_dir => '/usr/bin',
-        }
-
-
-## EXAMPLES (with example42 puppet modules)
-If you use the whole Example42 modules set you get automatically many service related checks out of the box.
-Just set (via an ENC, facts or manifests) these puppet variables:
-        $monitor="yes" # To enable automagic monitoring
-        $monitor_tool = "puppi"  # As monitoring tool define at least puppi. If you like Nagios, you may use:
-        $monitor_tool = ["nagios","puppi"] # This enables the below checks both for Puppi and Nagios
-        $puppi=yes # To enable puppi extensions autoloading
-
-To the port and service checks automatically added for the included modules, you can add custom url checks 
-with something like:
-        monitor::url { "URL_Check_Database_Connection":
-          url      => "http://www.example42.com/check/db",
-          pattern  => 'SUCCESS',
-          port     => '80',
-          target   => "${fqdn}",
-        }
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md
deleted file mode 100644
index 683f48bfb2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md
+++ /dev/null
@@ -1,263 +0,0 @@
-# PUPPI DEPLOY INSTRUCTIONS
-Documentation and examples related to the puppi actions: deploy, rollback and init
-
-## SYNOPSIS (COMMAND LINE)
-Shell command to launch a deploy:
-        puppi deploy <project_name>
-        puppi deploy <project_name> [-f] [-i] [-t] [-d yes|full] [-r yes|no|fail] [-p "parameter=value parameter2=value2"]
-
-Shell command to launch a rollback:
-        puppi rollback <project_name> 
-
-Shell command to launch the first deploy:
-        puppi init <project_name>
-
-
-## EXAMPLES (cli)
-
-Deploy myapp with the standard logic/parameters defined in Puppet:
-        puppi deploy myapp
-
-Deploy myapp and doesn't stop in case of Critical errors:
-        puppi deploy myapp -f
-
-Deploy myapp in interactive mode. Confirmation is asked for each step
-        puppi deploy myapp -i
-
-Test mode. Just show the commands that would be executed
-        puppi deploy myapp -t
-
-Deploy myapp with full debugging output
-        puppi deploy myapp -d full
-
-Deploy myapp in interactive mode and sets some custom options that override the standard Puppet params.
-Note that these parameters change according to the script you use (and the scripts must honour this override in order to make this option work).
-        puppi deploy myapp -i -o "version=1.1 source_url=http://dev.example42.com/code/my_app/"
-
-Make the first deploy of "myapp". Can be optional and may require a subsequent puppi deploy myapp
-        puppi init myapp
-
-Rollback myapp to a previous archived state. User is asked to choose which deploy to override. Note that by default you have 5 backups to rollback from. Older backups are automatically removed.
-        puppi rollback myapp
-
-Automatically rollback to the latest saved state (unattended).
-        puppi rollback myapp latest
-
-
-## EXAMPLES (puppet)
-Here follow some sample defines you can use out of the box in your manifests once you include puppi.
-Get a war from $source and deploy it in $deploy_root:
-        puppi::project::war { 'myapp':
-          source           => 'http://repo.example42.com/deploy/prod/myapp.war',
-          deploy_root      => '/store/tomcat/myapp/webapps',
-        }
-
-Get a tarball from $source, unpack it in $deploy_root, restart service called apache and send a mail
-to $report_mail (you can have a comma separated list of destination addresses):
-        puppi::project::tar { 'mysite':
-          source           => 'rsync://repo.example42.com/deploy/prod/release.tgz',
-          init_script      => 'apache',
-          deploy_root      => '/var/www/html/',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true', # Redundant
-        }
-
-Get a tarfile with a .sql query file and apply to to you local Mysql with the credentials provided:
-        puppi::project::mysql { 'myweb_sql':
-          source          => 'http://repo.example42.com/deploy/prod/database.sql.gz',
-          mysql_user      => 'myweb',
-          mysql_password  => $secret::mysql_myweb_pw,
-          mysql_host      => 'localhost',
-          mysql_database  => 'myweb',
-          report_email    => 'sysadmins@example42.com,dbadmins@example42.com',
-          enable          => 'true',
-        }
-
-Get a list of files from $source, retrieve the actual files from $source_baseurl and place them
-in $deploy_root
-        puppi::project::files { 'gfxupdates':
-          source           => 'http://deploy.example42.com/prod/website2/list.txt',
-          source_baseurl   => 'http://design.example42.com/website2/gfx/',
-          deploy_root      => '/var/www/html/gfx',
-          report_email     => 'sysadmins@example42.com,designers@example42.com',
-          enable           => 'true',
-        }
-
-Deploy from a Nexus repository (retrieve maven-metadata.xml from dir specified in $source), get the war 
-(version is achieved from the "release" tag in the xml) and deploy it in $deploy_root and then restart tomcat.
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-Get the maven-metadata.xml from a Nexus repository and deploy:
-- The release war in $deploy_root
-- A configurations tarball tagged with the Maven qualifier $config_suffix in $config_root
-- A static files tarball tagged with the Maven qualifier $document_suffix in $document_root
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          config_suffix    => 'cfg',
-          config_root      => '/srv/htdocs/supersite',
-          document_suffix  => 'css',
-          document_root    => '/srv/htdocs/supersite',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-The same deploy Nexus repository with some more options:
-- A Source dir to be used to deploy static files when issuing "puppi init supersite"
-- A block from a loadbalancer IP (managing different sites addresess)
-- Some more elaborate rsync exclusion rules
-- A backup retention of 3 archives (instead of the default 5)
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          config_suffix    => 'cfg',
-          config_root      => '/srv/htdocs/supersite',
-          document_suffix  => 'css',
-          document_root    => '/srv/htdocs/supersite',
-          document_init_source => 'rsync://backup.example42.com/initdir/supersite/',
-          firewall_src_ip  => $site ? {
-              dr      => '192.168.101.1/30',
-              main    => '192.168.1.1/30',
-          },
-          backup_rsync_options => '--exclude .snapshot --exclude /doc_root/autojs/*** --exclude /doc_root/autocss/*** --exclude /doc_root/xsl',
-          backup_retention => '3',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-An elaborated war deploy:
-- get from $source,
-- execute /usr/local/bin/mychecks.sh as root before the deploy
-(or better with sequence number 39)
-- deploy to /data/tomcat/myapp/webapps as user pippo
-- stop and start tomcat-myapp but also monit and puppet
-- backup passing  $backup_rsync_options to rsync:
-        puppi::project::war { 'myapp':
-          source                  => 'http://repo.example42.com/deploy/prod/myapp.war',
-          deploy_root             => '/store/tomcat/myapp/webapps',
-          predeploy_customcommand => '/usr/local/bin/mychecks.sh',
-          predeploy_priority      => '39',
-          predeploy_user          => 'root',
-          backup_rsync_options    => '--exclude logs/',
-          user                    => 'pippo',
-          init_script             => 'tomcat-myapp',
-          deploy_root             => '/data/tomcat/myapp/webapps',
-          report_email            => 'sysadmins@example42.com',
-          disable_services        => 'monit puppet',
-        }
-An example of usage of the generic builder define to deploy a zip file, with an example custom
-post deploy command executed as root (as all puppi commands, if not specified otherwise)
-        puppi::project::builder { 'cms':
-          source                   => 'http://repo.example42.com/deploy/cms/cms.zip',
-          source_type              => 'zip',
-          user                     => 'root',
-          deploy_root              => '/var/www',
-          postdeploy_customcommand => 'chown -R www-data /var/www/files',
-          postdeploy_user          => 'root',
-          postdeploy_priority      => '41',
-          report_email             => 'sysadmins@example42.com',
-          enable                   => 'true',
-        }
-
-These are just examples, possibilities are many, refer to the docs in puppi/manifests/project/*.pp
-to have a full list of the available options.
-
-
-## BASIC PUPPI DEFINES
-The above puppi::projects defines manage more or less complex deployments procedures for different kind of projects. They are just samples of possible procedures and you may create your one ones, if the ones provided there don't fit your needs.
-They will have to contain one or more of these basic puppi defines.
-
-Create the main project structure. One or more different deployment projects can exist on a node.
-        puppi::project
-
-Create a single command to be placed in the init sequence. It's not required for every project.
-        puppi::initialize
-
-Create a single command to be placed in the deploy sequence. More than one is generally needed for each project.
-        puppi::deploy
-
-Create a single command to be placed in the rollback sequence. More than one is generally needed for each project.
-         puppi::rollback
-
-These defines have generally a standard structure and similar arguments.
-Every one is reversable (enable => false) but you can wipe out the whole /etc/puppi directory
-to have it rebuilt from scratch. Here is an example for a single deploy command:
-        puppi::deploy { 'Retrieve files':       # The $name of the define is used in the file name
-          command  => 'get_curl.sh',          # The name of the general-use script to use
-          argument => 'file:///storage/file', # The argument(s) passed to the above script
-          priority => '10',                   # Lower priority scripts are executed first
-          user     => 'root',                 # As what user we run the script
-          project  => 'my-web.app',           # The name of the project to use
-        }
-
-This define creates a file named:
-        /etc/puppi/projects/${project}/deploy/${priority}-${name}
-Its content is, simply:
-        su - ${user} -c "export project=${project} && /etc/puppi/scripts/${command} ${arguments}"
-
-
-## DEPLOY PROCEDURES DEFINES
-The puppi module provides some examples of deploy workflows they are in the puppi/manifests/project
-directory and contain simple to use defines that contain one puppi::project and several puppi::deploy and
-puppi::rollback defines to design a specific workflow using the builtin commands present in
-puppi/files/scripts.
-Note that if you need to design your own deploy procedure you have different options:
-- Verify if you can reuse the existing ones, using optional arguments as pre/postdeploy_commands
-- Use the existing ones as a base to make you own custom defines, reusing parts of their logic 
-  and the builtin commands (puppi/files/scripts/*) they use
-- Write your own commands (in whatever language) and integrate them in your own procedure.
-
-Here follow the main and most reusable deploy workflows defines available in puppi/manifests/project/.
-The have generally a set of common arguments that make you manage if to stop and restart specific 
-services, if you want to isolate your server from a loadbalancer during the deploy procedure, what to backup,
-how many backup copies to mantain, if to send a report mail to specific addresses and if you need
-to run custom commands during the standard procedure.
-For all of the you have to specify a source from where to get the source files (http/ftp/rsync/file..) 
-a directory where to place them and the user that has to own the deploy files.
-Full documentation is available in the relevant .pp files
-
-- puppi::project::tar - Use this to retrieve and deploy a simple tar file
-- puppi::project::war - Use this to retrieve and deploy a war
-- puppi::project::files - Use this to deploy one or more files based on a provided list
-- puppi::project::dir - Use this to syncronize a remote directory to a local deploy one
-- puppi::project::mysql - Use this to retrive and apply a .sql file for mysql schema updates 
-- puppi::project::maven - Use this to deploy war and tar files generated via Maven released on Nexus or similar. A good source of Open Source Java artifacts is http://www.artifact-repository.org/
-- puppi::project::builder - This is a general purpose define that incorporates most the of cases provided by the above procedures
-
-
-## BUILTIN COMMANDS
-The puppi/files/scripts directory in the module contains some general usage "native" bash scripts
-that can be used in custom deployments. They are generally made to work together according to a
-specific logic, which is at the base of the deploy procedures defines in puppi/manifests/project/
-but you're free to write your own scripts, in whatever language, according to your needs.
-
-The default scripts are engineered to follow these steps for a deployment:
-- Remote files are downloaded in /tmp/puppi/$project/store or directly in the predeploy
-  directory: /tmp/puppi/$project/deploy
-- If  necessary the downloaded files are expanded in one or more predeploy directories
-  (default:/tmp/puppi/$project/deploy).
-- Runtime configuration entries might be saved in /tmp/puppi/$project/config
-- Files are eventually backed from the deploy directory (Apache' docroot, Tomcat webapps or whatever)
-  to the archive directory (/var/lib/puppi/archive/$project). Older backups are deleted (by default
-  there's a retention of 5 backups).
-- Files are copied from the predeploy directory to the deploy dir.
-- Relevant services are eventually stopped and started
-
-The most used common scripts are (they might have different arguments, some of them are quite simple):
-- get_file.sh - Retrieves a file via ssh/http/rsync/svn and places it in a temp dir (store or predeploy)
-- deploy.sh - Copies the files in the predeploy dir to deploy dir
-- archive.sh - Backups and restores files in deploy dir
-- service.sh - Stops or starts one or more services
-- wait.sh - Waits for the presence or absence of a file, for the presence of a string in a file or a defined number or seconds.
-- get_metadata.sh - Extracts metadata from various sources in order to provide info to other scripts. These info are save in the Runtime configuration file (/tmp/puppi/$project/config)
-- report_mail.sh - Sends a mail with the report of the operations done
-
-General functions, used by both the puppi command and these scripts, are in puppi/files/scripts/functions
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md
deleted file mode 100644
index ff45eb3780e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# PUPPI INFO README
-The puppi info commands executes scripts in /etc/puppi/info/ which are generated by templates provided by the puppi::info define
-These scripts are supposed to show status details on the omonimous info topic.
-
-## SYNOPSIS (cli)
-        puppi info [topic] [-i]
-
-## EXAMPLES (cli)
-Show host-wide infos. Much stuff.
-        puppi info
-
-Show info about apache (connections, processes, config, logs...)
-        puppi info apache
-
-Interactively select the info topics you want to show
-        puppi info -i
-
-Show complete info and send reports (email, rest ... )
-        puppi info -r yes
-
-Grep the output with the string defined
-        puppi info -g <string>
-
-
-## EXAMPLES (puppet)
-The basic define related to a info is puppi::info, it creates a script executed
-when running "puppi info $name" based on the provided template.
-Customize the template to customize the info you want to see.
-
-A sample that just runs commands using the default template:
-        puppi::info { 'network':
-          description => 'Network settings and stats' ,
-          run         => [ 'ifconfig' , 'route -n' , 'cat /etc/resolv.conf' , 'netstat -natup | grep LISTEN' ],
-        }
-
-You can have more useful and dedicated info topics using a custom puppi::info define inside your
-own defines. For example in a define that creates a tomcat instance you can add something like:
-        puppi::info::instance { "tomcat-${instance_name}":
-          servicename => "tomcat-${instance_name}",
-          processname => "${instance_name}",
-          configdir   => "${tomcat::params::storedir}/${instance_name}/conf/",
-          bindir      => "${tomcat::params::storedir}/${instance_name}/bin/",
-          pidfile     => "${instance_rundir}/tomcat-${instance_name}.pid",
-          datadir     => "${instance_path}/webapps",
-          logdir      => "${instance_logdir}",
-          httpport    => "${instance_httpport}",
-          controlport => "${instance_controlport}",
-          ajpport     => "${instance_ajpport}",
-          templatefile=> "puppi/info/instance.erb",
-          description => "Info for ${instance_name} Tomcat instance" ,
-        }
-which has custom arguments, feeded by the data you provided to the define, and a custom
-template file that uses these variables. 
-
-## EXAMPLES (with example42 puppet modules)
-If you use the old Example42 modules set you get automatically many service related infos out of the box to be used with Puppi One.
-NextGen modules are supposed to provide pupi info intergration on Puppi Two (TO DO)
-Just set (via an ENC, facts or manifests) $puppi=yes to enable puppi extensions autoloading.
-This will automatically deploy info topics related to the modules you use.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md
deleted file mode 100644
index 8fe806ea020..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# PUPPI LOG README
-Documentation and examples related to the puppi action log
-
-## SYNOPSIS (cli)
-        puppi log [topic] [-i]
-
-## EXAMPLES (cli)
-
-Tails (tail -10f) all the known logs.
-        puppi log
-
-Tails only the logs related to the given topic
-        puppi log apache
-
-Choose interactively which logs to show
-        puppi log
-
-Grep the output with the string defined
-        puppi log -g <string>
-
-## EXAMPLES (puppet)
-The basic define related to a log is:
-        puppi::log
-it creates a file in /etc/puppi/logs/ with one or more logs paths.
-
-A simple, operating system aware, example might be:
-        puppi::log { 'auth':
-          description => 'Users and authentication' ,
-          log => $::operatingsystem ? { 
-            redhat => '/var/log/secure',
-            darwin => '/var/log/secure.log',
-            ubuntu => ['/var/log/user.log','/var/log/auth.log'],
-          }
-        }
-
-but also something that uses variables Puppet already knows
-        puppi::log { "tomcat-${instance_name}":
-          log => "${tomcat::params::storedir}/${instance_name}/logs/catalina.out"
-        }
-
-EXAMPLES (with example42 puppet modules)
-If you use the old Example42 modules set you get automatically many service related logs out of the box to be used with Puppi One.
-NextGen modules are supposed to provide puppi log intergration on Puppi Two (TO DO)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile
deleted file mode 100644
index 8fcea70edb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json
deleted file mode 100644
index f56438cd236..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "example42/puppi",
-    "description": "Puppet driven applications deployment tool",
-    "homepage": "https://github.com/example42/puppi",
-    "type": "library",
-    "license": "Apache License, Version 2.0",
-    "authors": [
-        {
-            "name": "Example42",
-            "homepage": "http://www.example42.com/"
-        }
-    ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme
deleted file mode 100644
index 08778cc69c4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme
+++ /dev/null
@@ -1,2 +0,0 @@
-Default ReadMe File.
-Edit puppi/files/info/readme/readme to change this message
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default
deleted file mode 100644
index 187d6f3a10a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default
+++ /dev/null
@@ -1,4 +0,0 @@
-No extra node or role related info available.
-To have node or role specific extar info, create 
-modules/puppi/files/info/readme/readme--$hostname or
-modules/puppi/files/info/readme/readme-$role 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck
deleted file mode 100644
index fbde3bfda79..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-# Possible Usage:
-# Run this command at the end of each Puppet run to be 
-# immediately notified if a Puppet Runs has broken some service
-# 
-# Options:
-# -m destination_email
-# -i <interval> (in seconds) before retrying a Puppi check
-# -r <number_of_retries> how many attempts to retry if there are failures
-#
-# In puppet.conf add something like:
-# postrun_command = "/usr/bin/mailpuppicheck -m roots@example.com"
-#
-retries=1
-interval=2
-workdir="/tmp"
-counter=0
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -m)
-      mail=$2
-      shift 2 ;;
-    -i)
-      internal=$2
-      shift 2 ;;
-    -r)
-      retries=$2
-      shift 2 ;;
-  esac
-done
-
-if [ ! $mail ] ; then
-    echo "Provide at least an email addess"
-    exit 1
-fi
-
-# randfile="$(mktemp)"
-lastrunfile=$workdir/puppicheck_lastrun
-savedfile=$workdir/puppicheck_saved
-
-while [ $counter -lt $retries ] ; do
-  puppi check | grep FAILED > $lastrunfile
-  if [ "x$?" == "x0" ] ; then
-    errors="yes"
-    sleep $interval
-  else
-    errors="no"
-    echo "Run $counter - Errors $errors"
-    echo > $savedfile
-    exit 0
-  fi
-  echo "Run $counter - Errors $errors"
-  let counter=$counter+1
-done
-
-diff $lastrunfile $savedfile
-if [ "x$?" == "x0" ] ; then
-  echo "No changes detected"
-else
-  echo "Changes detected"
-  notify="yes"
-fi
-
-cp $lastrunfile $savedfile
-if [ "x$notify" == "xyes" ] ; then 
-  # Yes, it's ugly
-  cat -v $lastrunfile  | sed -e 's:\^\[\[60G\[\^\[\[0;31m: :g' | sed -e 's:\^\[\[0;39m\]\^M: :g' | mail -s "[puppet] Errors after Puppet run on $(hostname -f)" $mail
-  echo "Sent notification"
-fi
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi
deleted file mode 100755
index 26f1e45a40e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-
-# Client program for the mcollective puppi agent 
-#
-# Released under Apache License 2.0
-
-require 'mcollective'
-
-include MCollective::RPC
-
-options = rpcoptions do |parser, options|
-    options[:timeout] = 180
-
-    parser.define_head "Execute Puppi commands"
-    parser.banner = "Usage: mc-puppi [filters] command [project] [puppioptions]"
-    parser.separator ""
-    parser.separator "Available commands:"
-    parser.separator "  check [project] - Run puppi check"
-    parser.separator "  info [topic] - Run puppi info. For all or specified topic"
-    parser.separator "  log [topic] - Run puppi log. For all or specified topic"
-    parser.separator "  todo - Run puppi todo"
-    parser.separator "  deploy <project> - Run puppi deploy on the defined project"
-    parser.separator "  configure <project> - Run puppi configure on the defined project"
-    parser.separator "  rollback <project> - Run puppi rollback latest on the defined project"
-    parser.separator "  init <project> - Run puppi init on the defined project"
-end
-
-if MCollective::Util.empty_filter?(options[:filter])
-    print("Do you really want to operate on services unfiltered? (y/n): ")
-    STDOUT.flush
-
-    exit unless STDIN.gets.chomp =~ /^y$/
-end
-
-if ARGV.length >= 1
-    command = ARGV.shift
-    project = ARGV.shift
-    puppioptions = ARGV.shift
-
-    unless command =~ /^(check|deploy|rollback|init|configure|info|log|todo)$/
-        puts("Command has to be check|info|log|deploy|rollback|init|configure|todo")
-        exit 1
-    end
-else
-    puts("Please specify at least a command")
-    exit 1
-end
-
-mc = rpcclient("puppi", :options => options)
-mc.progress = true
-# mc.send(command, {:project => project}) do |resp|
-args = {};
-args[:project] = project if project
-args[:puppioptions] = puppioptions if puppioptions
-mc.send(command, args) do |resp|
-    begin
-#        puts resp[:serverid]
-        puts resp[:body][:data]
-#        puts resp[:body][:exitcode]
-
-    rescue RPCError => er
-        puts "RPC Agent error: #{er}"
-    end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl
deleted file mode 100644
index f86ec468fe1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl
+++ /dev/null
@@ -1,68 +0,0 @@
-metadata    :name        => "SimpleRPC Agent For PUPPI Commands",
-            :description => "Agent to query PUPPI commands via MCollective", 
-            :author      => "Al @ Lab42",
-            :license     => "Apache License 2.0",
-            :version     => "0.3",
-            :url         => "http://www.example42.com/",
-            :timeout     => 600
-
-[ "check" , "log" , "info" ].each do |myact| 
-    action myact, :description => "Run puppi myact" do
-        display :always
-
-        input :project,
-              :prompt      => "Project",
-              :description => "PUPPI project",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        input :puppioptions,
-              :prompt      => "Puppi options",
-              :description => "PUPPI options",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        output :data,
-              :description => "Output from the Puppi run",
-              :display_as  => "Output"
-
-        output :exitcode,
-              :description  => "Exit Code from the Puppi run",
-              :display_as => "Exit Code"
-    end
-end
-
-[ "deploy" , "rollback" , "init" , "configure" ].each do |myact|
-    action myact, :description => "Run puppi myact" do
-        display :always
-
-        input :project,
-              :prompt      => "Project",
-              :description => "PUPPI project",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => false,
-              :maxlength   => 50
-
-        input :puppioptions,
-              :prompt      => "Puppi options",
-              :description => "PUPPI options",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        output :data,
-              :description => "Output from the Puppi run",
-              :display_as  => "Output"
-
-        output :exitcode,
-              :description  => "Exit Code from the Puppi run",
-              :display_as => "Exit Code"
-    end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb
deleted file mode 100644
index ee0b3289f23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module MCollective
-    module Agent
-        class Puppi<RPC::Agent
-            metadata    :name        => "SimpleRPC Agent For PUPPI Commands",
-                        :description => "Agent to execute PUPPI actions via MCollective",
-                        :author      => "Al @ Lab42",
-                        :license     => "Apache License 2.0",
-                        :version     => "0.3",
-                        :url         => "http://www.example42.com/",
-                        :timeout     => 600
-
-            def check_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi check #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def info_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi info #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def log_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi log #{project} -c 10].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def deploy_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    if (!File.directory? "/etc/puppi/projects/#{project}")
-                      reply.fail "No such project #{project}"
-                      return
-                    end
-                    puppioptions = request[:puppioptions]
-                    reply.data = %x[puppi deploy #{project} -o "#{puppioptions}"].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def rollback_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi rollback #{project} latest].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def init_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi init #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-            
-            def configure_action
-                  validate :project, :shellsafe
-                  project = request[:project] if request[:project]
-                  reply.data = %x[puppi configure #{project}].chomp
-                  if ($?.exitstatus > 0)
-                    reply.fail "FAILED: #{reply.data}"
-                  end
-            end
-
-        end
-    end
-end
-# vi:tabstop=4:expandtab:ai
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck
deleted file mode 100644
index 988d310fad8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-PATH=$PATH:/usr/local/bin
-
-if [ ! $1 ] ; then
-    echo "Provide at least a match pattern. For example:"
-    echo "role=fep-pgol"
-    exit 1
-fi
-
-filtered=$(echo $* | sed "s/[^a-Z0-9= _.\-]//Ig")
-
-randfile="$(mktemp)"
-
-trap "rm -f $randfile" SIGINT SIGTERM EXIT
-
-myarg=$(echo $filtered | sed -e "s/ / -F /g")
-
-mc-puppi check -F $myarg | tee $randfile
-grep FAILED $randfile && exit 1
-exit 0
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy
deleted file mode 100644
index 2f722d6c3e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-PATH=$PATH:/usr/local/bin
-
-if [ ! $2 ] ; then
-    echo "Provide the hostname and the project you want to deploy:"
-    echo "superdeploy web01.example42.com myapp"
-    exit 1
-fi
-
-filtered=$(echo $* | sed "s/[^a-Z0-9= _.\-]//Ig")
-
-randfile="$(mktemp)"
-
-trap "rm -f $randfile" SIGINT SIGTERM EXIT
-
-myarg=$(echo $filtered | sed -e "s/ / -F /g")
-
-mc-puppi deploy -I $1 $2 | tee $randfile
-grep FAILED $randfile && exit 1
-exit 0
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh
deleted file mode 100644
index 7448613d391..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-# archive.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to backup or restore contents to/from puppi archivedir"
-    echo "It has the following options:"
-    echo "-b <backup_source> - Backups the files to be changed in the defined directory"
-    echo "-r <recovery_destination> - Recovers file to the provided destination"
-    echo "-s <copy|move> - Specifies the backup strategy (move or copy files)"
-    echo "-t <tag> - Specifies a tag to be used for the backup"
-    echo "-d <variable> - Specifies the runtime variable that defines the predeploy dir"
-    echo "-c <yes|no> - Specifies if you want compressed (tar.gz) archives. Default: yes"
-    echo "-o 'options' - Specifies the rsync options to use during backup. Use it to specify custom "
-    echo "               exclude patterns of files you don't want to archive, for example"
-    echo "-m <full|diff> - Specifies the backup type: 'full' backups all the files in backup_source,"
-    echo "                 'diff' backups only the files deployed"
-    echo "-n <number> - Number of copies of backups to keep on the filesystem. Default 5"
-    echo 
-    echo "Examples:"
-    echo "archive.sh -b /var/www/html/my_app -t html -c yes"
-}
-
-# Arguments check
-if [ "$#" = "0" ] ; then
-    showhelp
-    exit
-fi
-
-# Default settings
-compression=yes
-backuptag=all
-strategy=copy
-backupmethod=full
-bakret=5
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -b)
-      backuproot=$2
-#      [ $deploy_root ] && backuproot=$deploy_root # This is needed to allow override of $deploy_root via puppi cmd. But breaks on puppi::project::maven
-      action=backup
-      shift 2 ;;
-    -r)
-      backuproot=$2
-#      [ $deploy_root ] && backuproot=$deploy_root # This is needed to allow override of $deploy_root via puppi cmd. But breaks on puppi::project::maven
-      action=recovery
-      shift 2 ;;
-    -t)
-      backuptag=$2
-      shift 2 ;;
-    -s)
-      case "$2" in
-        mv) strategy="move" ;;
-        move) strategy="move" ;;
-        *) strategy="copy" ;;
-      esac
-      shift 2 ;;
-    -m)
-      case "$2" in
-        diff) backupmethod="diff" ;;
-        *) backupmethod="full" ;;
-      esac
-      shift 2 ;;
-    -c)
-      case "$2" in
-        yes) compression="yes" ;;
-        y) compression="yes" ;;
-        *) compression="none" ;;
-      esac
-      shift 2  ;;
-    -d)
-      predeploydir="$(eval "echo \${$(echo $2)}")"
-      shift 2 ;;
-    -o) 
-      rsync_options=$2
-      shift 2 ;;
-    -n)
-      bakret=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-
-# Backup and Restore functions
-backup () {
-    mkdir -p $archivedir/$project/$tag/$backuptag
-    if [ $archivedir/$project/latest ] ; then
-        rm -f $archivedir/$project/latest
-    fi
-    ln -sf $archivedir/$project/$tag $archivedir/$project/latest
-
-    filelist=$storedir/filelist
-    cd $predeploydir
-    find . | cut -c 3- | grep -v "^$" > $filelist
-
-    if [ "$strategy" = "move" ] ; then 
-        for file in $(cat $filelist) ; do
-            mv $backuproot/$file $archivedir/$project/$tag/$backuptag/
-        done
-        if [ "$backupmethod" = "full" ] ; then
-            rsync -a $rsync_options $backuproot/ $archivedir/$project/$tag/$backuptag/
-        fi
-    else
-        if [ "$backupmethod" = "full" ] ; then
-            rsync -a $rsync_options $backuproot/ $archivedir/$project/$tag/$backuptag/
-        else
-            rsync -a $rsync_options --files-from=$filelist $backuproot/ $archivedir/$project/$tag/$backuptag/
-        fi
-    fi
-
-    if [ "$compression" = "yes" ] ; then
-        cd $archivedir/$project/$tag/$backuptag/
-        tar -czf ../$backuptag.tar.gz .
-        cd $archivedir/$project/$tag/
-        rm -rf $archivedir/$project/$tag/$backuptag/
-    fi
-}
-
-recovery () {
-    if [ ! $rollbackversion ] ; then
-        echo "Variable rollbackversion must exist!"
-        exit 2 
-    fi
-
-    if [ -d $archivedir/$project ] ; then
-        cd $archivedir/$project
-    else 
-        echo "Can't find archivedir for this project"
-        exit 2
-    fi
-
-    if [ "$compression" = "yes" ] ; then
-        cd $backuproot/
-        tar -xzf $archivedir/$project/$rollbackversion/$backuptag.tar.gz .
-    else 
-        rsync -a $rsync_options $rollbackversion/$backuptag/* $backuproot
-    fi
-
-}
-
-delete_old () {
-    # We don't count the "latest" symlink
-    bakret=$(expr $bakret + 1 )
-
-    cd $archivedir/$project
-
-    ddirs=$(ls -1p 2>/dev/null | wc -l)
-    while [ $ddirs -gt $bakret ]
-    do
-        victim=$(ls -tr 2>/dev/null | head -1)
-        rm -rf $victim && echo "Deleted old $archivedir/$project/$victim"
-        ddirs=$(ls -1p 2>/dev/null | wc -l)
-    done
-}
-
-# Action!
-case "$action" in
-    backup) backup ; delete_old ;;
-    recovery) recovery ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh
deleted file mode 100644
index 1f1c1d6d9b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# check_project.sh - Made for Puppi
-# This script runs the checks defined in $projectsdir/$project/check and then in $checksdir
-# It can be used to automatically run tests during the deploy procedure
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Main functions
-handle_check () {
-        RETVAL=$?
-        if [ "$RETVAL" = "1" ] ; then
-            EXITWARN="1"
-        fi
-        if [ "$RETVAL" = "2" ] ; then
-            EXITCRIT="1"
-        fi
-}
-
-check () {
-    for command in $(ls -v1 $projectsdir/$project/check) ; do
-        "$projectsdir/$project/check/$command"
-        handle_check
-    done
-
-    for command in $(ls -v1 $checksdir) ; do
-        "$checksdir/$command" 
-        handle_check
-    done
-}
-
-# For nicer output when launched via cli
-echo -n "\n"
-
-# Run checks
-check
-
-# Manage general return code
-if [ "$EXITCRIT" = "1" ] ; then
-    exit 1
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    exit 1
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh
deleted file mode 100644
index 7e1b79228ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# checkwardir.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to check if a webapp directory is successfully created or removed"
-    echo " after the (un)deploy of a war file"
-    echo "It implies that a directory with the name of the war file is created in the same path"
-    echo "-p <warname> - Waits until war created dir is present"
-    echo "-a <warname> - Wait until war created dir is absent"
-    echo "-s <seconds> - Wait some more seconds after the check"
-    echo "-c <configentry> - Name of the runtime config variable that contains the warname"
-    echo "Examples:"
-    echo "checkwardir.sh -p /store/tomcat/myapp/webapps/myapp.war"
-    echo "checkwardir.sh -a /store/tomcat/myoldapp/webapps/myoldapp.war"
-}
-
-seconds=2
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      seconds=$2
-      shift 2
-      ;;
-    -p)
-      check="present"
-      warname=$2
-      shift 2
-      ;;
-    -a)
-      check="absent"
-      warname=$2
-      shift 2
-      ;;
-    -c)
-      warname="$(eval "echo \${$(echo ${2})}")"      
-      shift 2
-      ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-checkdir () {
-    wardir=${warname%\.*}
-    while true
-       do
-        if [ $check == absent ] ; then
-            [ ! -d $wardir ] && break
-        else
-            [ -f $wardir/WEB-INF/web.xml ] && break
-        fi
-        sleep $seconds
-    done
-}
-
-checkdir
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh
deleted file mode 100644
index 40edae99204..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# clean_filelist.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to cleanup a list of files to download from unwanted data"
-    echo "It has 1 optional argument:"
-    echo "The prefix, present in the list, to cut out when defining files to deploy"
-    echo "The list file is defined as $downloadedfile , these variables are gathered from the Puppi runtime"
-    echo "  config file."
-    echo 
-    echo "Example:"
-    echo "clean_filelist.sh http://svn.example42.com/myproject"
-}
-
-
-if [ $1 ] ; then
-    prefix=$1
-else
-    prefix=""
-fi
-
-deployfilelist=$downloadedfile
-
-# Clean list
-cleanlist () {
-
-    sed -i "s/^$prefix//g" $deployfilelist
-
-}
-
-cleanlist
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh
deleted file mode 100644
index f8d89399d3f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# database.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script executes database queries and dumps"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-t <database_type> The database type. Currently only mysql is suppoerted"
-    echo "-a <action> The action to perform:"
-    echo "            run - Run a mysql command based on a given .sql file"
-    echo "            dump - Dump the specified database in the archive dir"
-    echo "            restore - Restore the specified database from the archive dir"
-    echo "-d <database_name> The database name to manage"
-    echo "-u <database_user> The database user used to run the queries"
-    echo "-p <database_password> The user password"
-    echo "-h <host> The database server hostname"
-}
-
-# Arguments defaults
-db_type=mysql
-db_action=run
-db_user=root
-db_host=localhost
-db_password=""
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -t)
-      db_type=$2
-      shift 2 ;;
-    -a)
-      db_action=$2
-      shift 2 ;;
-    -d)
-      db_name=$2
-      shift 2 ;;
-    -u)
-      db_user=$2
-      shift 2 ;;
-    -p)
-      db_password=$2
-      shift 2 ;;
-    -h)
-      db_host=$2
-      shift 2 ;;
-  esac
-done
-
-
-
-mysql_run () {
-    case "$db_action" in
-      run)
-        file $downloadedfile | grep gzip &>/dev/null 2>&1 && sqlfile_type="gzip"
-        file $downloadedfile | grep Zip &>/dev/null 2>&1 && sqlfile_type="zip"
-        case "$sqlfile_type" in
-          gzip)
-            zcat $downloadedfile | mysql -u $db_user -p$db_password -h $db_host $db_name
-            check_retcode ;;
-          zip)
-            unzip -p $downloadedfile | mysql -u $db_user -p$db_password -h $db_host $db_name
-            check_retcode ;;
-          *)
-            mysql -u $db_user -p$db_password -h $db_host $db_name < $downloadedfile
-            check_retcode ;;
-        esac
-        ;;
-      dump)
-        mkdir -p $archivedir/$project/$tag
-        if [ $archivedir/$project/latest ] ; then
-            rm -f $archivedir/$project/latest
-        fi
-        ln -sf $archivedir/$project/$tag $archivedir/$project/latest
-
-        mysqldump -u $db_user -p$db_password -h $db_host --add-drop-table --databases $db_name | gzip > $archivedir/$project/$tag/$db_name.sql.gz
-        check_retcode ;;
-      restore)
-        zcat $archivedir/$project/$rollbackversion/$db_name.sql.gz | mysql -u $db_user -p$db_password -h $db_host $db_name
-        check_retcode ;;
-    esac
-}
-
-case "$db_type" in
-      mysql)
-        mysql_run
-        ;;
-      *)
-        showhelp
-        ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh
deleted file mode 100644
index d255c6a832a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# delete.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Manage script variables
-if [ $1 ] ; then
-    tobedeleted=$1
-else
-    echo "You must provide a file or directory to delete!"
-    exit 2 
-fi
-
-if [ "$tobedeleted" = "/" ] ; then
-    echo "Be Serious!"
-    exit 2
-fi
-
-# Move file
-move () {
-    mkdir -p $workdir/$project/deleted
-    mv $tobedeleted $workdir/$project/deleted
-}
-
-move
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh
deleted file mode 100644
index 96d3b64c57b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# deploy.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script deploys the files present in the \$predeploydir to the deploy destination dir"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Destination directory where to deploy files"
-    echo "\$2 (Optional) - Name of the variable that identifies a specific predeploydir"
-    echo 
-    echo "Examples:"
-    echo "deploy.sh /var/www/html/my_app"
-    echo "deploy.sh /var/www/html/my_app/conf config"
-}
-
-# Check arguments
-if [ $1 ] ; then
-    deploy_destdir=$1
-# This breaks on projects::maven when using more than one deploy destinations
-#    [ $deploy_root ] && deploy_destdir=$deploy_root
-else
-    showhelp
-    exit 2 
-fi
-
-# Obtain the value of the variable with name passed as second argument
-# If no one is given, we take all the files in $predeploydir
-if [ $2 ] ; then
-    deployfilevar=$2
-    deploy_sourcedir="$(eval "echo \${$(echo ${deployfilevar})}")"
-    if [ "$deploy_sourcedir" = "" ] ; then
-        exit 0
-    fi
-else
-    deploy_sourcedir="$predeploydir"
-fi
-
-# Copy files
-deploy () {
-    case "$debug" in
-        yes)
-            rsync -rlptDv $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        full)
-            rsync -rlptDv $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        *)
-            rsync -rlptD $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-    esac
-}
-
-deploy
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh
deleted file mode 100644
index 95bb4ff150b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-# deploy_files.sh - Made for Puppi
-# This is an extended version of the deploy script
-# It accepts more options to better handle how files are deployed
-# in the destination directory
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script deploys the files present in the \$predeploydir to the deploy destination dir"
-    echo "It has the following options:"
-    echo "-d <path> (Required) - Destination directory where to deploy files"
-    echo "-p <name> (Optional) - Name of the variable that identifies a specific predeploydir"
-    echo "-c <true|false> (Default: false) - If to enabled the --delete option to the rsync command"
-    echo 
-    echo "Examples:"
-    echo "deploy_files.sh -d /var/www/html/my_app"
-    echo "deploy_files.sh -d /var/www/html/my_app/conf -p config"
-    echo "deploy_files.sh -d /var/www/html/my_app/conf -c true"
-}
-
-deploy_sourcedir="$predeploydir"
-clean_destdir="false"
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -d)
-      deploy_destdir=$2
-      shift 2 ;;
-    -p)
-      deployfilevar=$2
-      deploy_sourcedir="$(eval "echo \${$(echo ${deployfilevar})}")"
-      shift 2 ;;
-    -c)
-      clean_destdir=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-rsync_delete=""
-if [ x$clean_destdir == "xtrue" ] ; then
-  rsync_delete="--delete"
-fi
-
-# Copy files
-deploy () {
-    case "$debug" in
-        yes)
-            rsync -rlptDv $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        full)
-            rsync -rlptDv $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        *)
-            rsync -rlptD $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-    esac
-}
-
-deploy
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh
deleted file mode 100644
index e63d3050549..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# execute.sh - Made for Puppi
-# This script just executes what is passed as argument
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-#parse variables
-command=$(eval "echo "$*"")
-
-#execute command
-eval "${command}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh
deleted file mode 100644
index 382542c6e3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# firewall.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script places a temporary firewall (iptables) rule to block access from the IP defined"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Remote Ip address to block (Generally a load balancer"
-    echo "\$2 (Required) - Local port to block (0 for all ports"
-    echo "\$3 (Required) - Set on or off to insert or remove the blocking rule"
-    echo "\$4 (Required) - Number of seconds to sleep after having set the rule"
-    echo 
-    echo "Examples:"
-    echo "firewall.sh 10.42.0.1 0 on"
-    echo "firewall.sh 10.42.0.1 0 off"
-}
-
-# Check arguments
-if [ $2 ] ; then
-    ip=$1
-    port=$2
-else
-    showhelp
-    exit 2 
-fi
-
-if [ $3 ] ; then
-    if [ "$3" = "on" ] ; then
-        action="-I"
-    elif [ "$3" = "off" ] ; then
-        action="-D"
-    else 
-        showhelp
-        exit 2
-    fi
-else
-    showhelp
-    exit 2
-fi
-
-if [ $4 ] ; then
-    delay=$4
-else
-    delay="1"
-fi
-
-# Block
-run_iptables () {
-    if [ "$port" = "0" ] ; then
-        iptables $action INPUT -s $ip -j DROP
-    else
-        iptables $action INPUT -s $ip -p tcp --dport $port -j DROP
-    fi
-}
-
-run_iptables
-echo "Sleeping for $delay seconds"
-sleep $delay
-
-# Sooner or later this script will have multiOS support
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions
deleted file mode 100644
index 38bedcad3fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-# General Puppi functions
-
-BOOTUP=color
-RES_COL=75
-MOVE_TO_COL="echo -en \\033[${RES_COL}G"
-SETCOLOR_SUCCESS="echo -en \\033[0;32m"
-SETCOLOR_FAILURE="echo -en \\033[0;31m"
-SETCOLOR_WARNING="echo -en \\033[0;33m"
-SETCOLOR_NORMAL="echo -en \\033[0;39m"
-SETCOLOR_TITLE="echo -en \\033[0;35m"
-SETCOLOR_BOLD="echo -en \\033[0;1m"
-
-echo_success() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS
-  echo -n $"  OK  "
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 0
-}
-
-echo_dontdeploy() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS
-  echo -n $" NO NEED TO DEPLOY "
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 0
-}
-
-echo_failure() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_FAILURE
-  echo -n $"FAILED"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_passed() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
-  echo -n $"PASSED"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_warning() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
-  echo -n $"WARNING"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_title () {
-  echo
-  echo
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_TITLE
-  echo "$1"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-}
-
-check_retcode () {
-    if [ $? = "0" ] ; then
-        true
-    else
-        exit 2
-    fi
-}
-
-handle_result () {
-        RETVAL=$?
-        if [ "$RETVAL" = "0" ] ; then
-            showresult="echo_success"
-            result="OK"
-        fi
-        if [ "$RETVAL" = "1" ] ; then
-            showresult="echo_warning"
-            EXITWARN="1"
-            result="WARNING"
-        fi
-        if [ "$RETVAL" = "2" ] ; then
-            showresult="echo_failure"
-            EXITCRIT="1"
-            result="CRITICAL"
-        fi
-        if [ "$RETVAL" = "99" ] ; then
-            showresult="echo_dontdeploy"
-            DONTDEPLOY="1"
-            result="OK"
-        fi
-        if [ x$show == "xyes" ] ; then
-            $showresult
-            echo
-            echo -e "$output"
-            echo
-        elif [ x$show == "xfail" ] && [ x$RETVAL != "x0" ] ; then
-            $showresult
-            echo
-            echo -e "$output"
-            echo
-        fi
-
-        # Output to file
-        if [ ! -d $logdir/$project/$tag ] ; then
-            mkdir -p $logdir/$project/$tag
-        fi
-        let counter=counter+1
-        echo $title > $logdir/$project/$tag/$counter-$command
-        echo $code >> $logdir/$project/$tag/$counter-$command
-        echo $result >> $logdir/$project/$tag/$counter-$command
-        echo $output >> $logdir/$project/$tag/$counter-$command
-
-}
-
-
-# Function taken from http://www.threadstates.com/articles/parsing_xml_in_bash.html
-xml_parse () {
-    local tag=$1
-    local xml=$2
-
-    # Find tag in the xml, convert tabs to spaces, remove leading spaces, remove the tag.
-    grep $tag $xml | \
-        tr '\011' '\040' | \
-        sed -e 's/^[ ]*//' \
-            -e 's/^<.*>\([^<].*\)<.*>$/\1/'
-}
-
-# Stores the passed arguments in Project runtime config file
-# Only if the parameter is not already defined
-# Usage:
-# save_runtime_config parameter=value # Sets or overrides parameter
-# save_runtime_config parameter=value notforce # Sets parameters only if is not already set
-save_runtime_config () {
-    parameter=$(echo $1 | cut -d '=' -f1)
-    value=$(echo $1 | cut -d '=' -f2-)
-    force=$2
-
-    if [[ ! $(grep $parameter $workdir/$project/config) ]] ; then
-        echo  >> $workdir/$project/config
-        echo "# Added by $0" >> $workdir/$project/config
-        echo "$parameter=\"$value\"" >> $workdir/$project/config
-    else
-#        sed -i "/^$parameter=/d" $workdir/$project/config # No real need to remove lines with old configs
-        if [[ x$force == xnotforce ]] ; then
-            echo  >> $workdir/$project/config
-            echo "# CHANGE NOT FORCED by $0" >> $workdir/$project/config
-            echo "# $parameter=\"$value\"" >> $workdir/$project/config
-        else
-            echo  >> $workdir/$project/config
-            echo "# CHANGED by $0" >> $workdir/$project/config
-            echo "$parameter=\"$value\"" >> $workdir/$project/config
-       fi
-    fi
-    
-}
-
-# Adds a runtime comment to Project runtime config file
-save_runtime_comment () {
-    echo  >> $workdir/$project/config
-    echo "# Added by $0" >> $workdir/$project/config
-    echo "  ## $1" >> $workdir/$project/config
-}
-
-
-# Stores the passed arguments in Project runtime config file
-# Forces parameter overwrite if already defined
-overwrite_runtime_config () {
-    echo "$1" >> $workdir/$project/config
-}
-
-ask_interactive () {
-    if [ x$show == "xyes" ] ; then
-        echo -n $title
-    fi
-
-    if [ "$interactive" = "yes" ] ; then
-        echo 
-        echo "INTERACTIVE MODE: Press 'x' to exit or just return to go on" 
-        read press
-        case $press in 
-            x) exit 2 ;;
-            *) return
-        esac
-    fi
-}
-
-# Shows or executes a command
-show_command () {
-   echo
-   $SETCOLOR_BOLD ; echo "$HOSTNAME: $*" ; $SETCOLOR_NORMAL
-
-   bash -c "$*"
-
-# Grep filter at show_command level
-#   if [ ! -z "$greppattern" ] ; then
-#       bash -c "$*" | grep $greppattern
-#   else
-#       bash -c "$*"
-#   fi
-}
-
-# Filtering out only:  $ ; ` | < >
-shell_filter () {
-    echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's/<//g' | sed 's/>//g'
-}
-
-shell_filter_strict () {
-# Filtering out:  $ ; ` | < > = ! { } [ ] / \ # &
-    echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's/<//g' | sed 's/>//g'  | sed 's/=//g' | sed 's/!//g' | sed 's/{//g' | sed 's/}//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/\///g' | sed 's/\\//g' | sed 's/#//g' | sed 's/&//g'
-
-# Filtering out: all but accepted chars
-#     echo $1 | sed "s/[^a-Z0-9_\-]//Ig"
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh
deleted file mode 100644
index 9afe577e2c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-# get_file.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to retrieve the file defined after the -s parameter"
-    echo "The source specified  can be any of these:"
-    echo "  file://local/file/path"
-    echo "  http(s)://my.server/file/path"
-    echo "  ssh://user@my.server/file/path"
-    echo "  svn://user:password@my.server/file/path"
-    echo "Note: Avoid using chars like : / and @ outside the Uri standards paths"
-    echo
-    echo "It has the following options:"
-    echo "-s <source_file> - The URL of the file to get"
-    echo "-t <file_type> - The type of file that is retrieved: list|tarball|maven-metadata|dir"
-    echo "-d <local_dir> - An alternative destination directory (default is automatically chosen)"
-    echo "-a <yes|no> - If 'no' return a special error code (99) if the download checksum is the same of the one previously downloaded"
-    echo "-u <http_user> - in case of type http, specify a http_user for curl"
-    echo "-p <http_password> - in case of type http, specifiy http_user for curl"
-    echo "-k - tell curl not to validate ssl certs"
-    echo "              This option can be used for automatic deploys (ie via cron) that actually deploy only new changes"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      type=$(echo $2 | cut -d':' -f1)
-      url=$2
-      downloadfilename=$(basename $2)
-      downloaddir=$predeploydir
-      shift 2 ;;
-    -t)
-      case $2 in
-      # This logic is applied:
-      # In $predeploydir go ($workdir/$project/deploy) go file that have to be deployed
-      # In $storedir go ($workdir/$project/store) go support files as tarballs or lists
-          list)
-          downloaddir=$storedir
-          save_runtime_config "source_type=list"
-          ;;
-          tarball)
-          downloaddir=$storedir
-          save_runtime_config "source_type=tarball"
-          ;;
-          tar)
-          downloaddir=$storedir
-          save_runtime_config "source_type=tar"
-          ;;
-          zip)
-          downloaddir=$storedir
-          save_runtime_config "source_type=zip"
-          ;;
-          maven-metadata)
-          downloaddir=$storedir
-          save_runtime_config "source_type=maven"
-          ;;
-          dir)
-          downloaddir=$predeploydir
-          save_runtime_config "source_type=dir"
-          ;;
-          war)
-          downloaddir=$predeploydir
-          save_runtime_config "source_type=war"
-          ;;
-          mysql)
-          downloaddir=$storedir
-          save_runtime_config "source_type=mysql"
-          ;;
-          gz)
-          downloaddir=$storedir
-          save_runtime_config "source_type=gz"
-          ;;
-      esac
-      shift 2 ;;
-    -d)
-      # Enforces and overrides and alternative downloaddir
-      downloaddir=$2
-      shift 2 ;;
-    -a)
-      alwaysdeploy=$2
-      shift 2 ;;
-    -u)
-      http_user=$2
-      shift 2 ;;
-    -p)
-      http_password=$2
-      shift 2 ;;
-    -k)
-      ssl_arg=$1
-      shift 1 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-# Define what to use for downloads
-cd $downloaddir
-
-case $type in
-    s3)
-        s3cmd get $url
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    ssh|scp) 
-        # ssh://user@my.server/file/path
-        scpuri=$(echo $url | cut -d'/' -f3-)
-        scpconn=$(echo $scpuri | cut -d'/' -f1)
-        scppath=/$(echo $scpuri | cut -d'/' -f2-)
-        rsync -rlptD -e ssh $scpconn:$scppath .
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    http|https)
-        if [ -z "$http_password" ] ; then
-          curl $ssl_arg -s -f -L "$url" -O
-        else
-          curl $ssl_arg -s -f -L --anyauth --user $http_user:$http_password "$url" -O
-	fi
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    svn)
-        svnuri=$(echo $url | cut -d'/' -f3-)
-        svnusername=$(echo $svnuri | cut -d':' -f1)
-        svnpassword=$(echo $svnuri | cut -d':' -f2 | cut -d'@' -f1)
-        svnserver=$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f1)
-        svnpath=/$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f2-)
-        mkdir -p $(dirname $svnpath)
-        svn export --force --username="$svnusername" --password="$svnpassword" svn://$svnserver/$svnpath $downloaddir
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    file)
-        # file:///file/path
-        filesrc=$(echo $url | cut -d '/' -f3-)
-        rsync -rlptD $filesrc .
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    rsync)
-        rsync -a "$url" .
-        # rsync -rlptD $url . # Why not preserving users/groups?
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-
-esac
-
-if [ x$alwaysdeploy == "xno" ] ; then
-    # Here is checked the md5sum of the downloaded file against a previously save one
-    # If the sums are the same the scripts exits 99 and puppi will stop the deploy without any warning or notification
-    [ -d $archivedir/$project ] || mkdir -p $archivedir/$project
-    touch $archivedir/$project/md5sum
-    md5sum $downloaddir/$downloadfilename > $workdir/$project/md5sum_downloaded
-    cat $archivedir/$project/md5sum > $workdir/$project/md5sum_deployed
-    diff $workdir/$project/md5sum_downloaded $workdir/$project/md5sum_deployed && exit 99
-    md5sum $downloaddir/$downloadfilename > $archivedir/$project/md5sum
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh
deleted file mode 100644
index 2f5eea17942..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# get_filesfromlist.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to retrieve the files present in a text file list."
-    echo "It has 1 required argument:"
-    echo "First argument (\$1 - required) is the base url (in URI format) from where to retrieve the files defined in the list"
-    echo "The list file is defined as \$downloadedfile , these variables are gathered from the Puppi runtime"
-    echo "  config file."
-    echo 
-    echo "Examples: "
-    echo "get_filesfromlist.sh http://svn.example42.com/myproject"
-    echo "get_filesfromlist.sh file:///mount/wwwdata/myproject"
-    echo "get_filesfromlist.sh ssh://user@server/var/www/myproject"
-    echo "get_filesfromlist.sh svn://user:password@server/repo/myproject"
-}
-
-
-if [ $1 ] ; then
-    baseurl=$1
-    type=$(echo $1 | cut -d':' -f1)
-else
-    showhelp
-    exit 2 
-fi
-
-
-# Download files
-downloadfiles () {
-
-    cd $predeploydir
-
-    for file in $(cat $downloadedfile | grep -v "^#" | grep -v "^$" ) ; do
-        filepath=$file
-        filedir=$(dirname $filepath)
-        mkdir -p $filedir
-        check_retcode
-        
-        case $type in 
-            ssh|scp) 
-                scp "$baseurl:$filepath" $filepath
-                check_retcode
-            ;;
-            http|https|file)
-                curl -s -f "$baseurl/$filepath" -o $filepath
-                check_retcode
-            ;;
-            svn)
-                svnuri=$(echo $baseurl/$filepath | cut -d'/' -f3-)
-                svnusername=$(echo $svnuri | cut -d':' -f1)
-                svnpassword=$(echo $svnuri | cut -d':' -f2 | cut -d'@' -f1)
-                svnserver=$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f1)
-                svnpath=/$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f2-)
-                mkdir -p $(dirname $svnpath)
-                svn export --force --username="$svnusername" --password="$svnpassword" http://$svnserver/$svnpath $(dirname $svnpath)
-                check_retcode
-            ;;
-        esac
-
-    done
-}
-
-downloadfiles
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh
deleted file mode 100644
index 43e5647561f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# get_maven_files.sh - Made for Puppi
-# This script retrieves the files to deploy from a Maven repository.
-# It uses variables defined in the general and project runtime configuration files.
-# It uses curl to retrieve files so the $1 argument (base url of the maven repository) 
-# has to be in curl friendly format
-#   It has the following options:
-#   -u <http_user> - in case of type http, specify a http_user for curl
-#   -p <http_password> - in case of type http, specifiy http_user for curl
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -u)
-      http_user=$2
-      shift 2 ;;
-    -p)
-      http_password=$2
-      shift 2 ;;
-    *)
-      url=$1
-      ftype=$2
-      shift 2 ;;
-  esac
-done
-
-# Obtain the value of the variable with name passed as second argument
-# If no one is given, we take all the files in storedir
-
-#echo "Download and deploy $2 ? (Y/n)" 
-#read press
-#case $press in 
-#    Y|y) true ;;
-#    N|n) save_runtime_config "predeploydir_$2=" ; exit 0
-#esac
-
-if [ $debug ] ; then
-    tarcommand="tar -xvf"
-else
-    tarcommand="tar -xf"
-fi
-
-if [ $debug ] ; then
-    zipcommand="unzip"
-else
-    zipcommand="unzip -q"
-fi
-
-cd $storedir
-
-if [ -z "$http_password" ] ; then
-    authparam=""
-else
-    authparam="--anyauth --user $http_user:$http_password"
-fi
-
-case $ftype in
-    warfile)
-        curl -s -f $authparam "$url/$version/$warfile" -O
-        check_retcode
-        cp -a $warfile $predeploydir/$artifact.war
-        save_runtime_config "deploy_warpath=$deploy_root/$artifact.war"
-    ;;
-    jarfile)
-        curl -s -f $authparam "$url/$version/$jarfile" -O
-        check_retcode
-        cp -a $jarfile $predeploydir/$artifact.jar
-        save_runtime_config "deploy_jarpath=$deploy_root/$artifact.jar"
-    ;;
-    configfile)
-        curl -s -f $authparam "$url/$version/$configfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_configfile
-        cd $workdir/$project/deploy_configfile
-        $tarcommand $storedir/$configfile
-        check_retcode
-        save_runtime_config "predeploydir_configfile=$workdir/$project/deploy_configfile"
-    ;;
-    srcfile)
-        curl -s -f $authparam "$url/$version/$srcfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_srcfile
-        cd $workdir/$project/deploy_srcfile
-        $tarcommand $storedir/$srcfile
-        check_retcode
-        save_runtime_config "predeploydir_srcfile=$workdir/$project/deploy_srcfile"
-    ;;
-    zipfile)
-        curl -s -f $authparam "$url/$version/$zipfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_zipfile
-        cd $workdir/$project/deploy_zipfile
-        $zipcommand $storedir/$zipfile
-        check_retcode
-        save_runtime_config "predeploydir_zipfile=$workdir/$project/deploy_zipfile"
-    ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh
deleted file mode 100644
index 79dc97ca38e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-# get_metadata.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script retrieves some metadata from the downwloaded files "
-    echo "The metadatasource is automatically detected from the \$source_type runtime config"
-    echo
-    echo "It has some, not required, options:"
-    echo "-m <magicstring> - The string to use as *fix in custom metadata info provided "
-    echo "-mc <anotherstring> - The string to use as qualifier for Maven metadata config tars"
-    echo "-mj <anotherstring> - The string to use as qualifier for Maven metadata jars"
-    echo "-mw <anotherstring> - The string to use as qualifier for Maven metadata wars"
-    echo "-mz <anotherstring> - The string to use as qualifier for Maven metadata zips"
-    echo "-at <anotherstring> - The type to obtain the artifact, should be \"release\", "
-    echo "                      \"latest\", \"snapshot\" or a specific version (e.g. \"2.5.0\")"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -m)
-      suffix=$2
-      shift 2 ;;
-    -mc)
-      config_suffix=$2
-      shift 2 ;;
-    -mj)
-      jar_suffix=$2
-      shift 2 ;;
-    -mw)
-      war_suffix=$2
-      shift 2 ;;
-    -mz)
-      zip_suffix=$2
-      shift 2 ;;
-    -at)
-      artifact_type=$2
-      shift 2 ;;
-    -h)
-      showhelp ;;
-  esac
-done
-
-# validating input
-# see http://docs.codehaus.org/display/MAVEN/Repository+Metadata for specs
-case $artifact_type in
-    release)
-    ;;
-    latest)
-    ;;
-    snapshot)
-    ;;
-    *)
-    # defaulting to version 
-    version=$artifact_type
-    ;;
-esac
-
-case $source_type in
-    list)
-    if [ -z $suffix ] ; then
-        suffix="####"
-    fi
-    # TODO Make this more secure, for God's sake!
-    for param in $(cat $downloadedfile | grep "^$suffix" ) ; do
-        save_runtime_comment $param
-    done
-    ;;
-    tarball)
-    ;;
-    maven)
-    [ ${#version} -eq 0 ] && version=$(xml_parse $artifact_type $downloadedfile )
-    artifact=$(xml_parse artifactId $downloadedfile )
-
-    # Definition of qualifiers for Maven has changed from the (wrong) assumption
-    # of having cfg-$suffix and src-$suffix for staticfiles and config tarballs
-    # to a more flexible management of qualifiers names with two different params (-m and -mc)
-    # The "suffixnotset" string is passed by default by the Puppi maven define
-    # YES, it's crap. 
-    if [[ x$suffix != "xsuffixnotset" ]] ; then
-        srcfile=$artifact-$version-$suffix.tar
-    else 
-        srcfile=$artifact-$version.tar
-    fi
-
-    if [[ x$config_suffix != "xsuffixnotset" ]] ; then
-        configfile=$artifact-$version-$config_suffix.tar
-    else
-        configfile=$artifact-$version.tar
-    fi
-
-    if [[ x$jar_suffix != "xsuffixnotset" ]] ; then
-        jarfile=$artifact-$version-$jar_suffix.jar
-    else
-        jarfile=$artifact-$version.jar
-    fi
-
-    if [[ x$war_suffix != "xsuffixnotset" ]] ; then
-        warfile=$artifact-$version-$war_suffix.war
-    else
-        warfile=$artifact-$version.war
-    fi
-
-    if [[ x$zip_suffix != "xsuffixnotset" ]] ; then
-        zipfile=$artifact-$version-$zip_suffix.zip
-    else
-        zipfile=$artifact-$version.zip
-    fi
-
-    # Store metadata
-    save_runtime_config "version=$version" 
-    save_runtime_config "artifact=$artifact"
-    # Store filenames
-    save_runtime_config "zipfile=$zipfile"
-    save_runtime_config "warfile=$warfile"
-    save_runtime_config "jarfile=$jarfile"
-    save_runtime_config "srcfile=$srcfile" 
-    save_runtime_config "configfile=$configfile" 
-    ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh
deleted file mode 100644
index 08b8c338a41..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-# git.sh - Made for Puppi
-
-# All variables are exported
-set -a 
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the git operations required by puppi::project::git"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback"
-    echo "-s <source> (Required) Git source repo to use"
-    echo "-d <destination> (Required) Directory where files are deployed"
-    echo "-u <user> (Optional) User that performs the deploy operations. Default root"
-    echo "-gs <git_subdir> (Optional) If only a specific subdir of the gitrepo has to be copied to the install destination"
-    echo "-t <tag> (Optional) Tag to deploy"
-    echo "-b <branch> (Optional) Branch to deploy"
-    echo "-c <commit> (Optional) Commit to deploy"
-    echo "-v <true|false> (Optional) If verbose"
-    echo "-k <true|false> (Optional) If .git dir is kept on deploy_root"
-    echo 
-    echo "Examples:"
-    echo "git.sh -a deploy -s $source -d $deploy_root -u $user -gs $git_subdir -t $tag -b $branch -c $commit -v $bool_verbose -k $bool_keep_gitdata"
-}
-
-verbose="true"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -s)
-      if [ $source ] ; then
-        source=$source
-      else
-        source=$2
-      fi
-      shift 2 ;;
-    -d)
-      if [ $deploy_root ] ; then
-        deploy_root=$deploy_root
-      else
-        deploy_root=$2
-      fi
-      shift 2 ;;
-    -u)
-      if [ $user ] ; then
-        deploy_user=$user
-      else
-        deploy_user=$2
-      fi
-      shift 2 ;;
-    -gs)
-      if [ $git_subdir ] ; then
-        git_subdir=$git_subdir
-      else
-        git_subdir=$2
-      fi
-      shift 2 ;;
-    -t)
-      if [ $git_tag ] ; then
-        git_tag=$git_tag
-      else
-        git_tag=$2
-      fi
-      shift 2 ;;
-    -b)
-      if [ $branch ] ; then
-        branch=$branch
-      else
-        branch=$2
-      fi
-      shift 2 ;;
-    -c)
-      if [ $commit ] ; then
-        commit=$commit
-      else
-        commit=$2
-      fi
-      shift 2 ;;
-    -v)
-      if [ $verbose ] ; then
-        verbose=$verbose
-      else
-        verbose=$2
-      fi
-      shift 2 ;;
-    -k)
-      if [ $keep_gitdata ] ; then
-        keep_gitdata=$keep_gitdata
-      else
-        keep_gitdata=$2
-      fi
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-if [ "x$verbose" == "xtrue" ] ; then
-  verbosity=""
-else
-  verbosity="--quiet"
-fi
-
-cd /
-
-gitsubdir=""
-gitdir=$deploy_root
-if [ "x$keep_gitdata" != "xtrue" ] ; then
-  if [ ! -d $archivedir/$project-git ] ; then
-    mkdir $archivedir/$project-git
-    chown -R $deploy_user:$deploy_user $archivedir/$project-git
-  fi
-  gitdir=$archivedir/$project-git/gitrepo
-fi
-if [ "x$git_subdir" != "xundefined" ] ; then
-  if [ ! -d $archivedir/$project-git ] ; then
-    mkdir $archivedir/$project-git
-    chown -R $deploy_user:$deploy_user $archivedir/$project-git
-  fi
-  gitdir=$archivedir/$project-git
-  gitsubdir="$git_subdir/"
-fi
-
-do_install () {
-  if [ -d $gitdir/.git ] ; then
-    cd $gitdir
-    git pull $verbosity origin $branch
-    git checkout $verbosity $branch
-    if [ "x$?" != "x0" ] ; then
-      git checkout -b $verbosity $branch
-    fi
-  else
-    git clone $verbosity --branch $branch --recursive $source $gitdir
-    cd $gitdir
-  fi
-
-  if [ "x$git_tag" != "xundefined" ] ; then
-    git checkout $verbosity $git_tag
-  fi
-
-  if [ "x$commit" != "xundefined" ] ; then
-    git checkout $verbosity $commit
-  fi
-
-  if [ "x$gitdir" == "x$archivedir/$project-git" ] ; then
-    rsync -a --exclude=".git" $gitdir/$gitsubdir $deploy_root/
-  fi
-
-}
-
-do_rollback () {
-
-  echo "Rollback not yet supported"
-}
-
-# Action!
-case "$action" in
-    install) export -f do_install ; su $deploy_user -c do_install ;;
-    rollback) do_rollback ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header
deleted file mode 100644
index 9b04824109b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header
+++ /dev/null
@@ -1,25 +0,0 @@
-configfile="/etc/puppi/puppi.conf"
-
-# Load general configurations
-if [ ! -f $configfile ] ; then
-    echo "Config file: $configfile not found"
-    exit 2
-else
-    . $configfile
-    . $scriptsdir/functions
-fi
-
-# Load project runtime configuration
-projectconfigfile="$workdir/$project/config"
-if [ ! -f $projectconfigfile ] ; then
-    echo "Project runtime config file: $projectconfigfile not found"
-    exit 2
-else
-    . $projectconfigfile
-fi
-
-# Activate debug 
-case "$debug" in
-    yes) set -x  ;;
-    full) set -xv  ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh
deleted file mode 100644
index 0af50314ffa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-# predeploy.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script prepares the contents of the predeploy directory"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-v <variable_name> (optional) Name of the variable that identifies the file to untar/unzip"
-    echo "                              By default is used $downloadedfile"
-    echo "-t <file_type> (optional) The type of file that is retrieved: zip|tarball"
-    echo "                          By default is used $source_type "
-    echo "-m <magicfix> (optional) The prefix (directory) you may not want to put in the deploy"
-    echo "                       Use this if the zip or tar contain a base dir (as often) and you want to copy"
-    echo "                       to the deploy dir only its contents and not the whole directory"
-    echo 
-    echo "Examples:"
-    echo "predeploy.sh "
-    echo "predeploy.sh -t zip"
-    echo "predeploy.sh -t zip -v myz"
-}
-
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -v)
-      downloadedfile="$(eval "echo \${$(echo ${2})}")"
-      shift 2 ;;
-    -t)
-      source_type=$2
-      shift 2 ;;
-    -m)
-      predeploy_dirprefix=$2
-      shift 2 ;;
-  esac
-done
-
-
-
-predeploy () {
-    cd $predeploydir
-    case "$source_type" in
-      tarball)
-        case "$debug" in
-          yes|full)
-            tar -zxvf $downloadedfile
-            check_retcode
-          ;;
-          *)
-            tar -zxf $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      zip)
-        case "$debug" in
-          yes|full)
-            unzip $downloadedfile
-            check_retcode
-          ;;
-          *)
-            unzip -qq $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      gz)
-        case "$debug" in
-          yes|full)
-            gzip -d $downloadedfile
-            check_retcode
-          ;;
-          *)
-            gzip -d -q $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      war)
-        cp $downloadedfile .
-        check_retcode
-        ;;
-    esac
-}
-
-predeploy
-
-# Updates predeploydir if a directory prefix exists
-if [[ x$predeploy_dirprefix != "x" ]] ; then
-   save_runtime_config "predeploydir=$predeploydir/$predeploy_dirprefix"
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh
deleted file mode 100644
index 91d28a6b4a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# predeploy_tar.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script unpacks (tar) file from the download dir (storedir) to the predeploydir"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Name of the variable that identifies the tar to predeploy"
-    echo 
-    echo "Examples:"
-    echo "predeploy_tar.sh tarfile"
-}
-
-# Check Arguments
-if [ $1 ] ; then
-    deployfilevar=$1
-    deployfile="$(eval "echo \${$(echo ${deployfilevar})}")"
-else
-    showhelp
-    exit 2 
-fi
-
-# Untar  file
-untar () {
-    cd $predeploydir
-#    file $deployfile | grep gzip 2>&1>/dev/null
-#    if [ $? == "0"] ; then
-        tar -zxf $deployfile
-#    else
-#        tar -xvf $deployfile
-#    fi
-}
-
-untar
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh
deleted file mode 100644
index 749462e9f97..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# report_mail.sh - Made for Puppi
-# This script sends a summary mail to the recipients defined in $1
-# Use a comma separated list for multiple emails
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Check arguments & eventually apply runtimeconfig overwrite
-recipients=$1
-[ $report_email ] && recipients=$report_email
-
-# Main functions
-mail_send () {
-    result=$(grep result $logdir/$project/$tag/summary | awk '{ print $NF }')
-    cat $logdir/$project/$tag/summary | mail -s "[puppi] $result $action of $project on $(hostname)" $recipients
-}
-
-mail_send
-
-if [ "$EXITCRIT" = "1" ] ; then
-    exit 2
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    exit 1
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh
deleted file mode 100644
index c68ed7d0439..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# report_mongodb.sh - Made for Puppi
-# e.g. somemongohost/dbname
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-
-# Show help
-showhelp () {
-    echo "This script reports deployments to a mongo DB."
-    echo "It has the following options:"
-    echo "-e <env_key> - Facter key to identify server environment (default: env)."
-    echo "If no facter key can be found, the fallback is ''environment''."
-    echo 
-    echo "Examples:"
-    echo "deploy_files.sh mongodb://someuser:hispassword@somehost/somedb"
-    echo "deploy_files.sh -e env mongodb://someuser:hispassword@somehost/somedb"
-}
-
-
-env_key="env"
-fallback_key="environment"
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -e)
-      env_key=$2
-      echo "env_key"
-      shift 2 ;;
-    *)
-      mongourl=$1
-      shift 1
-      ;;
-  esac
-done
-
-if [ "$EXITCRIT" = "1" ] ; then
-    proposed_exit=2
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    proposed_exit=1
-fi
-
-# check prerequisites
-mongo -version > /dev/null
-if [ $? -ne 0 ]; then
-        echo "mongo-client is not installed, aborting"
-        exit $proposed_exit
-fi
-
-fqdn=$(facter fqdn)
-
-environment=$(facter ${env_key} -p)
-
-if [ -z "${environment} ]
-then
-    environment=$(facter ${fallback_key} -p)
-fi
-
-
-# something like mongodb://someuser:hispassword@somehost/somedb
-
-
-if [[ ! $mongourl =~ "mongodb://" ]]; then
-  echo "WARNING: mongourl invalid! Please use a valid monurl!"
-  showhelp
-  exit $proposed_exit
-fi
-
-if [[ $mongourl =~ @ ]]; then
-  # ok we have to deal with passwords
-  # you HAVE to provide a password if you provide a user
-  mongodb=`echo $mongourl | sed 's/.*@//'`
-  mongouser=`echo $mongourl | sed 's/mongodb:\/\///' | sed 's/:.*//' `
-  mongopassword=`echo $mongourl | sed 's/mongodb:\/\///' | sed 's/[^:]*://' | sed 's/@.*//' `
-  mongoarguments="--username $mongouser --password $mongopassword"
-else
-  mongodb=`echo $mongourl | sed 's/mongodb:\/\///'` 	
-fi
-
-result=$(grep result $logdir/$project/$tag/summary | awk '{ print $NF }')
-summary=$(cat $logdir/$project/$tag/summary)
-
-mcmd="db.deployments.insert({ts:new Date(),result:\"${result}\",fqdn:\"${fqdn}\",project:\"${project}\",source:\"${source}\",tag:\"${tag}\",version:\"${version}\",artifact:\"${artifact}\",testmode:\"${testmode}\",warfile:\"${warfile}\",environment:\"${environment}\"}); quit(0)"
-
-
-mongo $mongoarguments $mongodb --eval "$mcmd"
-
-# Now do a reporting to enable "most-recent-versions on all servers"
-
-read -r -d '' mcmd <<'EOF'
-var map = function() {
-  project=this.project ;
-  emit( this.fqdn +":"+ this.project,  {project:this.project, fqdn:this.fqdn, ts:this.ts,version:this.version,environment:this.environment}  );
-};
-var reduce = function(k,vals) {
-  result = vals[0];
-  vals.forEach(function(val) { if (val.ts > result.ts) result=val } ) ;
-  return result;
-};
-db.deployments.mapReduce(
-  map,
-  reduce,
-  {out:{replace:"versions"}})
-EOF
-
-mongo $mongoarguments $mongodb --eval "$mcmd"
-
-exit $proposed_exit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh
deleted file mode 100644
index 1105d25d6c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# service.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to manage one or more services"
-    echo "It requires AT LEAST 2 arguments:"
-    echo "First argument (\$1 - required) is the script command (stop|start|restart|reload)"
-    echo "Second argument and following (\$2 - required) is the space separated list of sevices to manage"
-    echo
-    echo "Examples:"
-    echo "service.sh stop monit puppet"
-}
-
-# Check arguments
-if [ $1 ] ; then
-    servicecommand=$1
-else
-    showhelp
-    exit 2
-fi
-
-
-if [ $# -ge 2 ] ; then
-    shift
-    services=$@
-else
-    showhelp
-    exit 2
-fi
-
-# Manage service
-service () {
-    for serv in $services ; do
-        /etc/init.d/$serv $servicecommand
-    done
-}
-
-service
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh
deleted file mode 100644
index a2dd4bcf730..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/bin/bash
-# svn.sh - Made for Puppi
-
-# All variables are exported
-set -a 
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the svn operations required by puppi::project::svn"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback"
-    echo "-s <source> (Required) Subversion source repo to use"
-    echo "-d <destination> (Required) Directory where files are deployed"
-    echo "-u <user> (Optional) User that performs the deploy operations. Default root"
-    echo "-su <user> (Optional) Username for access to private svn repo"
-    echo "-sp <password> (Optional) Password for access to private svn repo"
-    echo "-gs <svn_subdir> (Optional) If only a specific subdir of the svnrepo has to be copied to the install destination"
-    echo "-t <tag> (Optional) Tag to deploy"
-    echo "-b <branch> (Optional) Branch to deploy"
-    echo "-c <commit> (Optional) Commit to deploy"
-    echo "-v <true|false> (Optional) If verbose"
-    echo "-k <true|false> (Optional) If .svn dir is kept on deploy_root"
-    echo "-e <true|false> (Optional) If use export instead of checkout for svn operations"
-    echo 
-    echo "Examples:"
-    echo "svn.sh -a deploy -s $source -d $deploy_root -u $user -gs $svn_subdir -t $tag -b $branch -c $commit -v $bool_verbose -k $bool_keep_svndata"
-}
-
-verbose="true"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -s)
-      if [ $source ] ; then
-        source=$source
-      else
-        source=$2
-      fi
-      shift 2 ;;
-    -d)
-      if [ $deploy_root ] ; then
-        deploy_root=$deploy_root
-      else
-        deploy_root=$2
-      fi
-      shift 2 ;;
-    -u)
-      if [ $user ] ; then
-        deploy_user=$user
-      else
-        deploy_user=$2
-      fi
-      shift 2 ;;
-    -gs)
-      if [ $svn_subdir ] ; then
-        svn_subdir=$svn_subdir
-      else
-        svn_subdir=$2
-      fi
-      shift 2 ;;
-    -su)
-      if [ $svn_user ] ; then
-        svn_user=$svn_user
-      else
-        svn_user=$2
-      fi
-      shift 2 ;;
-    -sp)
-      if [ $svn_password ] ; then
-        svn_password=$svn_password
-      else
-        svn_password=$2
-      fi
-      shift 2 ;;
-    -t)
-      if [ $svn_tag ] ; then
-        svn_tag=$svn_tag
-      else
-        svn_tag=$2
-      fi
-      shift 2 ;;
-    -b)
-      if [ $branch ] ; then
-        branch=$branch
-      else
-        branch=$2
-      fi
-      shift 2 ;;
-    -c)
-      if [ $commit ] ; then
-        commit=$commit
-      else
-        commit=$2
-      fi
-      shift 2 ;;
-    -v)
-      if [ $verbose ] ; then
-        verbose=$verbose
-      else
-        verbose=$2
-      fi
-      shift 2 ;;
-    -k)
-      if [ $keep_svndata ] ; then
-        keep_svndata=$keep_svndata
-      else
-        keep_svndata=$2
-      fi
-      shift 2 ;;
-    -e)
-      if [ $svn_export ] ; then
-        svn_export=$svn_export
-      else
-        svn_export=$2
-      fi
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-if [ "x$verbose" == "xtrue" ] ; then
-  verbosity=""
-else
-  verbosity="--quiet"
-fi
-
-cd /
-
-if [ "x$branch" == "xundefined" ] ; then
-  branch="trunk"
-fi
-
-real_source="$source/$branch"
-
-if [ "x$svn_tag" != "xundefined" ] ; then
-  real_source="$source/$svn_tag"
-fi
-
-if [ "x$svn_user" != "xundefined" ] && [ "x$svn_password" != "xundefined" ] ; then
-  svn_auth="--username=$svn_user --password=$svn_password"
-else
-  svn_auth=""
-fi
-
-svnsubdir=""
-svndir=$deploy_root
-
-
-do_install () {
-  if [ "x$keep_svndata" != "xtrue" ] ; then
-    if [ ! -d $archivedir/$project-svn ] ; then
-      mkdir $archivedir/$project-svn
-      chown -R $user:$user $archivedir/$project-svn
-    fi
-    svndir=$archivedir/$project-svn/svnrepo
-  fi
-  if [ "x$svn_subdir" != "xundefined" ] ; then
-    if [ ! -d $archivedir/$project-svn ] ; then
-      mkdir $archivedir/$project-svn
-      chown -R $user:$user $archivedir/$project-svn
-    fi
-    svndir=$archivedir/$project-svn
-    svnsubdir="$svn_subdir/"
-  fi
-
-  if [ -d $svndir/.svn ] ; then
-    cd $svndir
-    svn up $verbosity $svn_auth --non-interactive
-  else
-    svn co $verbosity $real_source $svndir $svn_auth --non-interactive
-    cd $svndir
-  fi
-
-  if [ "x$svndir" == "x$archivedir/$project-svn" ] ; then
-    rsync -a --exclude=".svn" $svndir/$svnsubdir $deploy_root/
-  fi
-}
-
-do_export () {
-  svn export $verbosity $svn_auth --force --non-interactive $real_source/$svn_subdir $deploy_root
-}
-
-do_rollback () {
-  echo "Rollback not yet supported"
-}
-
-# Action!
-case "$action" in
-    install) 
-      if [ "x$svn_export" == "xtrue" ] ; then
-        export -f do_export ; su $user -c do_export
-      else
-        export -f do_install ; su $user -c do_install
-      fi
-      ;;
-    rollback) do_rollback ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh
deleted file mode 100644
index 4e2fe6152d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-# wait.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to introduce pauses during the deploy workflow"
-    echo
-    echo "It has the following options:"
-    echo "-s <seconds> - The number of seconds to wait"
-    echo "-p <filename> - Wait until filename is present"
-    echo "-a <filename> - Wait until filename is absent"
-    echo "-f <pattern> <filename> - Wait until is found the pattern in the filename"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      sleep $2
-      exit 0
-      ;;
-    -p)
-      while true
-         do
-            [ -e $2 ] && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    -a)
-      while true
-         do
-            [ ! -e $2 ] && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    -f)
-      while true
-         do
-            grep $2 $3 && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh
deleted file mode 100644
index f9934619ea6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# yant.sh - Made for Puppi
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to call ant in a hybris-system"
-    echo "It requires AT LEAST 2 arguments:"
-    echo "First the \${hybris_parent_dir} where it can find a hybris-directory"
-    echo "Second argument: Everything you want to pass through to ant"
-    echo "The script assumes that hybris is located in \${hybris_parent_dir}/hybris"
-    echo
-    echo "Examples:"
-    echo "yant.sh /home/hybris clean all"
-}
-
-# Unfortunately, showhelp will never be called
-
-cd $1/hybris/bin/platform
-. ./setantenv.sh
-
-# somehow dirty ...
-shift
-
-if [ -d /opt/hybris/config ]; then
-	template=""
-else
-	template=-Dinput.template=develop 
-fi
-
-if [ $debug ] ; then
-    ant -Dinput.template=develop $* 
-else
-    ant $* > /dev/null
-fi
-
-handle_result
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh
deleted file mode 100644
index f649bad93c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# yum.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the yum operations required by puppi::project::yum"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback, remove"
-    echo "-n <rpm_name> (Required) Name of the package to handle"
-    echo "-v <rpm_version> (Optional) The version of the rpm to manage. Default: latest"
-    echo "-r <install_root> (Optional) The Instll root path. Default: /"
-    echo 
-    echo "Examples:"
-    echo "yum.sh -a deploy -n ${rpm} -r ${install_root} -v ${rpm_version}"
-}
-
-rpm_version="latest"
-install_root="/"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          remove)
-          action="remove"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -n)
-      rpm_name=$2
-      shift 2 ;;
-    -v)
-      rpm_version=$2
-      shift 2 ;;
-    -r)
-      install_root=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-
-do_install () {
-    if [ x$rpm_version == "xlatest" ] ; then
-        full_rpm_name=$rpm_name
-    else
-        full_rpm_name=$rpm_name-$rpm_version
-    fi
-
-    # Archives version of the rpm to update
-    oldversion=$(rpm -q $rpm_name --qf  "%{VERSION}-%{RELEASE}\n")
-    if [ "$?" = "0" ]; then
-        mkdir -p $archivedir/$project/$oldversion
-        if [ $archivedir/$project/latest ] ; then
-            rm -f $archivedir/$project/latest
-        fi
-        ln -sf $archivedir/$project/$oldversion $archivedir/$project/latest
-    fi
-
-    if [ x$install_root != "x/" ] ; then
-        yum install -y -q --installroot=$install_root $full_rpm_name
-    else
-        yum install -y -q $full_rpm_name
-    fi
-}
-
-do_rollback () {
-    yum downgrade -y -q $rpm_name-$rollbackversion
-}
-
-do_remove () {
-    yum remove -y -q $rpm_name
-}
-
-# Action!
-case "$action" in
-    install) do_install ;;
-    rollback) do_rollback ;;
-    remove) do_remove ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb
deleted file mode 100644
index 19869842d9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'facter'
-Facter.add("last_run") do
-  confine :kernel => [ 'Linux' , 'SunOS' , 'FreeBSD' , 'Darwin' ]
-  setcode do
-    Facter::Util::Resolution.exec('date')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb
deleted file mode 100755
index ccd3e3f22b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'facter'
-Facter.add("puppi_projects") do
-  confine :kernel => [ 'Linux' , 'SunOS' , 'FreeBSD' , 'Darwin' ]
-  setcode do
-    Facter::Util::Resolution.exec('ls `grep projectsdir  /etc/puppi/puppi.conf | sed \'s/projectsdir="\([^"]*\)"/\1/\'` | tr \'\n\' \',\' | sed \'s/,$//\'') if File.exists?("/etc/puppi/puppi.conf")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb
deleted file mode 100644
index 7a7ca232657..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'facter'
-Facter.add(:windows_common_appdata) do
-  confine :operatingsystem => :windows
-  if Facter.value(:osfamily) == "windows"
-    require 'win32/dir'
-  end
-  setcode do
-    Dir::COMMON_APPDATA
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb
deleted file mode 100644
index a2652cbae27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# any2bool.rb
-#
-# This define is heavily based on PuppetLabs' stdlib str2bool
-#
-module Puppet::Parser::Functions
-  newfunction(:any2bool, :type => :rvalue, :doc => <<-EOS
-This converts any input to a boolean. This attempt to convert strings that 
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-#    unless string.is_a?(String)
-#      raise(Puppet::ParseError, 'str2bool(): Requires either ' +
-#        'string to work with')
-#    end
-
-    # We consider all the yes, no, y, n and so on too ...
-    result = case string
-      #
-      # This is how undef looks like in Puppet ...
-      # We yield false in this case.
-      #
-      when false then false
-      when true then true
-      when /^$/, '' then false # Empty string will be false ...
-      when /^(1|t|y|true|yes)$/  then true
-      when /^(0|f|n|false|no)$/  then false
-      when /^(undef|undefined)$/ then false # This is not likely to happen ...
-      else
-        raise(Puppet::ParseError, 'any2bool(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb
deleted file mode 100644
index 0ebe275e196..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# bool2ensure.rb
-#
-# This define return present/absent accroding to the boolean value passed
-#
-module Puppet::Parser::Functions
-  newfunction(:bool2ensure, :type => :rvalue, :doc => <<-EOS
-This converts any input similar to a boolean to the stringpresent or absent
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "bool2ensure(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-    result = case string
-      when false then "absent"
-      when true then "present"
-      when /^$/, '' then "present" 
-      when /^(1|t|y|true|yes)$/  then "present"
-      when /^(0|f|n|false|no)$/  then "absent"
-      when /^(undef|undefined)$/ then "present"
-      else
-        raise(Puppet::ParseError, 'bool2ensure(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb
deleted file mode 100644
index 1aad859b3a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# This function is based on Ken Barber's get_scope_args
-# It has been slightly changed and renamed to avoid naming clash
-
-module Puppet::Parser::Functions
-  newfunction(:get_class_args, :type => :rvalue, :doc => <<-EOS
-This function will return all arguments passed to the current scope. This could
-be a class or defined resource.
-    EOS
-  ) do |arguments|
- 
-    if (arguments.size != 0) then
-      raise(Puppet::ParseError, "validate_resource(): Wrong number of arguments "+
-        "given #{arguments.size} for 0")
-    end
-
-    # Grab the current scope, turn it to a hash but do not be recursive 
-    # about it.
-    classhash = to_hash(recursive=false)
-
-    # Strip bits that do not matter for validation
-#    classhash.delete("name")
-#    classhash.delete("title")
-#    classhash.delete("caller_module_name")
-#    classhash.delete("module_name")
-
-    # Return munged classhash
-    classhash
-  end
-end
-
-# vim: set ts=2 sw=2 et :
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb
deleted file mode 100644
index 65a03560b52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# get_magicvar.rb
-#
-# This define return the value of the the provided var name
-#
-module Puppet::Parser::Functions
-  newfunction(:get_magicvar, :type => :rvalue, :doc => <<-EOS
-This returns the value of the input variable. For example if you input role
-it returns the value of $role'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "get_magicvar(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    my_var = arguments[0]
-    result = lookupvar("#{my_var}")
-    result = 'all' if ( result == :undefined || result == '' )
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb
deleted file mode 100644
index 1421b91f52f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:get_module_path, :type =>:rvalue, :doc => <<-EOT
-    Returns the absolute path of the specified module for the current
-    environment.
-
-    Example:
-      $module_path = get_module_path('stdlib')
-  EOT
-  ) do |args|
-    raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1
-    if module_path = Puppet::Module.find(args[0], compiler.environment.to_s)
-      module_path.path
-    else
-      raise(Puppet::ParseError, "Could not find module #{args[0]} in environment #{compiler.environment}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb
deleted file mode 100644
index 33a2f8e7d76..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# nslookup.rb
-#
-# This fuction looks up the ip address of a hostname.
-#
-# Params:
-#  * Hostname: (string) The hostname to lookup
-#  * Type: (string) The DNS type to lookup. Optional. Default: 'AAAA'
-#
-# Returns: an array with the ip addresses that belong to this hostname
-#
-# Dolf Schimmel - Freeaqingme <dolf@dolfschimmel.nl>
-# 
-module Puppet::Parser::Functions
-  newfunction(:nslookup, :type => :rvalue, :doc => <<-EOS
-Lookup a hostname and return its ip addresses
-    EOS
-  ) do |vals|
-    hostname, type = vals
-    raise(ArgumentError, 'Must specify a hostname') unless hostname
-    type = 'AAAA' unless type
-    
-    require 'ipaddr'
-    
-    if (ip = IPAddr.new(hostname) rescue nil)
-      if (ip.ipv6? and type == 'AAAA') or (ip.ipv4? and type != 'AAAA')
-        return hostname
-      else
-        return []
-      end
-    end
-
-    typeConst = Resolv::DNS::Resource::IN.const_get "#{type.upcase}"
-    out = []
-    
-    Resolv::DNS.open do |dns|
-      dns.getresources(hostname, typeConst).collect {|r| 
-        out << IPAddr::new_ntoh(r.address.address).to_s
-      }
-    end
-
-    return out
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb
deleted file mode 100644
index 2acf87ca487..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# options_lookup.rb
-#
-# This fuction takes two arguments (option, and default value) and looks for the given
-# option key in the calling modules options hash, and returns the value.
-# The function is intended to be used in templates.
-# If no option is found in the options hash, default value (second argument), is returned.
-#
-# Example usages:
-#
-# Default value of no
-#   <%= scope.function_options_lookup(['PasswordAuthentication', 'no']) %>
-# Empty default value
-#   <%= scope.function_options_lookup(['PasswordAuthentication', '']) %>
-# Fact or param based default value
-#   <%= scope.function_options_lookup(['Listen', ipaddress]) %>
-# Lookup inside a custom hash - in this case client_options
-#   <%= scope.function_options_lookup(['PasswordAuthentication', 'no', 'client_options']) %>
-#
-#
-# Michal Nowak <mailto:michal@casanowak.com>
-# 
-module Puppet::Parser::Functions
-  newfunction(:options_lookup, :type => :rvalue, :doc => <<-EOS
-This fuction takes two arguments (option, and default value) and looks for the given
-option key in the calling modules options hash, and returns the value.
-The function is intended to be used in templates.
-If no option is found in the options hash, default value (second argument), is returned.
-
-Default value of no
-  <%= scope.function_options_lookup(['PasswordAuthentication', 'no']) %>
-Empty default value
-  <%= scope.function_options_lookup(['PasswordAuthentication', '']) %>
-Fact or param based default value
-   <%= scope.function_options_lookup(['Listen', ipaddress]) %>
-Lookup inside a custom hash - in this case client_options
-   <%= scope.function_options_lookup(['PasswordAuthentication', 'no', 'client_options']) %>
-
-EOS
-  ) do |args|
-
-    raise ArgumentError, ("options_lookup(): wrong number of arguments (#{args.length}; must be 2 or 3)") if (args.length != 2 and args.length != 3)
-
-    value = ''
-    option_name = args[0]
-    default_val = args[1]
-    hash_name = args[2]
-    module_name = parent_module_name
-
-    hash_name = "options" if (hash_name == :undefined || hash_name == '' || hash_name == nil)
-    value = lookupvar("#{module_name}::#{hash_name}")["#{option_name}"] if (lookupvar("#{module_name}::#{hash_name}").size > 0)
-    value = "#{default_val}" if (value == :undefined || value == '' || value == nil)
-
-    return value
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb
deleted file mode 100644
index 53aad84d768..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# params_lookup.rb
-#
-# This function lookups for a variable value in various locations
-# following this order (first match is returned)
-# - Hiera backend (if present) for modulename_varname
-# - Hiera backend (if present) for varname (if second argument is 'global')
-# - Top Scope Variable ::modulename_varname
-# - Top Scope Variable ::varname (if second argument is 'global')
-# - Module default: ::modulename::params::varname
-#
-# It's based on a suggestion of Dan Bode on how to better manage
-# Example42 NextGen modules params lookups.
-# Major help has been given by  Brice Figureau, Peter Meier
-# and Ohad Levy during the Fosdem 2012 days (thanks guys)
-#
-# Tested and adapted to Puppet 2.6.x and later
-#
-# Alessandro Franceschi al@lab42.it
-#
-module Puppet::Parser::Functions
-  newfunction(:params_lookup, :type => :rvalue, :doc => <<-EOS
-This fuction looks for the given variable name in a set of different sources:
-- Hiera, if available ('modulename_varname')
-- Hiera, if available (if second argument is 'global')
-- ::modulename_varname
-- ::varname (if second argument is 'global')
-- ::modulename::params::varname
-If no value is found in the defined sources, it returns an empty string ('')
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "params_lookup(): Define at least the variable name " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = ''
-    var_name = arguments[0]
-    module_name = parent_module_name
-
-    # Hiera Lookup
-    if Puppet::Parser::Functions.function('hiera')
-      value = function_hiera(["#{module_name}_#{var_name}", ''])
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-
-      value = function_hiera(["#{var_name}", '']) if arguments[1] == 'global'
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # Top Scope Variable Lookup (::modulename_varname)
-    value = lookupvar("::#{module_name}_#{var_name}")
-    return value if (not value.nil?) && (value != :undefined) && (value != '')
-
-    # Look up ::varname (only if second argument is 'global')
-    if arguments[1] == 'global'
-      value = lookupvar("::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # needed for the next two lookups
-    classname = self.resource.name.downcase
-    loaded_classes = catalog.classes
-
-    # self::params class lookup for default value
-    if loaded_classes.include?("#{classname}::params")
-      value = lookupvar("::#{classname}::params::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # Params class lookup for default value
-    if loaded_classes.include?("#{module_name}::params")
-      value = lookupvar("::#{module_name}::params::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    return ''
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb
deleted file mode 100644
index 5af9953f502..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'uri'
-
-Puppet::Parser::Functions::newfunction(:url_parse, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Returns information about an url
-    
-    This function expects two arguments, an URL and the part of the url you want to retrieve. 
-
-    Example:
-    $source_filename = url_parse($source_url,path)
-
-    Given an url like: https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0
-    You obtain the following results according to the second argument:
-    scheme   : https
-    userinfo : my_user:my_pass
-    user     : my_user
-    password : my_pass
-    host     : www.example.com
-    port     : 8080
-    path     : /path/to/file.php
-    query    : id=1&ret=0
-    filename : file.php
-    filetype : php
-    filedir  : file
-   
- 
-  ENDHEREDOC
-  raise ArgumentError, ("url_parse(): wrong number of arguments (#{args.length}; must be 2)") if args.length != 2
-  url=URI.parse args[0]
-  case args[1]
-    when 'scheme' then url.scheme
-    when 'userinfo' then url.userinfo
-    when 'user' then url.user
-    when 'password' then url.password
-    when 'host' then url.host
-    when 'port' then url.port
-    when 'path' then url.path
-    when 'query' then url.query
-    when 'filename' then File.basename url.path
-    when 'filetype' then File.extname url.path
-    when 'filedir' then (File.basename url.path).chomp(File.extname(url.path))
-    else url
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp
deleted file mode 100644
index f652d093657..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Define puppi::check
-#
-# This define creates a file with a check command that can be used locally.
-# It uses Nagios plugins for all checks so that $command is just the
-# plugin name with its arguments
-#
-# == Usage
-# Basic Usage:
-# puppi::check { "checkname":
-#   command => "check_tcp -H localhost -p 80"
-# }
-#
-# :include:../README.check
-#
-define puppi::check (
-  $command,
-  $base_dir = '',
-  $hostwide = 'no',
-  $priority = '50',
-  $project  = 'default',
-  $enable   = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-  $bool_hostwide = any2bool($hostwide)
-
-  $real_base_dir = $base_dir ? {
-    ''      => $puppi::params::checkpluginsdir,
-    default => $base_dir,
-  }
-
-  $path = $bool_hostwide ? {
-    true  => "${puppi::params::checksdir}/${priority}-${name}" ,
-    false => "${puppi::params::projectsdir}/${project}/check/${priority}-${name}",
-  }
-
-  file { "Puppi_check_${project}_${priority}_${name}":
-    ensure  => $ensure,
-    path    => $path,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "${real_base_dir}/${command}\n",
-    tag     => 'puppi_check',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp
deleted file mode 100644
index c827fd77f2d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Define puppi::deploy
-#
-# This define creates a file with a deploy command that can be used locally.
-#
-# == Usage:
-# puppi::configure { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-# :include:../README.deploy
-#
-define puppi::configure (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/configure/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_deploy',
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp
deleted file mode 100644
index 828b86d7835..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Class puppi::dependencies
-#
-# This class provides commands and tools needed for full Puppi
-# functionality. Since you might already have these package
-# resources in your modules, to avoid conflicts you may decide
-# to include the needed packages somewhere else and avoid the
-# direct inclusion of puppi::dependencies with the parameter:
-#   install_dependencies => false
-#
-class puppi::dependencies {
-
-  require puppi::params
-
-  if ! defined(Package['curl']) {
-    package { 'curl' : ensure => present }
-  }
-
-  if ! defined(Package['wget']) {
-    package { 'wget' : ensure => present }
-  }
-
-  if ! defined(Package['unzip']) {
-    package { 'unzip' : ensure => present }
-  }
-
-  if ! defined(Package['rsync']) {
-    package { 'rsync' : ensure => present }
-  }
-
-  if ! defined(Package[$puppi::params::package_nagiosplugins]) {
-    package { $puppi::params::package_nagiosplugins : ensure => present }
-  }
-
-  if ! defined(Package[$puppi::params::package_mail]) {
-    package { $puppi::params::package_mail : ensure => present }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp
deleted file mode 100644
index b2633ccecd7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Define puppi::deploy
-#
-# This define creates a file with a deploy command that can be used locally.
-#
-# == Usage:
-# puppi::deploy { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-# :include:../README.deploy
-#
-define puppi::deploy (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/deploy/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_deploy',
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp
deleted file mode 100644
index 5b81e97e29a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp
+++ /dev/null
@@ -1,208 +0,0 @@
-# Class puppi::extras
-#
-# Default extras class with predefined puppi
-# check, log , info content.
-# You can provide a custom extra class to use instead of this
-# with a parameter like:
-#   extra_class=> 'example42::puppi::extras',
-#
-class puppi::extras {
-
-  # Default Checks
-
-  puppi::check { 'NTP_Sync':
-    command  => "check_ntp -H ${puppi::params::ntp}" ,
-    priority => '99' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Disks_Usage':
-    command  => 'check_disk -w 20% -c 10% -L -X tmpfs' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'System_Load':
-    command  => 'check_load -w 15,10,5 -c 30,25,20' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Zombie_Processes':
-    command  => 'check_procs -w 5 -c 10 -s Z' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Local_Mail_Queue':
-    command  => 'check_mailq -w 2 -c 5' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Connected_Users':
-    command  => 'check_users -w 5 -c 10' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'DNS_Resolution':
-    command  => 'check_dns -H example.com' ,
-    priority => '15' ,
-    hostwide => 'yes' ,
-  }
-
-
-  # Info Pages
-  $network_run = $::operatingsystem ? {
-    Solaris => [ 'ifconfig -a' , 'netstat -nr' , 'cat /etc/resolv.conf' , 'arp -an' , 'netstat -na' ],
-    default => [ 'ifconfig' , 'route -n' , 'cat /etc/resolv.conf' , 'arp -an' , 'netstat -natup | grep LISTEN' ],
-  }
-
-  puppi::info { 'network':
-    description => 'Network settings and stats' ,
-    run         => $network_run,
-  }
-
-  $users_run = $::operatingsystem ? {
-    Solaris => [ 'who' , 'last' ],
-    default => [ 'who' , 'last' , 'LANG=C lastlog | grep -v \'Never logged in\'' ],
-  }
-
-  puppi::info { 'users':
-    description => 'Users and logins information' ,
-    run         => $users_run,
-  }
-
-  $perf_run = $::operatingsystem ? {
-    Solaris => [ 'uptime' , 'vmstat 1 5' ],
-    default => [ 'uptime' , 'free' , 'vmstat 1 5' ],
-  }
-
-  puppi::info { 'perf':
-    description => 'System performances and resources utilization' ,
-    run         => $perf_run,
-  }
-
-  $disks_run = $::operatingsystem ? {
-    Solaris => [ 'df -h' , 'mount' ],
-    default => [ 'df -h' , 'mount' , 'blkid' , 'fdisk -l' ],
-  }
-
-  puppi::info { 'disks':
-    description => 'Disks and filesystem information' ,
-    run         => $disks_run,
-  }
-
-  $hardware_run = $::operatingsystem ? {
-    Solaris => [ 'find /devices/' ],
-    default => [ 'lspci' , 'cat /proc/cpuinfo' ],
-  }
-
-  puppi::info { 'hardware':
-    description => 'Hardware information' ,
-    run         => $hardware_run,
-  }
-
-  $packages_run = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => [ 'yum repolist' , 'rpm -qa' ] ,
-    /(?i:Debian|Ubuntu|Mint)/                    => [ 'apt-config dump' , 'apt-cache stats' , 'apt-key list' , 'dpkg -l' ],
-    /(Solaris)/                                  => [ 'pkginfo' ],
-    /(Archlinux)/                                => [ 'pacman -Qet' ],
-    default                                      => [ 'echo' ],
-  }
-
-  puppi::info { 'packages':
-    description => 'Packages information' ,
-    run         => $packages_run,
-  }
-
-  puppi::info::module { 'puppi':
-    configfile  => ["${puppi::params::basedir}/puppi.conf"],
-    configdir   => [$puppi::params::basedir],
-    datadir     => [$puppi::params::archivedir],
-    logdir      => [$puppi::params::logdir],
-    description => 'What Puppet knows about puppi' ,
-    verbose     => 'yes',
-#   run         => "ls -lR ${puppi::params::logdir}/puppi-data/",
-  }
-
-  ### Default Logs
-  case $::operatingsystem {
-
-    Debian,Ubuntu: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/syslog'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/user.log','/var/log/auth.log'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail.log'],
-      }
-    }
-
-    RedHat,CentOS,Scientific,Amazon,Linux: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/secure'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/maillog'],
-      }
-    }
-
-    SLES,OpenSuSE: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail'],
-      }
-      puppi::log { 'zypper':
-        description => 'Zypper messages',
-        log         => ['/var/log/zypper.log'],
-      }
-    }
-
-    Solaris: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/adm/messages'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/authlog'],
-      }
-    }
-
-    Archlinux: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages.log','/var/log/syslog.log'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/user.log','/var/log/auth.log'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail.log'],
-      }
-    }
-
-    default: { }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp
deleted file mode 100644
index d87c198d583..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Define puppi::helper
-#
-# The Puppi 2.0 define that creates an helper file that contains
-# the commands to execute, for the different puppi actions, using
-# the variables present in the datafile
-#
-# == Usage
-# Basic Usage:
-# puppi::helper { "myhelper":
-#   template => 'myproject/puppi/helpers/myhelper.erb',
-# }
-#
-define puppi::helper (
-  $template,
-  $ensure = 'present' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "puppi_helper_${name}":
-    ensure  => $ensure,
-    path    => "${puppi::params::helpersdir}/${name}.yml",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($template),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp
deleted file mode 100644
index b8cd2f4805a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Class puppi::helpers
-#
-# A class that defines all the default helpers used by Example42
-#  modules
-#
-# == Usage
-# Automatically included by Puppi
-#
-class puppi::helpers {
-
-  # Standard helper for Example42 modules
-  puppi::helper { 'standard':
-    template => 'puppi/helpers/standard.yml.erb',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp
deleted file mode 100644
index 7ae750d7c18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Define puppi::info
-#
-# This define creates a basic info file that simply contains a set
-# of commands that show infos about custom topics.
-# To be used by the puppi info command.
-# By default it builds the info script based on the minimal puppi/info.erb
-# template but you can choose a custom template.
-# Other info defines are used to gather and create puppi info scripts with
-# different arguments and contents.
-# Check puppi/manifests/info/ for alternative puppi::info::  plugins
-#
-# == Usage:
-# puppi::info { "network":
-#   description => "Network status and information" ,
-#   run  => [ "ifconfig" , "route -n" ],
-# }
-#
-# :include:../README.info
-#
-define puppi::info (
-  $description  = '',
-  $templatefile = 'puppi/info.erb',
-  $run          = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_run = is_array($run) ? {
-    false     => $run ? {
-      ''      => [],
-      default => split($run, ','),
-    },
-    default   => $run,
-  }
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp
deleted file mode 100644
index 9d9d9926b4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Define puppi::info::instance
-#
-# This is a puppi info plugin specific for the tomcat::instance define
-#
-define puppi::info::instance (
-  $servicename  = '',
-  $processname  = '',
-  $configdir    = '',
-  $bindir       = '',
-  $pidfile      = '',
-  $datadir      = '',
-  $logdir       = '',
-  $httpport     = '',
-  $controlport  = '',
-  $ajpport      = '',
-  $description  = '',
-  $run          = '',
-  $verbose      = 'no',
-  $templatefile = 'puppi/info/instance.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp
deleted file mode 100644
index df6f3c63cb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Define puppi::info::module
-#
-# This is a puppi info plugin that provides automatic info to modules
-# It uses a default template puppi/info/module.erb that can be changed
-# and adapted
-#
-# == Usage
-# (Sample from Example42 apache module where there's wide use of
-# qualified variables, note that you can provide direct values to it
-# without using variables):
-#
-#  puppi::info::module { "apache":
-#    packagename => "${apache::params::packagename}",
-#    servicename => "${apache::params::servicename}",
-#    processname => "${apache::params::processname}",
-#    configfile  => "${apache::params::configfile}",
-#    configdir   => "${apache::params::configdir}",
-#    pidfile     => "${apache::params::pidfile}",
-#    datadir     => "${apache::params::datadir}",
-#    logfile     => "${apache::params::logfile}",
-#    logdir      => "${apache::params::logdir}",
-#    protocol    => "${apache::params::protocol}",
-#    port        => "${apache::params::port}",
-#    description => "What Puppet knows about apache" ,
-#    run         => "httpd -V",
-#  }
-#
-define puppi::info::module (
-  $packagename    = '',
-  $servicename    = '',
-  $processname    = '',
-  $configfile     = '',
-  $configdir      = '',
-  $initconfigfile = '',
-  $pidfile        = '',
-  $datadir        = '',
-  $logfile        = '',
-  $logdir         = '',
-  $protocol       = '',
-  $port           = '',
-  $description    = '',
-  $run            = '',
-  $verbose        = 'no',
-  $templatefile   = 'puppi/info/module.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp
deleted file mode 100644
index 5cf9950b465..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Define puppi::info::readme
-#
-# This is a puppi info plugin that provides a Readme text which can be
-# used to show local info on the managed server and eventually run custom commands.
-#
-#  puppi::info::readme { "myapp":
-#    description => "Guidelines for myapp setup",
-#    readme => "myapp/readme.txt" ,
-#    run     => "myapp -V",
-#  }
-#
-define puppi::info::readme (
-  $description       = '',
-  $readme            = '',
-  $autoreadme        = 'no',
-  $run               = '',
-  $source_module     = 'undefined',
-  $templatefile      = 'puppi/info/readme.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  $bool_autoreadme = any2bool($autoreadme)
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-  $readme_source = $readme ? {
-    ''      => 'puppet:///modules/puppi/info/readme/readme',
-    default => $readme,
-  }
-
-  file { "${puppi::params::readmedir}/${name}":
-    ensure  => present,
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_readmedir'],
-    source  => $readme_source,
-    tag     => 'puppi_info',
-  }
-
-  if $bool_autoreadme == true {
-  file { "${puppi::params::readmedir}/${name}-custom":
-    ensure  => present,
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_readmedir'],
-    source  => [
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-${::hostname}" ,
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-${::role}" ,
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-default" ,
-      "puppet:///modules/puppi/info/readme/readme-${::hostname}" ,
-      "puppet:///modules/puppi/info/readme/readme-${::role}" ,
-      'puppet:///modules/puppi/info/readme/readme-default'
-    ],
-    tag     => 'puppi_info',
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp
deleted file mode 100644
index be2043f740a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Class: puppi
-#
-# This is Puppi NextGen
-# Includes both first generation of Puppi and the
-# NextGen developments and modules integration
-#
-# == Parameters
-#
-# [*version*]
-#   Define the Puppi version to use:
-#   1 - First generation of Puppi, compatible with old modules
-#   2 - NextGen version. Intended to work with NextGen modules
-#   Default: 1 , for the moment
-#
-# [*install_dependencies*]
-#   Set to false if you want to manage the sofware puppi needs
-#   with your local modules.
-#
-# [*template*]
-#   Sets the path to a custom template for /etc/puppi/puppi.conf
-#
-# [*helpers_class*]
-#   Name of the class there default helpers are defined
-#   (Used on in Puppi 2)
-#
-# [*logs_retention_days*]
-#   Number of days for retenton of puppi logs. Default 30
-#   This option creates a script in /etc/cron.daily that purges
-#   all the old logs. Set to false or to 0 to remove the purge script.
-#
-# [*extra_class*]
-#   Name of the class where extra puppi resources are added
-#   Here, by default are placed general system commands for
-#   puppi info, check and log
-#
-class puppi (
-  $version              = params_lookup( 'version' ),
-  $install_dependencies = params_lookup( 'install_dependencies' ),
-  $template             = params_lookup( 'template' ),
-  $helpers_class        = params_lookup( 'helpers_class' ),
-  $logs_retention_days  = params_lookup( 'logs_retention_days' ),
-  $extra_class          = params_lookup( 'extra_class' )
-  ) inherits puppi::params {
-
-  $bool_install_dependencies=any2bool($install_dependencies)
-
-  # Manage Version
-  $puppi_ensure = $puppi::version ? {
-    1 => '/usr/sbin/puppi.one',
-    2 => '/usr/local/bin/puppi',
-  }
-
-  file { 'puppi.link':
-    ensure => $puppi_ensure,
-    path   => '/usr/sbin/puppi',
-  }
-
-  # Puppi version one is always installed
-  include puppi::one
-
-  # Puppi 2 gem (still experimental) is installed only when forced
-  if $puppi::version == '2' {
-    include puppi::two
-  }
-
-  # Create Puppi common dirs and scripts
-  include puppi::skel
-
-  # Include extra resources
-  include $puppi::extra_class
-
-  # Include some packages needed by Puppi
-  if $bool_install_dependencies {
-    include puppi::dependencies
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp
deleted file mode 100644
index 0fe66afe5d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Define puppi::initialize
-#
-# This define creates a file with a initialize command that can be used locally.
-#
-# Usage:
-# puppi::initialize { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::initialize (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/initialize/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_initialize',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp
deleted file mode 100644
index 6338e8adfa5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp
+++ /dev/null
@@ -1,83 +0,0 @@
-# = Define: puppi::install_packages
-#
-# This define installs a list of packages without manging them as Puppet
-# resources. It's useful when you need a set of packages installed,
-# for example as prerequisites to build code from source, but you don't want
-# to create Puppet package resources for them (since they may conflict with
-# existing classes that provide the same packages.
-#
-# == Parameters:
-#
-# [*packages*]
-#   String. Required.
-#   A space separated list of of the packages to install
-#
-# [*template*]
-#   String. Optional. Default: 'puppi/install_packages.erb'
-#   The template to use to generate the script that installs the packages
-#
-# [*scrips_dir*]
-#   String. Optional. Default: '/root/puppi_install_packages'
-#    The directory where you place the scripts created by the define.
-#
-# [*autorun*]
-#   Boolean. Default: true.
-#   Define if to automatically execute the script when Puppet runs.
-#
-# [*refreshonly*]
-#   Boolean. Optional. Default: true
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*timeout*]
-#   String. Optional. Default: '600'
-#   Exec timeout in seconds.
-#
-# [*ensure*]
-#   Define if the runscript script and eventual cron job
-#   must be present or absent. Default: present.
-#
-# == Examples
-#
-# - Minimal setup
-# puppi::install_packages { 'build_tools':
-#   source           => 'build-essential vim git-core curl bison',
-# }
-#
-define puppi::install_packages (
-  $packages,
-  $template         = 'puppi/install_packages.erb',
-  $scripts_dir      = '/root/puppi_install_packages',
-  $autorun          = true,
-  $refreshonly      = true,
-  $timeout          = '600',
-  $ensure           = 'present' ) {
-
-  if ! defined(File[$scripts_dir]) {
-    file { $scripts_dir:
-      ensure => directory,
-      mode   => '0755',
-      owner  => 'root',
-      group  => 'root',
-    }
-  }
-
-  file { "install_packages_${name}":
-    ensure  => $ensure,
-    path    => "${scripts_dir}/${name}",
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
-    content => template($template),
-  }
-
-  if $autorun == true {
-    exec { "install_packages_${name}":
-      command     => "${scripts_dir}/${name}",
-      refreshonly => $refreshonly,
-      subscribe   => File["install_packages_${name}"],
-      timeout     => $timeout,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp
deleted file mode 100644
index 8cfe08ab12b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# Define puppi::log
-#
-# This define creates a basic log file that simply contains
-# the list of logs to show when issuing the puppi log command.
-#
-# == Usage:
-# puppi::log { "system":
-#   description => "General System Logs" ,
-#   log  => [ "/var/log/syslog" , "/var/log/messages" ],
-# }
-#
-# :include:../README.log
-#
-define puppi::log (
-  $log,
-  $description = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_log = is_array($log) ? {
-    false     => split($log, ','),
-    default   => $log,
-  }
-
-  file { "${puppi::params::logsdir}/${name}":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template('puppi/log.erb'),
-    tag     => 'puppi_log',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp
deleted file mode 100644
index a15d0ca259c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-# = Class puppi::mcollective::client
-#
-# This class installs the mc puppi command for mcollective clients
-# (Note that in mcollective terminology a client is an host from
-# where you can manage mcollective servers)
-#
-# The class installs also the puppideploy and puppicheck commands
-# that are simple wrappers about mco puppi that correctly trap
-# remote errors and can be used in automatic procedures or
-# to give limited access (typically via sudo) to mc puppi commands
-#
-# They can be integrated, for example, in Jenkins as remote ssh
-# commands to manage deployments or tests
-#
-# == Usage:
-# include puppi::mcollective::client
-#
-# :include:../README.mcollective
-#
-class puppi::mcollective::client {
-
-  require puppi::params
-  require puppi::mcollective::server
-
-# OLD STYLE mc-puppi command
-  file { '/usr/local/bin/mc-puppi':
-    ensure  => 'present',
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/mc-puppi',
-    require => Class['mcollective'],
-    }
-
-# mco application TODO
-#  file { "${puppi::params::mcollective}/application/puppi.rb":
-#    ensure  => 'present',
-#    mode    => '0644',
-#    owner   => 'root',
-#    group   => 'root',
-#    source  => 'puppet:///modules/puppi/mcollective/mcpuppi.rb',
-#  }
-
-  file { '/usr/bin/puppicheck':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::mcollective_user,
-    group   => $puppi::params::mcollective_group,
-    source  => 'puppet:///modules/puppi/mcollective/puppicheck',
-  }
-
-  file { '/usr/bin/puppideploy':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::mcollective_user,
-    group   => $puppi::params::mcollective_group,
-    source  => 'puppet:///modules/puppi/mcollective/puppideploy',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp
deleted file mode 100644
index 40def160a1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# = Class puppi::mcollective::server
-#
-# This class installs the puppi agent on mcollective servers
-# (Note that in mcollective terminology a server is an host
-# managed by a mcollective client)
-#
-# == Usage:
-# include puppi::mcollective::server
-#
-# :include:../README.mcollective
-#
-class puppi::mcollective::server {
-
-  require puppi::params
-
-  file { "${puppi::params::mcollective}/agent/puppi.ddl":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/puppi.ddl',
-    require => Class['mcollective'],
-  }
-
-  file { "${puppi::params::mcollective}/agent/puppi.rb":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/puppi.rb',
-    require => Class['mcollective'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp
deleted file mode 100644
index a7b7ed6d086..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp
+++ /dev/null
@@ -1,169 +0,0 @@
-# Define: puppi::netinstall
-#
-# This defines simplifies the installation of a file
-# downloaded from the web. It provides arguments to manage
-# different kind of downloads and custom commands.
-# It's used, among the others, by NextGen modules of webapps
-# when the argument install is set to => source
-#
-# == Variables
-#
-# [*url*]
-#   The Url of the file to retrieve. Required.
-#   Example: http://www.example42.com/file.tar.gz
-#
-# [*destination_dir*]
-#   The final destination where to unpack or copy what has been
-#   downloaded. Required.
-#   Example: /var/www/html
-#
-# [*retrieve_args*]
-#   A string of arguments to pass to wget.
-#
-# [*extracted_dir*]
-#   The name of a directory or file created after the extraction
-#   Needed only if its name is different from the downloaded file name
-#   (without suffixes). Optional.
-#
-# [*owner*]
-#   The user owner of the directory / file created. Default: root
-#
-# [*group*]
-#   The group owner of the directory / file created. Default: root
-#
-# [*timeout*]
-#   The timeout in seconds for each command executed
-#
-# [*work_dir*]
-#   A temporary work dir where file is downloaded. Default: /var/tmp
-#
-# [*path*]
-#  Define the path for the exec commands.
-#  Default: /bin:/sbin:/usr/bin:/usr/sbin
-#
-# [*exec_env*]
-#   Define any additional environment variables to be used with the
-#   exec commands. Note that if you use this to set PATH, it will
-#   override the path attribute. Multiple environment variables
-#   should be specified as an array.
-#
-# [*extract_command*]
-#   The command used to extract the downloaded file.
-#   By default is autocalculated accoring to the file extension
-#   Set 'rsync' if the file has to be placed in the destination_dir
-#   as is (for example for war files)
-#
-# [*preextract_command*]
-#   An optional custom command to run before extracting the file.
-#
-# [*postextract_command*]
-#   An optional custom command to run after having extracted the file.
-#
-define puppi::netinstall (
-  $url,
-  $destination_dir,
-  $extracted_dir       = '',
-  $retrieve_command    = 'wget',
-  $retrieve_args       = '',
-  $owner               = 'root',
-  $group               = 'root',
-  $timeout             = '3600',
-  $work_dir            = '/var/tmp',
-  $path                = '/bin:/sbin:/usr/bin:/usr/sbin',
-  $extract_command     = '',
-  $preextract_command  = '',
-  $postextract_command = '',
-  $postextract_cwd     = '',
-  $exec_env            = []
-  ) {
-
-  $source_filename = url_parse($url,'filename')
-  $source_filetype = url_parse($url,'filetype')
-  $source_dirname = url_parse($url,'filedir')
-
-  $real_extract_command = $extract_command ? {
-    ''      => $source_filetype ? {
-      '.tgz'     => 'tar -zxf',
-      '.gz'      => 'tar -zxf',
-      '.bz2'     => 'tar -jxf',
-      '.tar'     => 'tar -xf',
-      '.zip'     => 'unzip',
-      default    => 'tar -zxf',
-    },
-    default => $extract_command,
-  }
-
-  $extract_command_second_arg = $real_extract_command ? {
-    /^cp.*/    => '.',
-    /^rsync.*/ => '.',
-    default    => '',
-  }
-
-  $real_extracted_dir = $extracted_dir ? {
-    ''      => $real_extract_command ? {
-      /(^cp.*|^rsync.*)/         => $source_filename,
-      /(^tar -zxf*|^tar -jxf*)/  => regsubst($source_dirname,'.tar',''),
-      default                    => $source_dirname,
-    },
-    default => $extracted_dir,
-  }
-
-  $real_postextract_cwd = $postextract_cwd ? {
-    ''      => "${destination_dir}/${real_extracted_dir}",
-    default => $postextract_cwd,
-  }
-
-  if $preextract_command {
-    exec { "PreExtract ${source_filename} in ${destination_dir}":
-      command     => $preextract_command,
-      subscribe   => Exec["Retrieve ${url} in ${work_dir}"],
-      refreshonly => true,
-      path        => $path,
-      environment => $exec_env,
-      timeout     => $timeout,
-    }
-  }
-
-  exec { "Retrieve ${url} in ${work_dir}":
-    cwd         => $work_dir,
-    command     => "${retrieve_command} ${retrieve_args} ${url}",
-    creates     => "${work_dir}/${source_filename}",
-    timeout     => $timeout,
-    path        => $path,
-    environment => $exec_env,
-  }
-
-  exec { "Extract ${source_filename} from ${work_dir}":
-    command     => "mkdir -p ${destination_dir} && cd ${destination_dir} && ${real_extract_command} ${work_dir}/${source_filename} ${extract_command_second_arg}",
-    unless      => "ls ${destination_dir}/${real_extracted_dir}",
-    creates     => "${destination_dir}/${real_extracted_dir}",
-    timeout     => $timeout,
-    require     => Exec["Retrieve ${url} in ${work_dir}"],
-    path        => $path,
-    environment => $exec_env,
-    notify      => Exec["Chown ${source_filename} in ${destination_dir}"],
-  }
-
-  exec { "Chown ${source_filename} in ${destination_dir}":
-    command     => "chown -R ${owner}:${group} ${destination_dir}/${real_extracted_dir}",
-    refreshonly => true,
-    timeout     => $timeout,
-    require     => Exec["Extract ${source_filename} from ${work_dir}"],
-    path        => $path,
-    environment => $exec_env,
-  }
-
-  if $postextract_command {
-    exec { "PostExtract ${source_filename} in ${destination_dir}":
-      command     => $postextract_command,
-      cwd         => $real_postextract_cwd,
-      subscribe   => Exec["Extract ${source_filename} from ${work_dir}"],
-      refreshonly => true,
-      timeout     => $timeout,
-      require     => [Exec["Retrieve ${url} in ${work_dir}"],Exec["Chown ${source_filename} in ${destination_dir}"]],
-      path        => $path,
-      environment => $exec_env,
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp
deleted file mode 100644
index 47574bcb7ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Class: puppi::one
-#
-# Installs Puppi 1.0
-#
-class puppi::one {
-
-  require puppi::params
-
-  # Main configuration file
-  file { 'puppi.conf':
-    ensure  => present,
-    path    => "${puppi::params::basedir}/puppi.conf",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($puppi::template),
-    require => File['puppi_basedir'],
-  }
-
-  # The Puppi 1.0 command
-  file { 'puppi':
-    ensure  => present,
-    path    => '/usr/sbin/puppi.one',
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template('puppi/puppi.erb'),
-    require => File['puppi_basedir'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp
deleted file mode 100644
index 721eae14129..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Class: puppi::params
-#
-# Sets internal variables and defaults for puppi module
-#
-class puppi::params  {
-
-## PARAMETERS
-  $version              = '1'
-  $install_dependencies = true
-  $template             = 'puppi/puppi.conf.erb'
-  $helpers_class        = 'puppi::helpers'
-  $logs_retention_days  = '30'
-  $extra_class          = 'puppi::extras'
-
-
-## INTERNALVARS
-  $basedir     = '/etc/puppi'
-  $scriptsdir  = '/etc/puppi/scripts'
-  $checksdir   = '/etc/puppi/checks'
-  $logsdir     = '/etc/puppi/logs'
-  $infodir     = '/etc/puppi/info'
-  $tododir     = '/etc/puppi/todo'
-  $projectsdir = '/etc/puppi/projects'
-  $datadir     = '/etc/puppi/data'
-  $helpersdir  = '/etc/puppi/helpers'
-  $libdir      = '/var/lib/puppi'
-  $readmedir   = '/var/lib/puppi/readme'
-  $logdir      = '/var/log/puppi'
-
-  $archivedir = $::puppi_archivedir ? {
-    ''      => '/var/lib/puppi/archive',
-    default => $::puppi_archivedir,
-  }
-
-  $workdir = $::puppi_workdir ? {
-    ''      => '/tmp/puppi',
-    default => $::puppi_workdir,
-  }
-
-  $configfile_mode  = '0644'
-  $configfile_owner = 'root'
-  $configfile_group = 'root'
-
-# External tools
-# Directory where are placed the checks scripts
-# By default we use Nagios plugins
-  $checkpluginsdir = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => $::architecture ? {
-      x86_64  => '/usr/lib64/nagios/plugins',
-      default => '/usr/lib/nagios/plugins',
-    },
-    default                    => '/usr/lib/nagios/plugins',
-  }
-
-  $package_nagiosplugins = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux|Fedora)/ => 'nagios-plugins-all',
-    default                       => 'nagios-plugins',
-  }
-
-  $package_mail = $::operatingsystem ? {
-    /(?i:Debian|Ubuntu|Mint)/ => 'bsd-mailx',
-    default           => 'mailx',
-  }
-
-  $ntp = $::ntp_server ? {
-    ''    => 'pool.ntp.org' ,
-    default => is_array($::ntp_server) ? {
-      false   => $::ntp_server,
-      true  => $::ntp_server[0],
-      default => $::ntp_server,
-    }
-  }
-
-# Mcollective paths
-# TODO: Add Paths for Puppet Enterprise:
-# /opt/puppet/libexec/mcollective/mcollective/
-  $mcollective = $::operatingsystem ? {
-    debian  => '/usr/share/mcollective/plugins/mcollective',
-    ubuntu  => '/usr/share/mcollective/plugins/mcollective',
-    centos  => '/usr/libexec/mcollective/mcollective',
-    redhat  => '/usr/libexec/mcollective/mcollective',
-    default => '/usr/libexec/mcollective/mcollective',
-  }
-
-  $mcollective_user = 'root'
-  $mcollective_group = 'root'
-
-
-# Commands used in puppi info templates
-  $info_package_query = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -qi',
-    /(?i:Ubuntu|Debian|Mint)/          => 'dpkg -s',
-    default                    => 'echo',
-  }
-  $info_package_list = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -ql',
-    /(?i:Ubuntu|Debian|Mint)/                    => 'dpkg -L',
-    default                                      => 'echo',
-  }
-  $info_service_check = $::operatingsystem ? {
-    default => '/etc/init.d/',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp
deleted file mode 100644
index 4cf23313e83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Define puppi::project
-#
-# This define creates and configures a Puppi project
-# You must use different puppi::deploy and puppi::rollback defines
-# to to build up the commands list
-#
-define puppi::project (
-  $enable = true ) {
-
-  require puppi::params
-
-  $ensure = any2bool($enable) ? {
-    false   => 'absent',
-    default => 'directory',
-  }
-
-  $ensurefile = bool2ensure($enable)
-
-  # Create Project subdirs
-  file {
-    "${puppi::params::projectsdir}/${name}":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true;
-
-    "${puppi::params::projectsdir}/${name}/check":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/rollback":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/deploy":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/initialize":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-      
-    "${puppi::params::projectsdir}/${name}/configure":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/report":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-  }
-
-  # Create Project configuration file
-  file {
-    "${puppi::params::projectsdir}/${name}/config":
-      ensure  => $ensurefile,
-      content => template('puppi/project/config.erb'),
-      mode    => '0644',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      require => File["${puppi::params::projectsdir}/${name}"];
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README
deleted file mode 100644
index ea75c5da38a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README
+++ /dev/null
@@ -1,31 +0,0 @@
-In this directory you find some examples of deploy procedures
-for general purposes deploys (single wars, single files, tarballs, list
-of files from a list...) described in a single define.
-
-They are made in order to be generic enough to adapt to different 
-environments and scenarious but you might need to design your
-own deployment process.
-
-In order to do that you can create a new define that includes:
-- All the variables, required or optional, you may want
-- One puppi:project statement 
-- All the puppi::deploy statements you need (each one runs a command)
-- All the puppi::rollback statements you need
-- One or more puppi::report statements for reporting
-
-The examples provided here make use of the scripts provided in
-puppi/files/scripts and tend to split the deploy procedures in many 
-different, reusable, scripts (one gets the source file(s), another 
-archives the current content, another one actually copies the files
-to deploy and so on) but you can use just a single new script or 
-whatever combination you might prefer.
-
-The default puppi scripts and the general ordering of commands
-execution in these sample deploy defines follow this scheme:
-Priority - Kind of operations
-1x - Pre Deploy checks 
-2x - Files retrieving and preparation
-3x - Operations to accomplish before the deploy (Archiving, Services stopping..)
-40 - Deploy.sh - The script that actually copied the files on deploy dir
-4x - Operations to accomplish after the deploy (Services start...)
-8x - Post Deploy checks
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp
deleted file mode 100644
index 34d25f0dee2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp
+++ /dev/null
@@ -1,406 +0,0 @@
-# = Define puppi::project::archive
-#
-# This is a puppi deployment project to be used for archives
-# like tarballs and zips
-#
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::archive (
-  $source,
-  $deploy_root,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_type = url_parse($source,filetype)
-
-  $real_source_type = $source_type ? {
-    '.tar'     => 'tar',
-    '.tar.gz'  => 'tarball',
-    '.gz'      => 'tarball',
-    '.tgz'     => 'tarball',
-    '.zip'     => 'zip',
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_Archive":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-PreDeploy_Archive":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp
deleted file mode 100644
index c76cd1777a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp
+++ /dev/null
@@ -1,561 +0,0 @@
-# = Define puppi::project::builder
-#
-# This is a shortcut define to build a puppi project for the deploy of web
-# applications based on different sources: a war file, a tar file, a source dir,
-# a list of files or a nexus maven repository
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*source_type*]
-#   The type of file that is retrieved. Accepted values: tarball, zip, list,
-#   war, dir, maven-metadata.
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*magicfix*]
-#   (Optional) - A string that is used as prefix or suffix according to the
-#   context and the scripts used in the deploy procedure.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup*]
-#   (Optional) - How backups of files are made. Default: "full". Options:
-#   "full" - Make full backup of the deploy_root before making the deploy
-#   "diff" - Backup only the files that are going to be deployed. Note that
-#     in order to make reliable rollbacks of versions older that the latest
-#     you've to individually rollback every intermediate deploy
-#   "false" - Do not make backups. This disables the option to make rollbacks
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# == Usage
-# A sample deploy of a zip with custom postdeploy command and mail notification
-# puppi::project::builder { "cms":
-#   source                   => "http://repo.example42.com/deploy/cms/cms.zip",
-#   source_type              => "zip",
-#   user                     => "root",
-#   deploy_root              => "/var/www",
-#   postdeploy_customcommand => "chown -R www-data /var/www/files",
-#   postdeploy_user          => "root",
-#   postdeploy_priority      => "41",
-#   report_email             => "sysadmins@example42.com",
-#   enable                   => "true",
-# }
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::builder (
-  $source,
-  $source_type,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $magicfix                 = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup                   = 'full',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Autoinclude the puppi class
-  include puppi
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $real_source_type = $source_type ? {
-    'dir'            => 'dir',
-    'tarball'        => 'tarball',
-    'zip'            => 'zip',
-    'gz'             => 'gz',
-    'maven-metadata' => 'maven-metadata',
-    'maven'          => 'maven-metadata',
-    'war'            => 'war',
-    'list'           => 'list',
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_filename = url_parse($source,'filename')
-
-# Create Project
-  puppi::project { $name: enable => $enable }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here source file is retrieved
-  puppi::deploy { "${name}-Retrieve_SourceFile":
-    priority  => '20' ,
-    command   => 'get_file.sh' ,
-    arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  $args_magicfix = $magicfix ? {
-    ''      => '',
-    default => "-m ${magicfix}" ,
-  }
-
-  if ($real_source_type == 'tarball') {
-    puppi::deploy { "${name}-PreDeploy_Tar":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'zip') {
-
-    puppi::deploy { "${name}-PreDeploy_Zip":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'list') {
-    puppi::deploy { "${name}-Extract_File_Metadata":
-      priority  => '22' ,
-      command   => 'get_metadata.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    $clean_file_list_magicfix = $magicfix ? {
-      ''      => '',
-      default => $magicfix,
-    }
-
-    puppi::deploy { "${name}-Clean_File_List":
-      priority  => '24' ,
-      command   => 'clean_filelist.sh' ,
-      arguments => $clean_file_list_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::deploy { "${name}-Retrieve_Files":
-      priority  => '25' ,
-      command   => 'get_filesfromlist.sh' ,
-      arguments => $source ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($backup == 'full') or ($backup == 'diff') {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -m ${backup} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '34' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::deploy { "${name}-Remove_existing_WAR":
-      priority  => '35' ,
-      command   => 'delete.sh' ,
-      arguments => "${deploy_root}/${source_filename}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '36' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '34' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::rollback { "${name}-Remove_existing_WAR":
-      priority  => '35' ,
-      command   => 'delete.sh' ,
-      arguments => "${deploy_root}/${source_filename}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::rollback { "${name}-Check_undeploy":
-      priority  => '36' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($backup == 'full') or ($backup == 'diff') {
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -m ${backup} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::rollback { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp
deleted file mode 100644
index a56ad645522..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp
+++ /dev/null
@@ -1,450 +0,0 @@
-# = Define puppi::project::dir
-#
-# This is a shortcut define to build a puppi project for a deploy based
-# on the syncronization of a directory.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*skip_predeploy*]
-#    For large data to deploy predeploy copy in /tmp/puppi might full the
-#    filesystem. Set to "yes" to deploy directly to $deploy_root. Default: no
-#    (files are first predeployed in /tmp/puppi then copied to $deploy_root)
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::dir (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $skip_predeploy           = false,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_skip_predeploy = any2bool($skip_predeploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_skip_predeploy == false) {
-    puppi::deploy { "${name}-Sync_Files":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t dir" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here is done the deploy on $deploy_root
-  if ($bool_skip_predeploy == false) {
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_skip_predeploy == true) {
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-  # End deploy
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK SEQUENCE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp
deleted file mode 100644
index 1c625b9819a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp
+++ /dev/null
@@ -1,482 +0,0 @@
-# = Define puppi::project::files
-#
-# This is a sample define to build a puppi project for the deploy of
-# one or more files based on a provided list containing, one per line,
-# the full path of the files to deploy.
-# The place (url) from where to get the files is defined by the
-# $source_baseurl variable.
-# You can strip out some beginning chars from each line with the
-# (optional) $files_prefix variable.
-# Files are then copied to the $deploy_root you define.
-#
-# Many different variables are optional in order to adapt the define
-# to different cases and needs, if you still need to customize it,
-# you can clone this puppi::project into another file and change the
-# define name.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*source_baseurl*]
-#   The full URL, in URI standard format, to prepend to the entries i
-#   the files list in order to retrieve the relative files.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*prefix*]
-#   (Optional) - The prefix that might be present in the filelist to
-#   define custom  metadata
-#
-# [*files_prefix*]
-#   (Optional) The prefix to remove from the list entries in order to
-#   determine the files path on the deploy_root
-#   We suggest to place in the files list just the deploy_root relative
-#   paths of the files, and in this case the $files_prefix is null
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::files (
-  $source,
-  $source_baseurl,
-  $deploy_root,
-  $init_source              = '',
-  $files_prefix             = '',
-  $prefix                   = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Retrieve_File_List":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t list" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    $args_prefix = $prefix ? {
-      ''      => '',
-      default => "-m ${prefix}",
-    }
-
-    puppi::deploy { "${name}-Extract_File_Metadata":
-      priority  => '22' ,
-      command   => 'get_metadata.sh' ,
-      arguments => $args_prefix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Clean_File_List":
-      priority  => '24' ,
-      command   => 'clean_filelist.sh' ,
-      arguments => $files_prefix ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Retrieve_Files":
-      priority  => '25' ,
-      command   => 'get_filesfromlist.sh' ,
-      arguments => $source_baseurl ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK SEQUENCE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp
deleted file mode 100644
index ac48e301a18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp
+++ /dev/null
@@ -1,418 +0,0 @@
-# == Define puppi::project::git
-#
-# This is a shortcut define to build a puppi project for the deploy of
-# file from a git repo.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the git repo to retrieve.
-#   Format should be in git friendly standard (http:// git:// ssh:// ..).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*install_git*]
-#   If the git package hs to be installed. Default true.
-#   Set to false if you install git via other modules and have resource
-#   conflicts.
-#
-# [*git_subdir*]
-#   (Optional) - If you want to copy to the deploy_root only a subdir
-#   of the specified git repo, specify here the path of the directory
-#   relative to the repo root. Default undefined
-#
-# [*tag*]
-#   (Optional) - A specific tag you may want to deploy. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "tag=release"
-#
-# [*branch*]
-#   (Optional) - A specific branch you may want to deploy. Default: master
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "branch=devel"
-#
-# [*commit*]
-#   (Optional) - A specific commit you may want to use. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "commit=1061cb731bc75a1188b58b889b74ce1505ccb412"
-#
-# [*keep_gitdata*]
-#   (Optional) - Define if you want to keep git metadata directory (.git)
-#   in the deploy root. According to this value backup and rollback
-#   operations change (with keep_gitdata set to true no real backups are done
-#   and operations are made on the git tree, if set to false, file are copied
-#   and the $backup_* options used. Default is true
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose git utput (file names) during
-#   the deploy. Default is true.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#   If different from root (default) it must have write permissions on
-#   the $deploy_root dir.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#   This option is used when $keep_gitmeta is set to false
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#   This option is used when $keep_gitmeta is set to false
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::git (
-  $source,
-  $deploy_root,
-  $install_git              = true,
-  $git_subdir               = 'undefined',
-  $tag                      = 'undefined',
-  $branch                   = 'master',
-  $commit                   = 'undefined',
-  $keep_gitdata             = true,
-  $verbose                  = true,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_install_git = any2bool($install_git)
-  $bool_keep_gitdata = any2bool($keep_gitdata)
-  $bool_verbose = any2bool($verbose)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### INSTALL GIT
-  if ($bool_install_git == true) {
-    if ! defined(Package['git']) { package { 'git': ensure => installed } }
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata == true) {
-    puppi::deploy { "${name}-Backup_existing_data":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'git.sh' ,
-      arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata == true) {
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata != true) {
-    puppi::rollback { "${name}-Rollback_Files":
-      priority  => '40' ,
-      command   => 'git.sh' ,
-      arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp
deleted file mode 100644
index a1979dae478..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp
+++ /dev/null
@@ -1,814 +0,0 @@
-# = Define puppi::project::maven
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of war and tar files generated via Maven and published on
-# a repository like Sonar.
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the maven-metadata.xml file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*http_password*]
-#   The http_password to use for authentication to the source in case of http.
-#
-# [*http_user*]
-#   The http_user to use for authentication to the source in case of http.
-#
-# [*artifact_type*]
-#   The artifact_type to parse the maven-metadata.xml. Either "release", "latest" or
-#   a specific version (e.g. "2.5.0")
-#   Default is "release". With artifactory, don't use the
-#   "Maven Snapshot Version Behavior" "unique" for your repository.
-#
-# [*deploy_root*]
-#   The destination directory where file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*war_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the war
-#
-# [*zip_root*]
-#   (Optional) - The destination directory where the zip is unpacked
-#
-# [*zip_user*]
-#   (Optional) - The user to be used for deploy operations of the zip
-#
-# [*zip_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the zip
-#
-# [*jar_root*]
-#   (Optional) - The destination directory where the jar is copied.
-#   If set a jar file is searched in Maven
-#
-# [*jar_user*]
-#   (Optional) - The user to be used for deploy operations of the jar
-#   (owner of the files deployed in $jar_root)
-#
-# [*jar_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the jar
-#
-# [*document_root*]
-#   (Optional) - The destination directory where the eventual tarball generated
-#   via Maven containing static files ("src tar") is unpacked
-#
-# [*document_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the
-#   static files tarballs ("src tar")
-#
-# [*document_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#    project files present in the source tarball. They are copied to the
-#    $document_root. Format should be in URI standard (http:// file:// ...)
-#
-# [*document_user*]
-#   (Optional) - The user to be used for deploy operations of the tarball
-#   (owner of the files in $document_root)
-#
-# [*config_root*]
-#   (Optional) - The destination directory where the cfg tar is unpacked
-#
-# [*config_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to
-#   configuration tarballs ("cfg tar")
-#
-# [*config_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#   project files present in the cfg tar. They are copied to the $config_root.
-#   Format should be in URI standard (http:// file:// ssh:// svn://)
-#
-# [*config_user*]
-#   (Optional) - The user to be used for deploy operations of cfg tar
-#   (owner of the files in $config_root)
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*report_mongo*]
-#   (Optional) - A mongourl with optional user:password to report to. Append the
-#   database with a slash ("mongodb://user:password@mymongo.mydomain.com/theNameOfDb")
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::maven (
-  $source,
-  $http_user                = '',
-  $http_password            = '',
-  $artifact_type            = 'release',
-  $deploy_root              = '',
-  $user                     = 'root',
-  $war_suffix               = 'suffixnotset',
-  $zip_root                 = '',
-  $zip_user                 = '',
-  $zip_suffix               = 'suffixnotset',
-  $jar_root                 = '',
-  $jar_user                 = '',
-  $jar_suffix               = 'suffixnotset',
-  $document_root            = '',
-  $document_user            = '',
-  $document_suffix          = 'suffixnotset',
-  $document_init_source     = '',
-  $config_root              = '',
-  $config_user              = '',
-  $config_suffix            = 'suffixnotset',
-  $config_init_source       = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $report_mongo             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $config_real_user = $config_user ? {
-    ''      => $user,
-    default => $config_user,
-  }
-
-  $document_real_user = $document_user ? {
-    ''      => $user,
-    default => $document_user,
-  }
-
-  $jar_real_user = $jar_user ? {
-    ''      => $user,
-    default => $jar_user,
-  }
-
-  $zip_real_user = $zip_user ? {
-    ''      => $user,
-    default => $zip_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($document_init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${document_init_source} -d ${deploy_root}" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_init_source != '') {
-    puppi::initialize { "${name}-Deploy_CFG_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${config_init_source} -d ${deploy_root}" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  $metadata_arguments = $http_password ? {
-    '' => "-s ${source}/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-    default => "-s ${source}/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-  }
-
-  puppi::deploy { "${name}-Get_Maven_Metadata_File":
-    priority  => '20' ,
-    command   => 'get_file.sh' ,
-    arguments => $metadata_arguments,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  puppi::deploy { "${name}-Extract_Maven_Metadata":
-    priority  => '22' ,
-    command   => 'get_metadata.sh' ,
-    arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  # Files retrieval
-  if ($deploy_root != '') {
-    $war_arguments = $http_password ? {
-      '' => "${source} warfile",
-      default => "-u ${http_user} -p ${http_password} ${source} warfile"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_WAR":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $war_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_JAR":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} jarfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_Config":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} configfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_SRC":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} srcfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    $real_arguments = $http_password ? {
-      ''      => "${source} zipfile",
-      default => "-u ${http_user} -p ${http_password} ${source} zipfile"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments =>  $real_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '30' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Existing files backup
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_JAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${jar_root} -t jar -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ConfigDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${config_root} -t config -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_DocumentDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${document_root} -t docroot -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ZipDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${zip_root} -t ziproot -d predeploydir_zipfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) and ($deploy_root != '') {
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '31' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Deploys
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_WAR":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_JAR":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $jar_root ,
-      user      => $jar_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Deploy_ConfigDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${config_root} predeploydir_configfile" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Deploy_DocumentDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${document_root} predeploydir_srcfile" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    puppi::deploy { "${name}-Deploy_Zip":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${zip_root} predeploydir_zipfile" ,
-      user      => $zip_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) and ($deploy_root != '') {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($deploy_root != '') {
-    puppi::rollback { "${name}-Recover_WAR":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -t war -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::rollback { "${name}-Recover_JAR":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${jar_root} -t jar -o '${backup_rsync_options}'" ,
-      user      => $jar_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::rollback { "${name}-Recover_ConfigDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${config_root} -t config -o '${backup_rsync_options}'" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::rollback { "${name}-Recover_DocumentDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${document_root} -t docroot -o '${backup_rsync_options}'" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) {
-    puppi::rollback { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($report_mongo != '') {
-    puppi::report { "${name}-Mongo_Store":
-      priority  => '30' ,
-      command   => 'report_mongo.sh' ,
-      arguments => $report_mongo ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp
deleted file mode 100644
index aa787d80ac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp
+++ /dev/null
@@ -1,425 +0,0 @@
-# = Define puppi::project::mysql
-#
-# This is a shortcut define to build a puppi project for the
-# management of mysql queries, contained in the .sql file defined
-# as $source
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main sql file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*mysql_database*]
-#   (Required) - The Mysql database to work on
-#   Default: root
-#
-# [*mysql_user*]
-#   (Optional) - The Mysql user to be used to run the queries
-#   Default: root
-#
-# [*mysql_password*]
-#   (Optional) - The password to use for the specified mysql user
-#   Default: '' (blank)
-#
-# [*mysql_host*]
-#   (Optional) - The Mysql server. Use ip or hostname
-#   Default: localhost
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve a sql file to
-#   process only for the first time,
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup*]
-#   (Optional) - If and how backups of existing databases are made.
-#   Default: true
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::mysql (
-  $source,
-  $mysql_database,
-  $mysql_user               = 'root',
-  $mysql_host               = 'localhost',
-  $mysql_password           = '',
-  $init_source              = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup                   = true,
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => 'root',
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => 'root',
-    default => $postdeploy_user,
-  }
-
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_backup = any2bool($backup)
-  $real_source_type = 'mysql'
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_filename = url_parse($source,'filename')
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -t ${real_source_type}" ,
-      user      => root ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::initialize { "${name}-Run_SQL":
-      priority  => '42' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a run -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Retrieve_SQLFile":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::deploy { "${name}-Backup_Database":
-      priority  => '30' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a dump -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the db change
-    puppi::deploy { "${name}-Run_SQL":
-      priority  => '40' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a run -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::rollback { "${name}-Backup_Database_PreRollback":
-      priority  => '30' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a dump -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::rollback { "${name}-Recover_Database":
-      priority  => '40' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a restore -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp
deleted file mode 100644
index 62eb6c8b95a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp
+++ /dev/null
@@ -1,352 +0,0 @@
-# = Define puppi::project::service
-#
-# This is a shortcut define to build a case-limit puppi project
-# that just manages services and custom commands without deploying
-# any file. It doesn't require any parameter but you should at least
-# provide one among predeploy_customcommand, postdeploy_customcommand,
-# init_script, disable_services to make something useful.
-# The rollback option is kept for coherency with the standard puppi
-# deploy approach, but actually should not be used since there is no
-# data to rollback.
-#
-# == Variables:
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::service (
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp
deleted file mode 100644
index 0affd38de4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp
+++ /dev/null
@@ -1,438 +0,0 @@
-# == Define puppi::project::svn
-#
-# This is a shortcut define to build a puppi project for the deploy of
-# file from a svn repo.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the svn repo to retrieve.
-#   Format should be in svn friendly standard (http:// svn:// ..).
-#
-# [*svn_user*]
-#   Name of the user to access a private svn repo. Optional.
-#
-# [*svn_password*]
-#   Name of the password to access a private svn repo. Optional.
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*install_svn*]
-#   If the svn package has to be installed. Default true.
-#   Set to false if you install svn via other modules and have resource
-#   conflicts.
-#
-# [*svn_subdir*]
-#   (Optional) - If you want to copy to the deploy_root only a subdir
-#   of the specified svn repo, specify here the path of the directory
-#   relative to the repo root. Default undefined
-#
-# [*svn_export*]
-#   (Optional) - If to use a svn export command instead of checkout
-#   Default: false (A checkout is done)
-#
-# [*tag*]
-#   (Optional) - A specific tag you may want to deploy. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "tag=release"
-#
-# [*branch*]
-#   (Optional) - A specific branch you may want to deploy. Default: master
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "branch=devel"
-#
-# [*commit*]
-#   (Optional) - A specific commit you may want to use. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "commit=1061cb731bc75a1188b58b889b74ce1505ccb412"
-#
-# [*keep_svndata*]
-#   (Optional) - Define if you want to keep svn metadata directory (.svn)
-#   in the deploy root. According to this value backup and rollback
-#   operations change (with keep_svndata set to true no real backups are done
-#   and operations are made on the svn tree, if set to false, file are copied
-#   and the $backup_* options used. Default is true
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose svn utput (file names) during
-#   the deploy. Default is true.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#   If different from root (default) it must have write permissions on
-#   the $deploy_root dir.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#   This option is used when $keep_svnmeta is set to false
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#   This option is used when $keep_svnmeta is set to false
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::svn (
-  $source,
-  $deploy_root,
-  $install_svn              = true,
-  $svn_user                 = 'undefined',
-  $svn_password             = 'undefined',
-  $svn_subdir               = 'undefined',
-  $svn_export               = false,
-  $tag                      = 'undefined',
-  $branch                   = 'master',
-  $commit                   = 'undefined',
-  $keep_svndata             = true,
-  $verbose                  = true,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_install_svn = any2bool($install_svn)
-  $bool_svn_export = any2bool($svn_export)
-  $bool_keep_svndata = any2bool($keep_svndata)
-  $bool_verbose = any2bool($verbose)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### INSTALL GIT
-  if ($bool_install_svn == true) {
-    if ! defined(Package['subversion']) { package { 'subversion': ensure => installed } }
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_svndata == true and $bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_data":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'svn.sh' ,
-      arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${svn_subdir} -su ${svn_user} -sp ${svn_password} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata} -e ${bool_svn_export}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-  if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_keep_svndata == true) {
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_keep_svndata != true) {
-      puppi::rollback { "${name}-Rollback_Files":
-        priority  => '40' ,
-        command   => 'svn.sh' ,
-        arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${svn_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp
deleted file mode 100644
index 3206864f1ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp
+++ /dev/null
@@ -1,479 +0,0 @@
-# = Define puppi::project::tar
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of a tar.gz file into a deploy root
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::tar (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $verify_ssl               = true,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  if ($verify_ssl) {
-    $ssl_arg = ''
-  }else{
-    $ssl_arg = '-k'
-  }
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "${ssl_arg} -s '${init_source}' -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_TarBall":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "${ssl_arg} -s '${source}' -t tarball -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-PreDeploy_TarBall":
-      priority  => '25' ,
-      command   => 'predeploy_tar.sh' ,
-      arguments => 'downloadedfile' ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_stop":
-        priority  => '38' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_start":
-        priority  => '42' ,
-        command   => 'service.sh' ,
-        arguments => "start ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp
deleted file mode 100644
index f9ec025d078..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp
+++ /dev/null
@@ -1,525 +0,0 @@
-# == Define puppi::project::war
-#
-# This is a shortcut define to build a puppi project for the deploy of warfiles
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::war (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  # Unless explicitely defined, we assume that the WAR file to use
-  # for initialization is the same to use for deploys
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $war_file = url_parse($source,'filename')
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_WAR":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-}
-
-  if ($bool_check_deploy == true) {
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '32' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${war_file}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_WAR":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${war_file}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Remove_existing_WAR":
-        priority  => '30' ,
-        command   => 'delete.sh' ,
-        arguments => "${deploy_root}/${war_file}" ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($bool_check_deploy == true) {
-      puppi::rollback { "${name}-Check_undeploy":
-        priority  => '36' ,
-        command   => 'checkwardir.sh' ,
-        arguments => "-a ${deploy_root}/${war_file}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_stop":
-        priority  => '38' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -t war -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_start":
-        priority  => '42' ,
-        command   => 'service.sh' ,
-        arguments => "start ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_check_deploy == true) {
-      puppi::rollback { "${name}-Check_deploy":
-        priority  => '45' ,
-        command   => 'checkwardir.sh' ,
-        arguments => "-p ${deploy_root}/${war_file}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp
deleted file mode 100644
index ec48cf419e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp
+++ /dev/null
@@ -1,723 +0,0 @@
-# = Define puppi::project::y4maven
-#
-# This is a shortcut define to build a puppi project for the
-# deploying hybris-production-zips via Maven and published on
-# a repository like artifactory.
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the maven-metadata.xml file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*http_password*]
-#   The http_password to use for authentication to the source in case of http.
-#
-# [*http_user*]
-#   The http_user to use for authentication to the source in case of http.
-#
-# [*artifact_type*]
-#   The artifact_type to parse the maven-metadata.xml. Either "release" or "latest"
-#   Default is "release". With artifactory, don't use the
-#   "Maven Snapshot Version Behavior" "unique" for your repository.
-#
-# [*deploy_root*]
-#   The destination directory where file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*war_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the war
-#
-# [*zip_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the zip
-#
-# [*jar_root*]
-#   (Optional) - The destination directory where the jar is copied.
-#   If set a jar file is searched in Maven
-#
-# [*jar_user*]
-#   (Optional) - The user to be used for deploy operations of the jar
-#   (owner of the files deployed in $jar_root)
-#
-# [*jar_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the jar
-#
-# [*document_root*]
-#   (Optional) - The destination directory where the eventual tarball generated
-#   via Maven containing static files ("src tar") is unpacked
-#
-# [*document_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the
-#   static files tarballs ("src tar")
-#
-# [*document_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#    project files present in the source tarball. They are copied to the
-#    $document_root. Format should be in URI standard (http:// file:// ...)
-#
-# [*document_user*]
-#   (Optional) - The user to be used for deploy operations of the tarball
-#   (owner of the files in $document_root)
-#
-# [*config_root*]
-#   (Optional) - The destination directory where the cfg tar is unpacked
-#
-# [*config_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to
-#   configuration tarballs ("cfg tar")
-#
-# [*config_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#   project files present in the cfg tar. They are copied to the $config_root.
-#   Format should be in URI standard (http:// file:// ssh:// svn://)
-#
-# [*config_user*]
-#   (Optional) - The user to be used for deploy operations of cfg tar
-#   (owner of the files in $config_root)
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::y4maven (
-  $source,
-  $http_user                = '',
-  $http_password            = '',
-  $artifact_type            = 'release',
-  $deploy_root              = '',
-  $user                     = 'root',
-  $war_suffix               = 'suffixnotset',
-  $zip_suffix               = 'suffixnotset',
-  $jar_root                 = '',
-  $jar_user                 = '',
-  $jar_suffix               = 'suffixnotset',
-  $document_root            = '',
-  $document_user            = '',
-  $document_suffix          = 'suffixnotset',
-  $document_init_source     = '',
-  $config_root              = '',
-  $config_user              = '',
-  $config_suffix            = 'suffixnotset',
-  $config_init_source       = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $config_real_user = $config_user ? {
-    ''      => $user,
-    default => $config_user,
-  }
-
-  $document_real_user = $document_user ? {
-    ''      => $user,
-    default => $document_user,
-  }
-
-  $jar_real_user = $jar_user ? {
-    ''      => $user,
-    default => $jar_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($document_init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${document_init_source} -d ${deploy_root}" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_init_source != '') {
-    puppi::initialize { "${name}-Deploy_CFG_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${config_init_source} -d ${deploy_root}" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # First: hybrisServer-Platform
-    $platform_metadata_arguments = $http_password ? {
-      '' => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}" ,
-      default => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-Platform_File":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => $platform_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_hybrisServer-Platform":
-      priority  => '21' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  # Files retrieval
-  $platform_zipfile_arguments = $http_password ? {
-    ''      => "${source}/hybrisServer-Platform zipfile",
-    default => "-u ${http_user} -p ${http_password} ${source}/hybrisServer-Platform zipfile",
-  }
-
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP_hybrisServer-Platform":
-      priority  => '22' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $platform_zipfile_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Second: hybrisServer-AllExtensions
-    $extensions_metadata_arguments = $http_password ? {
-      ''      => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-      default => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}",
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-AllExtensions_File":
-      priority  => '23' ,
-      command   => 'get_file.sh' ,
-      arguments => $extensions_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_hybrisServer-AllExtensions":
-      priority  => '24' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  # Files retrieval
-  if ($deploy_root != '') {
-    $extensions_zipfile_arguments = $http_password ? {
-      ''      => "${source}/hybrisServer-AllExtensions zipfile",
-      default => "-u ${http_user} -p ${http_password} ${source}/hybrisServer-AllExtensions zipfile",
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP_hybrisServer-AllExtensions":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $extensions_zipfile_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-  if ($config_root != '') {
-    # Third: config-tarball (optional, right now not supported)
-    $config_metadata_arguments = $http_password ? {
-      ''      => "-s ${source}/config/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-      default => "-s ${source}/config/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_config-tarball_File":
-      priority  => '26' ,
-      command   => 'get_file.sh' ,
-      arguments => $config_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_config-tarball":
-      priority  => '27' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_Config":
-      priority  => '28' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} configfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '30' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Existing files backup
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_JAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${jar_root} -t jar -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ConfigDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${config_root} -t config -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_DocumentDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${document_root} -t docroot -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Deploys
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_ZIP":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${deploy_root} predeploydir_zipfile ",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Deploy_ConfigDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${config_root} predeploydir_configfile" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  puppi::deploy { "${name}-yant":
-    priority  => '42' ,
-    command   => 'yant.sh' ,
-    arguments => "${deploy_root} clean all" ,
-    user      => $user ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '45' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '47' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($deploy_root != '') {
-    puppi::rollback { "${name}-Recover_ZIP":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -t zip -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::rollback { "${name}-Recover_ConfigDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${config_root} -t config -o '${backup_rsync_options}'" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp
deleted file mode 100644
index 5379ebeea5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp
+++ /dev/null
@@ -1,347 +0,0 @@
-# = Define puppi::project::yum
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of applications packaged as rpm and retrievable via yum
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*rpm*]
-#   The name of the rpm to install
-#
-# [*rpm_version*]
-#   (Optional) - The version to install (default: latest)
-#
-# [*install_root*]
-#   (Optional) - The rpm installation root (default: / )
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*checks_required*]
-#   (Optional) - Set to "true" if you want to block the installation if
-#   preliminary checks fail. Default: "false"
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::yum (
-  $rpm,
-  $rpm_version              = 'latest',
-  $install_root             = '/',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $run_checks               = true,
-  $checks_required          = false,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => 'root',
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => 'root',
-    default => $postdeploy_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    true    => 'yes',
-    default => 'no',
-  }
-
-  $real_checks_required = any2bool($checks_required) ? {
-    true    => 'yes',
-    default => 'no',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => "${name} ${real_checks_required}",
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'yum.sh' ,
-      arguments => "-a deploy -n ${rpm} -r ${install_root} -v ${rpm_version}" ,
-      user      => root ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Rollback":
-      priority  => '40' ,
-      command   => 'yum.sh' ,
-      arguments => "-a rollback -n ${rpm} -r ${install_root} -v ${rpm_version}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp
deleted file mode 100644
index 4f8651e93ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Define puppi::report
-#
-# This define creates a file with a report command that can be used locally.
-#
-# Usage:
-# puppi::report { "Retrieve files":
-#   command  => "report_mail.sh",
-#   argument => "roots@example42.com",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::report (
-  $project,
-  $command,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi::params
-
-  # Autoinclude the puppi class
-  include puppi
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/report/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_report',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp
deleted file mode 100644
index b09692df632..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# Define puppi::rollback
-#
-# This define creates a file with a rollback command that can be used locally.
-#
-# Usage:
-# puppi::rollback { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::rollback (
-  $project,
-  $command,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/rollback/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_rollback',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp
deleted file mode 100644
index 01556d663fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Define puppi::run
-#
-# This define triggers a puppi deploy run directly during Puppet
-# execution. It can be used to automate FIRST TIME applications
-# deployments directly during the first Puppet execution
-#
-# == Variables
-#
-# [*name*]
-#   The title/name you use has to be the name of an existing puppi::project
-#   procedure define
-#
-# == Usage
-# Basic Usage:
-# puppi::run { "myapp": }
-#
-define puppi::run (
-  $project = '',
-  $timeout = 300) {
-
-  require puppi
-
-  exec { "Run_Puppi_${name}":
-    command => "puppi deploy ${name}; [ $? -le \"1\" ] && touch ${puppi::params::archivedir}/puppirun_${name}",
-    path    => '/bin:/sbin:/usr/sbin:/usr/bin',
-    creates => "${puppi::params::archivedir}/puppirun_${name}",
-    timeout => $timeout,
-    # require => File[ tag == 'puppi_deploy' ],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp
deleted file mode 100644
index 01aa36c20e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp
+++ /dev/null
@@ -1,154 +0,0 @@
-# = Define: puppi::runscript
-#
-# This define creates, executes and optionally crontabs a
-# simple whose content is directly managed by arguments.
-# The script content is provided either with $source or $content arguments.
-# It's placed in:
-# $destination_path , if provided, or in /usr/local/sbin/${name}
-#
-# Cron execution times are defined by the $cron argument (Default empty).
-# Automatic execution of the script via Puppet is managed by the $autorun
-# parameter (default: true).
-# Conditional execution of the script at subsequent puppet runs is
-# defined by the $refreshonly, $creates, $unless $onlyif parameters
-# that map the omonimous exec type arguments.
-#
-# == Parameters:
-#
-# [*source*]
-#   String. Optional. Default: undef. Alternative to content.
-#   Source of the script file to provide for execuution.
-#   Sample: source => 'puppet:///modules/site/scripts/my_script',
-#
-# [*content*]
-#   String. Optional. Default: undef. Alternative to source.
-#   Content of the script file to provide for execuution.
-#   This parameter is alternative to source.
-#   Sample: content => 'template(site/scripts/my_script.erb'),
-#
-# [*destination_path*]
-#   String. Optional. Default: ''
-#   Path of the provided script. If not provided the script in saved in
-#   /usr/local/sbin/${name}
-#
-# [*parameters*]
-#   String. Optional. Default: ''
-#   Optional parameters to pass to the script when executing it.
-#
-# [*autorun*]
-#   Boolean. Default: true.
-#   Define if to automatically execute the script when Puppet runs.
-#
-# [*refreshonly*]
-#   Boolen. Optional. Default: true
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*creates*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*onlyif*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*unless*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*basedir*]
-#   String. Optional. Default: /usr/local/sbin
-#   Directory where the runscript scripts are created when destination_path
-#   is empty.
-#
-# [*cron*]
-#   String. Optional. Default: ''
-#   Optional cron schedule to crontab the execution of the
-#   script. Format must be in standard cron style.
-#   Example: '0 4 * * *' .
-#   By default no cron is scheduled.
-#
-# [*cron_user*]
-#   String. Optional. Default: 'root'
-#   When cron is enabled the user that executes the cron job.
-#
-# [*owner*]
-#   Owner of the created script. Default: root.
-#
-# [*group*]
-#   Group of the created script. Default: root.
-#
-# [*mode*]
-#   Mode of the created script. Default: '7550'.
-#   NOTE: Keep the execution flag!
-#
-# [*ensure*]
-#   Define if the runscript script and eventual cron job
-#   must be present or absent. Default: present.
-#
-# == Examples
-#
-# - Minimal setup
-# puppi::runscript { 'my_script':
-#   source           => 'puppet:///modules/site/scripts/my_script.sh',
-#   destination_path => '/usr/local/bin/my_script.sh',
-# }
-#
-define puppi::runscript (
-  $source           = undef,
-  $content          = undef,
-  $destination_path = '',
-  $parameters       = '',
-  $autorun          = true,
-  $refreshonly      = true,
-  $creates          = undef,
-  $onlyif           = undef,
-  $unless           = undef,
-  $basedir          = '/usr/local/sbin',
-  $cron             = '',
-  $cron_user        = 'root',
-  $owner            = 'root',
-  $group            = 'root',
-  $mode             = '0755',
-  $ensure           = 'present' ) {
-
-  $real_command = $destination_path ? {
-    ''      => "${basedir}/${name}",
-    default => $destination_path,
-  }
-
-  file { "runscript_${name}":
-    ensure  => $ensure,
-    path    => $real_command,
-    mode    => $mode,
-    owner   => $owner,
-    group   => $group,
-    content => $content,
-    source  => $source,
-  }
-
-  if $autorun == true {
-    exec { "runscript_${name}":
-      command     => $real_command,
-      refreshonly => $refreshonly,
-      creates     => $creates,
-      onlyif      => $onlyif,
-      unless      => $unless,
-      subscribe   => File["runscript_${name}"],
-    }
-  }
-
-  if $cron != '' {
-    file { "runscript_cron_${name}":
-      ensure  => $ensure,
-      path    => "/etc/cron.d/runscript_${name}",
-      mode    => '0644',
-      owner   => 'root',
-      group   => 'root',
-      content => "${cron} ${cron_user} ${real_command} ${parameters}\n",
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp
deleted file mode 100644
index 6be5cc94ffa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# Class puppi::skel
-#
-# Creates the base Puppi dirs
-#
-class puppi::skel {
-
-  require puppi::params
-
-  file { 'puppi_basedir':
-    ensure  => directory,
-    path    => $puppi::params::basedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-  }
-
-  file { 'puppi_checksdir':
-    ensure  => directory,
-    path    => $puppi::params::checksdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_logsdir':
-    ensure  => directory,
-    path    => $puppi::params::logsdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_helpersdir':
-    ensure  => directory,
-    path    => $puppi::params::helpersdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_infodir':
-    ensure  => directory,
-    path    => $puppi::params::infodir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_tododir':
-    ensure  => directory,
-    path    => $puppi::params::tododir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_projectsdir':
-    ensure  => directory,
-    path    => $puppi::params::projectsdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_datadir':
-    ensure  => directory,
-    path    => $puppi::params::datadir,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_workdir':
-    ensure  => directory,
-    path    => $puppi::params::workdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_archivedir':
-    ensure  => directory,
-    path    => $puppi::params::archivedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_libdir'],
-  }
-
-  file { 'puppi_readmedir':
-    ensure  => directory,
-    path    => $puppi::params::readmedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_libdir'],
-  }
-
-  file { 'puppi_libdir':
-    ensure  => directory,
-    path    => $puppi::params::libdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_logdir':
-    ensure  => directory,
-    path    => $puppi::params::logdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  # MailPuppiCheck script
-  file { '/usr/bin/mailpuppicheck':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    source  => 'puppet:///modules/puppi/mailpuppicheck',
-  }
-
-  # Puppi common scripts
-  file { 'puppi.scripts':
-    ensure  => present,
-    path    => "${puppi::params::scriptsdir}/",
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    source  => 'puppet:///modules/puppi/scripts/',
-    recurse => true,
-#   purge   => true,
-    ignore  => '.svn',
-  }
-
-  # Logs cleanup script
-  if $::kernel == 'Linux' {
-    if $puppi::logs_retention_days
-    and $puppi::logs_retention_days != '0' {
-      $purge_cron_ensure = 'present'
-    } else {
-      $purge_cron_ensure = 'absent'
-    }
-
-    file { 'puppi_cron_logs_purge':
-      ensure  => $purge_cron_ensure,
-      path    => '/etc/cron.daily/puppi_clean',
-      mode    => '0755',
-      owner   => 'root',
-      group   => 'root',
-      content => template('puppi/puppi_clean.erb'),
-    }
-  } 
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp
deleted file mode 100644
index 6fff3805b78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# Define puppi::todo
-#
-# This define creates a basic todo file that simply contains informations
-# on how to complete tasks that for time or other reasons could not be
-# entirely automated by Puppet.
-# The basic idea is to have a quick way to document and check if are completed
-# some specific operations that are required to bring a new, puppettized system
-# to full operative status.
-# This can be useful for cases hard to automate with Puppet:
-# - First setup and import of a database needed by an application (module)
-# - Installation of a legacy application that involves user interaction
-# - Run of any kind of setup/configuration/init command that can't be automated
-# It can also be used as a quick reminder on things done by hand and not
-# Puppettized for lack of time or skill.
-#
-# Use the command puppi todo to show the todo present in your node.
-# The exit status can be:
-# 0 - OK - The task to do has been accomplished because the command specified
-#    as check_command returns true (exit status 0)
-# 1- WARNING - User hasn't specified a check_command to verify if the todo as
-#    been accomplished, so it can't be notified if the todo has been done
-# 2- ERROR - The task to do has not been accomplished becuase the command
-#    specified as check_command returns an error (exit status different from 0)
-#
-# == Usage:
-# puppi::todo { "cacti_db_install":
-#   description => "Manual cacti db installation" ,
-# }
-#
-define puppi::todo (
-  $description   = '',
-  $notes         = '',
-  $check_command = '',
-  $run           = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_run = is_array($run) ? {
-    false     => $run ? {
-      ''      => [],
-      default => split($run, ','),
-    },
-    default   => $run,
-  }
-
-  file { "${puppi::params::tododir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template('puppi/todo.erb'),
-    tag     => 'puppi_todo',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp
deleted file mode 100644
index 1bbe5fca4a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class: puppi::two
-#
-# Installs Puppi NextGen
-#
-class puppi::two {
-
-  # The Puppi command
-  package { 'puppi':
-    ensure   => present,
-    provider => 'gem',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp
deleted file mode 100644
index 5f62e1d738c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Define puppi::ze
-#
-# The Puppi 2.0 define that transforms any class variable in data
-# you can use with Puppi
-#
-# == Usage
-# Basic Usage:
-# puppi::ze { "openssh":
-#   variables => get_class_args(),
-# }
-#
-# puppi::ze { "openssh":
-#   variables => get_class_args(),
-#   filter    => '.*content.*|.*key.*',
-# }
-#
-define puppi::ze (
-  $variables,
-  $helper = 'standard',
-  $filter = '.*content.*|.*password.*',
-  $ensure = 'present' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "puppize_${name}":
-    ensure  => $ensure,
-    path    => "${puppi::params::datadir}/${helper}_${name}.yml",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => inline_template("---\n<%= Hash[@variables].reject{ |k,v| k.to_s =~ /(${filter})/ }.keys.sort.map{|k| Array({k => @variables[k]}.to_yaml)[1..-1].join}.join(\"\n\") %>\n"),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb
deleted file mode 100644
index f6c072f9f2b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi' do
-
-  let(:node) { 'rspec.example42.com' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test standard installation' do
-    it { should contain_file('puppi').with_ensure('present') }
-    it { should contain_file('puppi.conf').with_ensure('present') }
-    it { should contain_file('puppi.scripts').with_ensure('present') }
-    it { should contain_file('puppi_basedir').with_ensure('directory') }
-    it { should contain_file('puppi_datadir').with_ensure('directory') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb
deleted file mode 100644
index ba050bb79eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::check' do
-
-  let(:title) { 'puppi::check' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :arch => 'i386' } }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi check step file creation' do
-    it 'should create a puppi::check step file' do
-      should contain_file('Puppi_check_myapp_50_get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::check step file' do
-      should contain_file('Puppi_check_myapp_50_get').with_content(/\/usr\/lib\/nagios\/plugins\/echo/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb
deleted file mode 100644
index a1969bae76f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::deploy' do
-
-  let(:title) { 'puppi::deploy' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi deploy step file creation' do
-    it 'should create a puppi::deploy step file' do
-      should contain_file('/etc/puppi/projects/myapp/deploy/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::deploy step file' do
-      should contain_file('/etc/puppi/projects/myapp/deploy/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb
deleted file mode 100644
index 8e5ae9bcc6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::helper' do
-
-  let(:title) { 'spec' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'template'   => 'puppi/helpers/standard.yml.erb'  }
-  }
-
-  describe 'Test puppi helper file creation' do
-    it 'should create a puppi helper file' do
-      should contain_file('puppi_helper_spec').with_ensure('present')
-    end
-    it 'should populate correctly the helper file' do
-      should contain_file('puppi_helper_spec').with_content(/info/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb
deleted file mode 100644
index 7dcc99fe939..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::info' do
-
-  let(:title) { 'puppi::info' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'name'         =>  'sample',
-      'description'  =>  'Sample Info',
-      'templatefile' =>  'puppi/info.erb',
-      'run'          =>  'myownscript',
-    }
-  }
-
-  describe 'Test puppi info step file creation' do
-    it 'should create a puppi::info step file' do
-      should contain_file('/etc/puppi/info/sample').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::info step file' do
-      should contain_file('/etc/puppi/info/sample').with_content(/myownscript/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb
deleted file mode 100644
index 158a6005724..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::initialize' do
-
-  let(:title) { 'puppi::initialize' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi initialize step file creation' do
-    it 'should create a puppi::initialize step file' do
-      should contain_file('/etc/puppi/projects/myapp/initialize/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::initialize step file' do
-      should contain_file('/etc/puppi/projects/myapp/initialize/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb
deleted file mode 100644
index 7fd8e9119bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::log' do
-
-  let(:title) { 'mylog' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'log'         =>  '/var/log/mylog.log',
-      'description' =>  'My Log',
-    }
-  }
-
-  describe 'Test puppi log file creation' do
-    it 'should create a puppi::log file' do
-      should contain_file('/etc/puppi/logs/mylog').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::log step file' do
-      should contain_file('/etc/puppi/logs/mylog').with_content(/mylog.log/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb
deleted file mode 100644
index fbbf8ba7094..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::report' do
-
-  let(:title) { 'puppi::report' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi report step file creation' do
-    it 'should create a puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb
deleted file mode 100644
index fbbf8ba7094..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::report' do
-
-  let(:title) { 'puppi::report' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi report step file creation' do
-    it 'should create a puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb
deleted file mode 100644
index 2d4cbe5b51c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::rollback' do
-
-  let(:title) { 'puppi::rollback' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi rollback step file creation' do
-    it 'should create a puppi::rollback step file' do
-      should contain_file('/etc/puppi/projects/myapp/rollback/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::rollback step file' do
-      should contain_file('/etc/puppi/projects/myapp/rollback/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb
deleted file mode 100644
index 692711c5837..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::run' do
-
-  let(:title) { 'myapp' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi run exe creation' do
-    it { should contain_exec('Run_Puppi_myapp').with_command(/puppi deploy myapp/) }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb
deleted file mode 100644
index 483852202d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::todo' do
-
-  let(:title) { 'mytodo' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'notes'         =>  'Test Notes',
-      'description'   =>  'Test Description',
-      'check_command' =>  'check_test',
-      'run'           =>  'test',
-    }
-  }
-
-  describe 'Test puppi todo file creation' do
-    it 'should create a puppi::todo file' do
-      should contain_file('/etc/puppi/todo/mytodo').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::todo step file' do
-      should contain_file('/etc/puppi/todo/mytodo').with_content(/check_test/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb
deleted file mode 100644
index 17913686913..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::ze' do
-
-  let(:title) { 'sample' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'helper'     => 'mytest',
-      'variables'  => { 'var1' => 'get', 'var2' => 'got' },
-      'name'       => 'sample',
-    }
-  }
-
-  describe 'Test puppi ze data file creation' do
-    it 'should create a puppi::ze step file' do
-      should contain_file('puppize_sample').with_ensure('present')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb
deleted file mode 100644
index bc9a5ee9459..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'any2bool' do
-
-  describe 'Test Any2True' do
-    it { should run.with_params(true).and_return(true) }
-    it { should run.with_params('true').and_return(true) }
-    it { should run.with_params('yes').and_return(true) }
-    it { should run.with_params('y').and_return(true) }
-  end
-
-  describe 'Test Any2false' do
-    it { should run.with_params(false).and_return(false) }
-    it { should run.with_params('false').and_return(false) }
-    it { should run.with_params('no').and_return(false) }
-    it { should run.with_params('n').and_return(false) }
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb
deleted file mode 100644
index 967d36c3b55..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'bool2ensure' do
-
-  describe 'Test true2present' do
-    it { should run.with_params(true).and_return('present') }
-    it { should run.with_params('true').and_return('present') }
-    it { should run.with_params('yes').and_return('present') }
-    it { should run.with_params('y').and_return('present') }
-  end
-
-  describe 'Test false2absent' do
-    it { should run.with_params(false).and_return('absent') }
-    it { should run.with_params('false').and_return('absent') }
-    it { should run.with_params('no').and_return('absent') }
-    it { should run.with_params('n').and_return('absent') }
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb
deleted file mode 100644
index 3388e9ae9c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'url_parse' do
-
-  describe 'Test Url Components parsing' do
-    it 'should return correct scheme' do
-      should run.with_params('ftp://www.example.com/test','scheme').and_return('ftp') 
-    end
-    it 'should return correct userinfo' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','userinfo').and_return('my_user:my_pass') 
-    end
-    it 'should return correct user' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','user').and_return('my_user') 
-    end
-    it 'should return correct password' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','password').and_return('my_pass') 
-    end
-    it 'should return correct host' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','host').and_return('www.example.com') 
-    end
-    it 'should return correct port' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','port').and_return(8080) 
-    end
-    it 'should return correct path' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','path').and_return('/path/to/file.php') 
-    end
-    it 'should return correct query' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','query').and_return('id=1&ret=0') 
-    end
-    it 'should return correct filename' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filename').and_return('file.php') 
-    end
-    it 'should return correct filetype' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filetype').and_return('.php') 
-    end
-    it 'should return correct filedir' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filedir').and_return('file') 
-    end
-
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb
deleted file mode 100644
index 5b090700a19..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb
+++ /dev/null
@@ -1,49 +0,0 @@
----
-:info:
-  -
-    :command: "<%= scope.lookupvar('puppi::params::info_package_query') %> %{package}"
-    :description: "Package info"
-  -
-    :command: "<%= scope.lookupvar('puppi::params::info_package_list') %> %{package} | egrep '(/bin|^/etc|/sbin|log$)'"
-    :description: "Interesting files from package"
-  -
-    :command: "head %{config_file}"
-    :description: "Main configuration file"
-  -
-    :command: "ls -latr %{config_dir}"
-    :description: "Configuration directory"
-  -
-    :command: "ls -latr %{data_dir}"
-    :description: "Data directory"
-  -
-    :command: "ls -latr %{log_dir}"
-    :description: "Logs directory"
-  -
-    :command: "tail %{log_file}"
-    :description: "Latest log entries"
-  -
-    :command: "service %{service status}"
-    :description: "Service status"
-  -
-    :command: "ps -adef | grep %{process} | grep -v grep | head -20"
-    :description: "Running process"
-  -
-    :command: "netstat -natup | grep %{port} | head -20"
-    :description: "Network connections"
-
-:check:
-  -
-    :command: "service %{service} status"
-    :description: "Service status"
-  -
-    :command: "check_tcp %{port}"
-    :description: "Check listening port"
-  -
-    :command: "check_procs c 1: -C %{process}"
-    :description: "Check process"
-
-:log:
-  -
-    :command: "tail -f %{log_file}"
-    :description: "Tailing logs"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb
deleted file mode 100644
index f866f7a56b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-echo_title "$HOSTNAME - <%= @description %>"
-<% @array_run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb
deleted file mode 100644
index d74f7e601c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-<% if @configdir != "" -%>
-# Show config info
-echo_title "$HOSTNAME - <%= @name %>: Configurations directory: <%= @configdir %>"
-show_command "ls -latr <%= @configdir %>"
-<% end -%>
-
-<% if @datadir != "" -%>
-# Show data dir
-echo_title "$HOSTNAME - <%= @name %>: Application data are in: <% datadir.each do |item| %><%= item %><% end %>"
-<% @datadir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @bindir != "" -%>
-# Show bin dir
-echo_title "$HOSTNAME - <%= @name %>: Startup scripts are in: <% bindir.each do |item| %><%= item %><% end %>"
-<% @bindir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logdir != "" -%>
-# Show log dir
-echo_title "$HOSTNAME - <%= @name %>: Logs are in: <% logdir.each do |item| %><%= item %><% end %>"
-<% @logdir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "tail -30 <%= item %>/catalina.out"
-<% end -%>
-<% end -%>
-
-<% if @run != "" -%>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end -%>
-<% end -%>
-
-
-<% if @servicename != "" -%>
-# Show service info
-echo_title "$HOSTNAME - <%= @name %>: Services: <% @servicename.each do |item| %><%= item %><% end %>"
-<% @servicename.each do |item| -%>
-show_command "/etc/init.d/<%= item %> status"
-<% end -%>
-<% if @verbose == "yes" -%>
-show_command "ps -adef | grep java | grep <%= @processname %>"
-<% else -%>
-show_command "ps -adef | grep java | grep <%= @processname %> | head -20"
-<% end -%>
-<% end -%>
-
-<% if @httpport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: httpport - <%= @httpport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @httpport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @httpport %> ' | head -20"
-<% end -%>
-<% end -%>
-
-<% if @controlport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: controlport - <%= @controlport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @controlport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @controlport %> ' | head -20"
-<% end -%>
-<% end -%>
-
-<% if @ajpport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: ajpport - <%= @ajpport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @ajpport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @ajpport %> ' | head -20"
-<% end -%>
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb
deleted file mode 100644
index aa53d25cce1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %> 
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-<% if @packagename != "" -%>
-# Show packages info
-echo_title "$HOSTNAME - <%= @name %>: Packages Installed: <% @packagename.each do |item| %><%= item %><% end %>"
-<% @packagename.each do |item| -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_query') %> <%= item %>"
-<% if @verbose == "yes" -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_list') %> <%= item %>"
-<% else -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_list') %> <%= item %> | egrep '(/bin|^/etc|/sbin|log$)'"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @configfile != "" -%>
-# Show config info
-echo_title "$HOSTNAME - <%= @name %>: Configuration Files managed: <% @configfile.each do |item| %><%= item %><% end %>"
-<% @configfile.each do |item| -%>
-<% if @verbose == "yes" -%>
-show_command "cat <%= item %>"
-<% else -%> 
-show_command "head <%= item %>"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @datadir != "" -%>
-# Show data dir
-echo_title "$HOSTNAME - <%= @name %>: Application data are in: <% @datadir.each do |item| %><%= item %><% end %>"
-<% @datadir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "df <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logdir != "" -%>
-# Show log dir
-echo_title "$HOSTNAME - <%= @name %>: Logs are in: <% @logdir.each do |item| %><%= item %><% end %>"
-<% @logdir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "df <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logfile != "" -%>
-# Show logs
-echo_title "$HOSTNAME - <%= @name %>: Last log entries: <% @logfile.each do |item| %><%= item %><% end %>"
-<% @logfile.each do |item| -%>
-<% if @verbose == "yes" -%>
-show_command "tail -30 <%= item %>"
-<% else -%>
-show_command "tail -10 <%= item %>"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @run != "" -%>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end -%>
-<% end -%>
-
-
-<% if @servicename != "" -%>
-# Show service info
-echo_title "$HOSTNAME - <%= @name %>: Services: <% @servicename.each do |item| %><%= item %><% end %>"
-<% @servicename.each do |item| -%>
-show_command "/etc/init.d/<%= item %> status"
-<% end -%>
-<% if @verbose == "yes" -%>
-show_command "ps -adef | grep <%= @processname %> | grep -v grep"
-<% else -%>
-show_command "ps -adef | grep <%= @processname %> | grep -v grep | head -20"
-<% end -%>
-<% @port.each do |mport| -%>
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= mport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= mport %> ' | head -20"
-<% end -%>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb
deleted file mode 100644
index 8f377ca12cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-# Show Puppet info
-echo_title "$HOSTNAME - <%= @name %>: Information on management with Puppet"
-echo "Where to configure this node in Puppet:"
-echo "manifests/nodes/<%= @site %>.pp - Node's definition"
-echo "manifests/roles/role_<%= @role %>.pp - Role's definition"
-echo "modules/<modulename>/manifests/init.pp - Main class for each module"
-echo
-
-# Show ReadMe file
-echo_title "$HOSTNAME - <%= @name %>: ReadMe"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>"
-
-<% if @autoreadme == "yes" %>
-echo_title "$HOSTNAME - <%= @name %>: ReadMe Custom"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>-custom"
-<% end %>
-
-<% if @run != "" %>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb
deleted file mode 100644
index 4e4b1357b59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-# Show ReadMe file
-echo_title "$HOSTNAME - <%= @name %>: ReadMe"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>"
-
-<% if @autoreadme == "yes" %>
-echo_title "$HOSTNAME - <%= @name %>: ReadMe Custom"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>-custom"
-<% end %>
-
-<% if @run != "" %>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb
deleted file mode 100644
index 906d15e8a5e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-export PATH=$PATH:/bin:/sbin:/usr/bin:usr/sbin
-<% if scope.lookupvar('::operatingsystem') == 'Debian' or scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
-apt-get update ; apt-get install -y <%= @packages %>
-<% elsif scope.lookupvar('::operatingsystem') == 'Centos' or scope.lookupvar('::operatingsystem') == 'RedHat' -%>
-yum install -y <%= @packages %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb
deleted file mode 100644
index 5ca47bbf510..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<% @array_log.each do |path| %><%= path %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb
deleted file mode 100644
index 4e8a952bdf3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-# File Managed by Puppet
-# This is the base configuration file for project <%= scope.lookupvar('name') %>
-# During a puppi deploy it's copied into the runtime configuration
-#   used by the scripts executed by puppi 
-#
-# Do not edit this file. You can modify these variables:
-# Permanently: directly on your puppi manifests (When you use the puppi:project:: defines)
-# Temporarily: using the puppi option -o to override them.
-#   example: puppi deploy $name -o "source=http://alt.com/file deploy_root=/var/tmp"
-
-# Common variables for project defines
-project="<%= @name %>"
-source="<%= @source %>"
-deploy_root="<%= @deploy_root %>"
-user="<%= @user %>"
-predeploy_customcommand="<%= @predeploy_customcommand %>"
-postdeploy_customcommand="<%= @postdeploy_customcommand %>"
-init_script="<%= @init_script %>"
-disable_services="<%= @disable_services %>"
-firewall_src_ip="<%= @firewall_src_ip %>"
-firewall_dst_port="<%= @firewall_dst_port %>"
-report_email="<%= @report_email %>"
-enable="<%= @enable %>"
-
-# Variables used by project::files
-files_prefix="<%= @files_prefix %>"
-source_baseurl="<%= @source_baseurl %>"
-
-# Variables used by project::maven
-document_root="<%= @document_root %>"
-config_root="<%= @config_root %>"
-
-# Variables added during runtime puppi operations
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb
deleted file mode 100644
index b167c036e43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# General configuration file for Puppi tools
-# This file is managed by Puppet
-
-# Directory locations
-basedir="<%= scope.lookupvar('puppi::params::basedir') %>"
-checksdir="<%= scope.lookupvar('puppi::params::checksdir') %>"
-workdir="<%= scope.lookupvar('puppi::params::workdir') %>"
-projectsdir="<%= scope.lookupvar('puppi::params::projectsdir') %>"
-scriptsdir="<%= scope.lookupvar('puppi::params::scriptsdir') %>"
-libdir="<%= scope.lookupvar('puppi::params::libdir') %>"
-archivedir="<%= scope.lookupvar('puppi::params::archivedir') %>"
-logdir="<%= scope.lookupvar('puppi::params::logdir') %>"
-logsdir="<%= scope.lookupvar('puppi::params::logsdir') %>"
-infodir="<%= scope.lookupvar('puppi::params::infodir') %>"
-tododir="<%= scope.lookupvar('puppi::params::tododir') %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb
deleted file mode 100644
index 7248a2a1125..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb
+++ /dev/null
@@ -1,517 +0,0 @@
-#!/bin/bash
-configfile="<%= scope.lookupvar('puppi::params::basedir') %>/puppi.conf"
-
-# This is the actual command used to run the different scripts
-# Use cat for debugging noop purposes 
-# runcommand="cat"
-runcommand=""
-
-# Define defaults
-verbosity="max"
-show="yes"
-
-# Define action tag
-export tag=$(date +%Y%m%d-%H%M%S)
-
-counter=0
-
-# Load general configurations
-if [ ! -f $configfile ] ; then
-    echo "Config file: $configfile not found"
-    exit 1
-else
-    . $configfile
-    . $scriptsdir/functions
-fi
-
-# Main functions
-check_host () {
-    for command in $(ls -1 $checksdir) ; do
-        title="$HOSTNAME check: $command"
-        code=$(cat "$checksdir/$command")
-        ask_interactive
-        output=$($runcommand "$checksdir/$command" 2>&1)
-        handle_result
-    done
-}
-
-check () {
-    for command in $(ls -1 $projectsdir/$project/check) ; do
-        title="$HOSTNAME check: $command"
-        code=$(cat "$projectsdir/$project/check/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/check/$command" 2>&1)
-        handle_result
-    done
-
-    check_host
-    # show_report
-}
-
-log () {
-    tailcommand="tail"
-    which colortail >/dev/null 2>&1  && tailcommand="colortail"
-
-    if [ "x$project" != "xdefault" ] ; then
-        if [ $logsdir/$project ] ; then
-            alllog="$alllog $(cat $logsdir/$project)"
-        else
-            echo "WARNING: $logsdir/$project does not exist!"
-            exit 1
-        fi
-    else
-        if [ "$interactive" = "yes" ] ; then
-            echo "Choose one or more log topics to show. Select the last number (done) to end selection"
-            PS3="Type one number to add a log topic to the show list."
-            all_choices=""
-            select choice in $( ls $logsdir ) done
-            do
-                echo "You selected $choice [$REPLY]"
-                [[ $choice == "done" ]] && break
-                all_choices="$all_choices $choice"
-                echo "Your choices: $all_choices"
-            done
-            for log in $all_choices ; do
-                alllog="$alllog $(cat $logsdir/$log)"
-            done
-        else
-            for log in $(ls $logsdir) ; do
-                alllog="$alllog $(cat $logsdir/$log)"
-            done
-        fi
-    fi
-
-    # So, show something
-    if [ ! -z "$counts" ] ; then
-        if [ ! -z "$greppattern" ] ; then
-            $tailcommand -n $counts $alllog | grep $greppattern
-        else
-            $tailcommand -n $counts $alllog
-        fi
-    else
-        if [ ! -z "$greppattern" ] ; then
-            $tailcommand -f $alllog | grep $greppattern
-        else
-            $tailcommand -f $alllog
-        fi
-    fi
-}
-
-info () {
-    if [ "x$project" != "xdefault" ] ; then
-        if [ $infodir/$project ] ; then
-            $infodir/$project 
-        else
-            echo "WARNING: $infodir/$project does not exist!"
-            exit 1
-        fi
-    else
-        if [ "$interactive" = "yes" ] ; then
-            echo "Choose one or more topics to show. Select the last number (done) to end selection"
-            PS3="Type one number to add an info topic to the show list."
-            all_choices=""
-            select choice in $( ls $infodir ) done
-            do
-                echo "You selected $choice [$REPLY]"
-                [[ $choice == "done" ]] && break
-                all_choices="$all_choices $choice"
-                echo "Your choices: $all_choices"
-            done
-            for info in $all_choices ; do
-                if [ ! -z "$greppattern" ] ; then
-                    $infodir/$info | grep $greppattern
-                else
-                    $infodir/$info
-                fi
-            done
-        else
-            for info in $(ls $infodir) ; do
-                if [ ! -z "$greppattern" ] ; then
-                    $infodir/$info | grep $greppattern
-                else
-                    $infodir/$info
-                fi
-            done
-        fi
-    fi
-}
-
-
-todo () {
-    for todo in $(ls $tododir) ; do
-        $tododir/$todo
-    done
-}
-
-
-rollback () {
-    if [ ! -z $rollbackversion ] ; then
-        save_runtime_config "rollbackversion=$rollbackversion" || initerr=1
-    else
-        echo "Choose deploy to rollback:"
-        ls -1 $archivedir/$project
-        read rollbackversion
-        save_runtime_config "rollbackversion=$rollbackversion" || initerr=1
-    fi
-    
-    for command in $(ls -1 $projectsdir/$project/rollback) ; do
-        title="$HOSTNAME Rollback: $command"
-        code=$(cat "$projectsdir/$project/rollback/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/rollback/$command" 2>&1)
-        handle_result
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-deploy () {
-    for command in $(ls -1 $projectsdir/$project/deploy) ; do
-        title="$HOSTNAME Deploy: $command"
-        code=$(cat "$projectsdir/$project/deploy/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/deploy/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-        if [ "$DONTDEPLOY" = "1" ] ; then
-             echo "No need to deploy: source file has not changed"
-             echo "Type 'rm $archivedir/$project/md5sum' and run puppi again to force deployment" 
-             exit 0
-        fi
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-initialize () {
-    for command in $(ls -1 $projectsdir/$project/initialize) ; do
-        title="$HOSTNAME Init: $command"
-        code=$(cat "$projectsdir/$project/initialize/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/initialize/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-configure () {
-    for command in $(ls -1 $projectsdir/$project/configure) ; do
-        title="$HOSTNAME Init: $command"
-        code=$(cat "$projectsdir/$project/configure/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/configure/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-save_summary () {
-    tagend=$(date +%Y%m%d-%H%M%S)
-
-    result="OK"
-    if [ "$EXITWARN" = "1" ] ; then
-        result="WARNING"
-    fi
-    if [ "$EXITCRIT" = "1" ] ; then
-        result="ERROR"
-    fi
-
-    echo "Report for $action on $project" > $logdir/$project/$tag/summary
-    echo "Job start: $tag" >> $logdir/$project/$tag/summary
-    echo "Job end: $tagend" >> $logdir/$project/$tag/summary
-    echo "Job result: $result" >> $logdir/$project/$tag/summary
-    echo "Actions executed:" >> $logdir/$project/$tag/summary
-    cd $logdir/$project/$tag/
-    for message in $(ls -1 $logdir/$project/$tag/ | grep -v summary ) ; do
-        msg_title=$(head -1 $message)
-        msg_code=$(head -2 $message | tail -1) 
-        msg_result=$(head -3 $message | tail -1) 
-        echo "[$msg_result] $msg_title : $msg_code" >> $logdir/$project/$tag/summary
-    done
-
-    # Copy runtime config in archive
-    cp $workdir/$project/config $logdir/$project/$tag/
-
-    # Write runtime config on Summary
-    echo >> $logdir/$project/$tag/summary
-    echo "RUNTIME CONFIGURATION" >> $logdir/$project/$tag/summary
-    cat $workdir/$project/config | grep -vE "^#|^$"  >> $logdir/$project/$tag/summary
-
-}
-
-send_reports () {
-    if [[ "x$report" == "xyes" ]] ; then
-        save_summary
-        for command in $(ls -1 $projectsdir/$project/report) ; do
-            title="Reporting: $command"
-            code=$(cat "$projectsdir/$project/report/$command")
-            echo -n $title
-            output=$($runcommand "$projectsdir/$project/report/$command" 2>&1)
-            # handle_result # This breaks the overall exit code when deploy fails
-        done
-    fi
-}
-
-show_report () {
-    echo
-    echo "REPORT FOR PUPPI - STATUS $result"
-    echo "Summary of operations is: $logdir/$project/$tag/summary "
-    echo "Details are in: $logdir/$project/$tag/"
-    echo "Temporary workdir has been: $workdir/$project/ (Will be rewritten at the next puppi run)"
-    echo "Runtime config file is: $workdir/$project/config"
-    echo "Files have been archived in: $archivedir/$project/$tag"
-    test "$testmode" = "yes" && echo "This was a TEST RUN! Nothing has been done for real."
-}
-
-
-create_runtime_conf () {
-    if [[ ( ! -e $projectsdir/$project ) && ( ! -e $infodir/$project ) && ( ! -e $logsdir/$project ) ]] ; then
-        showhelp
-        exit 1
-    fi
-
-    initerr=0
-
-    # When project is unset we set it to default
-    [ ! -z "$project" ] || export project="default"
-
-    # Clean up and Create runtime configuration file 
-#    command="00-$project-RuntimeConfig-Initialization"
-#    title="Puppi setup: $command"
-#    code="rm -rf $workdir/$project && touch $workdir/$project/config [...]"
-#    echo -n $title
-
-    echo $workdir | grep tmp >/dev/null 2>&1 || ( echo "Workdir must contain string tmp" ; exit 1 )
-    rm -rf $workdir/$project || initerr=1
-
-    mkdir -p $workdir/$project || initerr=1
-    touch $workdir/$project/config || initerr=1
-
-    test -r "$projectsdir/$project/config" && cp $projectsdir/$project/config $workdir/$project/
-    chmod 644 $workdir/$project/config || initerr=1
-
-    save_runtime_config "project=$project" || initerr=1
-    save_runtime_config "tag=$tag" || initerr=1
-    save_runtime_config "action=$action" || initerr=1
-
-    storedir=$workdir/$project/store || initerr=1
-    mkdir -p $storedir || initerr=1
-    save_runtime_config "storedir=$storedir" || initerr=1
-
-    predeploydir=$workdir/$project/deploy || initerr=1
-    mkdir -p $predeploydir || initerr=1
-    save_runtime_config "predeploydir=$predeploydir" || initerr=1
-
-    save_runtime_config "force=$force" || initerr=1
-    save_runtime_config "testmode=$testmode" || initerr=1
-    save_runtime_config "interactive=$interactive" || initerr=1
-    save_runtime_config "debug=$debug" || initerr=1
-    save_runtime_config "report=$report" || initerr=1
-    save_runtime_config "show=$show" || initerr=1
-    save_runtime_config "counts=$counts" || initerr=1
-    save_runtime_config "greppattern=$greppattern" || initerr=1
-
-    for oopt in $(echo $options) ; do
-        save_runtime_config "$(echo $oopt)" || initerr=1
-    done
-    
-    echo $initerr | grep "0" 2>&1 > /dev/null
-#    handle_result
-}
-
-
-showhelp () {
-   echo "Usage: puppi <command> [project|topic] [options]"
-   echo " "
-   echo "Available commands:"
-   echo "check [project] [-s <yes|no|fail>] - Run puppi checks host or project wide"
-   echo "log [topic] [-i] [-g <pattern>] - Show system and application specific logs"
-   echo "info [topic] [-i] [-g <pattern>] - Show informations about the system"
-   echo "todo - Show todo's checklist of the system"
-   echo "init <project> [-i] [-f] [-t] - First time project initialization and setup"
-   echo "configure <project> [-i] [-f] [-t] - Project configuration deployment."
-   echo "deploy <project> [-i] [-f] [-t] [-o ...] - Deploy the specified project"
-   echo "rollback <project> [state] [-i] [-f] [-t] - Rollback the specified project. "
-   echo " "
-   echo "Available options:"
-   echo "-f - Force puppi commands execution flow also on CRITICAL errors"
-   echo "-i - Interactively ask confirmation for every step"
-   echo "-t - Test mode. Just show the commands that should be executed"
-   echo "-d <yes|full> - Debug mode. Show debug of what is done."
-   echo "-r <yes|no|fail> - Enable reporting: yes/no/only on failures. Default depends on action"
-   echo "-s <yes|no|fail> - Show output: yes/no/only for failures. Default: yes"
-   echo "-g <pattern> - Grep command output with the selected pattern"
-   echo "-o \"parameter=value parameter2=value2\" - Set manual options to override defaults"
-   echo " "
-   echo "Available deploy projects:"
-   ls -1 $projectsdir
-   echo 
-   echo "Available info topics:"
-   ls $infodir 
-   echo 
-   echo "Available log topics:"
-   ls $logsdir
-}
-
-# Check Input
-if [ "$#" = "0" ] ; then
-    showhelp
-    exit
-fi
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    deploy|init|configure)
-      report="yes"
-      export action=$1
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        showhelp
-        exit
-        shift
-      fi
-    ;;
-    rollback)
-      report="yes"
-      export action=$1
-      if [ -n "$3" ] ; then
-        echo "$3" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          export rollbackversion=$(shell_filter_strict $3)
-          shift 3
-        else
-          shift 2
-        fi
-      elif [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        showhelp
-        exit
-        shift
-      fi
-    ;;
-    check)
-      report="no"
-      export action="checkhost"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          export action="check"
-          shift 2
-        else
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    log)
-      report="no"
-      export action="log"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else 
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    info)
-      report="no"
-      export action="info"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    todo)
-      report="no"
-      export action="todo"
-      shift ;;
-    -i)
-      interactive="yes"
-      shift ;;
-    -f)
-      force="yes"
-      shift ;;
-    -t)
-      testmode="yes"
-      runcommand="cat"
-      shift ;;
-    -o)
-      options="$2"
-      shift 2;;
-    -d)
-      debug="$(shell_filter_strict $2)"
-      shift 2;;
-    -r)
-      report="$(shell_filter_strict $2)"
-      shift 2;;
-    -s)
-      show="$(shell_filter_strict $2)"
-      shift 2;;
-    -c)
-      counts="$(shell_filter_strict $2)"
-      shift 2;;
-    -g)
-      greppattern="$(shell_filter_strict $2)"
-      # greppattern="$(shell_filter $2)" # This allows partial regexp usage
-      # greppattern="$2" # This allows full regexp usage but is highly insecure if you sudo puppi
-      shift 2;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-# Action!
-case $action in 
-    check) check ;;
-    checkhost) check_host ;;
-    log) create_runtime_conf ; log ;;
-    info) create_runtime_conf ; info ;;
-    todo) create_runtime_conf ; todo ;;
-    rollback) create_runtime_conf ; rollback ;;
-    deploy) create_runtime_conf ; deploy ;;
-    init) create_runtime_conf ; initialize ;;
-    configure) create_runtime_conf ; configure ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb
deleted file mode 100644
index f6a0eaa0da7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# This scripts cleans puppi log files older than <%= scope.lookupvar('puppi::logs_retention_days') %>
-seconds=$(( (RANDOM%60+1)*60 ))
-sleep $seconds
-
-if [ "<%= scope.lookupvar('puppi::params::logdir') %>" == "/" ] || [ "x<%= scope.lookupvar('puppi::params::logdir') %>" == "x" ]; then
-  exit 1
-fi
-find <%= scope.lookupvar('puppi::params::logdir') %> -type f -mtime +<%= scope.lookupvar('puppi::logs_retention_days') %> -exec rm '{}' '+' >/dev/null 2>&1
-find <%= scope.lookupvar('puppi::params::logdir') %> -type d -mtime +<%= scope.lookupvar('puppi::logs_retention_days') %> -exec rmdir '{}' '+' >/dev/null 2>&1
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb
deleted file mode 100644
index 3eaf03fc341..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Script generated by Puppet. It's executed when you run:
-# puppi todo <%= name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-echo_title "$HOSTNAME - <%= name %>"
-
-<% if @description != "" -%>
-cat <<EOF
-<%= @description %>
-EOF
-<% end -%>
-
-<% if @notes != "" -%>
-cat <<EOF
-<%= @notes %>
-EOF
-<% end -%>
-
-<% if @run != "" -%>
-<% array_run.each do |cmd| %>show_command "<%= cmd -%>"
-<% end -%>
-<% end -%>
-
-<% if @check_command != "" -%>
-<%= @check_command %>
-if [ "x$?" = "x0" ] ; then
-    echo_success
-    result="OK"
-else
-    echo_failure
-    result="CRITICAL"
-    EXITCRIT="1"
-fi
-<% else -%>
-echo_warning
-result="WARNING"
-EXITWARN="1"
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml
deleted file mode 100644
index 1d111f97527..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-    "staging": "git://github.com/nanliu/puppet-staging.git"
-    erlang:
-      repo: "https://github.com/garethr/garethr-erlang.git"
-  symlinks:
-    "rabbitmq": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml
deleted file mode 100644
index cbd0d57b83d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml
deleted file mode 100644
index 9f68e1fe0d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        mSHk+9ReN6wxJ9sOgySOSKEjaXOdtT9B1BtvsOGcm/FQI3p57meid3B6z37r\nNv9PbxwGb
-        mcZafMxNAfwr8nUb/bqxeXnZaGiY0E9pvg9aRr3g4knczn+siW+\nDkKlvM0rex2zzF0PDc
-        495e61kP5cxcKNVdDJSiUPPK6fNGQ1xX8=
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_GEM_VERSION="~> 3.4.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG
deleted file mode 100644
index 2a6e7d81acb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG
+++ /dev/null
@@ -1,115 +0,0 @@
-2014-05-16 - Version 4.0.0
-
-Summary:
-
-This release includes many new features and bug fixes.  With the exception of
-erlang management this should be backwards compatible with 3.1.0.
-
-Backwards-incompatible Changes:
-- erlang_manage was removed.  You will need to manage erlang separately. See
-the README for more information on how to configure this.
-
-Features:
-- Improved SSL support
-- Add LDAP support
-- Add ability to manage RabbitMQ repositories
-- Add ability to manage Erlang kernel configuration options
-- Improved handling of user tags
-- Use nanliu-staging module instead of hardcoded 'curl'
-- Switch to yum or zypper provider instead of rpm
-- Add ability to manage STOMP plugin installation.
-- Allow empty permission fields
-- Convert existing system tests to beaker acceptance tests.
-
-Bugfixes:
-- exchanges no longer recreated on each puppet run if non-default vhost is used
-- Allow port to be UNSET
-- Re-added rabbitmq::server class
-- Deprecated previously unused manage_service variable in favor of 
-  service_manage
-- Use correct key for rabbitmq apt::source
-- config_mirrored_queues variable removed
-  - It previously did nothing, will now at least throw a warning if you try to
-    use it
-- Remove unnecessary dependency on Class['rabbitmq::repo::rhel'] in
-  rabbitmq::install
-
-
-2013-09-14 - Version 3.1.0
-
-Summary:
-
-This release focuses on a few small (but critical) bugfixes as well as extends
-the amount of custom RabbitMQ configuration you can do with the module.
-
-Features:
-- You can now change RabbitMQ 'Config Variables' via the parameter `config_variables`.
-- You can now change RabbitMQ 'Environment Variables' via the parameter `environment_variables`.
-- ArchLinux support added.
-
-Fixes:
-- Make use of the user/password parameters in rabbitmq_exchange{}
-- Correct the read/write parameter order on set_permissions/list_permissions as
-  they were reversed.
-- Make the module pull down 3.1.5 by default.
-
-* 2013-07-18 3.0.0
-Summary:
-This release heavily refactors the RabbitMQ and changes functionality in
-several key ways.  Please pay attention to the new README.md file for
-details of how to interact with the class now.  Puppet 3 and RHEL are
-now fully supported.  The default version of RabbitMQ has changed to
-a 3.x release.
-
-Bugfixes:
-- Improve travis testing options.
-- Stop reimporting the GPG key on every run on RHEL and Debian.
-- Fix documentation to make it clear you don't have to set provider => each time.
-- Reference the standard rabbitmq port in the documentation instead of a custom port.
-- Fixes to the README formatting.
-
-Features:
-- Refactor the module to fix RHEL support.  All interaction with the module
-is now done through the main rabbitmq class.
-- Add support for mirrored queues (Only on Debian family distributions currently)
-- Add rabbitmq_exchange provider (using rabbitmqadmin)
-- Add new `rabbitmq` class parameters:
-  - `manage_service`: Boolean to choose if Puppet should manage the service. (For pacemaker/HA setups)
-- Add SuSE support.
-
-Incompatible Changes:
-- Rabbitmq::server has been removed and is now rabbitmq::config.  You should
-not use this class directly, only via the main rabbitmq class.
-
-* 2013-04-11 2.1.0
-- remove puppetversion from rabbitmq.config template
-- add cluster support
-- escape resource names in regexp
-
-* 2012-07-31 Jeff McCune <jeff@puppetlabs.com> 2.0.2
-- Re-release 2.0.1 with $EDITOR droppings cleaned up
-
-* 2012-05-03 2.0.0
-- added support for new-style admin users
-- added support for rabbitmq 2.7.1
-
-* 2011-06-14 Dan Bode <dan@Puppetlabs.com> 2.0.0rc1
-- Massive refactor:
-- added native types for user/vhost/user_permissions
-- added apt support for vendor packages
-- added smoke tests
-
-* 2011-04-08 Jeff McCune <jeff@puppetlabs.com> 1.0.4
-- Update module for RabbitMQ 2.4.1 and rabbitmq-plugin-stomp package.
-
-2011-03-24 1.0.3
-- Initial release to the forge.  Reviewed by Cody.  Whitespace is good.
-
-2011-03-22 1.0.2
-- Whitespace only fix again...  ack '\t' is my friend...
-
-2011-03-22 1.0.1
-- Whitespace only fix.
-
-2011-03-22 1.0.0
-- Initial Release.  Manage the package, file and service.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile
deleted file mode 100644
index 02e632165fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
-end
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile
deleted file mode 100644
index 5301dbce61b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'puppetlabs-rabbitmq'
-version '4.0.0'
-source 'git://github.com/puppetlabs/puppetlabs-rabbitmq.git'
-author 'puppetlabs'
-license 'Apache'
-summary 'RabbitMQ Puppet Module'
-description 'This module manages RabbitMQ. Tested on Debian, Ubuntu, and RedHat'
-project_page 'http://github.com/puppetlabs/puppetlabs-rabbitmq'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 2.0.0'
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'nanliu/staging', '>= 0.3.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
deleted file mode 100644
index d956bdedcff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
+++ /dev/null
@@ -1,394 +0,0 @@
-#rabbitmq
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with rabbitmq](#setup)
-    * [What rabbitmq affects](#what-rabbitmq-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with rabbitmq](#beginning-with-rabbitmq)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-   * [RedHat module dependencies](#redhat-module-dependecies)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-This module manages RabbitMQ (www.rabbitmq.com)
-
-##Module Description
-The rabbitmq module sets up rabbitmq and has a number of providers to manage
-everything from vhosts to exchanges after setup.
-
-This module has been tested against 2.7.1 and is known to not support
-all features against earlier versions.
-
-##Setup
-
-###What rabbitmq affects
-
-* rabbitmq repository files.
-* rabbitmq package.
-* rabbitmq configuration file.
-* rabbitmq service.
-
-###Beginning with rabbitmq
-
-```puppet
-include '::rabbitmq'
-```
-
-##Usage
-
-All options and configuration can be done through interacting with the parameters
-on the main rabbitmq class.  These are documented below.
-
-##rabbitmq class
-
-To begin with the rabbitmq class controls the installation of rabbitmq.  In here
-you can control many parameters relating to the package and service, such as
-disabling puppet support of the service:
-
-```puppet
-class { '::rabbitmq':
-  service_manage    => false,
-  port              => '5672',
-  delete_guest_user => true,
-}
-```
-
-### Environment Variables
-To use RabbitMQ Environment Variables, use the parameters `environment_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  environment_variables   => {
-    'RABBITMQ_NODENAME'     => 'node01',
-    'RABBITMQ_SERVICENAME'  => 'RabbitMQ'
-  }
-}
-```
-
-### Variables Configurable in rabbitmq.config
-To change RabbitMQ Config Variables in rabbitmq.config, use the parameters `config_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  config_variables   => {
-    'hipe_compile'  => true,
-    'frame_max'     => 131072,
-    'log_levels'    => "[{connection, info}]"
-  }
-}
-```
-
-To change Erlang Kernel Config Variables in rabbitmq.config, use the parameters
-`config_kernel_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  config_kernel_variables  => {
-    'inet_dist_listen_min' => 9100,
-    'inet_dist_listen_max' => 9105,
-  }
-}
-```
-
-### Clustering
-To use RabbitMQ clustering facilities, use the rabbitmq parameters
-`config_cluster`, `cluster_nodes`, and `cluster_node_type`, e.g.:
-
-```puppet
-class { 'rabbitmq':
-  config_cluster    => true,
-  cluster_nodes     => ['rabbit1', 'rabbit2'],
-  cluster_node_type => 'ram',
-}
-```
-
-**NOTE:** If you are using a version of RabbitMQ less than 3.0,
-you still need to use `x-ha-policy: all` in your client
-applications for any particular queue to take advantage of H/A via
-mirrored queues.
-
-If you are using a version of RabbitMQ >= 3.0 You should set the
-'config_mirrored_queues' parameter if you plan
-on using RabbitMQ Mirrored Queues within your cluster:
-
-```puppet
-class { 'rabbitmq':
-  config_cluster         => true,
-  config_mirrored_queues => true,
-  cluster_nodes          => ['rabbit1', 'rabbit2'],
-}
-```
-
-##Reference
-
-##Classes
-
-* rabbitmq: Main class for installation and service management.
-* rabbitmq::config: Main class for rabbitmq configuration/management.
-* rabbitmq::install: Handles package installation.
-* rabbitmq::params: Different configuration data for different systems.
-* rabbitmq::service: Handles the rabbitmq service.
-* rabbitmq::repo::apt: Handles apt repo for Debian systems.
-* rabbitmq::repo::rhel: Handles yum repo for Redhat systems.
-
-###Parameters
-
-####`admin_enable`
-
-If enabled sets up the management interface/plugin for RabbitMQ.
-
-####`cluster_disk_nodes`
-
-DEPRECATED AND REPLACED BY CLUSTER_NODES.
-
-####`cluster_node_type`
-
-Choose between disk and ram nodes.
-
-####`cluster_nodes`
-
-An array of nodes for clustering.
-
-####`config`
-
-The file to use as the rabbitmq.config template.
-
-####`config_cluster`
-
-Boolean to enable or disable clustering support.
-
-####`config_mirrored_queues`
-
-DEPRECATED
-
-Configuring queue mirroring should be done by setting the according policy for
-the queue. You can read more about it
-[here](http://www.rabbitmq.com/ha.html#genesis)
-
-####`config_path`
-
-The path to write the RabbitMQ configuration file to.
-
-####`config_stomp`
-
-Boolean to enable or disable stomp.
-
-####`delete_guest_user`
-
-Boolean to decide if we should delete the default guest user.
-
-####`env_config`
-
-The template file to use for rabbitmq_env.config.
-
-####`env_config_path`
-
-The path to write the rabbitmq_env.config file to.
-
-####`erlang_cookie`
-
-The erlang cookie to use for clustering - must be the same between all nodes.
-
-####`config_variables`
-
-To set config variables in rabbitmq.config
-
-####`node_ip_address`
-
-The value of RABBITMQ_NODE_IP_ADDRESS in rabbitmq_env.config
-
-####`environment_variables`
-
-RabbitMQ Environment Variables in rabbitmq_env.config
-
-####`package_ensure`
-
-Determines the ensure state of the package.  Set to installed by default, but could
-be changed to latest.
-
-####`package_name`
-
-The name of the package to install.
-
-####`package_provider`
-
-What provider to use to install the package.
-
-####`package_source`
-
-Where should the package be installed from?
-
-####`plugin_dir`
-
-Location of RabbitMQ plugins.
-
-####`port`
-
-The RabbitMQ port.
-
-####`management_port`
-
-The port for the RabbitMQ management interface.
-
-####`service_ensure`
-
-The state of the service.
-
-####`service_manage`
-
-Determines if the service is managed.
-
-####`service_name`
-
-The name of the service to manage.
-
-####`ssl`
-
-Configures the service for using SSL.
-
-####`ssl_only`
-
-Configures the service to only use SSL.  No cleartext TCP listeners will be created.
-Requires that ssl => true also.
-
-####`stomp_port`
-
-The port to use for Stomp.
-
-####`stomp_ensure`
-
-Boolean to install the stomp plugin.
-
-####`wipe_db_on_cookie_change`
-
-Boolean to determine if we should DESTROY AND DELETE the RabbitMQ database.
-
-####`version`
-
-Sets the version to install.
-
-##Native Types
-
-### rabbitmq\_user
-
-query all current users: `$ puppet resource rabbitmq_user`
-
-```
-rabbitmq_user { 'dan':
-  admin    => true,
-  password => 'bar',
-}
-```
-Optional parameter tags will set further rabbitmq tags like monitoring, policymaker, etc.
-To set the administrator tag use admin-flag.
-```puppet
-rabbitmq_user { 'dan':
-  admin    => true,
-  password => 'bar',
-  tags     => ['monitoring', 'tag1'],
-}
-```
-
-
-### rabbitmq\_vhost
-
-query all current vhosts: `$ puppet resource rabbitmq_vhost`
-
-```puppet
-rabbitmq_vhost { 'myhost':
-  ensure => present,
-}
-```
-
-### rabbitmq\_exchange
-
-```puppet
-rabbitmq_exchange { 'myexchange@myhost':
-  user     => 'dan',
-  password => 'bar',
-  type     => 'topic',
-  ensure   => present,
-}
-```
-
-### rabbitmq\_user\_permissions
-
-```puppet
-rabbitmq_user_permissions { 'dan@myhost':
-  configure_permission => '.*',
-  read_permission      => '.*',
-  write_permission     => '.*',
-}
-```
-
-### rabbitmq\_plugin
-
-query all currently enabled plugins `$ puppet resource rabbitmq_plugin`
-
-```puppet
-rabbitmq_plugin {'rabbitmq_stomp':
-  ensure => present,
-}
-```
-
-##Limitations
-
-This module has been built on and tested against Puppet 2.7 and higher.
-
-The module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-### Module dependencies
-To have a suitable erlang version installed on RedHat and Debian systems,
-you have to install another puppet module from http://forge.puppetlabs.com/garethr/erlang with:
-
-    puppet module install garethr-erlang
-
-This module handles the packages for erlang.
-To use the module, add the following snippet to your site.pp or an appropriate profile class:
-
-For RedHat systems:
-
-    include 'erlang'
-    class { 'erlang': epel_enable => true}
-
-For Debian systems:
-
-    include 'erlang'
-    package { 'erlang-base':
-      ensure => 'latest',
-    }
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Authors
-* Jeff McCune <jeff@puppetlabs.com>
-* Dan Bode <dan@puppetlabs.com>
-* RPM/RHEL packages by Vincent Janelle <randomfrequency@gmail.com>
-* Puppetlabs Module Team
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile
deleted file mode 100644
index 5868545f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO
deleted file mode 100644
index 8ae578e9e38..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-provider TODO -
-  - password should be a property and not a param
-     - what if we tried to log in as that user?
-  - can permissions from list_user_permissions contain whitespace?
-  - what about defaultfor :true?
-  - prefetching for performance
-  - rabbit plugin should require rabbitmq class
-  - rabbitmq class should be renamed server??
-  - service name should default to -server
-  - cannot find stomp package
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown
deleted file mode 100644
index be52188c47b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
-Files
-=====
-
-Puppet comes with both a client and server for copying files around. The file
-serving function is provided as part of the central Puppet daemon,
-puppetmasterd, and the client function is used through the source attribute of
-file objects. Learn more at
-http://projects.puppetlabs.com/projects/puppet/wiki/File_Serving_Configuration
-
-You can use managed files like this:
-
-    class myclass {
-      package { mypackage: ensure => latest }
-      service { myservice: ensure => running }
-      file { "/etc/myfile":
-        source => "puppet://$servername/modules/mymodule/myfile"
-      }
-    }
-
-The files are searched for in:
-
-    $modulepath/mymodule/files/myfile
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
deleted file mode 100644
index 125a89a7b79c40f2d41f912b7e71dc20503c4d7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151907
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%0D&Db
zu!w-cR*-`n7^5mkz=$zkS&dQwPD2Tzha*1jNgpsIgrK3=f(AHP24|KQF4Ph5!`(kY
z8zMH;|Kz};83+K}g=JpJA~}=`3z|esx<rW>r`|$|1|w!Ao{QHNmSj~XXmA)?+Ot#r
zniK+ModP2=HOvVRvHds3{*!#4>xGT;MXXSM$qJx2I0r2l0BR861606(V(y|OKmttI
zLmpLtq*qy4Aj}h@J7)UZdnUjO{2R>u+|xZPZ%0%GKyFW!#GIHDAd)!)wg2NUeq-)h
z&UAE113&?web#y&fWe%t8{i!vK4-^`=MPc*e)>&6LxlR=j&~P;0uUm*<|$_)pV{xT
zX}#I}?V<vPANbgs{y#y^$wv0EHGi==qvV{kpE$63-%|H&8N_4=yu`dnq;gV>%E+R%
zvm75Qs*O5y#NFL&w7>-0qF``(&!`{3e`|upJtDjQ0VM_b{~^~aKdWmuf@#U{3|W&%
zvvW*~{3wqe3aURQ`;V2ZlJ1TZ^&)<wip>)DJiee#TQf0L3;ob`zN3)G{O$)}{SInt
z7vuJ7<T;uDRdg>BM03?79b<+eK_Ce{bLIMTArx3ZliTs}=S06G`Eg#&-^X5*fhYUu
zIn?R>_WI1^^8emf+kJ5rEYCf;fCn`GMoD;G3hp2Id?b<nqyY!OxjF)@hk@*SjePNT
zjsCg`L~(v}cXCAN$E755EqS~}zIkzcAa8Hm|5n|<xI4QJ|H4B2_&`POZ)^L_`z^5?
z>HYZ0)%DpCZvB{(Fa{P@o>*|#S748y`!Xk1kne8qL;yJ4h&VpGzJK7}y(mxsK1BSD
z*by?C%cIMuD`J=DR)Xwf{>xw&EO8*=0*gi`j@JJkg+S!s<?Vq#{_51EpGTs8`u55T
z{UPT`{>6&$@6%)9SOV#wGz)g{PSyrAWo8(yfFcj3+nc+id;r^ZTy7>0mz&_*k+t&S
zv-PqJJp++nwGrMSN2Zc94oaZhLW(X?jbXnPxIS#nQVr?BgYeS$Mn|3V75v<9__!>2
zwqEqahpP{LSjPCz#j2#O|D)?tx3_L0d&TPe#r2=Ne9%Pvxpf~aI{m&2o-{S2=T;{@
zJ%`GBNJD;s68=IZZU-|-{4V0ttbObT_!d4ce%!iz8g1`-X5r=st@uQX21>~;FXz$j
z#-k0xk?9rQD{$y7ygxF~54c<qst?$?1Wa0luE7+UDfp$Y`fkbNj<KTGdSs6Ti6Zl4
zrc|dr<l~)tk}0cdQlb|8C7Jr7E5DL(0PIpiXEbU<Y3e936~5#AGFL3=$Sgx8Urat$
zn&Pvo%tXitHZ74?(@auMXD+<PSNpD<QK{0<1l^E<wfe2#$+hnbwBDX1U(P&CMUA+;
zk7z5jQ7zPGSdyAq=gX~{H&wLrTj?ek>J}IV5<Bcr9NHskrPT7eF|F((kGN+;<W5tH
zfJr}i3-K1SK~N5HS?8VjMPZ9mQv9^%yxGyZm|^&s`KjT0tpU?@cK=u>qT=IX8{>be
z@x9#os)ixSP5sr4@nQF%JJh@uNW2}DGlbnP9{6`>7gXSy9N6j3%AE*tv39jpAsY5v
zs#-6$h7aZOE8GV`JwJn;r|Z@DCx8-q_k=-489hjRQk$^B$dw*AHQ4+>k0zl_e&j^Y
zTx-Yu`se%gnT1-k6xQ)govv5_&>f3fBSA_u@2wk9Yxu0$WqBN35ezr@@!58}CFDS!
z!6}dK)`@Km_1AnKc$4t2bdG%a`i{RkQ|>t*zr~Y-BTd+k$NFD)0-~#Nk@{q-Vbb-j
z`6cBNx9yoLgl+U0IuFh*A67(Eeb#dcnf4>bdn2O;*3PfC#ByN(T}Sfuzc*QA*|f;d
z0>~G>;bD52G1*kOo-o0h)#SxB-|u9dmUEeHQV2e`JL1&QA$vDh4=KZ4&4tgJ9XGNQ
zG_hl?`55G3gx!#?PgCekXbqJca*&zHYF=5V-MR$Uni(dZjkrCRkMB|wDqK99V*DzN
zC<9hit2N}&j@nd<^^^w7;|haA@5z-%e75R{n!#o4G>|tT3$4zz+uldxIK%=Lwu7#z
z*XjIvY8TwM+wly2FMyKdj$fTNupgbd59;n0=A7CIody}i>g}qrMykLPzBvAUGWw+A
z8W`tK+T5((r~Udy`Uyg=3S|@?)^GdA#eVePWpa{?BbFR}<6UMEu5=atUag+{Y?kpR
zufo<_MtJ2Nq02Yi>13}n(*K4p{Ws60Si(sf7G9S|$L5Xb^iSQaj^olBTe+5Kag|D~
zP#iU1$R$?NfIVmuwM?&9g0p_hYjmU}6$YXD=mo}YAChNqci<Vz9vMj|jNemS7wSG2
zyB8R&tB3_?^duo(ox1&&uTb--9iCN>G(?xtEh8e}4~qm}rkJGI&?il$-IJ4!&Ft$!
z<tZpj+Ua}W_m6!4kWl@WJqJaq&5}8SZ=2F98WAo&2w$SyY}egdds(w%reGTT9$e86
zbIDl;+3PulH&*oClptj_8SFvz2mF29CrXTD2br?7zh<I)il)S)Xdt-raAUmODm8vq
zKqkdHbSJDgdMS`hF2~9*hasvDx?n#!HpLlvkGCIENg+r21km**5b?YBIQad57Fy(U
zonE2Ebkky-8Te!duXJiV+MI<?RFyRi<OUT2pLa(en2+xLWrFU3p^NTs0a}!JizKiT
zSygkPH{LO&b%t`@+=ONDNQlTm$83_g^n-2lo%O4Fh|!bIl&;Np>RMaw4l({@m2um7
zyVX)fm-wwDS5p&%%?dm3VT;&y*k#cS8Xp&5PWr==k=t^nseMC$Vm~HO)HTAI@}wB~
z7Yf%AYA4KnchIg-Y=jp+>%}Kb1=D|=lm$YQPRPgA%uRJcibDA+3U6l2wi=$Ar)7v-
zA~S6R(8t(h^(rA<n6vZHUWi5$6apw^^u2UzxFb7=9fg=%ZJwhw1@ozU4_wt|$MLqx
zY{PbF=W83b)GPQrTjeRO^XMS;eMuQLDe=6HQmb_?Cd*^d#=V%HvosgjbTJ{Uh{<0O
z8&sA+I~D?x&QX79+G{D#r-Lh&tjVOOmJ#cZD^<K|;#Jcsj_4iZLVWtIFNG}Q1Bwe<
z1vUQFcE3Kx2S-aQg*00qig*}RO9%d`3~x>e-$A9cfg8m-I*ErQqaahikjEh9Dr!Lr
z<NLa<_v%KRWq$<7EPdrXAB6u*_7*N|<`|J?%eJ-P3h|YmwtgD$pX^W+L0*}@QV2Ua
zd0zNCl$CFXy*$R%B6FWn83223x<J@*#%UyEN$pYl=)jhD`He|oG)R^ANqrz$Fwkza
zm;W8z0GrZ*K!fL5ne=k<6pzwTq!my25d2<}nq0Rs%^eE;8IRe>8B$XnbmMn-d4xno
zjsyjmeiUfO{fqq4-3@17ZGwkbfqDquo!VAwJ^y}?Wj_}j(jk1B20d7{@(B{WI$0Y-
zv(x%0k7-MGh2@7%%eH*RL2J(gwDhK=5ehgsE3@xl(?zJ|crrj#Atn(Bz-TD=5aui8
zFU_Y+d|_}PFu(sGPbpoXf$4iksu)8!(Lh`Li}dtEDt5E@tE#7un71MOZ5{TknjdF}
zbgKEVq+)nY*x!aJVSlKl)s><*J$~K^Pa8`OZrl9iN&km`UNPeQ;w<>#@{g;|eqmJk
zn@_z?%88hGN@+gnCQ<6+%*nNj|He6(Bd;#ZL4sL7r8TZ8MS{RozrbFcZbCr{617_{
zv(V#fAx^%t`&H1Bv+nAo8Exo6<x*(W%Xv;MeTIs`+PiAE<5ZWgcLZsoP@D<cIk5<9
zZLf(`h&GVEPl1^~_c=x<V@a3jtpGylCi7$Bn!o~PH!3Z5sII94-fORfm|LyU!LWGr
z<dZTkkt#BQ5=)r|4EoVY^CGjn?FeYkhuiw5?v|i9hSW>mSBvdCMfRiyi?TYkWy0nO
zTC6jP$NEuQMqcmPN9IWsEprfNg$C9TcvCa@_6?J7CkdpF*y{<NJhtg2+F_xl_ii=D
z*d>Rnd9}&n05k2xs1<#&V_e8~<RJwmBWvX$<sQ3g?E}k+`2owRtn?{GhndYYGf%s<
zG|G_cJ(DjbRATFQ5`kg5$nd#1ky-^$E*VB`wRvRc!Rxbl{Tq1yPbEfhDTW;#&GI{-
zd!I>X#MOw7^CqQ8F;*f`lGnJVdVf8{;fDOJjK5Z6BzC8*u*TIisXeX=Y#~FjYIUv|
z0)JD-wuQVdt;5F(2#qO{Tu2*MTZ+5La;7^3zFasCe|RfXjnmjw0|iW1>f=u52;W)r
zfWG~i<9VVKF{v(}8p^ceC9Jnd=3TB>o_<SL1gkmC)JJCgTY;%(0;%{tpLu`uzh8~Z
zTSu@onM`|WK_wJwn(fD<ugylIG*)W0Nex8PHaq5&9CmD6$~P(X$w*s<)O$X~lKBS6
z*em`!mbsQ3?c%~D<U|t6qKXHSzlH+GiJ<t&$ub>pQ{4|GAEr#4rynuWvnn|W>(H<8
z?(EluQ21WKe@m6l+~kvvDbXji*n@?OsUELE{BYMLWeyFWw^TOXuz1+(PiyGk|7`zF
zhBUJ97Th6xOQPQlIT&jiKA`1tLIjqaJYmUYmmIG4x7fdQA9ucl>JbiDj8+DGf#)8c
z;e8Z3SX+s9ou3R1hcyol;37h)V>@^@*er0XQKL7Zxx1bB>EO0;zZvk2u@H^T{WvLl
zzO(*<)xGKXn%#?Y{$eTY#g#68BCU#(!#V0x(%s!AX3A%J%cmxwyHs(IF;WzL!nE{W
zwyJT5e$Qs9*!=J$=nQH)AA^?mck&Zf4GG^Ty~L+^|DxxC!tWSsVsQ!cG<#oa2LX6j
z^)ylB+W)s*Le?zeQ?%io<Ypyt<r4k(&vc>Y%gziir1M$2s!rMWZI8#YmyTOI!8m>T
z(ean#*WLEh6n;Pk?WB2!vU0aeQ(Fsa&dP)@(m`^Xrqi}yI6&=6BVNM7UFF-M*m@HJ
z+kX%)kR}!PO^CGx2p;OH?;3x5=z2TqraA1S)dg!8TrfogRRfEkX_swnnY5~K&q={y
z7n#1x{Nk#7U?XI}@~MKS^o+*4IOQp})(hqGTt6y5I!D0?kA?(U#=@j7;KB+{1cf!D
z8cYxt#m=P~d}MP595$u8&p?PJxVDELNBrP1r#dIds8p$<=G5byPxnGiN~W*QQnk%Y
zx7Do2PF(*7rR#a}J+iF8dam?ZknajxbCf-Nf3a3H@6?VM-=wICHGK^W4%wq<YFZ;3
zQSfjeh&f>z*i8(%6@Mc_4^1c>bX70w#i+sZzzvnT#EdPvLyO~l>#J7xuf8{@cg!Y#
zi}s5P+u_LTO1JXFJ76@>;!|2eI{?Cpj8{>NSA;Fu+(-<|iaDzCI{kGVY5T*yMZ2;x
z{fs@@Gn?eX!&MS0=wEc343$?QvJCmhSK3YTc>4WGJFlPv`8+NWOwp<Us@_+}`~@Ji
zTT1+xI9>>T3eZ+ot*U&mR=)Bjf$B6Zxw0g4lD702^BzMvv~3YkDGXi$`$VQ7tj7_a
z9wC#`Vb{pa1w9hfh_pUBt5NQ8vFU<OWUm?(e%mC4`-hZe5qW~hFD}z2Ux@Uf()B$?
z1}W2gv)-YlPT8wTnQWlpy9S9DPt|#1O&#M;>4@iLO1o<Uk9)`Nm^o&PfklVa)ytbW
z)yeF`>FkL1r!0T);tdhxqz<S}3|I+mH;}4BcK4E0Z)+Qpui8`6Z0Rpv$Nlo_ziK~1
zqHEF2>2CvHxX;|y7!~}wE1S!RqH=&l5(aXi9Q{b&U2{;Pd00y$RbLIUvX22!;V#GK
zn40{OA2zuKKX!J|^JS$}K!^nYo4ejGR-W`g8dBq8?u*rtI(k%?J(sY1=yEY11B|Tv
z94^cilCOA&GTXc+>+jc<ezL@hXct?$u!=k<3EPBc`g+{w07kPRjr&-HW=3atq~1#J
z{x%R;{R7N92wa|Y5f+10RrhL@H@3GKXL!El@aL5Dx`eV}z@wxFQpyQv&qh_y&Ja*E
z@n#aMr473Z!2SKHR9t?IKz?k4)imWkI`qA5ZMi*hPz~SK0E(quG^|gyiX5H4V|2!w
zCw#2A(8KffP<`jC??m+|H+SYNXBlJX-mKs7md{Y5p54I@I%DdQ%l|r`YzQN3%}-$o
zA$$+up7H^MXBPv~8<`JLREY~e)4Ov9O}SYvb%{}%QtIxT3<+~rg@5Upxy#EUW6k^;
zjeZ0^K+K)UW=GpgshPWKW{xxoK9&itiNbzwyO%o%z(7H#VcETWeO;Al4`X~yXSXmf
z^fx*mmBdbWyY}|(j@yfJEdXr%oZFwoN~9wd1Xp6@c^wZUgW=ycQgMpCjnbe+*vUFG
z6)7kr8DEO8mfR`63p?ilRJlJ?1!gXbT{EDGPR}MfaI)3y4g5H;)v$cN;?0M%SFFla
z+WPLOLt!y?PLRDjRI{eUxn=H*#|`D1A7v*6hSzZ4f(L^C0!s2LVMZ?$yzJNRDQ4C^
z%El?L_D5P?)_^2Iq{H${gCYx$B7Y%6B|(#(y5R7BuwHbU)t8T0tCjh+ITdh&lBA|9
z8q=Fp>1Uz0rTPkSd!|0<)<%cVHP_Q}bya(qS_OX3jSPJtd}N%{nYo^0I|aXALSy@v
zg9L7##*(E$TsTYFU>~YEk5qhd<96>3I>N6+cc=M^&LlVXOuFSW`4Xwhm~b(HEQ$KM
z&iVSidgyu~`b1u($Y`ZpwNhqTx9s)2Pr^<g5<?G<YSiDXgrFbqN}K!sTlWc5wK09E
z`1j5M4Q?ki?)TqoD6!8~<x2LaXmU#nQ-6DP^~heRcYl%FJumU|3~hX?EA7h{r>y;h
z?xn=3mNQp0Ta>a*#vR}1?=Zx|Td%XeZMeolM=<6oHLXvLfLv_pf{=+%3ORcYdE|k1
z6nTM!&;bdJ?T6XUg#3j#HHg}J#AAIuScWb|cICwU&?C{%%c!CW<L15z;$nM&`xeyN
z!F34G@OOsk<^maLm)}oWVC%OYV#B3CE|(4qzhlYmCv-M}8(RAMVt2Iy=ly}hr^*fi
zdx=hXa4-kd@M1drkTl`em=ra%h-GG$w44A_lBq@Gj2AvO8e2RHS)b=0_oD32&vOrH
zA!8{TDx+yc`E{#Ebnq$NE?7~CZg9=r4_&$M^Y3G@uqEJ}<ABwZ{oO}uk>_9Sy;$&`
z>P3O)a{Vl>GY@L5PtFDKO%cCdhaJwwSN+VD4Y&j6%tWTq<y#~_`KYOq+YJM{^g85{
z&Nf09MwWg0KZE{2E_(=#4qYGjtHl`HH|Q&yaeCQ7IS)BMt>)A`?Jqg9N|_R#JeKWE
zDDT&+wQ7Y!rAw1l4clFvlnmv741sy-pdN*(ks;m3{n?r*Vy>l{OE2~oG(Xrxa#oq5
zAoePB__E_XDri#Q2jO!k1^i@}JuGG>-x+68KJRx-RinDKfwugcF_|hFC+iYWrLGcA
zMW-#1)7>$a*Er7d&9>_~Qp(^{m(YJ4y@MwJMkZ$tdT$PT3hd(c=g=%yPUq92swrXZ
zbjEgWN9viP*2|npl9rzOvFWzu**s0?bgF7Og&8t5lFEzWC%J03H&o1WIn8pp&Anxo
z|Hvub&s`w3=0}YYlk=AemfVseKWe8s1Anp*9JlRm6#de!Bgt4B>Qsa)pjWG^W)za<
z>l*kwmsRRLK^+`6-csX&CpnQ{lLtBIwJha9UU`^t-O;%EN{bs2Qj=VVzeuhele+PA
zJnxGS;&oD)`sqFGTDND<+~m{6>3@dW#&$)Me7mH^dPi*>Lt0S~P14|hZWsDjaqJj1
zUE6#&j@r?WMMqWOXM?r0w=rvQ3E$5blsq7%Ac_P1Qd7tTMQ(3I#GAF?F#kR`D0$wh
zCN*32uWJF%Pj{~l+C_bS#0i5t2%&4|&9+j1Xi6VfDaR-$#p*hscZ*8mBMuXCZx6+G
zw5LKt#dPfWHwfY$r!e*@tGM#QrfFUEf4$kNY8>S(c6(ptQ;P(^d%fijC2?-dCV4=p
zsuwZVhARA+pSmU)WQFcY=*^R@?5s{6pK!;PpNkk8zHuO+J^94FySrVPl#`z#X=Ss*
zRj9aql@$v~`$8^a9>u8<vAd4j-ZQJPdX&puV?SW7JN8#2f7NCK)K*}u);5C7qYebK
zNGj3HF5FnC{l>^)_}DFP-XseSBSVW_16ehk)z@X#ZCW};f(>ISQyk%%aRX7cu;aL<
zC_!CI*V*kDA#p}T*&@>W4LPv*id;*)oG{lz5R`84I%9vZ(%QJ{gs1{Br9pR{*~)cf
z=iL|cn27)Krxe*O10IYv)jOPL6rhBH#XwZCY>yMuom)g;g*d(KGZSO?iv-BAFM3@t
zuzJ=T7%<ah)B?LRBc{<_*Vm9seEp&uoKi5^)cmv!<|Wc$Va_SE5GgJZ>wU~e?X04g
zj991=aNgGA)T=({E%+aG2_H7h)oUK%d7n2PexYcZBKgE4GY~6nXn_O!Dye=cLPN7A
zM3toK5*d$|So!e|I^h4Cg3j=KmiC(KM-h%-GjUA2X4=1Ha>q~Fso4(lfa9;&WRmrJ
zVcmEf9yOmMJIUGQPC+7rA8XYXd+=qM#va}ka(|(SiHFmEm3sbptK+qGrBKz?RiYB7
zney}S$mVO`-MCd({hHri8*{Ng`~5bem?EnCw^BBhL`oZ-=k%qPch2ut!r2S(m*nIV
zQ?e1(E0eTgQc3$EL}>-6T5-H)@;BLe@$QLwP#1O>Azz}3fzOM$hs5yab9ihtTKY?*
zO)7;#K2ub~RX(wnjY;!S@&=;0+(B<uPK@8_;+2y026>m6aTID9CRlszBg4P0q@wax
zN->9)>76@k<o2plpQ4Y1)0j4y;DSF%F}hwP>9$kpDcfl#>-nQI;hPw@GTK2;xt9HT
zY`rIqk<mcE?32vERX6|jd3buY%^){@WGtfuJAGFY^fz^8qju4No;!QdiI-rvI^VZ+
z<;#qoRVMaV%F8CNE)oNr1Bv@7q?q`2bs{o)w181o5FO&RJLceGK`Y~%(QB->DN1xv
zGBJiySDjt?&WueQ>@)63j+x>`ElmnEj-x~h6v^0=qE9-Cxt(<;57UziItY4W&q)wY
z(jq<iqSfbQmmZt*Ryb+A5@g+|Sp=G<%0#6p3TKMZ9~NBJdsgH|v+h|}Jgjrk!N07_
zw4sOdo5EF(iN(qymyKB$+4nQQw)Q8urquZ1h`YUbR=TCw9*Ix@;|VP1F*GlJHbZw6
z{jm1l_MU6n8EFueQ?AlMQ=mz#W3>{7;Ki6!nf;@lQst5Cd!4+qk1oe(*xUN%1FA+B
z?cG(;&~h45*kRCr8d1VoP5*p3p^a>5Ss0|E<@LrQuCLe`(seqng!oOQJDOh6|G71z
zmY^1ujJ@SleigW@0%n5W!@2dNA9*hCv0UaR5_*!=b9kNw_mNy~e7tBldN%8-YeD}t
zlK1bKMe_AG>Jnv+E;fu}|8(fsRDm8><4sk74QB&<!-vA85J)_YP(DxO&XRBMD`m-i
zdYre&RT|+n#%J4v$5w@K-l*oM!3`kJ#G7?9(AsI<eb_HF?<BYIIy&cM3{`Kl-pfVL
z^O<uzU!^DK{N!UG2s3W7Rj?$&A;7h`7SOylN#W4i`5u0eA1BXx)lXJQj0*o0L+X{0
zlQMN2)^ce%)GcQG#r^`SihubK!rtSrJ5}ClQFVb0VhI&n#W%q^gs(`BzlyT>u5xsY
zK{y1q{-w!3mh61WA0Y_fB|8M#ESHtc1-BKI%tZ)X6|YvYvGp4tH;!w#);q)RpIwd{
zi$NxDzf%#((SX?U?Jn5SE8E+z(svMsi2s)92iAR6e9Lue;Yr&dWWE*2zW7`1dua;U
z4bwTuP<`972J34O#dwViAMsBCX~0eEP?ZNmlRr^A5a7p#gz4DO%;8PS0Tft9pyfr@
zIYhGRdPnm?#P?60tkxLw_J4kGBNkp-t6Jg6zh}r0GEir15TGCY|4o+6`(}x2FaZFJ
za{&NQ|DR;Z|MYilO|6~uZ47M<&Hul6iTnQu;@AG78=@yHFuE9`$N6MTW-z{bslT{Z
z88Ng;NUWL(P;7#OtszY%DHSDNi$#=Bs1!+j*Cg`f>(0J>^!oa8^>Q+<_})10oNAqR
z*E;Nq%xy{G1Ik;GU0P&X1_OZz5k83^Kn{m5@Gy|BFE6g-3gX8LY6EUj-0+c55wT9?
zVE>bzD*_?#kwjWiL|_RPHiCc#y~NUP#~t2?KR`znzB!X8xrHST{%!*ji2F0Kz}%u=
zN<qQEMHv+Yga0A}BVOZSU0%w%z>_?LetsxyPt@iL?#G&^>mvw|gNJ-7dawT}i^@lV
zy*=2&79~m)z-;wD>-pvyGC)x#0+Qf}8Qr^*hb5i|0;La0EDP{MDcn55JQCTAy%OF4
z<>{H&gCd#bCk9R^{{0gg!jM#9su%Lli61W(Kq8HfKx(!b5hzp&D)+M<=nXn|nTF3`
z1XT{=kt`@U&%yRn4?DVR><kSBUkbi)Q~g_H0tE|@1yw{efUeD#z$2mJB@GuUgf9wB
z+AjzoP*k$OPzjB=mU}6vDMrXI)gw{xNJK9R>q1vx4uYmvkVk^N1#i89+dro)CN}hY
ze1VEAW(ZSu%{~_%3Jm-+`6frsgw)RWN(P@mwdR00mRP#~yX~Z|x%JIY)~oHkRjIpi
zji0|A81UO!Uv>Bi`-!EjL197r*;1ahDZXh0dgAw}zX1UG4DpQj-XZQs69gCdFKj2d
z6bIxkW;EMU?O#ee#@vUBe5Mchv+PFy>^pb=v;O8^5BUZE)b}L%&wPyMYnV@Vt4Bh0
zCfD^>vDpecbtfAi<lWy;kP|_$)~|ry>Nj6bg5Rf5Z$_}d;$P~o^fwAs_T4de4k`hT
z0fU7h^||&l2YL7{{`96;2>%lG3mt=lf&!2(2I*@4-D47NPac-E{#Pc*5RyBZ(YFZk
z3beA}`rU)_;l%Kle9sRZdQTSO@!1I$Unt}T3g!`VmmR&sXMphS5|i}tCp<wp9?vVP
zYw!5T#DSUGCl3cw2pdZe(l`Y$O@(s&)~E8{@d_7EbiO9Spa2u?KQFwv?_}V~6bK`&
zADXsDpoopl2@gV20LjLKtCL?AzcPkY(*VM=2^AKkJzuZDD945hTNpBUsra-2LbC}S
z5D2<hZ&H|d&oo?ZJ<#NOB|>?ol2vT3DK9Xt8xq`dGq`FseAw#!alVFUm}los2mUkg
zEj7*)6Fi_eK}|=4iBZ)X_-FXA`K8{hX%E8Y36vS+k8T>c55eF`1_7uVv<NMBMLhqB
z^I7=${K?>hI=-697bpx5yd-XaS+wC`L6IF3i#re!Ft`B;A&1c}7G!0MgEA{9utdi>
zKnmY}tR(0-q>_-$fP)A&fNV%%Lj+??8*)61tQw!KVGoWiGc3dtq0y$0|00q<U``Pj
zWDrAUF@)hDp-7R94gS4iAR%WfgqBzaF##R&RG)7TLIXo06DQPJ1VO=zGoFrq4CM-J
zEFJ*k{>S$4T}S3kAjww`?u$x-FM}I;d_-mt?`1DRNZ}1HfeyVmaun~a!Af(p3ZUd4
zi4r^r3gM1H3}y)$0^KM8K_vmBg(|^-2pb?t$jAVa=|6_FZ79P5jRIE^1}F&nY}g!+
zfS_~^Pe&2diqc<e9H4<PuMx;*AGB~3|N1uqDLfz6zfZvqfkFqPga$+zRZb8hs2gI4
z)(6N4fB^na8ldIB-42F*<T!*<z(2}kK?)q`Y*7Ja5!HAN1<z~Oiw6-JT4Wl$0J8zj
z`F4L%<oRb18%0kTB_+@f_}~rjA%6yocy_d~?JzZA;x`9mguwA02)SYml-@V~N@?S8
zi~wL+gb>8~LTenEb_3L64gsV+G9ZCLgOd0|3lMUJAeG?;jCiQba8X0ZXZK8WEf&;}
z0&;>JL10S(2ty2HGCWk64LZ0ozA!vEG3fBsGV?Kii$gF53hz9`_jrIV6kyWCWTD9c
zghMI`&Uu248!*EN3!L2WR)DXRp}-#_8i57K&1Vn{aO6uGxQ;xrrXK?<90|%{zG4~_
zI?;W9#)8^P0#t!VsJ<zJ*km(deB=J*{0)OGaU1S}8`}k@gk4w5KYThS3(x(<zdc<O
ze`sK+3XsNB((@u;>JycCBm$?1zl@Gyxl;?R%|i(f3Tu2NJ!~*B0OV6xxQMbFz`h=E
zob@0clvv>d0&ep(V{FY_0eC1XIAZ`<FhW#|k|AV-Mgkjl3UB_J@W}jdM*|az1_1?`
z@;MMT76vsi5FUXp!0cpA1&nwgWT;pr!OFm#%D*j5hhnIoKP7_A2IT~y%7w~+t1@%o
z|7eX+CWsO$PzHoU5T9u~W>#Seot)GtFo+5O3$J+4u&=Z{1}y%c;`mGk5Ij+T>m|d!
zUOu?{fKfhKAn;TG;XgBEV89Ac00;ny1b`5$fQB|;kXR~LZ0N9MvTz_L8Vk@Y3o0;B
zmfF6su!p=)NC0asGZFtHko#uU_)iNLmc{rif8k4mcu$3PxO3EW%ush$9)&JKI06^M
zNeSR!s6_y%HB~_@phj%lJZ>8SS9=ZEmVtf&yRv_<cv$vq6gqLCf+9r%b+8W*FMT=H
z0ZHTv+Q8%tj68;B7#!RvweUoXa-<R<1pzD=`Jl|}nA4$D5=8gpzns@B8brT&`J2u8
z{nHTFlE}^j8laXSot7ZbzfOk{4D8(~ix4paNAY6KKA1L1Qy}qEC{XMhkj9<7wryjK
zaF&8c`JfD2VJyI<rwZ+u0eCVD9N^&wa!>2EMW8iZsRZ?C1j#8-i%9c3kMKK+1m&bL
zm-*@pn+k;coE9;ga0cSg25q?gSRnNQgEf{uMc_$bAPWMULI-SHH`}X#g&=|ltyJT}
zg_Qz<5rxf)KH+SY0kB5+Y^dOb!Qb@ATd}Ff1v!u~nZ6ju(7BiPUw<aVlAsp=|IXg$
znwQD)0e>u#fl_7A?B#%9q_NHXBrqZDaf<zi*g{-HFAO?y^2t9zFmQm+fY@;@2XX{N
zd<3-3QHzoF{^#0&KMxwyM1BD22O}3CBmqR1>AwRvMuq_mB<Hn3FWm3x$C?TbazZwE
zzp2;QG#LSQHTF*pD-AT<;DAVNuCZDgvfo-701ajaYS2}Ur}O8a^9u*Yqu1Cx8ZrHn
zJZSxi1}FwaMKB%g_xNvg3&tCcp)(-z&JS`Q3@9ClsJ)6{N1$W-R{<6r57O4(%zz}l
zU{>e=uYVS1-J_C#*FR@$&lS(_djDIY9i5>W00rpf4G87&)6GbVu*U)=5TUh<*gFnt
z5u4!S`->w<=rbQt4ZyN%ZFfJBEfC>-Z;h|{@e9b=%Kx@3@EP>H*KZyYVCT)w84$IY
zUjY6cn-_rR@HhV}NE$=v9{(8tiwiS<EASMol3*gg<Jd2YI)r2iD+;J&G|2a#UEi7J
z(k_a?6Nn`-j*1R67<hHaASJ*lf&`NUs3f4I(yv^ikTg<@PvpJ9@KA_9eR{`1KWw)(
z(e;1|d_hk`;XZ)B)RI4ULGwYsTo(PHg8P5H_rR=!$#Dn_Xs{wsU=rXVd|>nfQb47H
z_Z?RhURd;?#gecezC*;XgoNe?1juAhie|oP2-qgLqRn}|LRjFS0rqAXng#&_fpgbh
z%fa_GtX?O(H~qVPYk_sQ)o+2<>-ELeK!JSj_Cmjlx8IPVZew9>>FfVog^7L}5<ewr
zztZ$iYgljSvEQ>=sNtJ(I-6QPW4Wz-?`gU9#&xhF;1IwFx&)qn2iVu^ORrY#O{Etx
zZq^o_NqyHdf0JX6^w?Q_*4Mv-Jl|`0xW8kWW_KVUlG;~z1uxKx%|V8J#@L-rr9aSs
zM9oL!K*4tAvO`B35fh-nUgk3mPO@!F(yO>KT5+1L&n!E&xL%oX4aPz5Rbec?3^(gb
z?!tY>@_j{HXvlpGTE89ww>TXZTgp?J0s;$fXCz1;D^#*rd{dH1?6W+umZ8GL$GK>m
zH+vR`wRN=TwuS-OK_J}SGWJfqmHn4>#)hl3yX@zB{u=M3Tkp=p5*L(0k4mow=8F=a
zXY6``fUrn2Q|il~cr-4MQ&lj>9-!QKHl8+@AC{-@6)n^8%?(U$4o)-mA}J=c4h=E-
zc70ZCS9sMCY7hSDARdd4UjQJm!w%$k_5@+BtAYa7Zm*~i!=B=I;KN4du)k^{={L(G
z$l({Wo4DZ%a=JPJ=Xd)Yz=XHwmOjgy0}Vih9Y@kfnTxToF;$V=y)4=xxV$lIj@-SI
z+*aqYdF!!yj$!C5UWzsK3{>xIJc6Y=FC|Zb{X{~P&CnE}pq6#MC`Q#JjxWb*&f_<B
zn54ffz^6C(rr&{s6<cO{@qNBn&u?X<<`NHJ20~lu&n)Pr`39T#p9Oyu2Du4(fC%Ir
z5N?$^8V2>-clsJ8JcB>udX3=8_fXuK{RkQN0`OE3GOmB>$T+uxuTS6f?7n}F<VTXP
z#EOF!h8RJEL*3uyfCz7YQxc9O@cdA;ILq_^hcA9u6LE)<aBoBbnO+GzgFdZ(S{t@d
z$P~U56b=BvhJDqA)kL!5_^0R+kEYK6V~-`=Io#7ZBf29wc3pG@`Chrj020rCmaPRU
z@*RJlU5zyLPhl1w!J&XqRM`M!rF^I3BjU6CO`P~Gou_!x_QI4}x%UR*Qw-rKhOXvL
zm*-qHzAaMFoOJ>GScnhTfl~5uykN-RI81f#q{lbny*)WGcPLMHz75;mRCDSBhK@(y
z{Q{{mh94`1Yuf3fMS*p`KUy}=hOE(zbPYetPd+xZuV+&eBOTE15hI>}zYe|`MeRwO
zGuN@XcjBXCW9&YeT;F`VzE$5b4f$;QGUx689Ho0VhX));F@u+D<gX?sTDxJ#$m}jR
zd$e>Z&hDVE#@7sLP`&l>`Cz(i@jWX5ZRQ2ezDtz!Zivn({%8*u_J5u6(Mndmz0Zk;
zzIJ;n3xIihiDfopT-$a}&O=tGH%lMo5pFB=nzUROyT5H|#|#-j?vhab<qc0;CGVhf
z=efsp=qpyJ-h(XAa)t==RKh#6f*_?&a}dvETl^5Z$BElj=;MDn$uxT$T&F+9A*-;i
zzDKYrSFaH3LNn$}$Q!#+ldFjJ^>vhU8W~k)JzT2xrDF>32zk#Y&MeIz@%VaC-AqL3
z<9%<e-m}UI=VrGhm6Ic%?Gki9ELizFuatz0*z`ff_hn2b1MQMvGf*p^gZh48nI8pC
z6sIslTfdG3!CEleus8fHy0%YE^GNwFxK+n<%u#bSTJ}TP<PnNS)mP;V<#r{t+qY75
zw^L&L$w>KT!yWVPD|6^7MI(pa<+Box;G0PGlYQMnLPTxt<P>Y}NqihJ)|SncBTfQq
z)j}+ru3lFJbKGW<V!Kv+{Y;%5Y#NU%I&YBcq+*oYmyyNLlr)eff$pBdj8SK_-oX;Y
zsC&}>;kfYIn(p)@D6)rl@=$PHo4-El^yCZ2F{p27P_P+Wz&QpbS}zS1Svy|bo)HXH
zNWy2=@Ndj0&NJ1@hJNVTwaRUjAMjQm^t8Q{c8m~XXpedw?!3W0Z1>;gbPC));Zs9!
z>`F_<w(peXDsIrvAGjiJ{04li@a>t*DnhsQ>h$t$=z#}8et1YD@o%Arxi3X2EY$<+
z7iOM*^oo%?Q5Y|T#c%{toUIS7$fU@KN1qN~ev??evdn5ZIKoxWYG~hgsza}%Vl<9Z
z?+sF@8;yMqK@A7?z}jt3x(g$8uzIAvj8RJ`6)j%evU?QqRB=q~ffYr;IsHmlYcSDi
zRfhAMdvKkPyF0WSoaEOh+o%?7pgxd%P(>mM?rXmAP(Rq_c|S?4FY9sV*|7s@OoST8
z-^bQ&k(WF*#C?{^1ab3TYJ&0P&E}@rhOWD0HKX|2kr9{~ea9nd_|AAlUbjHwXVUQ3
zQ0iVlVUK_?@ybe{sC)hF_@x+D-^;}?7DTwo2P7NC-Hvzs2CQj)c)h+%VlzOY6hpHV
zIUYTASgjSKdoQJ<ha+9VcmGpyt~H{$%i~u3#(_nh@hfs~e=wd2G08OpMyL6H6(*OE
zno|v+n2qc`M0Y}m<kx}_D~`CX>xPfwgF@B6^`tS1mYPGLzvay=wSQ~&Ywcr5Q&d!%
zW_+b@loErtMFDF{=tEEOxDvwspsRi>MNi^Zg;%>_f8@4P>KF{h=JVbXSM&+==3_v6
zlIvY68Q?dPk-&(g{ba-E`wY33PjkM#(OwD*9{!oNj&)SSQYys%56-RqqoMhw^ggW3
zuj#RR`l+jjVJ?6f;#wJp!;uqvHGjxz#VA1}u1|qS`6F!ndFUc4L0&l;t1ph4Jpc#M
zd_ytM*u|6fLy>tQq6En`GdpB@mF7nsC*<OPl2ZF^s;|kW7A#xk9KR`|aTXzn8*sKo
z?LbR&z0IJD6(?p-nftmf^KXr-%-~E}(>u<)sLAwOA>W=pdDGnQ+9nD5mxA3^x0_8f
zsmk`Q@K#ktPtaG{<zg<|PUR50>8t+bXmwn$!LOBzhc^X<#416C3&Eu*_~5g8zj*NT
zZ@S`C*nHWHj(@-MH9CSs<ptA+nbs<{;!6i5NA+*DcjIQm`r7hWv@Uj9-?yd1BS91?
z7o3sL9BWXsBrQ|BR^*jF*GKi^yy{B0jU?<8phjHP?YRnE&6Y|H<Ctgh-MVQ^B2xT6
zfr*(t#~o<}YjLK56N!@jfvSqfv6ozWP+0m^`r-kQaqJM7F(;9Oa7mly%7oS0)Ml1b
zH-9ow^ccG?#*W?WY6N4c6;#Q;&ip!t<5%!DSkN|7oZrX&8AIKg2)j19oN*@Z(}j2+
z4@+KE4zPdF1LLye6;iJqXE(Y%SoiPWHN@<JZwe<ZbG~MM6Q+lY>Oyk=43nL*scd^R
z98^v);{p~tjL8?%qOJ<@8nr0g=lI^9d#f*by($k>2I|H0V=Gle!uHwy(ptHR-M*NP
zV78xj>7#BOI$wRA)+);3*yO4|2$l$8n}6xstkfYA`!eTh=@7&2ZXUNPCp7s|e2Rmm
z%PQ}ens`V-DKghBJ{rYQbCuM{F5e;&N2=^iSGsI^*~PkcCA9ukQ&2Xn$Y=4qDS4@f
zwvgje;c|PeyMg@%rhiN6onB<oaGKBf6N?~%!qx`3Yhsr_r3*K+=x*g&%XvsUU$UDo
zfX?APYnkKBLUZz=V;?h8GVPXX`_k+jtR{xb0*}q%(L`D2zst-<S<|88juB`4DtEHq
z`1QZvqH`_tjMbnxs68wB$WWQEMuF~nJ)2c=wcJOzlK9ZL7HU-vm+|`ukeZMxe7*3J
zXTY&e91l)b*4`2#2&-nghsJP%Mz$AA-+5&uj*hC{70NVn9NuM{!_<gQ%WZuiOvyF5
zu;EPdWoGDgS>yC&_ZTFTEZNPmE#R}2>z{kSJ?mACUE6$1A4R&o;*;U^lr$aAd_UyI
zNr7}c0Ef+_C+Fh{(nht>9?1oqhK;2F5gISvc_x<S9px2QpYzWu+hO}SJoX<fy1M_;
zT{x_<#IV_#t@s|v6NZV`BwzL7c{v<BEBEwwT|W)AGI5@C0H1WYNWFgRnai%c6gQm^
z*_wxNV(R)?l~BaHbrN=yaI^Wq&T`T_c%2_ssBBSmjXS0A|J&1C%|YnP-}`x7;JTZ7
zrY+y#hGb8h-oD_S!GYbKj8nca@}U2;Z*0u0fchZkjv~xrp3dc=rIsUM#$aN`w?VB<
z=k~`9In79g>>KHs?P3U=yV5WuBpX(Cr~fSu8*%YSv*DvfbHDr|TWi#<GR&l0Ca|oH
z&*Qy$lwXMD(2I%b#>RDcMJ-T*>Ux$$SE0+BIW=_0x>gHmazHpn<orRY@NtRN4)ZMA
z)fdhG%84njHx9QT8`NT15@5Qz$PTzByv|8A1WwQ%DD(i;FiT+p-WUsU1G6^@`YGR(
zr_6<-3KaEW#d5RpgH0Z*H2c9?Ji7n1Xw2*QDbxRw-+Il9h4K0Z_x3b;SgL3ReT>~D
zy~^o8KRv~gKxB%;!NQ%kGNzxD?pP6WZ;;Atv${h#yMcbWE&0^8u~lif>w9p2wQdeH
z+X#x@Syg$YA~7T8-`gn6Y<Oo@d7)I!aE9{OQ!a&H6hdn=s)aj~fZuoqmRsrh4UwNk
zl$(IF>`QlG+sa4oH0QY8OzIvi$a;RUxN_k2Hto%KIO*7!G_q>z;dC}nAiWXucH&F~
zR*LQP?ykt7^L;{geH+R`LMo#2cA8}+cFmF+qm+~3XI%A&5xnE`9e1xCth<hH328<8
ziR9n=u0K`?F-FSsOSmjM*hoFbi-|^OhnIP?6|C&og-d%>!DpX23ku1_Wo^g5Cn+FB
zR}>E|HLP?369aG7iN<ulf?`}DCD*!+*B`ryCJnQusSXagscCiRj_z$B4H?hAZEE>&
znEaTr|K0(niUb#GQS1(H8v;hBUgeWQubgo{ZI||m$&uqYH2Q>)Wj)KhA744vu6ay5
zXyEKuEeV!^wYL(6V5E+#FX{K`Mo)wy)fqO0yXw<d^%>ksk>RDXk9c<oA2M9VFEIV&
zSkW#lFp`FFa4y;jU&)RST;9=L_c1w`0H1Lkx~KfH(jh(~9(t;02<X)+_>%HwKD$F`
zg*jbYmy28nojRs*=&iO@x^~~fRCwehI4-WsZv}58>Tf=JI>Oq9y@Re}v*KjiZDd!|
zzbaPfG5tvPj24GI6U+1RRe$*tQBiWp?qDm!>e>7FyjYBb11d%9rm{0mT-}@I4C!8<
z3mc?fE6#)eAf(02_wi5MW;6A(v5OemWsZZb=EJ|BOss1&?67=G?1)xf_OFSbi#XA2
zHhHQ+CZ4cE=S%h0TgXU6zTrmZX-6NloqePlvOGAp=xiQ#(jLD>oI4&XxjLKr_*nD6
zL4<W03#v90atR5gmwwQ7eW#P+2!pte>a+{kb&5We#8dk!?s3sW69Zb5a9L1FFQu>Q
zOvBOf8UEBp6>f;0(#>K@S&p^7D5IIPS5niG6uQ10bM{JPt^gYuPHrtcZVhlSY(*ia
zugx=TA~w0&AK$kVHbgWv^k+KQH5a3Wvw+Yz+k>n^P3}9iQuS^dj$^Fh{PK*uNSMX|
zhV?A?aNBKlZjhyyr~Wx!mXoFYC9!64N##^sWJC9hT=<xf=F%<_9vT5W`*{nd^XbYN
zc-9@tthDTIlc4eR@BI%&=`?`@%d>R;h}HLwqB?E7=U{8UHVkOP^B8T_lSWRk*_w0p
zb@w|3gS3rp#b2R>m1aRG#8JWMPl5e=r;8vKgzG+IAWAg6=93oHOY=aj3^@T-OpA5R
z<{s4dv$-w44gyp8dz<qh3s;SGDq_TiXGxsJs&M06)4waTvTcu@94qeF2zF#X;+d6Z
zN?X>w>icNqP;71{@RF&vSc8sIcopoHHO&*15T$>LpIz)tClSdMSWHi1rs|{I`V)F>
zFJaod*`E|If&am;zsz)`m)=b<;4rXWyQyHFX$hZZ@IKIVL~(t+cXXbcj@&)ai;cu<
z%6D1@?wG8Z?x5ykY#2ZfENYx<Dc<4!t0*-$l`+dSu|%+G)Iu>?(HT;U7Yk000OuK3
z<k|Pg5dY0kp6t-KI8l7yVp%DsgcSD<Kt+=&Fu6>Crp|Rrd9tL$<vwbe(kw5q9@%L(
z0;P)hv7Hy=VIx_eL6stU<^kE8f(Q;=j$zTTf}8vDn3TLj<c^@IfK-;ATRm9U?sR3H
zapClIKqY4vzb1m$?a4BrrlR8Yt-oM`UrW*)Mt{wtR;!{W1y!n$74Pj|JVjAgH`9#u
zGkV`IEx;CFv**EnU~)Oulzyge5J#Z|r~1eo3ZO%_ObLbF1%+ld{(@^$cnpv6$m!bP
z=j*AD|E>*tu^)?KYKz096*P*@(;zMXyiKAd5AUkjrtV>4y*mp`yaru<@3x!mapnJb
z)Eg@T%Td`o9S1KHt=)J8^+@hZhQMKFfmiQx2x_UVe=2W((h~8Ii<ci^x{99-SgQ>g
zE~Kyfq3atPhsC$Pu27j)Vou2)%$~$wMk(JprvL4?L)n?xqotCigW+OFAi>q3(BbZK
zmAcl%Az~uk-S~3IKHjbQ4AajxS0Xju!j6`gyUe9@!jqCE5T|D^dGm32<?lJJdv8}L
zp!)~hV6^e2=GqZ4U(~ey{EYMe_&SFuL7*gyrfu7{?MmCWZQHhOv(mP0+qOM5=gg)T
z(~G~4?T@(czS8#3f+_M7@xzT1-55&A_O|lwR1YOUBX?p$-}xH~#4aOmp4{>(M$&SI
z3?-MB@H1SWB8f`}S;V*qJ)D1WKKqk?^t%%X77d5l&4hN{?AhVM6~R$<BFm8OSGEYY
zG~6h9lVB=+Y%ieQ;buE7mxyN;2Ral=lQ_v!93dudMMo^Mhs~Z3&P3V~_&UBzyZA}f
zkw<0{J@~n)naE3T9DU)QC&m5kGVKU6K=g7`B(GNQm|j)Jvu+Q3?<Mh8oo=r|NP`~N
z8WBMzYVpt0XyoO9fRJ+w`4&{W`1XYQzl@pPIpRZu*mVxZX(yBHoctDEDV}-+YZ5g5
zPD%`bnfa>L^PDr>6f8;RK`R!Ltai&-?!1Kc2p1Uddvsvy(EUexD%AJaOY#;d1{4$F
z^$(_^J<&$D^6nWc3f}OK&wa+cJx&Q;1gp(!&5L_M%HSc+wj2!)w8O3RzPH_Z_n}gw
zsDBu>+Am6`w;E8TQ+9nhGle0ZwF4w|5C>(31@UQw7U?5t`C86LF8{*0L!$g{S>5SK
z*4%9#N=VZhm=E)@Jf^=-FAWqKwSvNhw>U6QN0d}-u|@fe*gpI4E5Pk|`dU--F@6r0
z{A79A;qQtE8>3QKTHec&&d`LBiOJ@F8G1qGXtI0jxJ#8r$MyTo82h=O?tV$!Vg(Iw
zn}9WX)k5y_JuFFQ<>m!|*`n|xC;7P$^-$&ee4O>S7csw&x?+E$B(ps;r4vM&Glxc+
z@5*2-NMyTkC8Q5!pNZ7GBPa`d%NrN+?pSeV*k1AY2K#jvE?+EO0<zaw)PjKR<bFaL
zz`P<OndPn95gmN0Y$+F_vm(b~b8-#RxMIKDoOJzR|7T_Y3J@s4Kyh2SSUuwQib<_=
zGv@1xt7><CFx5WzI72)>F6T90yqh*yjff&IQNesF4yk&!;r_SY|7)hsZ``0L6+Akj
zH!kU9dgbYIzQ(S0&h~g(ohBpq75QX;p|2BOyBRrN?l_A-K<MXjj_z^S+@eESquJqG
zNw{TuEqGj{`ZOXIi#}`HN3Vk~&)N#xi{m5fVmY4wD;cy=kx=x0yn9*qUG9hKO8i9k
zvXdfp{tiAW21Nni7>u!;U7>~+rIR;<=b666?MB2P|Md`a{3+B5dn5R%s4|OwA7Xa+
zVl7MJQ!krAgSxfM=K+t-{Hqaj$ZNO4G<j&p&UN?sksAGx+H>L8z~jPv01<u3@w=6=
z-GiJroFbPsQi@r<KL!bOmK~rZ^mCb~4Qd!3aJjwY%HJH+#aEGGruz6Vudc-*B&k5S
z14yKy*9g-|?h?Xl=rmYb+`H3J(O|rL<a#gj4b~gPVG4qaij>hnK!2JgJ=5*bN=wcb
zkab;ERT*Y6wl0!jpSPXE&o%9p_KdFD9ea93dGVpTK|bbJ)?z#|TuwcsEp+VDhk1yP
zy)$zPt^Kg+hUr6l&(nu#%4*bUTDv^$aX;T(A{Mv3#I@_$4vK@-hPplC(|uNcdcsst
zgC6^W@`+_meC%CuRI9F&jg_&l7^<kgupyi>nHD1?L`?G9s6j3!c!iFkHpiWJXrLPQ
zCoL^^Lu;p_msBkwEH~~fosC1Fg`LfdOAC8jH{(mjNS#`TF;qwol@N`H)Cta~jPBjX
zK5==HLF?yXVliyt=G5E5YUU~oGi_DX$D`rrTQ~Q5tk7BVvnaiv&1xqi=5{`~#kqF@
zs!EHV38+?Fn8S6)5S8B9<i2gM!@O=s@n^v1Qd#suzaY3{HfHvEsj8Z+f99|du>@Ww
zZB{z%$UD&$zy8*3jQn9t(nQnbvS7;_NEL#dFJZev1d`C8A<)L<A2U7Vx;l4%rVPs$
zwQ`i3ZkKasK#^FrbU5j$XKIgGRr0{$D;k2{`8$}qU*#i1KXJ6Z-&kM<O=9O#7dk?Z
zaOJ8N-ns@7>)m5MW)Xwa=D&G-=+|OLwkW+iPH#@olOG&Q36~=&SMMd?l5in^Gz^*(
zzk;MtyPUi<RPPl!mP>vk_Uyn`R=gY*3U&n!pS~(Go2%Y?gN*%Tncn-arktjd;(Pwp
zTeYfHv!qv3<W_gLKo7E3{9dn8t;Z+YL!~=A<Nf3*YJ|IINZ~n9Cvr9voQOiT{(E9k
zcf`#({$3$5el~Yjgm6;lll~IjPhq$B9goY>==H*7$zMwJcZ8*iFWUPrUv*4E+54pp
zleVd=;$-`?tbrIWVT4CgY>G#GY<F_Nj<H&A9d&UHp}b){QI`Cmi=nu;4yMP+9`RRy
zJnG5mXrdhfEuT7fN5hG4)?+%RxABQPikfV}zm0v2Z~5z<0?)0ab0&;iA4Hl#FR&oH
zQQxMGoNniufjWg#D2{7I|BbEiy}Fx9n~#VR=)hH|Q?7Z;W=WR??`Xeygrqs%b7`{Q
zuKQ}ig*{`D0p)2zH|XNGYaR?*jw3j4v{M-dYZx`$Y6i~CLd@~;=gSg_my$vITdqWZ
z>v5S~3Fz+YHfmoOj-(1V$m_U)1=-6%sn!Pvct`Pssv6>~-Y0+H(2T+tCiCgA`bR};
zW!^>yoZ8!^{AHEPPFwNx3#qT45dBN-#+6~T&$_4S_sLX*SlLMT>5EMl-sv0Bvcu>_
z*AG3B8$_cc?lvqsZIbp0?NAop5G~J?K9_HT$)HK{J78UncRD@cLf>&e<brNm-VeDr
z>1P`qPg+CQp7HMQzUe{5<a`}cC+R;oZAvLLYFY>{r>@!3ar~olqT2JLSQzmQ`T}z7
zwgAtQnaA1eJQt3tLelN5MVc+Ri=us%k#pT*XWe1QS~+IJcrpfpiY<0?c-wlnfSb8_
zq1S~y*IVBH5l6qS#(_X9kyPC_N(wW|6sG)-i)s2{&qN_fJ%J}enXXHoo>dnUPzKNN
z>+v1maCH-W*k$RY5j6UPma>vx4_65FW5=ooANQZ~OP8m{X%XUkcx&o+`F;ElbaKPt
zQ9kE6eA$XRVQv^qX3rQH&B5ceN+ldo=-SijHcsQv)QKzN&(~#aX1pzT`@$E`oK6pk
zfh4qCCw@Gh!E|q5m&y=3w~Dv?Rb=BHe*iI=3YLKYB_EZE*T2^S%f2^aS$WZt-pNF-
z%~jc3gT~auPb5cU&Do{Q3jf;atKzs0q>gICnafqTb7I^~)LcDOY@S2120ir!*&=kW
zq(uf-$vZ^8x-_mo6+2gIBt$OjWFt`2eX^0lJZKAUHf#^-e7A4uy=>GJfrWZ-5*UrU
zS_pZEG#yYarhbV*`3QWUWBwF}ZY~-|&%k;lIcX@t(>GqzBC`~-@6yL>QqAeD@Y<-i
zu}PR!TW=lv#s=7LM(xD8T^u*YyjDust!WoOg|RFjm7c9~E?_-B+f=Qa<>?){T-5H>
zL2->e4%kIPvQ_WCKaST#qJ=bf<GX}dHkd59avM|rojxS&7@E%xw{lRMuKJG4+9FTi
zA;%!>9Kwu+=ebfJ&db@|9XzGJCu)oB?BP>~bV1L+<e!#4LokMd4K``EP$8YS+i+5#
zu?9MHkqfI<PNkQt<?F7#7{nzFFIS*)f({mETK&S<2{Y~Ck8S7Y<=UaDW;3pz<ht4)
zbm;%)-)VH?isF;Ldhj)ydSHu=mVx0pRnR}fb*mImSJtb}l95}yArs3XpU_Fzc~VHg
zh*EvY<|Q3gO_)hObf?6B3fmTBE4Q|(RUle&!<%3h4_hp9n{;=WBuYW2rVWqDro(*N
z8a;?GaM<uBY#|H0Qx?7ZCqB6BVr_@Y`)VR#@DWk%E7H5HR^%+3nL{pf)8@Izs-CY?
zdzI;?GyKhGOvo}xe$l+{IO@C}CS@FVbCpFJWUQex%gLJu6<dx|UhYwqIPG|~S8UOK
z<yekywQnk{j;=Xo6^XRUpKhI7ph&f;Q7gHhtml)q-M>^+&9(Df2H(c&>H1E8ua)qu
zTSOo});w1Kha7oRXLQ!jx0U%`v;dqN4Q)<f0Um{fU}d1I@I)6FNUJt8Fdro?z2)Oo
z?W~kSo9^Cvqw1geglFR;N0`Gz`gQiTxw)Axol12~*wWjezQpFp1W<2h`8D-t1V~Kf
z`15zKu+HE=OHNuR%vkGQ<S^6akYAj3Zn)%;#%<}P)s4U1(<z*cP!2}!qCB9FQU)3(
zoIO07K2@Eyagp6a_Ls)gTkZPc*|;HoVE(<onZ&K0|5Afo$f#_3RIR!vZ{~v=Gjr*Y
zZTcV!rOwXJ)1eH9H^QcU!}&AZ*?Y@+PNOL$S4{)K4yU*<D=XBTBQv8q1I@@MQK`8<
z0NG2I7(6Cxj2Z<hw|T7xe{o%Hn9~92x5qJ+v4V0^4@Iq>#5bCfIq_I@|3hyZH-=gA
zcoP$Xg|6!h{IH)KzcvbC`i^npalEm}j(KzI6wQN>)X|{-_b)>fPemwKZ@s*t=Wz0$
zW{L+(4tiHgmyZjFK?e%vLsGNl(3_d~*ev*}hHVl!QjwQl?FerIe7EiyrhRHHY!-5g
zz3s;xV4q61)c7n*>bbqkz!=NUA;l~oJF()U2@y*TdL$`wNvLv<Wb&Cd5|w|E<wKt+
z#KV$5(B0&fcriSy2ZB{4qK4>1{HgRzY|v|yA$b;DEuS;BbIi|+f%}TnPN@72b~dCV
ze0aQ<uei%JpWEX1otAt0sz!0n!7Y2Ru1-<`k7T=(@1QXx<Vw{maEZ0J-n$)H*<LDT
z=TJGJFu&A(JrUb;?8`VW=$Urzb{+X(Iat6X%%^lT6R;m!v~s2$nNvdnUG`S5%LBSW
ziuINWtZBL9P6-<9aX1GwEaU6jzK=*sa%G~Je#Gp0hXueWoFR)D=(EtG2P4?+qgd^u
z*ka>J%Le?Q$f~T7NjvDWW%_P<ZQqjy&Zz87SlOMjHuL4dG>2!2v~?(g_eUtXQk3$`
z+ZzUf?F?$4gs@dy?=?#w7A?=EVQcI%5m{vXw04gpYuP-WHyvXn9xok>D&#f#2Tf@M
zPFszfdF*CjwN=pPe4b|QXoKSX)V+3sx`WE%S^G8K*o!9JR#6?>+X2N>Vo_C94>7=4
zXxWc(F?AzcDfsQ_T|Xh+SCJwHH1|jIM5!M4J|4FGy>rBA^Vc)?c?}BmL$r`aNomEU
zWj*_2WqD?|$Mf+J(bE@SbJMvF>ymsMXGimnXw|y*^YDXqjIblBXV0u~NAWJJb(c%G
zt*blJ%Oc}kdXgO7N9-b8yv%K@d->5L^WMveb<c>R9mto0HMCgdwGdTCuQ*b8?6Gvu
ziCKr;^?jd5wX?bXq$#w#FM8uXX5^gWcgJoo=*4-M?fjFd4Y61mV@uNgLr=@SU%rgL
z56tEdPpz0ANHM1cI{Sn0<RWtp=es&#OC6^ubZpy6k$8;1#ZCSHTGtmI*3l&7{=oSj
zcMN=Ks!C^1zNLPU-k7Z@%$lT?VY*ATMOn4w`Ky#mNnI=(&CWVZril3<I&7|{&0MeL
z%yeH~KIzt39L^ZIJrK-d_wH2oJ~rEGh{rxItRVi0aZ7(~^q3`QLy4`QO$grYJ!C?+
zFd=+r_Wq~KRuXGNxzQE*7FKR8>ptd5eY!Rtn)8}z^?|2CkzW?ItZiZMByM9%OvrF(
zDZ)Oc;&U)tE9-@)C0puJQigGucCAeH<5<%eHc?`n{qlA0dtAK7_<5|$ZL1vtSpnaf
z9eBUNN5&HF)PaX$KosIh@2p;5S9keV%}#fs)jhPB+}gU_Ue!(2U0UNo>}trGvD(gB
zW>NLDakH16JQuY}OJ=u8dwtr_*~OWjKfxU}!^!vSpLHw;?8)!8I`@Y)c(9K7QXAx~
zKsP=mPvVn~G1aLCs;KD{8lkRvwb7o0jm9Rj)9IvX-&Gtd`OF;>Ldl$J{2eXbJa$@2
zV=kQu0(~z5&-YAB`+D1*oO0{8T1;)fFf-9TX4gFPn^jpwKUcRh|0pTOn7iQVTcRp*
zX(B*t++b*-d`)$LRJA4V_4HQCe5_X<MA|qxH84%ej#B*Fc~S}=rvZy!d@>9vGvU{X
ztL_fNBw4D*5%7#!7}b+_{14i=3E95-UW;#QJ8P?|CA57#*);klsXJFiMxVyFC-LQA
z!oFlht1@Wopf+{C4iXqk_5T$_e4zyF#cO6rKuah8j-s7M*V5IA$efCJewb{id3~1o
zN)5lS3oB3v)2+p2%;WG3l{2OUZ}jH077V%_a1&<o7QJ#;Zq~Al(q6y39M|FhPSQHI
z)|%E>C$h!1s|074deHfFxEml^9MogT=@ddMQ)c+blLGfbxJ=JJAoj!+oT6oPkg-7`
zYpLM}(Em=qE!w3!-+n!u?>x<i+9iCVx$drYIU7Hk84LzZXC4&8M%|<Cha@B`%Bfj^
z7hun>!phc`WomOJ?Js)HQDrk!RxD{sm~T|(Y<qXPG0J|N%swJ&*`4=TY4&U^aJJ`S
zw1n(<za5b`Qh9P-4@bUh555l$*N2Z@uU0H1h8f`?;pyOGFuf-6m7n?U3VY;rO0EM}
zh9rdc2Z5^~lKN;KR6oMp)_UR@^9M#+8+z*I(&1~cZ}O<|@y>XZ=NW$vHt+gr-aK7o
z{Xs_a=$a5wW13Yj9v)>{`C&L;jN7QAOkulZmVb#3+2{4`o$WcjC|oUsk)4K;s?Khn
z)SjgLBKavdCL9*J%s21u?eZ)<MSLrorFgz9(9z^0j-$o4iFfGGTLETMf-jqGD>W*b
z>4eB<S=k<~g^YozJq*XUA6yN-3gjc|ENvJ_E@54gcBOZ%?yX0@>?fnaDn`$Lj^eH#
zH<P`oZ`xt?mzA{FWtfouc}}d+mPw-fWaili|9U4Sl%g=OT%2E1cqKGQ>iw~ie-IkY
zT{jyE){}+r*>Y%&VCH7+y|^<^5^qfjUfXNQJZ5WekTo!0P<@rS;&#pcn}HC+&c|<z
z>r1mzdiuf}%Udg_{P?ya^~HY#tDW4*+uh|BRbza@EqkkS3%)4JDGS_9gZTo?<D!+o
ztcCEI!AJ^m^b7c(sTHt5aRx?=f1=d?T0ZxGsTDmZ7yJKx|D}A+#f>Ff=k+Ch{_;%l
zX(s}WRUu3`_^c2XY%m?u=!w8H4lmGrUgTDx5M*8i8gkwWffR|AFPDAy)oZ2I_qWHa
z#ww?~u6wp;#%HGIR_pK{*#W?RUsy!vJ%I`B80g=ab%KJxE)F7E>s&$!;ur%H)3`ps
zhU_#bLCr#a2{R<CbTEg2Zhs7J<bT3`)R@M9P4*zTwK<StL4SXb#eYnY4GieaQNSYa
z$?E&tj0zyA%{YJrzxbg9l9?l*CuVQ~8v}{272X(NfFhmq?fngEenfzk6<q&bcBAV8
z!@SMTwS$eb-r4sFP{A?4VW-1Z!vQJomI0mr1+*XXSEe%Lc<p~3Ug8YMzF5j$;<DDq
z(IH5I#TfmlB^3WBfTOe+gCr|9Q7QuqWEm<a#DD+?DK>x&1Q9GJjELtEhXny@qk~+~
zFA5dtTV-TJD25i2i3tKzi~+XK-4zd5w?C-kWssfmne%HJ769<)Lo>2(l%Pd_nx^r9
z-Llda1L*5*tH1x*IAVWwgw6I_7jUWbTiN-|5_@5n{aWq83|{T~ojm-N0)DmI#>Oj$
z9o<=)?+A@lE3Ij6ZjNbo=~{%4HH6`(WN6?-xy{cbT-fXse#tKbn0@N`_iJ8o!TQ=d
zE@;o68c&K^8BgkfhP%6ryT^wFBp{_KxfI%<&<g710x+RLbK>QN5Zx;01iA(wfM-97
z2?_!Met?t$R2l3A1w5UN#$^_f%dtfYx7Lr9hv%5UeU!_@-P`3oJputJw<Nr-i>m)p
zLVh)c1cZtSDT=rKjRRQs+~5SB65-9qP^gC1L;-HD4=@U`*{Z`<5*F1wn9&;<R$1E~
z1_S;>kpDZFzioqHzxhjgm-mC*BGP9deiZ}5H-T#fKFR@{|0_ePkPeIEK^z9`2DbJu
z)VC+D72JtC1t(w)-ss@=cKZEsstCcOkI{Nb><YFg5h)%azHQ&8-UdB|xC;hA@CF4c
zBq*;~PLq6|=j71Y!>g6f-1phrp~W6ubN2hvjnppNd4p_%%}xU#Aca{C4Um7`#pFdZ
z18lym*CUr?U^c12sWG)p60?`+z7v@xZAzbtXoW?H^1Wwa1PwNPxk}_Iu@;wwFwXJn
z8QEXp=4^bcv;NADbP7iodMo8pD*2*|BghVstj@^qOKsh1i;dwqbE|O4!N0P_JZ*Mk
zP}kzZC)-Su#pU#f6EsS;MVj}TzfgA`niRp(ctxcW_xTt3_93p-+hz-q^KO%E8GE<w
zAi$1{0lAJ6Rbo29*w?-2F^9iY`8Y!8JE%6Xbas76leV+FOOL2`l8iIjbfOyy!|wig
ztx|3KMb(S#=S?b=xeWE=!7%u&N(=Jx@Z?3u_F?}{*za7!1(xkJPoeVElh}y0Keg}^
zKE*WZt#C6GV*N5`wB-gw=}ulYINeiioPNcluUZ-}5@)wo0ych0d*(c9DIWJ!g$DGS
z%rJ?A!j$Rz@A8%`ANj|Z_ev6V!!U)BsQm(RXB~W3K4;wL$F`e&9|`p63+e|`jrC#^
zIXJ!+qog{crGPBV5$|E-2Dd=7y^Y)|gw-j8_SxxG97V!Akwqr3f>Cc|U@&Kfl_21E
zr}mWxk>$}N$)k+3Vrwo9Iy6NBM(x2WMl;1?+q`L91{Gu`1#ieD(#*15Si39lB_nN;
z5<%Y#i4Cx}&^sJ6dY$cM%K~J2vPd(KIfkTFheRNoIM_=ox3bGfZ(7>2e7V37+6=iK
z4z9enT0X%{WdBP2L8m6NI#W~%@Rk#tsVjfINUE5(LtX`4IKR%CY<Zei%&jua=yq)0
zTOwl#mJAvp^&a3X`=)9uT|pDQM3JymybY{|0<6aR+A2j)wg)C}#x&#;6ye-KD~uib
z1Y!z(9yr&s+AgQVVEY3dg{NRwxteqIwC`mUa5L0o-rwVB4{SY!4X-pF(QJooIVIAd
z1oyENpYcf(MH4?pDz0JB+aM?Xb0!7Gu;B?1u55>QnxT!T!Tw;9i$@P1I8u6NqFs*6
zaf5+AP1lE*2+y-Aa_j@exv1dEVsFwQb;zzY+xC34La~kRy7H+gLr>uK*vz$YBkw8<
ztpT}FJV*D^bQh`}>O&b8sOUu=cu?(1aVsVxM_&$7na3=Y3ak{g(+guI*zHUr@A6GI
z8b2_7F|JZ~#E=Hn$!-s81rVP#krW(J4LvGKa-O7Sy6Bbq3=$nSoR#tTWbl;r7;kKD
zKN$%sD}&+=8(5^FmISG*n0t>mm;0T2Cy+_MrhRoh0{#mBXq2EMaZP)#c!PjCiwaSY
z9%)T{Z^f0+hj#U#dq|$>bh9oQe<&t4vC_pnj`Ci2w_IK+v3UAN#MDv)^LTPg0F!r*
zl3To~1!U`Klh0j9$MXew-0{2OxaVUUYAn_U4j3_M!9cr)x2t}V6hQr9#8!~5@HuA7
zEb~bo#|+FGs*YnG|KW?*Vu)GGZkrr~17&mQZmxm&`bvTV;{ug2DMKE6)7!@Bn$gfr
zOv5CyXE;Tu6Q(~46o$VTPg-M*cT$pYUP120q`{oanVE7iUqOvzVG{@+gU(Ik6pYD>
zS@u;Gh;DLgzMGCn7p+!|;s$ryJn|Bg?tc<dSn9noOunlLXj^_D1w25teu5O~8KRTS
zZp6Cw^1U2eiHgV}gx2-UPh^<`M%MaoIC{nV=E($QpCpmNLp)eTohU1Y@%Ad_Ni;NN
zuG^2MT4($7SPF@1vF?FH19g1@LD6OtT}{4^+)fdi{Ffx_P1UOl2J}Sd23LE3*mV0o
z4Yg$gryuj<5K8#xzghB<mK<I<Bz<xwrzvWf)E;EeV!CN5XC*H4Po#+?Rh@v47uLq7
z($kaqQ{Io&Ew#LV#Jb|n7FQw%J+dv^8-hnP$11iHMYD>D10*JWa{jD#%RE?C>-ev4
zHaD-vVv%WAeN!$P={Qm5UhaUzDYB+{r2?~9DNAzD)>ItEt7?xP_a<=SnDj)Yl>{EI
z@ER%SaE+*r&5m}rfL;XU>ADH>;QyUU;{cUIe_dpMlc{ssn+F^u1yhi_Tpb(;siQG_
zC3jI?h}apJ{agq~Ika?V(N}X^Q5)};%oW0sy1A0N`DRlh>5q(<y~V>B1}nRKYo0NW
z_56UHqX1n5Vv+C_V=tdYgHZ92`5^${_63^mc{HFqBi5TxM&MZ&+zRZ*$@~hx6`;3*
zI^b=ncz4Xl#i~bCJbp>gX4f$^;#W#_Gb-ma`4Ev%@74w4k$~Jud`3|qOxf_h2TSV`
zfm~ibw`W4XyH1_b#<RxtZBxIvs}3`~Z4$0JH8wU8(Pg;_3rtMhCy=OH*{aKj7zyBa
zZ_jQ~L3;NsU%k<PAoui)-N;)On&Kv~ouC<X?~jp9G-38Az+JXm$M(HBnHW0T<f^av
zqnP@L#Bn8#;X6DabFY*)otv@paBxD`t~g;`IeRi^7X0E6)!lSgisB5W*jyI+HtKFt
zNC$z3WwMsjn(|gwNH6j+OOp+St`7=P)2N12OhlLKOxf5Jo!YHfBQ&EsT{j><>3k9<
z*keFCQo5|{{9s~wvqMtthMV0;mX=z^g&{oU5g`V%3P3~@7{oE;ZWT2&<|OERwpzLQ
zs$;PV(6`?#qTB%gs}zXT6+z~p<O6nIhF~OmA)j9}BWZUsslM((BRBRy%a{wbqlY7+
zl%wk24;_bqIbc+pT!U%E?X8}qtTq@Y1Ds3!1&%+04w}3$35QE<`SS+%H)`<q;l5y(
zYKZ4`Jk5Q?Tfp6J@t>qsq`FvNeD|5hxP4+5z0+l`)M#l%<IgR#scnv922<lnRy^>-
z<l1})tQ!pESKvJp{E|37Y2@}qBRr)kLmr8XY~?9bixzULLC*jNbmB83#g?nOh*{>q
zI8NeMXSb05=>7RYJUbOoU72<w3<~y%yYcPI?EO`wk6XBY2a)$*5hays%6$|ki7owG
zl)+fH{`B)cndm8D3YmqbySb)d#A*r1`}(ZP%SxKk<~4^;rE^4{KTE}@CS2e4bUb*8
zV$?m1fRVG%Cb|3oAAU{rKT1_dW?W&lGFpbryf;%vX9Koqs+iGlF~3tc84wH$?U}UB
z)RSKAIfj~EaXH+GbuCLTvrTke>uBC~!TXS#0r`P6b~>J|h1PBCDuo5N$dYFUzUa&I
z7uVgs>+2+~Vv(f7pnT~GxU|#a^wF`OcR;`=vDoVm`EHsED^Q<=72Xw%$>utqd4<;5
zQJIc1wf)F%J+E5_3NojnV29V>hj4#(nt7Y#v^^0w6h`ao6Tr1#52l^j2A>xzAtu*Y
z<jh(974gq+m%KF*{gmsSC>bhFE^Y+`jsggNmmINZ@_ne#v`<Jj>K`<`*eA+zX=R)h
z>b~1MXwrOln6umd@T>!VJVAACeU-Za+$GK4D)SM8YgA}G{mBXbf?PT2urceEk-a79
z{e+934a~Kg4rk_PDcfbcRnkc=0v@qK2KBY0D#!6&|FLo8p(=06XZll{069%#xUp;*
zuCi@6NlSwRkuTh_;CRY8LS9Z+>Gq*8f#bBsZGl$$uC3(}ew{lo@OOyHaaXRDf7FXq
zNmhNQv8%9JDz3<{_(+ZrwypqU;ogttM2~ZUo_GdZ2Hcg`d&y(Gu{ARxb?C>^gSChf
zk~M#kPb;miP-IdD`YYMp^&2J|<%^Lil%G!E@~7oVmxR;jP~?(_{|?!4xJSWemR4;g
zRG-+3mrrb3<D5R0Po{I!w=3<9&Z$O0#o~sbyr3D2Hyx&jNV}qU+T!uxQfxV%#7?i=
z2qiKYrd{!RbVzuj#LkIsx^STl%$J=WGcm~yu&P7?s~zfgu2YQ_Z>IAtTl(99br$<Z
z57>bdf9LvEG<b!bC5wWpXky5Zl5mG&w2SE7qn61LPsA>K(9*}hSeIf-(~=9oMc2Q0
z>4HL~>S~grX`lQ`XoJ=Cat@$J3y=(n`+>|Wr0CBD+IEdP#D~w_2wr16`DYc&KE+U{
zei)?bdNl920UqDNYAuZ&itOL9MN3~YtgP?YfAZH`(awkBN1ck90ZUfA!pj`pr}Kwx
zlL`^$jOF+g^qYeP1c1kg_oJ8+Q9`mcC}uLWrIgY&RKj18i329m2GrM|p0rY}MI0Od
zfKb&dt%D-NsX4Ar$V*{c7h4>!cz1G_78eo`zXsJ2qLK|N!qFm49p3F#kc6*!J?XQd
zV>OF&B4li|Ugb9Gz1l7T69%Ox=$%>|iu-q%CQ2#Pgj6zn-U<A!#c6qpXl|!|Sx%cT
zK?*j0ZCFOPt-pthOjQ$tvab$juUGQ#XtP&cy4ZH^HumKp=##Z=yV_otE2^4mQ;u=7
zS0S1UVaewVU|Vfpg@lFBe+_#~<lE%RGsM6z@n*~1D99dF>F5<G7*x2e7qQ5)E-+@d
z$#_;QPHS}@XN-qQL`N<ELUt1%df!Zs(mhA0=8rSDEt8?MGYO(Ie?cVki?mFwZHQLR
z+GHRaHSk%n>8=~lUSTm-BTVA<&9Rz1NIj4Ob2?XfVFb#7Vd=cvsDB~)<IFF>I2gck
zJuGoc>+hALh<FE#ecPVy?m9(Md#eNIs(H+GkbO+(hv_vwu+R*rrRU60|KuzlYG<E>
z64`gKr8tu2RBFPQwAQK)yhYW9M;0#+X;I*25zv1K{}|MyD{NbWF6WA2E_n+>d+IXw
zft<`?IzeNdF06vJz#|}(cfmFlmi;{paN!VhZ*r3)GpJkn>(5R*za^lRZ%}5}4Gx8%
zT&I>%yDw(&kCk;#ehe!AZbkOR{>h&e=tR#9*k|ymZ(fz$95jC3j@_e@j<e@G{x%(H
z3O6YB;(PN@NL>1G_XIP+0Wn~&xbhk1aGd%LDg~kdKABM~*6fZ_Ij(|Z@%{6Xs_+kg
z%*HKG41_#nKQtf7Bo2+yLd8G(DWT*|E}W`$V1|CMfC@pgwac|Kg>AVj%laPK<Pe)I
z|K)n&_LeJMZfD<PcYDEp@d13U1zj_GOAYFtIQO1UmE!PAcTM?J!`X@BFvB#$db(#4
zoC{d0>v0+AQ`xZSW(|6<d;yEaMQeGmzCCRGRPpV2uF{>oOt^2AW`r^vTv+Fv_FUFY
zvouV5Uj*E1ErgRi5Q3x8i6&+hJVsKuhS6l+7qr?2zAn3ZiOfV(Vq&r`)PWunbA+8@
zJJ$M%4bxMIVw01B*r#QZ7Z0=%q+hJEIhTKkMh+So6T7+JxKqst3J~=@eAyo$emFwN
zuygRVKGZFLg4LKl`<P!F^MsuOffaLA3jk;-@i>^uzmU^0xB#WpSOwV55I!}zM&}yI
z{|E-~8d-#GBHt&AJ~k#kGyenCluxAK`LcCvuq>1oj66<|XIdb=rBsKZ-0S|CY;0Gn
zp7Yw6K3M6p+AsZ&26q5GqTZt-HByQ^Kr%b63pU*`BOE34{>l=rmcsJYmLBy)*4Qg=
zkil=MRNR5quQrRw-+-=t-D`gx?i^}T(W8R}0=<U>HbZ<r>Rewjk!r<qsm1U#db;GD
z&1Lghs<>H4UDoEN#g|&xY!ri^!Tcs%$Mkul4V;(EFHygw>E1J=^xDy{l&mzbsaG_X
zGc<I#{3M6<h4J}@A}JP`Q57au1)mM&E)~h(z?ZTz<{YL_7p^O1JNjjyF6B1Jos>jr
znQ3@Dm2rBjC>!nLeb{+Z>%AJ$I?$pKQnQHyjzxeZ^jh3RY(4WI#3DBpK4>p#d{ZUa
ztxnf|fm~30S6kQ#(~5FwIJmGHo3EZTQYI4{q2<FW>~j<?hS!YWJ**UlSl$+}jvG<G
z&t~1w9N{2YO3!of9!Yu6#MNUzYPbGNS>z#@wqH=cHyXivY+<l>^=`SZtl^@{Xm6;^
zgEZ8AT9$>4Kz5wE`PA2NnmE2CzGVE;rJ!#H=t*e2K%4>H1q4XoEVTB7O#BQK7S1`1
z<|fPEpPqN@vZSEucgGFABqh37M4x;C8i*v^Ha?CtleQl3k@3-!<xAfmsYh|L{<p<d
zjUeBQR??(1AFoX2_(w5xir2)nDQMQ@1gQ}wH)Eiqw!Fln!=deH%XmIo5nCneICgEt
zt~B<G?`Qn`aa8|TAE{_XD1{#$ywMFo&hramZkxmzTI~Cuto@f~b^Xg`f1orHt_MG~
z)0e-R(sF9=y+gu&6ksm`eZ+N~S#EfPA<xfy?O{T3ZQFU+q_H6f@4jat2Tl!4W|Wjn
zu7M^#0=?}==PdFZZK)pl(dk4|V?y6EE8&TQ<44FvGVOXe@ct9b7&%?HWVXsH7Ga0Z
ztcT?foMx_q7rrAJLxc{$CDG5rVIdytKl<)XX}=8e9^U2T<~gaTR;#Gu>HUa4M0UU{
z(a7~?Yge`nqjvyDyX8kSdpHA<0*hm1;c5NDiNtU|WU%Myiy@+&1jyO(<<!IK^Z8#Y
z!Ha*XsWax|jrrH0g^xe_7&w{~bA(B)+=occh3ObE))ubS3eL{HCNHc3U&Y}jCNiBt
zYrx1rdO3@CrEqBTsm=`x!LKQ^K#Yx6$?V&+Zu}Re$_rr&G+|r8^nEzT?X@t&c$fi4
z(Im>rQ5IiS)OLB&Oe90wqxEj%>IiyoANnjNYd@O$^$utrG;-x{Lo6yiujs8gsIX;E
zC#lY?byh?0Zz9zv66$Xo2a{GXK_u%BWPw|do%q?3lhrC0_bONDS;vaXBZVBVJsWlN
z#Wuraov9Jc2T3<F7qY4mpJ_X~a7w2Oe9XyucxG9-2ZB<);ODzw)onfgLfU#LUfn84
zR4aZp%P(QBi~ug4g1yVeb{-eo_1>}Rz{hyCmtwqyOdV7FA(<C7k@p|POb)V4Qq#oF
ze`P1TGnwj<#_aI1bp^CiJ`UxSWEh6gzvU#EQAe<mBRff+>x->V#rd7@g8g9a<>h->
zX2LP&3(OV3zWd`y+0rtQ{Hr^!KHLn`4cZ-LBPZnKKOG;<K_K)QORJlZbapV}<Ryfx
zBC2v<rdqTZ9!fmzd})#|^0`o!l)GSU(4(H^65bU(M)Z`k*}=bvw=D!aHs7nYc2%B$
z&?=f{G+QY^#6L>*A``8g{)_tApUZ`lui7lZF_AlHf0uC^_>SncD6&k@aP-n^{5~qH
z;=H=;;?s_2JoN%_ps%znfgtQNXVw3{CHDrowiJJeXw+$U&WTl}OmcTFw|c<IeCFiA
z#*>!7`k_>>L7+T`H<W6&fCSK@Df@E5$AY^@UH7_GD=s2-7<O|QRD=C1X9NGwV}yi%
z+6@mb06;N5007PZtI#sGa5OP;)-$sEC(<%<wy?APFXspqGxa2$B-sKf$Y9++x83ZJ
z1wkl?hzKx*!B|4#5Gn%aA_+SnsKS{j3JJC41oYhy;)sBP2*Sk>;tFhU4ZAmS-<`8A
z+nkS6Q|)EhNgmNPHmHCA0YbqEJte;Rz5m8!`FA>Da81?&z&pQ@>B|RBF!#fW?ehFQ
zr08<k37GnEhk=WD5lU!QCyCsXC?)|b1Y#s`^Na7LC)T))9VYl@5GI;H9uyxi5V||s
z#&9dfpHB+JIEyP2HTsU&;gF+(0gM{(SU_Y9z@Qm{4}vZpLV)-IIm2W}#0)2V^Ee#a
zy14>L&dPElVDb+pG#JA)s5h4N1Ipp{Fe3nq7%;T>J%o8Gg@740D*utm+krjy%_Kdy
z^B15G^kb-DpBcnIkAfss%v*N7vFmn60X!Bn=74^_b!7mID-}q3uNdPo&Hy{Tjdgg1
zAIW)qbR$oI<~=ri7y=>sUFGiczXAd9e;Dfy2Ke!*9z!4r!h-;;hY<8<KxJdt0s#mG
zLKUEqL?F;sLai==aux9hln22eiUt@=M$`ud2Ep)^&_s>&-?C@z00F|r^zRp)&@WG5
zNbXt&8#06j?ikn}W5OE}@&~jNxMMI%|0~f1xuy<iooGO04HN>jC_qCB)d!vlJD>?W
zPzzxIpxyx(oexgYS1@63K%uRH5euY54L|^eV1%(WGz|h17N`LrzlYog31STz0KhFk
zlSkNRFirPYb=8j?lAPS4h-Mp9WNvWJo&i)F14hlXB(#sfzOT1mLxw_KUw)4#JR}wq
zZ0jqF9Jbw;3k@SaR3kG0R2n>Fu|C&QW5#f?{u|a7Q~_W?U_2KGfB=?y3&izeP}KJ{
z7}#Qs6?3gm(-<ZRna~ZwF=C6BrCm!HWQ|ocGho_3HmZMwH6{b7)*2$LvM++@4nvig
zXsi#yMql4~TmVycR0eK}5+)8%X>dOirpuU1m*J{6tFEsPdO4Ko&ath7(SGip(LR>R
z9?*hg%y+<;-vFaMXad3j0#rLhyFL<BASobBy6=%6WC4apo?Qma_75$SHex6M!@wLE
z)pQ@MsK5zov`#-6grk$Pw6N^#s5+pfkO2@$9tMo`4R7*rs5W&O3nv0D{}Ae3EA<yy
zb=k^1Gxh4O-p%4-L4bg@KMPN(J^^eU=X+S(773u^;@dvW5nZATP#F|NJQx`GA2}BW
zwYw65!0q!AmdC-oS~z3*B!`<P-$X#ZB+M~@#C~VjxBxTH7v_vG7+ofcnWw+M$4*p1
z(Lz5DW;ypz+3N;o59fn&V5gX)l=Pz+xhXKIN^nf+vjAL^A@|XzEc_jf-sdxx9M1)W
zK@ZZUT#dl9hW<0gbD+0<i(7O_h{%fJt}ZUm_Ac8`xX!F%?Jsb!9h&*tCdX68Q#1;X
zOu%TSsXpImse$V-ROlY{Lb)xrC+I#93Fzk^xOjhwBBCvB(B*3rQ<zGD2>^B^mcpey
z`|)ku(2(=-F~kYzTNu|C$8-tY064<KxqSc+2mtQSEs@I{WfLArt(G(_J*N4};F@eP
z=#}GJ`6KRDr*Q$kxr=z@%x?X_8sgvq^z}m@36chW9F?+dOI}9vup)jH{O9{`dH~Gc
z2~Y(2=HTgnZ-bLuh&_z9kC&E{Q)XCv0UJp8*@3{KM84y|<QxY*i+<q;dk?kHVxGz5
zRu&nQe~JYjmYzWKfB1>VjkdZR%J%(tdH`O3SH*WYSW<=YUI8B5Mq-ZM-CBNmaV`j8
z0>o|W>HQT&WL0FJmBkRxuEXvN9f|b@F;O5uMdyoH6uSIAg-G&<unwUie*LCX#RVpR
zcXw?#8;at3uo>gOUOkbFfB}N}At<jLIm5A-XYT!&{&Y(xg_89#dwOnhw^fHLBj*S-
zu@RfaQq*vc8xoh1g>6pN;pb9GUgFWD?k@H|T}jHH^x+>9%k^GuRDL&GBhEfvO10N^
zetLH{8>BH$nSlq+k^Sz~sy4bnez?j>f3{-sZ!tmS4sCmu_H%FpLT92_saR{lH$v^)
z3w}2CAh>-Q@V`2{x(gn8jsEnHTZip<)BH+TtKBVKKUvjEb8U0rHomTxQXb&ru(Z9v
zGlTkI^Mwk(&xBoX3uiIhKd=4_`Jlg@D|cad?r%^fEp}u6D{_1_n78XCTyPjWyO}DB
z&7TihfR7H4h(z7Gw%zC@o%?l$_bZC_rrojqac(fnCk~)zqevqs0zuMWf1)T@CV;s1
z!dU!U>taVhv3^hkW2D}+3aUN?!f3A>>pGsEN0H4`^0_}at*X%VF>Vt&+k9xdOYg>>
z$cC;F%PNax+7lw>HLku}J&NSVt?cc><Bou@Ze^otl`}04Zn@=RoMYmLdc>i6==(}1
z@bR`4G@YF`*BytHx5yjz%E4qj{I0s7wGvbg5_SBqT@=}VMq(@48_&Gu^Ip+eUu;)H
z-BJ5NM=`cpB-VwFow~ff1+#?tH?gE6*8!proum-7cOtu**gGHGv?hu*&t6=woscEJ
zxP}<dlaKHRiqw|tWCMOA+ZB#BxZBu4?0}%&wqmsU69Kf~XXhS+WaPzPHl$reExU2i
z_x$~kJjy5Vvu<R5m+n{TMbmA}(3%|L`h1AQ3$I0iQ37c|)p5()c<XCy8ft}~E!EGk
z%9*Ir*TR%>yl(x@tsE0#ywEP|tw4R}z)BCHgLOrsCGw|aO-RRe4J+d1gGSbDh`H^0
zB-Ouv=mM>={(IFDr32PoDnaM65NKN3(m^aM-+WV~7A#zLGm|#-w6wrFY)LdQd8PH%
z@pbkdljC=+WcRf=ZDp4#66G1|aQ6w%XUn4foc0-HQ>I$Hv`P&B?}oyIXCcp`ub?}R
zMjLV<B~}F(_ZIZDr+ATW7mK8uJD(d1>C>_mJ7e=D{j%l8p;>h=X^M7kSgh}aXTC4z
zh%CeYU)AX>`pn|yr*bt1>t%wVs_akb8ab=t2!Lv(=RdhzzPeADr?V4wQ0k5G=Cn(R
zz@b_6;FHOPrG(XIf0~c)u4>i<F0d=UJfHIt$O^$e+L0|3lLl3W9J&6Hv%}ASFn>pS
z$n9K)f+JTKeS>SH?%=6qBL_6w%LD1st%msPt}uKsl3wRcJAg%J+h)f3G4}u#6n?u7
zId}(va^TK5VaEF^X~pNnkC6#3420P6#tv@4TPwF;Wxvdwz036k+pSZ}NG5l#UfVj`
z`R1TrZaQf9C)cLf)Xc`&0smYIpOWTledMi;w`@hS!}Ke=o&rr3)g-!33u}^*0!{E9
zB<D?)Lco#+=~hx)?>wX2w=Njk@JyWG1ZxUsN1fJgT1Cl0l=`vRv;GmtehoX=a#Xga
zL4Q1Z)!D(E!T{Cj=ucJkBofXru~IYt!Zcin!Yyc4*w%O|u^tS+T?~_xivv_sbN9>S
zU54^4$|s;^H-51-@tP3KL@I2M@2;aJ<F($vbQ?ks_DYtf&^gb(W<cZmE5)c_jKJPb
z_TtMK*Le7zn2G;FSS{2rEMhJ-H>v@qn%L@fHn-u<T&_}~?f6o%m)D+cG~vW?sC|J1
zZ<2ZUqpy2ihDm~YG_$gFybC-1ZBsho)LaL56l%q+jrTQU8`8--creXg{zgGoNGDB*
z27aDfVd@b*9Bl}#S4H_l@V865Lo(|=J8c?%SBATUU%}w}JKn3+f_SZoSLtUXY$gVK
zMkMVw1C!LXgC3(b%AGX0$(4Z&d~an*sJZ3YnBRt6t0Mg6PwS}<9-9@2op<cdM?OSR
z%egB7{gFD4tHO?yhk50AQ)m54X1>CVub5T0bIj!%!=zOewfI)bwp)~gC?&BsDOrE1
zcjIs{#wV1-3p!$6ss_cnAX$sg4;*aRJ!Av9>S31ZK0?hz>=C*`h+CMOJHJcEO$I=0
zhsx{2d{YxyN&UdMPB)J7Ms;6JEFr5XWsQ!eDZuSEepq$lYGW~g#T7P=Z-iX0jq4tZ
z$&QIneYn%T<W!k-hdLA9b<Q&FK9PFR1d&9w?vbBeVFV;f{m2xhv!tY95_!N0NZe7s
zw}i?plUHu1VGr^M(JUBTRd4XVF54z?npc=Q3m<;!oTA^`hWA2ocoeJTxnJ+o$Ai3C
zO5Z52x#=yMo`>6C=3Q-pHJ32HGw#Ng+vIce2;%#NrGZt>!K(d!!X*j{E!V5g{!}fC
zxjbD}RCrc}tQQBoLbbd<EH@P{CtXXhILq>=MISip<C?xv%^Z(O{|ITZx7@9b&&quW
z2z0-8wJBb$(7%;dgdxgj6+kT?NQ`4bZHt<2iSDPJ<>YH%VX5t%dO^@+zC3lATCm(S
z3#01MFsOxhJ2iza-_1r@Ppr_|X}eUnmD+M1jK9f;MH?Zmb+tS3&z86M^h_OZtH@j_
zcAa>;%C5Ep&lV@9L0Or`#uXy!jfUZ~z3|<pgRlqyI_nzxSSefSYG9o$u+iwVDIP_w
zlgX9XO2^8>=9IgrsoN{n`(!QF+WF^D_SbGLI}8n)-adI;rndGQx1`>~=1zr!Q~Y$#
zRSWr`tCHxo*EO<@k)h8y$80r$IW0+Ev$&r=80Tm1#||U*+c33h<AkpGy{>6Juyf@U
z*R8PX(c3R?-#1nxQ$4ANfGT;*YCZ=tMa1Wx=e&eI7k`>F)Tac*{BHR|EfO8fx#X2g
z*h&bxhXyYT9kY&w!F<59h#wF2aB5^tv4RGnvEUEUKYiwiMEHGnAsbamqPG{0OlwJ&
z_6;Tdy5EGBA3MtP3|L&4nR+~|&H}c<%rmC5D!mjxBQCT=j8>+d-n`OC4S_}Bt?6pS
zHfw_38aSx%hB~4y7I(C_+$%dIa$;l8k-cc%jwL$1cY>Klg)mZ#ng*(+_YrX^2%P#(
zT2G08%x2MfNOmvyw@(N&M`}~=+emG2BC0PmlJk_&zdS@W>*-B)FKco;@>1{Rnhrg4
zMY`Hq>iX;a`&kg)RLsccU+Pbs$rz=y=jt_ha>$gj*9+N`-n6}kXFTn_)rMZQISlN#
zr<Q1f`_?Y*DQO!Q(!eNJ72E^z&I?bA3nz^xCLHEo@g(sLI$%`FHMXqa>M-7+sEkAC
zbqB6`h{X6iCC;B{M>{pFczWhuZ@<4F8gi_9SRs@0m%8+odHvs!*cQs(^VzJ*T(4Uf
z)}jvi={B<2Vt@k;Y6#gJ7Jy9NE_e%Cc0pC>T3oIQxkWX*aZ>&{jgh)>s*uDx!&WcZ
zr`D%Sx-bnamirZ2x9Lv1e728<&8;m(>nWOA(QMuFlb093=VaZuBRv9b6JYJDiB6bz
zt{RI1sOtkAyJ_QJ8W5+O;}(j@#hhrPOxH3o>c;Z<B$^>`wY_vQoC$t4TUw^=BLpb{
zuna{7Qq^0qPn^skbQAF@J58<DZC?$hLQQZ;^Lodo9m)G@z6NvfN1tSYx6urN#yBPe
zS??OBxE|fq@X&R8W!xh{7b1z7`B!4pyIEF_CJ<1>`2LkpNo?4fBbqR$B~}NgpG0>v
z)s{iC3O5h8-d>sEZo6iXZ|}ACsO86`$ri_LTGne>KvE*XPElHB+8}J$8E<J5KJUmu
zL$A7>@17u{sKd^;rn{IAWRQz)uQ_(4)Xq)cY23lCG2$GjT-i<dW7o!o@0X%863|Bv
z^YF1WqVhmw%|{@O8jq$R2fgzEhUK=(dy9EX2)V?y8okw)#nepFAI`ALswFJH;*}rT
zH8W4U3(igE@6tEA&e%cM+X1cnzR|Kj!0v0c_VJGD>lT~~3x=5;E}2k`BDmI1HgL;5
zHQ1i3INfMSf|_~Kr7acKHjA^(rXalzH)t)=!8C+bPN(u|(Nh0a{yhOSVZ~c&GaB^M
zsj7$Elrj;Y<+oVk#O$A0k%uu6n%ch<Wy-cnG@B!;#(&TAxaUw|Tx#+z(=P!_Sx_@~
z*wR5vwe%3x8MH5BlqBJwh<}cw{eh3^fQCRLLMdNjnMN})Ge=XKZaAzwuP>5!F;gk(
zd4r?+b5Hp6GfYyNyT1@n$70Ke@=O~WQJurhU@|qFtV^gZ^o*SvRfIXC)~JN6UDj%x
zM++57M!SN}2b&tw-PXgU*#h%t+sW<8TrzzEP{t3<_{X_K>C{y<aR2Gij#*{b)b(BC
zf_i_FzJ}K!^+E^R((APie0dFQQK+)h4LEjXV&eNO8Tp8;IBghO-KvJc<0DHqcuU^j
zJJi$UCeWnQNd_U>Z_p_CHU;1J@?7x~RMU*L7Afe89$oUusYS03nP~*oYsK2GXx2((
zjIJjF!*KhKh7E_gOOZ7XIn4lZl!z$wOhLs=yirZ=X?v@vGamN=d#6HMjrc<=(ig~>
zY5jMHkW+2$ooxgw=Qo4w^lS7|Y7i=m3viVprs7VR+6V0lvG^}9>7gq>3CqCe_j|&L
z&tz6V+CCNCxv1W{;HU>7Z^_NdM*;8!Q)8Mr6}RCC!@hInFU#2oY^T{=a0L`Zfvv+x
zme?j}Jyuerx)V2W1kHq<=Hi*kFsch|$I96{-<t+60wlABekn4fp$l>16FFDZ)z_4d
zwETc=`9^I6+zp&4@xRkgg**m&QnF86-M;q>*q`Qg^4%+YhT;#`HUEi?sU#qYGVhD<
zs?BS<NIeNS<hkyk^q!d}_`?4o?3{utfx0w$b7R}KZQC7nY`Z(`*tTt_V|Q%ZHafPQ
zJ3UWR^;gZzc|Pyw)c*Fj7JV^e%Wv?0;_egHiQgpMidFbiDNqFx+$4^GoI;x+dURrV
z@n9i%^m^R)FZk(a?&>36ai@Q7;r_tZV5PMqVq!re$MXGU&B)e9ies`ml|LQ+S%MIQ
zC1FwV%r-%=dqM2j67{*A&63h?nO<!fld$&uGdi)+f5L62hnnOxmOjgb%UO%y+Z$Nf
zZYwrV|E^y!WJy%><6kOFBK!d?cHrp3C)CCz!p1n+*~MPHB$A1!J{f=CtznUrssVS&
z`>Wmrw)}$)cq`!K@sZ^|?B*CPS>ZAS0S=$sY2ePKd=)#9*jAe6BU*d(8!*(;?QI*{
z{Xwc3iaD}E+$wg=6kg?J;eG3kQGbx}2cDdFns?-cMN;;;RsoNiE18hia{ALa)$5jq
z>2_%D)djZXY!2n5WG#HW1=U!+dO4Nij@M`1@DfpKS#Jl#RrYg$4Zkp~)w&gj^*4L*
zwHl_1t#);0y*+Jf^{HNnRcEC>JH^{i8NMp%FXHrQ!`sTHxLUfpp+F=7Xae(7m8L#e
z?i$9O=)}cnC$-IDSMKRtXT&gtQ$b||a0|n49lJBkELAVizFtw8!AB+N-5Wp297n<o
zN$jBq5eT&)4BHFHfp*?ZzWOF-o#Va?s)t=1sB&A7L8ow~6UZ}~Ga{&9|GuvnydCwU
z57q0vt%_^8d<ma?<r)w}|6ZUPs%QN8PSFFDTJ*?D1a^hu0aD1g$KRLN#|HS2lE_-p
zuyTl>G+ml9vx=?l|9A<Yh+J=&#pAcj{HR62Zr-lA1JlEJEGFjac<8H(<)hmI6;@_4
zj*h<Ai){QqsQsBL{Tmg@nuhAz%Z|IS)yf;gQR{b#mQAnQ$y>#C^FDtU3l^NKYR$Ud
z>J(%vZYUgU!<-Iz38{M~#|BCauI+Sjqsd!nsrjvXU$DLOa<_Q6h7BLWKtKN&&VF^T
z0y31K;5_b^aTE7_uYI=}f;j~Gogt!c2TN-Pqf4g==rr>h2~VMM#QZ#;F!b(-ZCK1(
zWq8vLVp{)6S7*n>`Tg(X<6f6UwdZ7RvNI;+;m_SlvvzEE4Bs0jR-U7ZOzML33(-N+
z?R<GHyOdrwy|C(6?vbB+#A`1*>n&IKvOCzStBc^f;L^e4Nxn34oYXR#o>zrJ?ZP&E
z)YbYQ&V9uD7c9+~a^INgTDUdRsSbVOE)fv@|GjkjaE5SG0Vj$qQ~kg>J8C2410=M$
zpL^g)F_7Nfl@-5dLR&}(u$gYkRS{rN=vNOjpoqv@tCtZBw0`3)*W32+eoR&0Q2NJm
z-vvL#_>IckK@XK^&csdmYPI{A0n3CR<>tFUs%b{Aa`_zJXJX|d_Q7L1%IS-|3OTAN
zL*%%*C6O@yHvVNSdYAph&3bxU;<f>TnMmlw{_I|sv@kBJ0AHgO+Fg^xXqxfiVlM7%
z>!fk+AJE>s;KXe9MVpBKEDRanZ3#b#$icHE`(@r~r<lNft9NSxTfwC$>CdcwFqDO_
z>T3=R-|@tg)aNUItKKoZq}uwaz)d8!iMrLvRT{3al+@i7g6LnnXGos?KC!js6wvG@
zfcE83{BiRmpJ@I3rO2n=6^7Ng-mS+m#(XB3%Ueq?D}?vs{L0?<`yl;HXu{(l&q#pl
z2`jBf4h`nY&R1toS4B?_b<|TzUAO;EckG4l$zcp3QOqf#+!*0_<?|J`AiOvy&Gvwc
zh4M&~yc$_vj~}Rse&h1eDeZHhy2M_`djwO;SPgFxLBi)tf6pZ5AkI-2)83ihLL^I?
z;1(G-!5nS$p{jk1twD<+U~;-bzPmkl+efkkB7MHEX<eau|2~Q<rIwnTl^zN*2evM4
z&?98}T7tEBHt}fa-M?Cw6gM}5>#BN-6bZrN!i9is<*Yq~;;_vrPXFJqh=5V_X}-gd
zL0GuI2gyU#t6zg0=`~k-zVPzSB!kWZr^U{^BIgW5&3nAU)(FZ;7ZJ3NQaMUZn}0T$
zx{eWrJZf$&bJRfpt_QSX^DC`itTc@DbX^tynTYMi^iy{qDK4{nOtoW--n#~SeC^<I
zoAoX${%d|2$<%Ribl-4-vRI9rruHmmb`^x$(G%or_;C-L8+Pjqyo=j^JYT#pxE6#R
z$n9I;9(sNfoddGfvyYEwRb<lUbTQK*vf_@X?2UEd6?tWAHvG%i9~o+5EG;_}rnU=X
zam1GD^-Ea$Us>1VxItDg=`=o7)TnefTLX8l5^18LNAKZuGlSaRxoX*#-r@G`jo=97
zUh(>#>7Q+M%bRVoa?=xb_cA^l>0CV#H-vxPaVR_RJURsZcwTScgKjV4yrf=LWqP}t
z9AwRQYP8HOm>Y9nD^RCApI`fZ0|gz|b26edbn8d0f5W%B&GvpwWoM0yKB9V+IVILj
z@-g_77zqta6=YZL#xAdCmqg#SnFrM<F{$SS`d!IrmCvkw9)P9u_2918orw0v!qiK%
z3q^Lbxz?=dmuRg1c1otJTa?0keEQ=$RRPyt6~(o^Z!}?Ap~%CndKl^5ee0qTidh?&
zmioF)b-eg3+(rn0vJV6P6dcnFlQ`v<n=S^6`T^v&`7dwC_KU$lIf*d+pVdj88CyRR
zS%rm>T{-%_*NstoA<(=$%MyfqvG2)cPQH^%ld*n(z~!*2w-o$4NGO0nC$N&&_=V1*
z^+y(My~tl6_L9Z)lQ#FWSEt`ICWB*qO|@G@<#$_+lktsD1jdgx@7+6K7x{)!MwD-@
zDPKg6(+(;-c@hy1si|xBA4@XECF!P!RbXl9VowhRvV4p<Gmj9S)qcX=#jSgJLVm-h
z3i-L?<F2E9K&71n?s$vZ!qREY7>lOG_f0O+NYL76lz>gkKas>;^=yT3RimQLAro71
z292BT+lR+T>)?x<jWvZ!4%}f)bCxWW(>JFAwu=b!Bzi15OM?_PDwi>+HAA7kW`4fx
zoWf2n>djO>jA(y+TsF=c&4n~RE)u?Q`CEH3k8B0XM318+I|Y5W)PDUxZg>hs%kK>d
z;A*~|h>;l4$!YaM(<+!SK5WXmZ==c0{bB<mHR;{F6XOAxsfzIrapQb$BSRORyQ;8)
zujAQ}Rmxu_@uGbuCYufy*ajJytzi?c^)If!^D&PKlyjPtW9-Fe>u{C`2`T>koi@nw
zIGl|pogl$Es92myg6*`F#q9nTLDX(OL|D|Z(C!@<b^TFPu#QnnGJZ?G71!|dFiE;y
z-ugYKEhFdf`BaGTIr8;85pkz79Lioi_HnD8H>6U~V%*hYi`_f5MU|lV@t@zWD85j<
zZ1-YK3sXP5KT?aq-!loQ=7%ogLgrz9POFJO!Mc~<o^AX6M^CKO%o}^}Uo^`=3INdl
zuhH!PWU~KHO-#d$C+p{i(jXD0$qdROme`VwX=o~*B(xk#FbrAQzRI8SF1~2Il4QI;
z<%Kr3)i&1U)snW?kCGe5UU>(C+t)8&p4SIF&iX4Jpy{1|6_Ci-f(Qlx2}yB5wOzjA
zFK0-=C<!1D80h-w(9-NYaKP#+QH8&~zA%xqoD@!lQthbK2~T($PU>zdxCP^6X2-<P
zGpA^UM&Je~h&k-XzhHDL0mQnF_)|2zPgv*9FqigZ$nmRZ>@vHK=Y40IkoCn6Lgc-c
zF^91)DtuVG!^n|Gj+i?TKD76CBXdw*#0w49z*T}7IK18muM{$ZqC}efqy-$yJhx}=
zA-ivKl{}b>#p$O_{NNzt)8zJICOAqSjX@LdEx3)1j>Rc_6kZhj4&n}r&c-;^gkzGt
zis<95`)Z^EMS+7l0z+j)k}3lG&>>5{YB|18CgeVQP+BoYdRk&n&SQCh0`7a>EI)rU
z#Df4qAECU)GCj>W9Jk2?`KK0fq*GErYp!1Z9VG}^9$7JPh$L3{{s3i9itGpi*hFcu
z;CM3>3U(M+(}F-?GKR=F97!1z3}6lrV2lQbg6JSj0874-N-ciU%c(*|BZ?t50u|UG
zX<Z0Y=2a$v0p}kaP?o<7GKvZojsHvHWCe!?AwHgWmB8ZRREC?52V72-4lrIP!TFXI
zLLtVIjzkbpK{7X>c&e)cgZ4>cgBKE*o0%{n-P;FRgT;Ye2?$cgqjAEB#zg?@cM%n#
zz`f_gu!2|#EfZ;4OK37eU`)cE9YzI!weu&kxQ(S-XB70hQ$U15h|1jZi;?zHQ&2)6
zFeLfGi52dWz|>_F8-W4dWe?kcp+IV-IHTROa!6V55b$!@rDF3iV0i`(pi&u+f|i&q
zm<!>S9$RO6XRKGbNw4^aRhvq;Kl;3LCOR4{X$sIO69t@ICWE5qd*Z+F&Wa@|u-Jl%
zQWTN2{@y=ek>LTrf@c1JKP?y77`WR*4+xQEsY{dtgq@2h$phZaCp~Q@rPz-CVKb*;
zep>`Ckf5%kuqpfurV_&sep!;!5yD^uU0ckH$!<|VzEtLL`K^!jirx+0wotP~|3xJ2
z>jj%5=@O0KCfUV<@sEcBP8J6EC+6V=#PquL@yWo*!3>F=L7ljLL$TnYr9#q23Fq+F
zjDT2J2v~G>5!Qc{6_ZU|&@}V=`%CHFaz+k~D-i&y2kFk-S~kBb_5}RKx!maCIg}Ms
zL`xNRjrM!`jSMbJ;`i_ibR%7Q5CY=QU0}b?OZki=jKBMyifw)PYWmL2jgsy{xr=<2
z9CdmvKvNqYb7~s#J9~;^b!p?Ypx&p+tl@!_y=f#v2ZL?DqZ!y*au(`Xcz!>|mm#})
z{8r|Lx<@+o1)~UnF4KNfp~TF1btrA1sJuAbJz#bYkv;B~rt|xp{2K2O9x|9$XVTu<
z*S`-TL!`*uxX^yu;`>HnL;Ka;i~h)?J}86LqvMiQZlDtwVtsXlU_ZI2l~!WK^EJJK
zr;<ghyroY#V-yqG8E5wT&q(-PZV@?~i6`z`#76NQf{yy~N9XO-+$S|FS)DTFeffQ9
zch;6QkxZiUhwjfW?Kr<>|JRw^Bc)HJXN)rmvVbN7xZxa|?9mG_5__eOQ?PJoa9`lh
z&4xI?&V;Yk*Qa88kEvG-5z{C~F)!1tPM98}Cx1T!i|J{Ae<{&+fW+{7RMN*{@c7i{
z1N!M}4_tgsTo-)r_hEd6c+&Rv36$C9X05{HYV6aeL=Azk`1c~m$M`#^Ka@reJP$n_
zR|d^IRa<`Ux9|N44Ffp_P`~YHwmQR$qb4BzzwA8|`&LbEe_#1)Vf%mjEumxChut@f
ztb$uzvNjvU_Ao6PDiqueqX@`Sx`HW>%G1lxXP=EmXlX{HmoNfE9&r^yp$bmt<g9WH
zU2Z8{W{?hmt)GT5%SlGm_rzb&vPsIttYBpuo@lb<e8fK>055Kvihi~(C@-QT?~lb~
z=8z5j+^FS!7lTJ5+n&8<xY@2>ldn%~tavK?U6;vdu$2n#+5&QM2)YX)&%QracllDE
zKlf*4Rfhd1yxY;LY!~akSO(7@11|yti>7xQL+7q5ejMhlF%%|}Ns(8^QW_xp2v@1T
zO8w}`E#ox4E5l0T7_@G?G+fx#Z3sBPRiJzFxZ;Y0TJcm0gQ~|On4_tQi?mw$hbr5d
z<LNM0zhT4ENsccD?Uy8NK36x^osDZ7S8yaf3z5}#+I-E}K;w7r3KusSR*`t;S;$_S
z;}M93oled~b22Ks9@hK4+15WXHuOW9n8VY|C#dupCLd`%uXYA;>73IkBtN(wFMIY?
zI#XWO6AP3o{+0K-;i=m#>6e|D`Z-Z+mD2qCten*5>~8<Iw}j998R!Jm-^{sdInB7(
z$*fMdEmB&CzSk=@`+UQ3cSp7zWA5h9SX&qVSA~;pNch-<F-P0s*7Ss$)RL3aldFL1
zUb(>QT~@hoUW}Xy^Wso1&Uhk&oEXekvZL|}I}`d`h1^r=&u1`{of)KLDwT{``y$Rs
zYl{v-_jHf^9Twd*r<|s_d6^(Z#Jp2&+OgcTgRq=VaGTg>cBfhxVr!k!?N_0fH!dqi
z-luXhczg9LS_M08kS{Lbv(e3R``o;HCigoGoKo$_DoRY-=qNo&f{B^4k8!PIvplkk
z(Fe)kdluOZ<xgSWG-FdLH(v_dAnrl@-yA-A&X%um!Lz&>V@yplDmQ2vc+<nkPpmmL
zN!3K%=BlH?%m@L><T%~WI@HfPGkj_gX1;Qgh?XU=)o|>vC7Vap+>5I!<1c*|4Cc|=
zoJFuzcx|2}7hj&E+{d3YJ^>j~e67C;X^^6VLs!!|ncO=Te(-17K1jMc7lk_<z(`|i
z{c+vK86YgCTw<8UCNsEhWXO@UEU_NT`!+KwHB-IK`Gq}Mu3)e9)v^EUJy+m-YPAGP
z^>S7T974ykVbzIxPY4u_1EDa9pW=lT5=Xox9loT$7YSBA<7IW{aIsqUbK+~U6X$;X
zoV*%8r8d)%l2OL=o79W0PQqJ}yR!e@!8p5pvd7A|qgE{LIsNC_;i^P0&ULGM@eLd~
z6zs0jV0&IWEG7>hIf_$fVRgpwo%#xxx<vcZa1JSnUjm*X#Clkaip4hzdbg}8rlfCd
zM%SzuE3X2fGlNcfT}zv#DKn!+@`sf>rL1_1ovb!hZ-X@#Z1eb{Js%`%IYj)wo@pcH
zo~&KX<N2UxsI`~aWN=@vs<%VZV%qx2QsM`zWyVx;HB9ShO^_mY7J+5D90ppqM_nus
zHBsAJo<;I2UYN16UEKmUM90=GX|bI>X#yMiT1kQ7vtRD4fpJ|m=!;bD5~{HYxG;Oo
zi}Yq$H54;Ox^nG`4A1F3^U~+xc1G7$CWy}?>&$fBJsb&&!KuW94xK@INPrN>6g%$F
z0&g6HCr9eLyhCj|`&_t1xIHsGz4eBRI((|%3ILZ|I5t?G>^#GHCMN_&`G3oNzABMw
zrz|*e-L4z!wP70IX{1k#u*Z+8Bde#ShnQVYmCmjE7;H97c_~u>)Ck|_ZDl&xY-e?f
z0#{M9PD6c%84f(k2?s0}c{9^5Flpz*3tmk<rbXGb)qKus-j7|rh8PR$%FV3Lnie?y
zfK~UT-umdPTS2&?O{Dl+`RRCaS+~l@B}{|6WqjKr3uyyI<mYk1Og3OkRjwHg2T6IW
zPvAPt*#oU1PV!ik5{gUCY0`CJAx0u$C?~YzDdVx3W}!R%D+7*!#vMyrjg(`WEf%tQ
z?A#dhcx>(9PC<j6H>w~~m8xq*tw%e`(h}aKTM=lo!VQJ_elpE?`}8`8I;F*nA{lyq
z;(?!2pRM8f3=Y$rY$jTp7sJ9Om&IjHC}wNw>i#(cmB7BH2YuY>fZnR)QPR9J@W|W=
zv(mr)*7%Bty%~)#58C^{irM4^ZD2L&<2<j~huF}fO>yd8@r?6r0EgS~u^{p^3(CHx
zz5S@}toJ?c-K~mh{YSHke-Kj0r7}Mro|*v+!`USnzj-!}c46m98@t}PF3~ptQB>Z0
zsma&azQ22O-bD>6ru_L-3k>&F1Y^lu1%m(SNxJi&TvddKVcZqlO>gqIH7gcPPGP$)
zR}xW9$Ok9_H{31Mv3H4iR#%y^g@)_BX!%gl#AJ8|)c3o<p?1GhY<X<l8Ac4m8Ll-E
znYxLiv|bIQp=E+bkBc|6grXjdKln@HU2R+RpX_vN_4I#jup^HjEP`*KPt0qsOuNL=
zO*2^bc2{l0K08yJ9bAiv<$kMP$9}9KgP-2D<W=@~Q@A8${tnxCy3-Ug|Hg+6{OdT!
zWg|mPCpPS>Nku$h-6quXcQp-m8ScC{R*;qjetNL+o|nt8)?$H)sc>$6>f7pb`V)=e
zL0WSw!>db)y{e@1nDp^LWcT=7M|R}z9fF-cTlx`&NkW7i``@uuSl9|Np3a=*x~*|+
z?T*Jg6-`5Bo^fi7XeO^VKlRwcewPY!ILqlS7Z)?TfHN{me;1u>+G1p=fj0S5UGq;#
zRqi7JfS5wpu+80~!$WnjOK@AtV_AA-Wm8^aO5XY~D*N8tJ9#Ci0HyHs%KnCo<!Rtz
zqVC51Lqk~j*H*rAYMZ8M;Y+4^TkCNr0##0zv4W?mox^wa%empgg^n209#M{%sKl}|
zFGoRYhsp(GO|#4~@-*So=<wV0tC-GH*UYx=&vdYFQ<0iOLgIAxem4Tz4^NyH1Ll`r
zmRw^(VMcG6UPEpymLBs2`dR61p-u0<Vo+0Nc&H`x9%wrLNxg9hgj(nl{yKgf<=TA=
z4-`No*tIfq4oL7<oo-H}qZ{kERZDFRg4jvjUGK&PD7iMD_p^qzlM`Bz>!{^~R_$I*
zGy3th2~(G>p1-lrp~O837FAC0mQDnAj$MQ(iCthWS_fWG(S4_>pBPWV)SqsbYfU-%
zsNNpAvgu1aL%#WO4b%#<=^)4@?BR&$U_JU`^MLa_pplX-OW_$*uK9zmT%Ymyi)MCn
z*Q{w>wLf?onZ4mhS*7I;+3A)os;g|EwDZb=z5wpBRjGXW4fsqPQ^{5F%YFpKR(wq{
z%w8K)Nj=3(VI#b$TROb>QZhkH$X&2nN`Ez11?04+F9bJdqSyFqxs7?giUH-kC*?eN
zMvP94&Kc&~8&&$!L<%EYNOEnMG*t{5^XgV&<F2fO6i;h9M%y031EQ^5dqpo(iMn^Q
z_0`W*WBakDhsr0o<0DoRc+4p2@qwlD5!}w#ftp-Y^m*@6)h!yz++&+)yV~O%VI<+_
z%e$Fq{b$T;tlemxXZ0(C7n01w<#?RTlMfgP#wHHC9A`o6X~M57N0ua5=ZV)=&3DVm
z%#*zR04~DZ)+pAaH_rYa9^=0xY-Gv7MAA_InE9PCl9y|Kk_WY)wO(UrVt3LSbQ*Vk
z<Wrr6*e!6nS#BIyJ)ayWeoHs{Wd7Td*z?c)HlF@BY|RZxS`(`wOFyMtLs@3|?hQlG
z5Pvx}>+5tx<NLsn*Ac!guRh_*tnBOi)I{S9`if9^_Md5mv?h^eS09XZ$MSD<oZVt%
zr*9{}mfvhb{UR!fXoKYU|3>udvJDTNc@GnmoTLn}^q)KN`8`n+VnW`Nz0BVIa8DY9
z-m#6jPCxg&X%?c)Ly|i|dM-Xja53x}_t>k$MxW7Y=TFfx?0ysbw)^s}BPvjler9CU
z;jB?*qxzF!*;+3Z(iM6fj-cJR8G5`Ek676MoO(J$V2qyCD?=~UsUIh~@+#Pv;|G+J
z^sRb0hEem#e(v9;+F^-c4fUS(no<M4fxQteLBP-Jl2uJ~UFEE$)NBNlJO}glhyH3;
z@0PKzmwsHT6)uO{6O&%`nuv}9PYc0{iOmRGR^yXe4+u$N=+ivCdnICOA{?6c){MnD
zm#O_|!cc@{;)5uu2xk46@*>M?dy)1aMC{201gUGOCVxCK9=z@2zuDvzV+-@w4zeyj
z4mIivb5^gU`1(1Yzy2FviCGMd(dOPV+PL}LpOhWC@o8Gwf?S67T-H=7M?1g285Ruo
z%xA>umZw{-l0iA)hBd}kx}IY?x#ibeLDNB7$$Tu5Efro1>mXF|_pka&TtIAgk$kIL
z){KzhorR+0;PHi}xz1RkCo|K?VCY74wZ7}gtlsfio$8%VTf`tCV)s;DSRuP3H-XJS
zeOka$i;K9cmNkO0Gw@qnmto4H(yrS+IS1`uS0Iyn`(l*Gd-5ehhnKK3wL;W-RBPM{
z#*%xjP#JmZ&i7WH_~Wag&(JTTioycTDit@fYmM~%<&p|>@+D@U1w_%BD_hLQ+6QZf
z8OQa|$md`iNcrhDsComuh<SD;=c7~Hm#hA<e=sfIN7z3Ov7?0Ok>5|v)Njqo7#2z<
z`7XA`JzbV|Gi^`ENQqH5zU`bXDqz33z!GuvuPa_?tX6pcD<)E5x#rCKkc+an_#Ia>
z(?eU@=AnfctRX8rbDqjKIAu2KDj^~@VNqewQWg6mp!`{DU>wzS{vDD;RIV~f>+N&&
zlO|q#*y`>!OpEg2fGf%<G54|sIXE0e+XBf^F-gTV7K|BvV(?3-OXCa^v2E{Hfx=s|
zCCoyfO-cTseP@BT)a>2n3-rt>orLevR;Nv&*u<2?F)gLMv0`O^q0!pA_p;g*T#Ls_
z;_}~7rO^Eeba_@^5(mf09LLw88S}V7JE3B@IxRm=Bv9#hjf>Vz@f0lD8%|Om%0R)0
zwA$Efin}L7tQb7544*JMKG--8mAkR)Csr5C`}?2l4Ijv9`}p9eSWnmQ%B~#mAuMk9
zbM9q7EHV}EwTC`9zC?0fwv?=nH@Z8FVGpKPVNy;$nd<~Ic})`=xFJU&c=ahIT%yD!
zI=R6icKmQGS!sA>Het$qvKxE+_DJYCXNE1W0?+3}=a%KBTGeNp8a;q7o(jDcB0$||
zflIu5QTKgC_eoP&n~9YUQ7$)=*oG92{BBkQ^V3JT<8>*qVHF+u*cO9NN{+WQ>!}O7
z;CmjmW^dOP)vv~$uTI6ChgAKQqv+`fPi@t=?cWU#f_JFT-!wo72bV(C%RLbGALe)3
ztjY&a<-EE+-*W^jIeB^OYe-l0&zQ%rKD9C${<PxmE%xpZWGyfd716wlG8$+<%8Cju
z)zPY_%}vg2VShyrZ1F4kas&oLo46uK9^~M?5;M@88q|0iqG^{j5>b@8kUli5aof)X
zR*SupSCvi@QCrHSES8$?2be}D3$(#s6l?l^el99G_{E)_dF_QfZzhl2cFjDsIY#$G
z?@18;5#U`Py!K(w9KZaKY#1@GdFGsZ!taQ`+LR{TyN?;=s*c(6#j?_~bRI*-^X)oo
zHTXlTHK$D~=rXVs?i^KzJhMOCEFR5(C=?jjxmdb-iBDMtA;46-;6f<b(gT3@xX>%{
z?1QDu^BWuFcCBCgh+z;qz;VrM1oSkV9^}RcT;Vpvo@^`A3h3S(ZmHSmkL|4~X|Lc}
zV`Mhr<r=pT3+gkYjb6#J%O<V0y6)|56iYk=yEIom^2cQ>HgF%Pmx#fa=qTKC$*;(v
z_1pL3*#63-BGc-xywtQ?pC!E8Lxf-34Rxwr@DzNujk;c7((^_Wu~MO<gfBYd4Om7U
zhH_`xkts1lf|u+zvzbRlVO4z*IGuOdO`LG})<tTWMpO@8ioG`V=Xx35a$DLU0*Adk
zN~mWve{QZi_R>MH5VwHlml(K{)l<^NJDlyj-E=7LmUB}4%+-c(txJ-^P>^X}!0Dr&
z@38-jrha89)4<cT`gNQ-u|4#!Q9@M=QaKNtg9arleTn{KdGX6`GX?d{jFYdox1ZWZ
zH+cPw=Hc0QT97Ckwyg9$R3$-cU}02h%%>Mw&OR-@*$UkbqYg@B?L;S3gnw8&WvW$~
zFJCG5J0~+vZP=BLd6u3hdCP(zTyu2sCIUufuMZ{~-?{Y)9F2<o9zL`QaJ%Wb;OBVI
zpUkGOzU@5dHP;4Q;dl8@U(N;F`!w%y8~9O9Xm+7JSR9f$rS0WNVl#i{7O3sE8={RM
z*|QIL!EZcUf*&x1X{f>VybVIkwa6qmvIzqm75QyN{Cy6SMb&%bH=10*V|nqoG(3Pi
zgmT~qOu7o2N85hgWFH<O{6U41bUA^g&s$wOOwy0kUdLXFqrZ5FmTt;^LUV<==xRY)
zf-v)NUZS&_8J$cW52Jue5c<vfNO;6_Gc)*J20FUE=xH;xjt`IC!@5gakD(7M8wqjv
z`!3tIgT@;6oa?^(upGykxcZ&^n`oFiUY~NBSsXNRN*9wVv>PkW)6p5i{juJ6jEzlE
z3%+{4-bp&M$1iehPku6=2sZs<>23wBOe;uJ{~X)S5@x58uWc~XXKd;*T0QWiH@}WY
zTWBxbh<p2hTSL#!b()pK)&0Z`eLZFE;HLY~o1!e*Bu=du51^mQ(#mA)m5}#_InQ$U
zG&kPsmG@ZTd5hovL|C~H1W6``j@S`yMLV`eJ0cGKjYSZQe73A9bFpcNmh-*BJ@-~Q
z5B@t36Lom^yrSmhKgSsDMW}W+-N8{$h{^WNM9rR{!ZH%pFcVg<k{UsU0}cVx*)7al
z-3vvh5c43mVklW`PP%GNTDWFoMlgrNI&yhcuybMoP7lP9*oqi`#3I1_$Y&d+cT=bM
z04-EKh&&~kq-(_ceTGPg1f{>fR-pRGk&v0E<-WO^)-I$U657368+W2dmTDll&=O@K
zKw{oG-AA*JaI;6FAoDZP1v<V&;w#Oo?aW4$@nhC23#^+noi4PeMf2ieKcsDcppHLL
z)z1a>D*TL)<MBt9)J&usZD>cG904=O@6p=X8fL$48&B^__Ut3xG6q{=EyaOIOZy6w
zo1#44^Gd>7e){$27EXgp^Ft)<E@igQ$|f20JGsO59jSm6BainFC>1TD2D_-^Ip183
zzb)2W)L1J(j|D=kWn`ckhX0ZRgcd{lLXY0Nfwrfx-OY9Yua3QrZn6jIuOCjI+9RA1
z`GHh7#*&?DWg5?2vo!ZQsRvhuLn|v3#onf^XNSY!AHU9MrzQxP5Bc6Uw(g)KvIn+v
zMeevGp>YV=Z*<%gwcvj&NYXaARtv4LWy@EoqGxN(F-?YxNYE`3Qh4*i5psLU44F*D
z>2-ixrSaTeB!CjPQwr}Sq`$KTtPVdjy!|tG^!<cPy_+WyS9+iTuz>1}GZPt^g+A9F
z$uEEVus!WK1E(U10FaAtad$Me#2b#Kzw#(%a#sZLyKVWc5*g-s9GnO8Kq%X`bHxtT
z^r05^<i&^m3-$@bliSPGF3Z$?>XOm)h&o&LR@5%k0)hMj+u_{fet@9!;j_Z?zeu_+
z)RI3Yo-XL&asuj+po!$PSBSX>ZJLzCrwtcw*xe!RC(6un2UIBiRM?Os5$Ue4BrOCZ
zn&3K(XF1RhF`;$$;fakeQMi(=e+u}O_MT0iyzz2#=njPy@^`mjGiP|OF{KL4@3l>+
zki|Z(u+)(YC3>y;x;i>=Gym!84X2M{_?RsKyJ)Jxh_uC=_#v5WC^ywrn3zDSsYOO(
zr<7_Sqt;dN@v_?6$Wn!#x{(vws+K%f(Lc<A?y=BA-DA+RGM!)?B<|uM;j%#?gSwVk
z-sWO8W<zGDI=oa{?ESpuMsf?un0()_e!OMD-!$}^u6Nx=KO=4AOu7^@NoPUEIK2@H
z#jX|WU$72e`ODr1-Bx`;z61wbz>P3i-%Mf+?;6f7@p1bhoQ}oo>?~@C*1p>%CooH`
z^_1p@K8yN^OR&mNs7wygh<m%a|B*|Qe{YpBdHFqc$$1bNCaxCj`5qn80Byh%o%c|W
z@4z<LLVnt@rqN}Xo)X^u3EG{@&`W6eKwnc~;hYAZOJ+hbX&Q5*4Ci1pz%rQ);kDw_
zkMU#C?3u)r3=9M3izFyUQWdU(He^w+qs;vPP47q>-Y45dvCh8vA?W+>)ZuWi?qP2e
z4HtiIHGgqDW^n%`o=2MF>cnx+V`ya&q`rj5t3McT>nsp#&X{7?KH09oc7sH;PL^p@
zs)ue_5eLoRHeW@<g^DQ>-u;^74R9}sVDM4<>jfkZtQg_RheiJu#)BkhhGeo=sQG<E
zs`0Yjct#phhZ$oW*7(5OyZxY{0AK&n>)o4^KAzA40K$I&0A&Arcx+|-uhIMC|7i2J
zLu(~X%?p2np@aww@F$V1$X}cdR_6GXz$ByMdCmAxC{qg;=+BWrMIwVK!3PuQ|6MJU
zgho<=j}GpvCE(<M_gHYp>$CRyUHG`_dAsr7VeiSv>57Paf<z@FOH+n4_fYV#che*z
zYw#f>E99Y**Hl7wwuP4G=GMhVvz5ojM&owl)=e+U$|=e!aszB`FHaFzo*&wtLrOVr
z7cVni@#yMs>-yO{BNNkOOJ{@QJpFS1-TSJwSJg#O{R34al}Fl^)YgqVJFb#3D6P7S
ze0pPfVsm17V`O5AfWiF0<b3EQ3<>9wpi9pWc@~6Q=j{0Wt|0gnW@Bn=d3vz_Q!)M;
za>PT|(<7^cr=2%x&9hCbeJyGChyI0CUu#zNpO&JItbc|HX%V;QIv4Uj`>4f*k>wGr
zGmCR+lLM<u1vm-!jl^~B_T3+}-kZH}v3AW|6x#+u&4X9d$zgQq2QlJ7jV_H~@*VBK
zOkSqmsm#TR<pE0n&8g4bS7hdC{7~nc+h)gSXYxLe4zGAHBu#m2CuC+fTU~<K%_YK<
zJ*1|V$7Yv$mp?A|RL*}MT^(9T|2*C~J-;!+y!7RqT}zh3bhEWQx;;>-%yTW8ykO_t
zOigWV%rW_&iNv=>b#!%AW0&NWq~X^Ew9!w0g{PIIq!hLAI(!BY(jdPE5N~y6bQ0?S
z{5iSh(>e9YK-hK5jwE1rb@j0lpA&^Vy=Qcxj0?Amqbbd8B#}-&y}7(J!0*2`F|ht2
zB4Cgsp2>SNM68JR0Yy{2_45aE@#+Q}O0%~Wl(W4X@GAWEwHy`)6_^VtL`f3uFAO8R
zWM6r}DT(q6jn7>iE%Ylt3E~*XO8(+R3JSxe84*weolD->&{Y4>@VoyU!5dQK*u)J2
zWO8_g7<jl#2*;&(W_!ACDsORMhXfUeI%#!mej3>_BuY^*#d<{cAi`yg?H<nK-qz9f
zzAJ<L<6j#-&5X#P`H1VPN02T!j5;L=dHTIYJMObm@}kq9E{uzm+6c<G?j)cn?nBDI
z2!D2d4(gTJ74S7M(!{?F`UX<3g87(juuEN@#t74&B~RZNULHcd`B1?o&K>oOaH$(b
z1@_HP;Td6cg1Xvzc8~)%wlW}s@rdqHd2}lV%EPSpPYT42UaVXotm=7xUD-!{SUMyT
z8KL>2z^A$b%*%GF{D$DWqB=Sn<3<W9e|%Q|6ucoz2bnTL%QN=}(im~%6Uaa=i!kmo
zN$cX9;JZ0->)H#uF<Y|XOEU|Qz$)L|J3-K^qHn{{s}fR`4X_rcF-~s{tvo5cnK(Fu
z7Dh5a(@xD?A3`J}o`5wG!oWjtn7&V9+W4buJx>wQ*Va#HMAtgoT|c@&U+AY&J_q65
zTPO!HtyiA*)eqmICfB+@u3RlnjxDZK)ae-?yHm@dR}RtsoWSH0z!m6jk~AR@z%GrC
z7x-AM&)~@8%q_2}TbA8KfY|p|6U#%d3oUP`iyyl479aq|g{Vm4kBm|ZqdC#jDHVBN
z_uyRg%cbR(^zRt?Q}gzbUl%+4SD2NtiYPxZx9C5#%qYKvM3u=df&?1j7dH4hmX#O^
z1uG*pe=uQ$xu$4Txl=`<nq)nko)&8|Rwhg!RFD-6R)i#o=<l1Qa#;FuB%#T_k(&I{
znGqGXTofVfEr8rghQ>H^sgI*RD1pL6hna!`xl(R0q~t_0p`e3Q-9I?A2|c~*%O!@?
zWSxb=3=1F1qEVbH+}gg7l!fAmUG9yYP8Lj(Vi=^&kjL_P)T0<OhqAC-CvMav!_fi9
zpJo$77nx6lAo*<rR_X+XJO>m#i@p%+pHLK>kl-hU6K=f|fGX8L+TkY^i@IP3R-GPS
zU<KEd&W2rI$R?+vf?ENjjuli`H>jtjQ-*~HAHa&f&~F`pfE9?qb15vQ)rSKo5O=^0
zkS4tHM?^UVB<RESL8XKhw)Q5;=gNOW6~H{ie5~qQ(AmbrW{Nd}|9uBjLRwHzv^QKh
zSZ^YyCFsL29hxlz4Sy)~k`|ji3WTQw1Cbd&$YA0i%3)5IRn*eeR1}X_%l(!sgcB}>
zv;2+;2?{Ff&*%e(%Z!2JSHqkxj4XT<5j7$ZA=jwWRz%pxP{WGcHR^33Z=Hp)gNc?0
zlcOjFNYdSr^9=5el*jXFVZdr&gs2B6=A$}l(X3*_!^s1OoD$+2z5J0F(PaL92`Ye%
z*Mvc-nh*LfDk~1cGDFNLKrnys>{CFv0w*X#B^`|)Z}vy)!r@VHW_l7PNm;i2$hAd{
zsLSKA+yx)LxCIph{uHo5^TUbX^r^u3!bBqn?d~Q*AxahXLN@)a;M*i1N2@Ffgt9PJ
zRaZL%{^Ku%&j$bL3sp~0Mq}uQkC3XU11E2+6sxD9VMN_U2OJ#$U{D50Aa0J(d$W{a
zVt5b(V8QqS=ww5)Fkno$Oe~8?#}Y6D)~IBhFmsB*t1x08gknG-`Y_3?$$WkR=HSh+
z6#e%HqCt{bXroA7Oh_y-@_H?x<b^*;AZAcvJvki-iwd19!#0@-4Z{b-Y;<h4AVyGc
zyi5?(ldKrTp|nxHgA@ZS+&|~ufMReLJf$@CCvpesyKt)7ry)fIh*&=JojH->D~?iy
z1Qb=a&?5+pFMk=K*Lsl+F2)pt111f2=%R*jGxTCYP=#PZwn2Zx24579HmR$)P{v_H
zZq>tU%|#Y4XMw@&JTJjzSVe8H3eH9X7DKJ=*xr&Cx9xsFkbI^xJlAH*9B?K;Wx|k5
z_r9W9lGd@icQ%sSkk&PVN->_U%i)xpa)B7OpJ_0n!2)_P1qcCSK`EGf)GRR8$sAU_
z8Z>0tKss7Iu#~hye>^&6k)Mk|B7*D$;sTVKFcBSh<@`Q7+2rbow&cgw*5m>`z`GR<
zuNUTad!ZidC@7W?(l^*-+z&Hw2)>VG(SKv{t5qRpw^_UogeXTsmJIh*X_N!fzwr}K
zMO*d0^uzpd+XMeqE23H|=C!+J5z~JrS|17M{H4Wo6=W77P0JBVC_B9!D}hc}Y~re(
z7!+Ir><m}Za%YYtRomMScScF41CC8A&LYbpJlyr3hYX^9Dk7T%uN{Bous-bI48ca*
zK)?i<o(TBYLHO74K{*on|NS79X~h7nzn~ts?MADSock|QLs3d26`<<4UpD!>j-cQ<
zSOil+lm?hl18s?z(t{1-i3?<b$HV=UeQ1qFunO^6$oKWj9yAc8h#G_b2T%l*$|4Jp
zweuu8Ov<N5)-V?Rd9KQoXcYU1zSfT3YNjbS8DE@G1<0Moa{Wlz0pCePoo>k=S|#f%
zJa%V8Oil+)XD|L<;A=TZRBC|fbH!^>K;o5rgWinX7n_^iySz=CS_=Sr%ES#My(iN}
zIshEX=jYD+Nqv0lFtS649bw@t`$)c>6pMmG6_N+i&8io?pi%)4aDo#OtI+yk@}8J=
zNDxTsqTuA*i*ZEv8npN@QbXbWLQVN^WD>-2#Eqc*h7Vs*Lup|A2f(&if|ChDCFUFg
zv_V`$FgGGb!!I!r;GoEnx}pFNsd@@MceEUwRD8T3syAlpMM~d6b32vdp#a+aL1lAF
z8a3RI78U-wjPD3oul5#w?`Lc*IdFI(+|X(%NX&5dsOUhaUnDH5KycVHj{M`kbljW2
z+PkvO5bMAw%!6U4x$+a5ivD^L09-OLiZ{+KJITsk{bwezG1x_<8&kehRDkMx&voCv
zy-Vw@8b`iPAmw3Sq6SVdr5aunMLZrX?cBh>%jN0FQoUm~v{0K=P>Ffzimid^l97R{
zKfrLHBI4+3;d+q(NWF>|BIrzf0HGfNLd)w=S^F`FalL0HL>1?On%Ht={&k8W?2zOa
z@hq8Yi?qRnaKL~7hzkpH(;x?a7$kfYf@YL-M5w(A3Phdxf(iYCS1n4TXHo%*WUB}3
zA6A{#-|O$(g-r{}S7AE6tOu>hM%Rp+aDt%$*(0R8fK>ryl6!!FXdfze<R5`_ai@G%
zHH34-7}!ty=Elz);HsLsC0NrvU<%2QK~$CkWxBi%<~S%OTY?9i!SkR1J3s+)4qUtd
z_3FjnO?Wj)a5V`X!Xj=-dhP^74UPlx4GAS3T(}?gA`hjdT)FDI%{MeOtvX`AbfOA)
zy%+(t=Qv$a!8d7B=?^pe4>Kc#z?9KBmUfU^lKWSsY%9p{+x|nEEEf!wBb1J)5fdoD
z>m!|B12c3GTo@VX%x@1K&<4V)a3V=2fQ1r(=>u!e1*BI1(hYEesr~bgNk1?!2kZXf
z!IUI<$O8#&1C(4nDd?<}?f1q1*5wX)eL2XJfSnKlgOIGG#DQom!a!)q)RLe?GSmPP
z+XInjk_eBW$7!%YWT-vF`PS#2Vn=&#Jn4f*`sDZg^a66|6-b1B;^1iEWWrzsI5l)V
ze?aM5(dw-m3nWH2(j#_I9<-UHh=v3`4cckIn+{;Fk~;EGDnLGhXm%MKct1q);jjAv
zQ=UM)2QByu9u^zsWI$mT6RL$+I50xw>sc7OiV*Oi0c|Nk0)+}_g7pWYLZ2Cl1{{F>
zLIx0(4x8L&{=-jE`IdR$>>|GF-qVZR*Y$8B^Un$(SP{AAx3vb6p;hFM#`dQ@Z0fx@
zp{1)M_>oEPDw#P1<qzx-^?DtM%2B4D(%>;bpb)vD07U_Zq$pbP05UDTWMWh~=sU2l
zeXzjPSgDU*oIadEP6rA7cU2ZWatwq`J=Rq}PAQnL+(5|f4&Z}i-ye~qJ!w76Fx!I}
z2X%*xfhdUKHaH0<@Pthfif7`4P3XN6_z<vQ5u<|O55^j~Fk!P=)C&Zu{+sK)-f6zx
z6I2`tj_&U<!+9DBeBm@O3~2U}z7ia8HSpiQg-ZMqF;elf(n27E(n~Wzs+Bjo#Q9jy
z=L<C4?Kc2-+ogbEz?%f`2=A*c4?zyrs>>wOVnhlGhfFdBZT=DPw>0U~kAkZN|AEL5
z{ajhd!!wRG8*bK_lZ4DBD^TYGgusehBrT)}VV!jlSFhU*?k<DlR#p$03ydf4BYr8q
z2uJ?MBmD@caD0J8*oSIi;NFJ<$BK|y6x9psMMIu)0f*yG76(Yy9_&D($SU)syMUht
zFzek&3%Ak*(F+xv1r_-JQkL--NBt+fFjN|%03dW$1`IRbuz-z);>$%!6$1js+{Jew
zbh)8)mHJ2`Z$p_Ztfa}l*N5v`Nn}Ej1ra*xLOWsu<%f3SUr~ol9K>&!<sNoxBKooA
zC@x^~c4$v_&z`9*x8B%~=lclifGl>m1&)}Qt#=|ev>JnHcc-3(Fcesbv0g@pLFk~}
zrm#6tP*{-AW!&ln$S+c1#Bja<dWjhucB?1O;^W>JjNyk^$gtmJFEk~#5VVQPW-r24
zFoyhZIbg*h2*vTe1%?BKlpKnI5RO~YtbYn+&B1w)uoV(W!g?><QvAD@6GAS?L=YhE
ziY$PDc?yA|y<F)2v%26HiWU}>3Q(-|uM$k!hjW_*S^a>YoUihxRz>0m@6ru6a0v92
zLGtdmC^4cFFaeaFm7>Nlbl*i{aKIs4-qfNQ1*<c~kwB91cm~OOe1yN#cwhcfMs{*M
zpx4D&FeU@{_`0Ehc;ACcF=v8E1z#<=QQgG^v7WMorGf>R`yJ1+#fwjTO&6F$^EP3m
z7e2(%%E6Y_L8Rf?IZ%BXKmjL)=n*3EY1|Od<lWN0kjLi-iin9Bpu>cSc0ks-{9(ra
zBVf<=D7&g0M9?HlbDwRTVEwxwDu!#n$a0Wb$9rvFISfsI|4)=x2Zllz-~<TU4NQ}A
zPv1PI2O|WCd`k}JkY6SAA{I{eb$p&r7fnQr>J%;pQw4}XQa8rt=h+!j)*>J>3;`h>
zlJy@kB6V~0#fpjkLt}Zk8~>09MI$r=*Y&1Asd1uFzX}4jrV~3}KP!SJn662~XHRzM
z9QJz1KCp)q{e*rb?{`3RD&T%4cgM~AI3#IY3#f-fC?p^$`KUz`2MbZUID|GI7A1)y
zbXQ7v&o?VC4B99{Ro`UW45u^Nf)9r#>ChB2LhePu@I}Z|+%?gIHsp;{5dw~eu$rPQ
z0bG{+lr{gM_w?TL3tOKInYL2=WHE%3!%5$)Zb6cNcUCNQc9}ZoDnYa+HvTFE0V+1E
z;hrc;kF$QSTmx}s$AN|t`St(S#g&~L4t(fb(|OyF9Qqwzj1Ti$g97j^z~kotlAzcz
z@aUxiks)X|sDKX?VC6vn&j4m3GI3-@7@Ag}xleqGGrt{6eYJvM(wd-|5JY!PAs}1_
za0s6@TpF+*_eC&e6@Ml!THzNgoST4UDT7jNC6QGaO;(7=Glh7Ia}{e9+Dmj#o~c|I
z7C~4{pusCa53w8!ns<~D8;B*2&wNE?^t-JmMA7{^0@tt=^a=-YQRqMuqeNEF2+Xes
z#2VyZo%WKf2Z*kNFhW?ow{4~OFeMIp5FA98B3QzidKVtuEH1?M?9X$0w{rY8w`3jM
z*t!jX4g8>2i20C~3G_NDq_V{rQ30?M-#h57M!*(+Z;}$AeF#<1M5~pX#>s-Tj_6~>
z0cAdtA`JG8R=Mcfp7ZSnHuL;uVnp=@4y_KRFzxU2$f*ItX4p+gF>=qjr3kp;ZiX+y
zKJLwAqi}8pWTi0w&A8}X@n}d7EUL}2Lcc3iubFWE7YP(AV3GJm-p6+ku*W{#N4@Ab
z9U+{Q7c};@`x;2h3V{h(fvAE?3P!@q5^h{qZcM{ZBjbC04*34{B0NDbIKr~+PA(#X
zg2ECh+6jR!^(D#@4$SX`fxC+1#>7^OA{>Sd=z=H?3NZ+X=rfwBWes<%JHGX!#Te<!
zoeOsqfEWRT_=9Rn;ubAxWUA#3)4feFLPFJRK&^5TB#cK&HMIMMGe{B7{`%Y98ag~z
zfX0C8ad)KdhW;f2efJ;05H#e;lY{D~1qhWz*vG{2dbGS)5;j#8Ijl6QwPy*}_732V
z0v+*J2c^r3b%ykoBEuhRd$U%<nGPzYzl!$*=UD|#FYUhz<+JS3Humm^so!{cV}5+)
z!{vf|+z~=>L8qr9H_mkgDOta4dkL5w1uzweq(QR0=PQN=79)a7zmnbb?}K68LfEmm
z0^wGKvfIL+SJBdO!EWxrg0z60@?joP#Ptw&m?U70OoU?L%5V&Ow<EqcE5s;04u~~D
z;F(Ay3D7}WU}ze?@7X!<F<PQy`6%?z+@<Dqad9ZCccNP`>ZRmZ;4K8^WjI3b^}CJ4
zUp3-k4b+8wJI(H(&x1{A<znLEzu`T1n|rfx+rYeDp?^CkHkhDi9*PSJi007WfUK$m
z%#tDSD-4Kcuy9ACjx4ha>U;^$ZG*QL;q;0&Pk(9%5I>pFtc)l*6r$Wo66&_!LIkXz
zZ3*c|7p9W1*zRxWOPYY`8%^Swfu|L{+@812;I@}9+F6o(*q~6Vn{a<Bxs!v#JgS@B
z*OITZi4V&ANkbn<AhK@_SwQTH!f9>yo#9(0>I<jH!iRjfPylgl)|{bp_1Bp$=uZu}
zD3w7hx@au4)d;LW&$~O3(ySir!;X)DAfQR4U(Z`Oyf-M#<C0l$;A@^eyB8f+XVI`Z
z<|~T&Y3FTl{0kb#h~k1gl%-qo<N%}#i6|cb8$1)jn9!wAd=mxTyI1rCK5$rW_ZT83
zmL!Rg1EU~rN0>1nFXV)nfHgo$A^*Td4CT#TKn3;9-6J_z$N*}{&?^M>?}2$d`iWYw
zP%aWR-ymml?>qiMPo6s;?3}PWwZ^UE0`*CF9<g-3J=zcPZ@C@E#d{}+?%}rnIKrTd
z$VF>QKGb%*^A2qOJGZMuELKwfX(c5*8divV+{-*~AKymuO!2CEtiy?eH0%4;POI9Z
z74or&4WTFBk~$4A`AvAYmSZQ3WhQO1N6TO#?@zMCJd~Kr+MBB5Y^yyf{qNbQ`PG$8
zIMr4aieyEYJ<86GlqMZjcb^$uMz?!0CBRy*Pi7*6iRuDHoCIgvp0YrC`F@t%J^1`c
zM${WE_u?6*MkUMw0sY0qNp`=;qDzI~(CIGAUp;*0yjXb_<~#<-AWm(Zg4&%{K^|=j
zi5%0<B(K|0*0^R(!m-E|L3cEGkg8M2Fe%5vWN+iI*YJ4uuD3;D)pV=tQ<>1v+`~0u
z-;O;iF4nrsnnkDm!|}93Y#nab6xmak!iDTE?R_bfbXA`*xY(J+Fd~ZgT$;2RcmgJ-
zvCC8W@CV~L-5v<k?~@dKoJn`n4{RfhQ{iUp^{V_$lCuK!sGD=+gA9nzRx#r&sC>{n
zjfAfr6BWl(2j3Q7h6zv2bFgq(2X5v53qL@>zi!xGj*F_|+I&}PJQQDBTV5O~wbkDe
zPkmEuyueLeXTyATAkhieWxw}nB4PFOU56swwtZ5vtZLyK55<krTqQ4rlQvigor=^X
zaV9gYml)S3*&iYsxrQ}WVDC;vreA|pjz020Wl<7|4yDOb>rK8Yd2?d^Gcj(hBSX>c
zdhO+#av9oZR-5y0tP0)m3-P7Qys*49@nr6DMxUZ6H*L4_u|bVOtntE-eGbmc*{ybk
z?P<xH<+{_=ud|t)s-|$Z>~Ny#jUlxl$D;7^7xl6N`^y)jYs)0%A1+_4k8`!sZ_dkh
z`^5VEq;~k$rpvnJ&guNi=X8tG5jJ;LgUJO~mTFmrWISg!AD?C%wdWNSyLSXSSmc?e
z{&<bLvAa&>bfNl|{|Ea?#`Wo+i04{@S3weSxBff+|HgL&q5lE2Py+rJK)XulzX2_n
z5Hqg{ISNl71<jw(e*u~wLCzp(z6Ab$&~OBLH)vi2{tlvla$qB9js%`s(Ci5P3eb!R
zJSm{*5&Ch2`~)TFu1=7N&!guEbA3QlCB!&>O?g5epUck@`sScX6Z#kAy}j{#YT+(;
z2@b?IL{MLx8~z32h9n~Oe({d{u1fnRnaRflF_m9Vcm|4t-zqt}`*<C&*%1Bp8(b&+
zfuN}72KGXH^gt#FehRt!!B3)ae+W=(KO1Kv6JcLVFJW(258=aKR0$sZyh}*(w3sM?
z;_4~r<7(w)>*8Yh59Q!@mDc~mz~Rqp1+85iZQZ=_%aFPIc-uI7ITKm_-&{%9*2>Wh
zzZ}HTnaJk<>Pn7o)-FCaw!r2#wpKp&2R|b_a0)pvJ`R}JnTS+eNJ2;gPb0zqAl88l
z_?~>qlGqYzNo9$#WIC`54tUSn)|trj|Ejh)FKgkyf4?mRh5<n2t#IC;lt~HKA%dKB
z_RsDP2}srNZuH05U$ZnK5r;c5axTtw=7rXrWMW}&*JDZUjv1L*4ze${4}6?uW``xA
zr@P6BlFU~V=b=?I5wWAue#y{K5@7Z6UhDi5CCz*lxw!MGZ!wr*^H<Yltwn3DTUs-F
zP%Z80%GU2+zB{egXTR*dDVJ0)^X%5moYKO*8!w73l-_&1lB1tuTAEtJ`YO)(h}VVB
zITP7auAhsk1=2<JKDA18dlyeVUz#?#fBD%&xK82=snVX-FulP>EvF1>*6>ErqPIet
zr91TZQa@e4?qchuDv^b|WS=eN>ZCK$VCVI)vS5DEtDf(afsEG#)wcY|t@X_8KHKSF
z+w-UI^j&0?WS{1DUbQ<pc1n80Gk$@{Qd;lB3jaKp?3GjTR;d=P^LFqP_b$U8wO%@!
z3M+l>H%4K(%Qli@EV(pZV58e&dTOWdydt;F%o^_0tOKdkB_g|i$EoH1#Z$A4q*5wz
zt(TUy{KjvaNv`Y6Lg_cIy;H5P%vh0cW})&wmOE(39oy*LtIygUSk)QmA)tr!@E;aR
zC!Zg4YkHFtbD9pqvx~%T4CP<`*q_!vp)iA8<$za|Os1Zim#H;<MXM+j;lg;*mOobK
z^NBHEbgVT;>;>%d&ozZcPPMv|&#K`I<3`sM+AV)fTqxr6KA~&P)B|Bs2^7Z~i$o;o
z?LLKcqU7nFG<q#VlcJ<BEX5wjqsG;V-8{-dLRLJc?nK5RAHQh2eZKuFSNAvLNIiYl
z3j*|fks2K7Bp;MRx$_p!*S`?d=U=YLQVVnaC_wS!-rlE&YDoyP&k2S)?{i+BJbS#D
zR8c|qR{7<go0&x15=Q6BIQh<rNa)Pp(d#|S`y{oG;;EMX?Oj|1v8)1<+Dlo|oDwXr
zbSVv7e7YmD<Eq~5ucP-%)!-gCQ>05AD*NeOHmhy?K2uQlFW;QH5$Q>V>`A(LSx8^~
z*cj5{x~?Egio-+XqgKiONLLbWYY300DEF`_f74r`F^jPj`p!N`r&8Xt$5xy}7Weob
z_nB~-)P5+2J3bw3G*ODIQtT8uNm11&<a1Gu)oM=TS|`o1j?A*l5)}4vozmSWSztDc
z%$<<dmG_paaMs1L1(&ugA*%Tw{`tBWd&MeP?}c6;CA~>vY&dXJ%b6)*^aM?riDGtc
zaZ>E1@W^oKiC_j>WT(W=RAU)syi)dE(=qRin=o=8bz4bR)nV^Q-^UsO;e0C3*ky}d
z9>><8EK{k5n7!Ii^a{o=Zg8ks__VA&=FYHtDri^}aM{-;RRVTd*d<>ewxZu2_a!#t
z?lH7F)=Lb1TJa$os+&U8k0ZBKkf-TkXS8u4vvWC01!;6K-m$-;((mn1OZU+@w-%F-
z&#t499$vM{3L#<26pV8jqme_rZ-SXu>u^Q|(0bpdZpt1k+#@+XwT@!U)xKb)ygFxj
z<mTdgwg|Vh){|7+gC9|yQH@HpCLxBm)H$>au)O`7YQ}cew%R#L@O$mvl_t-N`bkB^
zMHjN}oqUt;WO_nRBZ5ZC^Zq>rJ=Cz-lZ_E+MR#0TCokXW&l3Tv`?^+7V%Td#LLQ_%
zY^0`BczyA;=yjMSQ@>Sn??O4!#lu2@ZjBPYMyc>JWI-r-?19=6rI9r5u2%DK<7Ga2
zjqv_P_~x4`NuIkz#1c);@tDiXc|A1_vTto)tg4kwj4v5HrlfYd;QcTo{`5E|4!z9#
zlnUw!znmqK7=}fNPT8`sDM<7|lp3wR(u??PLwpLLMUE4#9Y2@&_h}=M)&`86$;U`!
z*w-IxVOA3hx-+zQ9(*5*(vmUcdB^<Y>KRILX}hBiUhf2wScJ|QOibjJV!xA@$lKl5
zF*wDjNOM=~q7@1j)qllMpGL7YH*6^_+?MIhLfWTN-?A^06SAe#N}s8nZ_tL1UBSrY
zsn}DjB35y>_Q`@@15_^aj*teG&Es_Z!aY<s?JpHJi=saBM^R%QO1>Jp^8Jmnx((T?
z@8l~J<sVkr^!3tGhP~q$zh7D2+sg~~wVFLk?bcO%qmgEc=Sjp&rQc{hOU&YoRe7WN
zzA>v9Cn;!_M`82qnyYSMqef_CXkzR9*Q~lp(j$65bsx`8YdoC)j^HW$p{Wqjn9YBa
zG2tgk=ud3e86APqPKvTflz43S5h@iYgnrpKi+AiCdhXObLtVyqdLy;xiHXW7m*T(N
zw`<_1YU+B(|Hy7%$5Px%B#FK21e0LKqwJ1h_zKgb@*<uW3slb*GzvH)`Iis^&-D`r
zZR|p2@7(U&8_<}xxBF5|rdcX-I{&no@9<jhV$IzArB&B2`+A7ecH5#9<hH?Y&-Ob=
zUdT^gO8zoia<5U+oUu2E^Wy&CyKh-V+mi81NAxgL<FWQ$ku}b+y;}N2;*O!4mj^0P
z$0E9v^pDoPdvNinXx5Tl{qsSW@Os*l@wf9MLp84`WEYPr@*Zna(Z(v=c+}I^!*oI<
ziN;)`OH^up`{@g%Tx5*Ijg)|Ex#g5Q^OFPC)U&omk3^YzNP2>oPJUNfu)}Pcf6(w7
z{~27V`j#cP6(b#jb1GP;qpKJHK5(2Yx?ZuXH~S)8Zl|7qoYvf_hr0fJ!X3{|EZc`Z
z=hNI5bh&p&DP4FYLA`EKi<R08kulfq;~#?&VrlQNb&;}=mzT=u@4q6%GWVL1+5#ss
zM?{?2)!}&3?Bj@~l{~YsMzVgI6SL}5cnT?Lr_1}uiDJsyir2Zw)4W9dzNhaka!#SQ
zw~4m7K53{>4Jji{^n8944XI4_$iC{4#W1f=VkE>fp5nx`m+W$T+wMvEc0WiyHEy9-
z#|T;82;41v7QUcx_Q56dQx{RrWDg$wqJL%e<L9gGv~|aayA)}<I^l~%@r#Ch#ux?)
z(V=f&*x$S+{$M=U>~jA-yz;ZEf@WPQX;~?0upXsSrbafEL3|ob%7$v~rCf~A?4aj0
zx9gOFdWl!=nHR`)l9j3nqAzoml~uf2wZGWx(s<`p$N9x8uU+ZBCFE4>qa+?)Y)5kn
zwx9l@oRMkCY)!nYF#f_xqR?aiXA-hrho(MB@>yiIZl{xo3I!yqCTH2H^^z~Ej>}CZ
zPU`-kyN<H8u<Q0o+>FD5Q6c8~@<KJo@_$(=KeaORh{tqvIBinmN+?G2nH6GRhsb_4
zA87hzHT{EOY_fr~rpn-G)@KT5QL`#W{>8V5WCOma;rGjA3?+-!;sKBIKYE*`+{0x?
zym}`Qn~8R$y*n=+AYIuv>Z6%!cAtmF*eK;*mIRodDa(3)kt$sKdzqzoBgyx|205j5
z%V?dlw3B6N8<{4Zno1o`2s8EM_Vf*6^L)x+wF=^B!Qtb$SmSpke9I!v51uU~N*FFS
zO=aFkq3-86Ia#S!b!StAlU8LoY^Cfj-Y&}#^I3f=k2o^6E*i<#;6i;@wKtJ3Z1?7o
z>wRv~{gr1XL^jJzIoy{jnsaKsj1a~FGVTkjk8d@MN#BeV?B*s%CMEj)LUrEcj!vwe
zc1ft>u})Yux^M3}*N^;|Mm%oER&ONeb35%s8lP9%7Ee{G7{my1yZwUMh`NuOaK*)u
z7_7i@QSrd4ixl-3w`DG$^yN7@<|dw=HYzR8NDfYoq}$4~w(vbsvzPr+x?N7^UiSOz
z3XdwclpE-Fr9Gkwx;^p0a)BeiX3DU<e2@1dEvvBDvOh*+#G5taR<j9*S#IGxefG_Z
z@ZOUFk)5q!hFfs0zAB~*TX3^Je(w{NB@%_5X;un+BsPj4e??S9e935kMC@#T;@%bO
zqyE&PZd<;C4<DRLMO@otQGSlul2Y$m_2$35=8XxuOSuz3eNWpcNJ(Gj<HFZ_f!2l(
zhVE($WLta12+Id0`rAD56snD_k~k+!rMB4^7lsR%I+JcqW}sLfBIK^H^pVHgt%8T-
zGSkr$>hw)3R|`5gz9~#j$wH2uCXwUT)E#@i^Ajb}C=h%#GqSq=i(P4WZoI1ty+*;c
z#M{svzE{ur3YFiq2V}R{e+upyJeJ1%La+Bl7mtEeRJ)SF((N}J!HgN+H3KepDv@{Y
zw107W?$;uRTX0istGi@rKDf6A2$mABE=SDNWqvJw^;ojv!K*9_YnL0_!Y)VFo+rj>
z&V=%XBbrJ?4a_rZCvRRZP1}lk*i+Y;sbzHBTE1h;C^OyiQo7~i*WSdZ$*H)hbqs}$
zz97x^A!n{YOic;v^a@)LUls6p6q$7df_&6CPc|E95G-$Vg2J^shP=W0=#9Yz5mUGB
zq^INX>Oq;-LCl%*C~4QM2KLJh>`ey3N+j>D44n?pC0|ljpq7uYEiY8GTs@~ROR`A+
z*3v+>{CI)?8?86SlrZMA-hCb+Npv?P1;olN?ew9?8r78M>FMWGCV7&nD!(T@_^#oa
zrNr_)DRS*cZq`t7-*m_1=-|ZMz%hg4BfKB_j(%3terjVU#8w_OAd@Lx?v{UBezs$V
z4@ZBrCjMoPhpsR;zg|*S)9Tja;GVp9T9HjD&Q+t_F+xHD<bq6-BU+T+o~}N(CqFLI
zK24I5PV4Io&}Nfm%b-P}YU3hYvQOD!^ulf((|eYgLS~c>=XM_QJ>q@q+2re*jb<v(
z?`96=G%Q@TEb^z0DB4gwI}<h%ZLPC7H(x*`NbiLSFei-?Xz#-yZpvSdXzwsi4HXMt
zpueRNud!$*er$%RM#9uN{%!@yY;><8j|dJvDf0Hhr)-5-F<B!SH?6x-A8oYm+R&;U
zbCR%0rcoiyj3X}{JV{k7?#NfV(WlmJS4VmO?tEeAR~`D6=(3lY+3jh&$0Dy<h7Tkt
zbhDTyiF@)~#A&*zSOO5X8i*V-ptn2uxG_Vu?_%VmO!WCRdn!p^w><N?HSKKX(DsOx
zE2uFjI@3}A_U+?3{^Yb7W|UozqtCo~G*H!SU}?sGgh!^+tM(lVXG9l9O-cPdu$mH8
zeVu~D!cSEGL1Lrw!eY(rfRE7|hR)WRuGMSS?VqV=CRr$ISst6wROjAMS!r}2xj&4#
z`8hb)sPbv_=Z8Jy<BT$@Tf#0kvbc=huTzzXimBGj$cBa8k{Epw*BY~l3ppK`<dfVP
zOp~oS>=Tmw!zS@!$ERn?%{#&)MOSqzYWb@gGjzF060**Ww?B$J-Pp-u^)}DL{am(*
zeEViN8*Jc4wPc1MiNTFzYByfD1casafE!oJ_uHzK%=D9qo{HBKO+J$Gi-BkH%%at6
zNh`8S2L3_@-j7F!N9P8*qvi%qpra@&k?#}G?shC+Xd}07jyHd!)e5ZgHJLF{{5-Tj
zTEu>RRonKax4G5GRFOwj1^1J}=`0Hsns%pH$<bG?7sOrOH9gieF(ki#_el_n?c3?)
zWOu!aAJi_f+ReWr5u&kQd2naRSG<;SgSXT;8~bcHv*vW@%cip(T@6YkdFOAYSF12)
zDVP^mnWtqaC|Y!Wv*md%99^pzDkSzkoqr&m7u_29xn!5LUJ(A{=uAPq$8pm8!}Fe$
z?(Z*qGrzrXKe4N4e16k>{CK*oo5&t%*#P&A%Nk@gw<O+-XM5aNXnK{6a$E3HsORgY
zXxLJiE~E5uuE21(2=T033-!dzr5gv0)hO7hZS}+V(owYvBnh>5q-Gh(IP%^yTfS~3
z)<Zm%^7($zK}_q-n`L^Bq}7h7hBkEa5?uLS2}U9G-k{^cn8lUjb9TLtXb1BRTCCG1
zbrqx1_~``=zpI{Et@Aj~{QjqO<`;U#%TQr-`GXKs%b$;T4B4bYf(MiIoTIW0#O8OD
z&ILHe`@JSspJnz4Jf9xgnDQ-3VQow}I$5_Xm_Cy?J>$noi*chXw>tSgQg2#f`nEz7
zEI9IvVTN2Ny~0dekB6Nh4|U1Lux&d?!+8uzIP8J$IptST@T(lW5ll>_@r@r5VW%TC
zl2_^<M0(28Fu_9A!X8{KQC_9tpl@Zr*&a=vx?$CH-Lv0<hdSKN`jcdKo!CdWtbE(7
zt71{)cb0v{S~y$ZpMDTMUw7|S%Mr#MGDfkfF8+CuHx08@kL6bHv~^p&jrua0OWj04
zwaZE*^+;~e7bR(R(jB1-cO;=7Nj!f}(n;*@{(?JF>Sjq6L!Yw8ol7Q>9n%k1ADvii
zm4Zpie$?9=-xJ{2NwPY1`J^rXz&<$%3rB0}n`{Q=aefly4EwiJ+z{%|5AKL%dn)G5
zosOPgd{q>nmK2rsJ?T>m|8Po{Yh8RdQ+wSi-T1y6@uK0|+y~{|>~Bx}d|#<)^(YHs
zVjXnp`M2GrUWyP&{_k#D;x;goaE>mxonn-SNO3IDU_BYc8UdS2?R>Yc6dCH77IjI|
z`A3k{%Wts_9Btoo74}+`Y~^Q}Qc3wUZjsJerIJDh$BeJA!S3FbTh*CrBc*(%?Slw=
zto$%oorNE%HDlQ3n=_|i0-NMUEoQP08b)&^uoi`_+PDN#eD?kHyoT*5);jyw3bW)>
z_BiTDrtS8<XQokon~Jy4)QLjpDsJfXc2=p|*&VZ3?dT}_H9WhgQ?vQWBjak&6Z+Mg
z(@TSAj}!>9Jh&vqA~!K7;VE^t^{ffoTeg`jrw=!wwM<J|8!L1jI6mF1I}20$<ui-+
zUu!jYuajJTIPKp$y&2f_{_A_ErlYUy;tSSZQ0qS2DbC!FHTq&zMN#&J<Y}AW<uoPK
zX_WMZ(ia-}pJxk>{$!mcE-@2NeSbzYqH9Sg!I1TMhahG9S79ncR;_ub<E2i=mopwn
z%ig^IE#TtzwpVORHmZR2cId4R@?V>f3(RLaL`H&Q&owc=PRYS8biML1*nVf&@=51@
zfV<ReA@$Ba)y34A+}cRvSEuMwIO$TH6z3w-iPZg%Mh<_|jf*T8cfQ>9SamK`<h5F$
zh_gVMh*pnx!_?Y~qh%+C8@(I9)m_~dB2GQB7-RAXIg_wZ8Qu3S*W~ou6|q9of{Zjj
zH?_8^W+h#>vb=OSE49bzz@&*_1Gl2B`tN;XL0k1iJ4xdG#?R}{`fp7+A8lh5Y5$xJ
zxdodPXyMLU7Z^WUY$2PMH&f8wWmkH~r{e{(;8!hmffJ-8nEKhP>s~6sey4Uxh}JmV
zHr7sU-#&6B#pzB#1&fJSQ;pf;qBhIDkn8HHQ(O)U;rY*I7QB1PP>!z@^ULI;+#iH+
zSI9}PKcH7x6~5Sed2*Z7iT%#K&pj#?WOt=mpMMy!n~TRF6r6wFUV=JgLfIM|2jcg`
zrY?Jz6U!LPG@09uIPD(SDA0RGHbc^JiQee`zQI6Y__5)dxQz;V-(f@Kr*<ZU1ET37
z8L40BGSO_jP=O1L)M%&Z?Zx5`gB?zf8c+2s&K3w+^ZBMXD95>ONVUitRnPR<@#Q@k
zn%RVZ@E>j<xkgTxdD^c1elv5+$|U2(j-Y$0ijwLKwbZ+AA2MbuhOCobU<F1Kjb;a5
za4GO^vBGvLc)87M-+cNe+d8e)`l9pg1@cPaGuRu9Nk5ONe4h(x(Y(9v#3Q07NdddA
zVO2cLJuBEkK6?(*%5+>LOmgV>te;QowL)dpw_K?HlBelQ8sS&Co=G!{VJ>se{=}HM
zZ#~qa^5>qPt)JCBUs1kEwXW5lo9l4r(GB-oLJ0p^{q_5wy(+E5WmYAs;HM{bN{`}*
zO-V>rKE5J;%%1e?Xr!6Al6PgzlG)g3ICm}2N0nHc*I3Rm^i5;vNgaz04be0Mwe+KJ
zRG*)}|K#BR5rr2!NBDFvsWVmN6&suV(0w33|LTZf>78W5wuzf$-V^PKkIP-ih!rdf
zpx~M0()l=0!b%N#_XN!`m$;h(oZ*@}7qb|Tx#S0q(^-pU`82j`@|K&NuJxK2cxEeh
zv)@i2eK7U)pmc?isQE=>PMSf(f+E@@FAV9GBkUgyO(Ca`my-mM&hvh}_@L@eg37qz
z2G=M49m`GnmeLM$0lMt#K0;StQ{((|o`q0EkI6GtTBiy>`#2RA8Cha+`@@M?s`}-?
z=zg{GnTG0WE9U!OUC*sgDHQJnCOvoM$jM8?XuWYbcQ<y(EyB*zI>Go&Vf;Lga<3*?
z@|(g~rN&N89d4SFib8Wvye#50cD@SB>n}5D3nh0Z=ta)FDZR?(o0*;Hyd88U<bfM+
zt45(}<!SB`T~39^sthA?aa}=F3Xh{7W(65FHIh#Z$~~6ad7Q+*8lKN=Au=`m;1Ps7
z`Ik`1N7DrIxSBb2Ia$gOaiy@YE40n#!vSsbVP9)$zFsj1`>Kl7HAMwU^Js{qjTBUO
znQ|7Za+KZ>wW77<nhaLr!N?W&FN<`KT9aYqdY&zd7--$#z{nl#%DWynlyKs6U4YiL
zm}SRv%cBVyO2*s7*Sfh2rXMHx@?Y^~wyDdyHSA`f(v+Own`Jb*iFK;>o{72B&Q2Q$
z9r;GabyxCT*sH9^{xkaJ&5p<yS>^sSHr?Aiv@fzeo0lJndsPR|DAvX)v9EWa`DU4y
zzM%vz4R3^wpBNU<+AUi9bc-@3>B|R&$pXenYvjmrEH`}O-FtM%>x-HU>%*5{&aEhK
zy_zV1M$xV7e%dsrxhI=sBb_NWQ*ec5`Km)k=ZQ<Z$jRsu!?9eSowg$|m~)Epiy9y0
z^m8GVLZ4gCvj-tAyzS3iG<)T3krtF}yk>iQga%z_)ffCJ0ynO7l&x$3qxBv3&b2c+
z(;;!qA!NQ^s~x+}bUz?YiMU3KbN>~KdR~P(b7mNp#<QdL@&oTkM456IuT|dc{XQ&>
z?;!Rph4MZ9@24&--_v@=xAU>@&AsnCLbcA{^>i@V4WB1}>3foY^oB8A(3MyhmdIk(
zr&eFu#5HeivxizCGcHr>QoWm3LK_pMbZeYnma0IHbD)ymGHr~+rcPQ6GRm?uj)w&%
zS4Xb)){qt{u<<!dU3LmDxp2ibVsa-=i9AKvf6s>V#^y7TR7p*<Q*_ENvQ`qjS&igj
z1#Mz4!$p)vLpZ7vsi28**N$_iaU>hjsVbI~M9tEe>%hoDERDt2Mkz%!6{~c7<Rz~4
zWJMqqeuPC|Q!vq_;?RU}Jfa#MF8qMaceGO))leQy;CUV<Dt?4El{%OI`-s>xQ@N7t
zq*pAwxt5`!mR1_b7+!z1k_)hR!pSeuX;qeSXnl<jOm=i*FclN7l1C~Y*6p)U#Yvbf
z*~>G?cPdXPT)Ek;3u7d&4RJcf)Tz{PC%!zVun>`-tm2ty_e3Hy&bjWZx690C?g0Hx
z@dCYKAZ39ulWM{3OBLBeQcUM7v^3><E3LhUMBd$FyhPl19kK(DsUBjKQO0FrUULLf
zZCcZ9mPqBH>aOOc#qM5R*<tBj;_A3ZCae-pC$LMarbgZ{Z;V8&v756PJ&Z<|$whpj
zjpi=>f|S@xjEki{68mb-h}B!5psPBxs(P=etJ+&g_9RcpsF7Lt`y{fb5T*A6Of2><
zXQi~l-<OabS&)#*m44^%+oS#T1Uu7+SpjxeP+CL%B;@6bh7S~Mat|2iVtXAe4b|nv
z)-q3csoYdE=F$1W6OsRNSOYekq#$^ksB~PZ*}nTN1W_a-av`15k@JLOKGcvQOq9n$
zL)^O@_5OP}m%O#=nksJ~xB8RhD%2|xl&aLoxS)oWjaY2Yb+x|jPzYltT*=&L(+Df8
z%5hH?UUxP1P2am!o$l`NJ-8Lt;G}Nm!c(hKcI{gq^jW$`N*<lfw35EmU&$QG##&*0
zMtWX&qVamqE~1H3{H4uxdPgtOg1)}g^gf9JeKHUK8rqQ4D>d}XHS{_|&sJ(Aw9+e@
zg)Rqh-Xbd2(br3OmYrXad!b46p2dFg^eHAcX_|zWm|MC_`p*Vm7OK4>f(_iycehj4
zQjE(co6POu_qvqLd2cf=yGN&FH&<&@L(<9f@pZqz)l1peH*1-_#h*BoF)h236|@~o
zy>aZ}z<09H{dOCbY+`#((&r?JFXri`#I&x71&}^}GJooUy)Jic!emwvSI)(zFLsvu
zpB|h*RG*2zuJ0#W@HoY>mHkfV8rSqzpNoA+jb*U6mq`zrTwKz=t!5r0a16Jb{G7!)
z(1VF9ZnWf#c6<&uHGAeu5|Qs#N9CCviZx?H>s7qAPPeG-bhNJpM@@fAo&L5p;N$o3
z9Ua*g6<Q}Ely!bO_V^lP6CUo$F0G+`gfH$k)C60hduI011G>0JRl2*zcMx{*M;X7F
z_inT$ZM7jc**Md*-GqEry*S>6$65OuD+L%AZqjlZ)6J<AEp~Jq^WS^y;&{^P8&%YT
z*vWq4F?7gAIm(mltlJr`=T+%MpVYtfH>7WH&7RPB*Y>33V=ZIri~KSv{;2iZaYkGk
z$IBdg-s?qq!$o^1t``X$Q~##Z@bYBRLISqAh73F9B|=MFdveRXRj1E4>~1*`v-eRx
z2Zt56XyYedX*&yK6hihqrkoTHi1Z(f3sXF>=rih2_aHr6T0?8g#1E0<&v|+7SBd51
z+GXh1PV%=|Asld~ZF<^%Lo3e*RNb*R6LBRgxdkVfnWAtBX;pF65f@)d7?eJ|S=V%$
zGJ?C6HOWkeb|=T!X~j$-t=wQU+3RBVjcoEuXSJ!sI$L$P!p^P9o_5Q%x49xgKkLLR
zp_RMhGZN{fOeI>j;1+;Wexy)&*OWCqzBoCuP@c<?L$g7jFLk6*!H^--KSel}YP_h~
z<+QZfB?i}&9c-YUYX_%Ae_>*G!KJV|3*UIvz<BnS6WlGfc`{kJ%lgzb#O?#C>gBXc
zq@h14iPRXR=6b>{7GCiyy>`&MU)^|R@_}(@y{_l6vPV={es|ODs%P0JO+UOEwtGjn
z#NOTE_B2*6JEdIep5#MOHBZR0U{2%(^+&SDYIN_5nzo~;&I;YrU^rEq!dIK3XJ<cn
zVO^ZBHj6@j8r&g|wk_o}dc|I^o9cM*YVgR!<IQZ^?~J4;(Jk4p?$$&tFSu-l3R0dM
z;CUWud;1vLsZ6d{f9|`Fc6R9(?kp#5_m6LV^m3+aWZ9@^iUPi~)RC~%xd_yIKRQ-A
zlIBv>-S=3_IbL{l;vKW-3$u1rVfG41QEekdl(w+09gD*_m&5Cs_;NYbF16=UPUIYX
zhI=J)(VI_MsVT9Yibr~_w-TPtmp+|8cB2n<qi_3o3h%b>2mW<Y3rvB9$8Ck0I(TT0
z!j`P{wJiHWEj=YIXqU0bbH}(oExk{gImeg8AxC~?kCj6b${}?XmMwOPLU|JUcRi~T
zrpo2rx&|_CCAdKc?&&v8rJ{e1zfXcBbhz^+ywxvxtIyb0ifk+0xT1G0rRW1{UHl?z
znUhDRQ%!kUXuDHqo!c#ql?#5$s%s-hE`7LxOaE!(x4f<?7>8p}`*C)O9~v4D!HyHH
z@IxOvkR{Q+CpxBj412vMP5RlTf`al_o0S#Qy05MF7Zn>Ip&jZ%HqG-2A5Sodnt5?-
z-lPl=rs?Kd`j+zgjqe>w&D<KZ=u7S!sh|5gFCB?7xr2^u&Arec*st7sS%|p8gl<WY
z;Y3isGDVJhyS#cYWJyFNdV+{?g2-X2U3!4bRDqc>qz59VRSUrks(ch@PSmQ^ecD#-
zdv79UGwVnwInh2w|J&vT|0A()PkL9V_oa3hoj*DhBdp2u^8$9NXx9!l{w%4ed%$=`
zBH5$0o7V-U^NYvkX%<#-HZ8ct`&@lFi2H|aYVL2-A#?+aCFdhNYEd&0gZ`6tN^^E5
zuRb|urO3JB+?}L%>WWrf1&_b5@;7tqW8f1!ULa^ia=er!;H7QoY(Ehq-P3xbKQQ#X
z&={$IfDKRfPQA{uYpj9dqveN!jP+--wYiKg6>0{Q_un=*Z(CM4!&<HR{YHh-kIO$K
z*y66<Z*xw_+l7<<h(k3ub>w|J9}^|LaBEkT{kdQzckPq>$=RLT7<*;RjkxgR<VQ~z
zFI85gx+K<bydRsZBhOov-flhFlv}VZU1R!D+V}LH^pzLYvTqY4CC#3`=={Fw8cq|y
zoD=(&Y^Q2ajrD`+{jBGUd#fg|DRwz8O!QQ8x>8cS%-ZE~c$YQv(55E#x(UaqI^9=I
z1NOJ`q+6Q3!BE<-p9kPGpS`U<1^$YOjrtmRlgyOuk^|i{eJxzL*+sKcpOU?0hn^sk
z;+W5!^$LI2bZwc>gSqM|N#P9E_w1KlJMzeFK^3XDagRo&YuuB+3SN8Ow(vCSxb1q`
z#|EEv_pzD#SDDc}tK<Fdvalc|h5TE~-9753Z~Zo$Kg%)x@cX2H1jXd0AFp1uoRv}R
z{w}jM)>Zn+Rn$ZYylBsqb+_rE`qw7x<F`d4u1P&+RA;EAqr_2bfv;?LOjSrFQOVN@
z(l@L2gD$0#S~W%TBsVZpBVEaLrY4|Dmr|x~b#+@ETbsU^N$qz3M5?=_OXc+QCm&aJ
zUGn4>k1%F^gCt%&8)J3LOet+dd17ePCfJm(`^j}5H|1mF6-3Jwp5W03T1%-h8j7n~
zNHD$0@S}b=Cyr&tW?RsU0k_iA>}gR8)oFnuYr<K_KMkFzhL%nc6{x9eFZ;6N_BkY;
zvTgC#pA{EM-;WvIxlvMlRVlEDEwbgN0rp`6`mKt{+a6c@HpDZcD<U3VGNUuAx<MsW
zJH8Fp21*^*;`g(=#$F%$`D5HebKbY-rTf@-HitPscFH#B>|?Iyo$Ip#CXvdU6Vi)}
zHd}r>#n+>F?yS;A&1o`IGP|GhJ|F+pwe6vDm#=+<;QX>yxVTQd-<M*6c|kv7iZ>J)
zk5fLU$>?_7ZE!I2;N1#qDq(oj9n@i}GS!$>ozrv-JjS0-YdMJ{sjJ7E<WksA&_#UC
z$a!h)`|)@<yCCth@vWJ0t+aQ?NoZFQ)+$V2^YwD~H{O|z^u-3wZ`>2;iaxt;8+bqH
zwyp22ou5kNKVsj^zRL-X{FZo<jXJG8gt)PAo)?>Nmg9w~qvkgj&vRGcN&Bg1g6Y}6
zIi4h@?t4LW^A3e3j3T|iL-R-A^KG%kNoC`oxX`(!pD8L{{^xY}O$yU2@;ul)X7`AS
z_h@^xzA8ImAD$a(79J6lWUY?BKIBLGo~_5+S66u4_S~?qWyvm`D?|Sap{P5i2|v~p
zrUWI()_EP@{3zkK-EF?p6S>!zyK}`_JMe0A%Gq|7rUlj?*LrWHDxL`qUWWuPU7UaN
z#EgwdLv9wWeVL3U#@(ks!yaWUF!?_A(vO}Kk+<^e$QefEe}zZYJ~`r8OBMGk8VPHv
z*+@DgU1mMu53AZtnlrdOZt!08NJRHnHlnvztJ1fe#!0Y0-ZY=h((w2}JNx~_BmIkA
z9A_iK_-jYIk3buO8S_G<IG)K4tbYi}@a&J4&nQ(i*oPs+ZtPn2>>-a`N#cohPvk7_
z?GKT+oX(!W?WnL(xX{hHmMyY2h-LY)8ck=4k;C58m{gm!eo!Y?8G_&D_g8vOuXF8e
z*;t797O~LxGb-I%j5#tFJ(oS1(vL4~-+Jm;c*W#};m%0%T-uxk4{~?qeNWw*Vd}1V
zhYykW{&x!2b(Dgp`WuMEk>W-nGAfs(c(47sr>M{}-bW|Ll0Oq~qLP=F(@j;R>ZtZ9
zeqPh4`#|wrTlQ3b=Irndtt4eC!<C5VDWSEz*6TmgklJ^z4eRCo)cdrRbn;=1)7uN@
z7WASRf9NB7HiDm5mQwtjOcK~<QtalXY$K}=FT2^h<IH2Z`>^<SN%U)%Jx8Z0?Wa%p
z1G;m9O->sM5w+&_FlN>))HPc_R2rMkr7obtI_HS;9_M1K$vquWe(zh-!^_Uz4RI}j
zT}{axt7H+qdtciHXE=B|+$+`BPmEU(HyF_ERLK2WK{%V991D_DteCs~2>pYZsrYJF
z^zvIBwr>dLV&&z#fmG^KjW?ZTR+I*`4Es0cC*2b`_KctP*6Q}Y7PzeVrTqN+N7ZvU
z=})-8=24$r7KaO=i6b`xgEW%gyvLN4E>Y2Zz(~j(DcqBN)wTWj_|C}eVs*^?k_a~V
zTwv~t)ZDRmG?z<WjX`NgrmpI?{9ve^fADfE?D`%lPBLQ7X*J4>sIEC_<9I|w08Qg&
zJW*GCHgnsDVGe7W`b36O*Jg*RM23q-@~<~(Kewb){TNke<eOnMdzUzOLS<c8Bxh8e
zB4^Y+Hs$B(fOC5?A1T}3N7c27Q9E8`I9nKUOf8b_d8<amXHgmU;M-^C!SncjIQ3Sv
z$HIb?IQzb0jqxu?@6r*GChz%%qAQK9dgQjvS6|-W*A-+?<ek5JU7hDEJ$8-1c*!nU
z=fjmkz7+CS;%%(0dL=SCI8x-jp;33Mm6XyhoaQ9m!hPwD`&v#<^0&fVN=<IB+kXn3
zFr=xiB(68Jy&WRqrv37MhSay=XTHzeD?Oo2V^l56&JiAN{V$wDMRo5DpDK)W!gvq!
zapliy$ArPA?>H>d=I^DnI;hF*`ve$WU^G&_%jxk=>$zJ_P)?y~zEjr-x}2}5^}6Mw
z*zB<s);XW{xfPKsdx4r)_Q>kKN;0zfhkrTl9<y#mw90%mjAUku?7iR?^#^euh5&@O
zbf6@0$gu}FFIkPOw@PO=c-TK{z9v_4G`)MCq4h2IV&#$JKg+^@N?0V~;@U1)@83tc
zjo7pWjHSwRyVHD}8IffA!0AsJJ1ZFaQ*b-P$sJR?_j1Nc{HuY(l$@Ln={iy2I=f_4
zNV|-5kDrtFlXJ`}{a2&MDVN@_tLTq3MYOEboO*V7=2cd}*lhRu$L0;(=sL04Oyb;v
z>H4@t^n1C`_j0=)Mn<Mb8@_daN?ksl*CW@P@FkSzOI2>&(^<73?zvA21A7|Jznnq&
z&D`@`3OTdZto`o!Uc%?r7hgu!S1Mmw&~Zx2#ox$c`;f;ryXx60b(W}3J<qC7Q-)Mw
zm0ZA<Z6kJ$+zAFd`CW(nyH4<J!}jzuS70z&^ijouXaNznttY`H-*qhvgXEinl1*1h
zy+7SzK!1}&^)4ANtdXq${PupNcI2sbZ@AJTZMjTfx_uh_o5Dkla`(!~XMMM4-#SqJ
z%)%J&X7zAC*{12<rfHLx4UP8QqltaYCgQuNTcVzJ>&7wn?-_y5pAN))vTioTM%zgj
zhG^*R!6^57PmhLtKdm?JxvH2}eZ)}Q$7C;ob?i)ZBTSqVQuou3X#4B9+sb+%^VJ&y
zoQ-ce6B(_4yuJ8@Lv8IW<HWD<vTtl&=QVl0NY7ktKS!pyg<{=8y)yNv|8nYKs&-`D
z%Z{sB-FG<Yub%(NtiNAc(3Vc5YbAA+JV}U^U%Ak_XsAN%JNe=lfqc?<DqOjIlp@Ji
zxV`64f`Hu1OFk0zXOCvQNTSy?;BJ%WAE`ZlU*u!tz9P8;@wijMcj-ijFIwNLT2utx
zRTp})^vgR!b2_%-xK>XQaV~Te2bej-RM(NsisVSyCs=gjo#Rdq)S_L>OmVYzLB`3l
z8%(K3R!Y<O=MuRhhVMQqsE^8DHFtqDe&OGLO{EM^u+e`rt^CQ7-kFZWoi1IqcjV-a
zp-~2By0CW_oGWGJ-xP!zsa88yYe!-P>s6rEtO%X!z8A>jxRodw_C0Bxy<MoS67Pyw
zQ$3US=IpWP)oqm?37M$*`m=FG>Dq;qjAq1ie{pkUTCZ`;csuLI8iSCTHJm4h*;#vC
zRuU)H`NGWUhuzsZ4MkP+k`G_Hu)fTazR)DeGp;CjCDz1tE7GlWD8EHP>5?>Kop%*#
znyi%aIuU|8t+n8%{N>Yi)b-b>j~Gakh|D9cu}tc(q))p+x<)FU((^uVpO56M>Zz`>
zW{%f8Zp<%kuV2p0F3oS9Sa2%RoJ?lW^Q0&Tlv&kEFkSb26_zX}PVpEYb&);`lXm28
zFi~q-4DY-SiX&Pif<=V_Lxswx*hlLr2)6C!CNjxoD<yVmQgqKfi?eAw%j=xDq|onw
zMe8*an-N28<r}6WqvD$lGrPMPAq!gt!BwReQl~8wc^UYm!eTgO#W{j9j-D-4Uh0C<
zG}!d-Cti3>(%wmeeHC$1FhU|Uj2CI1+3tH8wbK~<F!oJm=*{OZbi==~G{u@6W#;Uq
ziTdWU5|gnu2cyC~AHT+?{rDpn%i7B%37XmLlXagyb6-olW~(_rCT-JLf3v5MDaGp4
zXIvu9Ic&<KZ1<a=a_U$lSey5d!)If!hgPU*gcYU+&|O^A-LEP2p^NJ5Cl}!Jr&CE|
z{PN|JDo%iH&{fHvmqpNHs-?WwT`Ao>fqA&Xn&_sr2J`R&!w#*7QQX2+s#@l=H<zpP
zzE@AW(9?BQn|yleqc-|<OXgI0U$URlD_)t8*BiOpUyvBz4lWSle@gDSACneM&1$~!
zY=i64Ya8nrhlTl}%#+auD%2I#Lg+|QjB-kp8KW7l{JsaA?7VOMsV9QP8Po5iq{W<B
zZ#?m8MpBMzoO)t){7fi?s_|Hzv&j`_>ITaQ=Ak<GIhFfj9gQl^P9?<HZT*%l{jOPi
zr+1ITZm7ERTV^$o#7-=_UK=ATcchqVK7p+|D|$`}k}`VNQIpqn-TR7lyugvu@K80o
z6%q?)-aL{;66_uY^|bGMdSAP3>bvtKC6{+jy|L{oGUFB1^5%TFg^Ilue^cJ|lWwqc
z6t!g6Tbi=eqZAfowCz+w@2Iqh#F|<CeaCU_b{e!9cU{d%f}e96*_|&Ql6|H@qO&3k
z_m`44(5P9x{kYKKQ-(6C+;}cZ$pBHy(NMd5^OnKUx$FvI<H*9nFR6*=$tbPl)*+X2
z66>V1EO?#0YEmz!q%5>vRVdTu43vo-o>GJ58MNe(oRc|qDk{5>f>S56&2%i2D<(59
z{JF@Jcnte@V%FUJuAEMxsc&eSj(aa_BJ~t*zgeJz-n!?Yizs=o@1%5(Y2>+{NNV*}
z#AP}9uNsr&qas&UC^aNy7(Q#^l;6usIxmU23Du|PP=3f|9_@dgxNN(0zArHGu9mM*
z%2J-Hkj~qe#o_hKOrzb1na(5&^3*q89AoRmT~$b-6wA6&D*a>MWL@UBsTRew?T>GW
znv-X_kC%K>RBnb<iM*0^UOK8^Z)M-gan}qx7;vp4o57+)31=3nffbf?6RmIU9p7e1
zmb<EZc{|DQXlCNK_)sU^%HgA3Q&%iPYP=s9PKL*=EF@lMgr;x`y<8C#FN~o~>Dp8n
zdfmA@CAIK1V@fK-QD}r;AdLPIog>YvKLe&`P<M;jG`{|5%5&H1GoHmPP9nY~-97hp
z7I?K;9e&mM@JP&wA$Wp$qRt0y7<VSTL<pYtpxsHR$f0o6jOLNqxybS9)09ud>O;RT
zt3-_@<DaUPVqFZCF8q>>-+WPY&PBaI%<Fnq|Ci|aC>GsWN0jmK_>@56vg<sKXM4Zc
zL!{+NzcjP2WXx?_=?|iMezjCXE#+xzcDFHSgx^2TS{Ro}D_B#(ba;)7dzo?e4=>2W
zyWt;I`FAIDKR=<UPrQ{N^+LYh^SVy8JM&N5MeL1t*4vI-1y_w_zSAw!if^1?{iq%_
zyH{lMb(ePbhq{{KntIGQ|JRV@?E8io2E#dp4L&A2!@J0G=68JJWX6%snPX%ICuYiQ
zDmeYVQ&u;2mSv}XW{!Va?;_yluv}triErAi@0K&<8*%H>Sq&2tazSMFkzFaaB;PYl
zSdUhrf$ijqClHmi0>LBM+5>(P%MAwGKVCb1x_!U#DQBvC1<zXJq|1l<5)9or)1)ue
zglBVhhzn9C6H+F7O<hE2H*;P-59Q5VNar{{hZ93rHcSkZKsnaVed(eOt>^mo-IwBh
zQ?!<Y>YE)OGK?nKZ2uFCCeMVUXiF(6*}Y^20WQA|$$jP@q|Z;v(@2%Kh59di$Q<1#
zdO_Ftvd3hm$D|<9NA&dTSdF`*4%Rt5%qupo<&+$2=j%ltwcX?2tbkF_ZqHPXaidSu
z^FQ`1|8PBsNAU`2Gk=RssaZ|4S&d2ys1=XUn%_ua`nYo920hmqiGU}9)yZ~&MuR(?
zFI)ODuQ>!cZ~QcSz8Cbq`D}DETXU_|!n@|P>7RZyUQPTO&hI8z75@68b&L7i5&?Pf
zSB`6Mqu-p>9u#<yWjy0xN7^$0?>!2)6XRzbEN{;=rnxJ`lXc95gP(^y)GC<hWG1wo
ziG?V`{^G1*Z}SC2h+H?{X4$D@7xg$s3+SU|cm(46WKB=_%GI3jyU(QZ?jqGKsoVOt
z4OjG8-)~u;wXD0NJpAH#Zc?{MIkk=fIaN8e#YwLFEZ>u|A!%PAUC*yWLhQ*WURQIh
z<yd?<S@iH4vJN84M)k%M8fHyy!+euLqa%g3Cd~8lXR_65qNDWwbsdwv?y}PvRhv6j
zC57>^*GygfFBo5m`9k!u-c#gbj1ZZP*}wxfQx=@U_+E*b>jp(cW^+XKqWTAwF!lMU
z)8B?T1#eBg*}br)rN46F373CZ=gk|&Lz1s;H+9yJ88_ADSA6)8B`-|>t0e^D1fSDU
zJ(547S?#Wt-|8XevprZ$u3SF&nDg}58Nr6zvrAv{+*Rx`9*>$5hF5I$E7Pk3TM{ND
zDeg1A3c_4iU&vcqXbu$CHdtSH*S2U{aw;NRcRg)<>_l>4!-dao5@mk(AIwxdyzj@~
z@uJkvIV`YE!{kT5gK(ME3cvp9)+wqQ;Sc<3FGkd3GMY}8S8m?;v}M{mc8-CwY_!48
zwsbRqV&y#R)_LB=NYo0muB&G3TXvbXZx5E3u{v)(US8j;^3;7TZq8}UdG=)l)cxU@
z&Z`#;cXqnUlZVYC_gDBrKbJkKes;0X`quqGy{B81{bWrc3%F51Gs^i~?-eKPhgW&4
z_a|ujUP(_G$_!*_y?(VZU+#mbTXjBnFDMaPThcrvgegh=^uDR5t<aeFI}`V`GZAX+
zW#H~bh2yFGbb<Gk**Z<LJmW9Cc;Z?)yh_$x;9UCN>^??_obi)*TiSN0GeTytGLgGS
za5=Uz`ew+@X<{kX?AKw5Cias^!8_MQnp?Trj(xG}OktT~6m+9(A*E;Pkr_jMsgxvp
z&RnwZZn1C`x++C7o8e-X5$o~5srbUJr@J*mRej7XYZq}VQM>FxwG9nvXUBcSHlwm8
zJUa(BEYgo6-L<s3+{uEUk!91G8Qd(|-XEFN*|n#jiIeB=`0?R3nk<-Y2l6)h@$Q*r
z!`8}}YemCGedZq{YnmfPVBe3%EVPimGa!Q(nVB4K-BuZMaFe%OJZj?OkF-lQ+NmsP
zHaR6bbK=HpRIYpSh$87n54w48nXYBuXUo35jxqi+QmO^GMpn;8)`Ivsucp|3={H}_
z>$hj@9ch0^ll1NKu|@Zyfwz2vvizSOg~bnEQd!S3YIs-1Mf|f-VDGg9rQFa;MaKKf
zgMrf>RrTRD_0X!L@1`yFSE!%7rcMyNUcvfF?x>kFzb>Spm-R7c<E%fkboRi^QS0fW
zB1KzqQ#-!-<f=N}&4QSgHbfOaA4}e7%F!qJQ6Hb1HHN-DA1tFky{hlikdo7vU+7sh
zMyKK8riwMY@1TT>rpBqRaxra`#g_LfZOhP^CQPnb)vNCokY#thQI=JB$(r`MK^J>#
z`j*Bo)6kzy?Kz8=cmf$#5Psp${A8m1kPGSI+mSI%UY9gKp`K2wWxR>4kHa4K<MEr6
zfr!W;zSak^<*VBpD}5zW`ugN-5PutUZcF6*M{LmBKN*!X*uqa={e;eXZ_5!RJ^OS~
z^YmFB$xl|!P3f_DUoS{Dr$4$I+-MW|=G^n<NxL81-(xcOPDy0l=`>x_aXJgV0IiHN
zI*V)WkBT=AeEq{d;eyoKRjs~n7|nNz<!9}yI3vF5MtsH0K9bm}*h80eG(1VSE(;LJ
zJQ|Y0C`A%9@Vdx$hCP^?xn$Y@z3`*y_rdu;C`ZD7bh_BLVS{?~Bd%h}gW89dWs_Js
z+PfHPh}Wmzbq)2--gqyQL;e|l<RkrT&mMX5jWe)w{z==z<g8uYja%_*{!zSA?2b?8
z9%x*R>k2IS@_<UVg@b=9EEv`sSzBbj6;$`Fw95Qu$!B$@^;>brUvsdXHX7{e8wgXC
zv?0x%h<2{ZRNaB!$f#JPv5}Z9r8G{yG{|**d3==1?tTFGYw4YP=yFx(hU=;j%Nv;_
zUmWs%WFN4;_@bxJ62x{-cg^!@^ZIwgImw7c3fkg3LwXJ>DcYSgYigW6-}sb*N_7MZ
zIy+XsJT~cw8k?u|)|s2V3o~{#LK|(Q{p?d+4{n^BQ?DF$c!;|6OYg(J%pJOGhP*a8
zQJi+4N@J!nkyJw86|g5cC(!j9cXqF7&#?bY;rnscn(CcnxcsL@yAHoGZo!StYvqbX
z4`mE4kwADWrm>gAdHu<by%Zx_7V{+gO!YODuWHp^YU&D)+0_@FPviE3AuUi>IrYcQ
z_7m|wwwp<H^%cgWBei{ykH+omwNVd??E5}nOn}JU<FjTC%tdd@z8KiHv&+@CBa`)+
zmFN)JmNh$BP`;mj`xXO?Ul?n^$t^79bT7H*DJ2J+OTTc<Q%f_>#MVLy_-0#SBM-Hg
z@QHq8Gm@Qumh1R;$*MBSW8d86^XzA~SVZO*8zQpaZoS^PTr07E+90lN)NKj+;A>Eq
z_2w0lZq(zpC55-^o2~($6x#c}2fo&%F!3Vy`enZVup+&esraJs($x=|4~2xA1Y!R5
zeqYsw_ESGUWs~tyR6i|DtCIDcVn4ay=Z%37Evj#oI$P$R7Ya^%`+45~q`uM@{+814
z6BEai3f(hrw;E!;n{~TeZ|=0HEC&s$g{X`$$SFGHZ$1p|fq6U==SsZFdFsiXx(Pk$
z)}LY@0)A4#_Hh-G{XZsRTa4F)U(WneAfGsIaP@8t?Z%xG-l^Ta4L6S#Gn()={>jxX
ztN%pR#8zb)c-$~*E&6rSf9mw-S4%IQ&s92?Z}j`}U5n4PYd$jloLX15RC{t}{;Jln
z1@qs}swuSnxx?}8tM$Lyl>a)t<e4Glmbhx$k%_N)CscgjnD(XaufNqlNAnv`e%$-z
zbLIMW-OkJ-iS}LBCrg~r`ZHnD=Kk8=_p5eHJTpDw&b(b!*AsO6{st{r6{WmWv9crO
zEAReeI#<jm&Ry0rKY!|TyBT4=j;wOWGqbPl$X~iw*pjQ->+XlJV%>etd8^$H?kX+f
zNzzZ;>=Qk6)?wkIBZ<N50&Xr||Fbx+Ys(b3l+$}(3I>}SuX6gwmB@ASnYh;Umm9+C
zXK7yixc5<?Q~EkL<wH$I8+b1|t$i(Wgf+_ccyoS@&A)w_pT5e)25t^{*Sz%NN`Lhm
zs#Btu?f=E{<_V`e@1YwPyuvqZ{C#74+3_`X0-c<9=dO8t&idR9`McRy{#Cv%-SRx{
zie#_kNm=jj{UM?6)bG!ky&>w<M~9ckUjK}F*6s6om-aW{8O>9^I?pYy?6R$1KBueK
z^z7n2l1Xh7Pdl#3yLLEj*^33)u6}<mIUY9tnR}Z5dF1xDn)9Em-4?t0zpI&RZeg3m
z-lZE}o7U8v_@2&_v+{JsvRF;Me1%Q#jxF|m*tb=HZ>MHx-}z9cMJIM$lrU!fKB3Y2
z&hDP<sFTX~rWo&J-G6Lbz2mk#*C64)_5t3EOybO33?QJN?raBUKnWfOUMNd|;jJTx
znV4Hx5TBfrnVMIk9~#2Sz-+b5%Qv)wfdQW}A}Ge#qZyN#mz-0Yl8VhZ5uj2Iu&Z`k
zvCG>rGcZhJXJAl<8pjBfUDDWw!#E_D>SYw=5ban&6vs-jp!zvADKihhOC6ifJkpb9
zU|0aWp;`}a7RaS>*vx`BGaq=`cydW*eqMY@WkD*^h1D1#j0lo!?Mt(RfkC3f%D|wA
zV$oZ9ERIGFkEGPZTr2^CFuPx;M%D%Bi4#CisG^uXMH#2ra8E#wO~>Q*(}!PaSIGd~
z4s@v+iune><bmW=eQ<z71R!U!6Bjt%C-kG0Y#10+Tp1X2Q7mAN!DT^SYDsy1QFc7y
z=5WFunJIBoUQ~jCVT&XKgB*%Itut`hQ(Rg=*x-NLw;n!W!N73E0d&bZEE|H7(d!Mk
z3{FqYBgyg1?<T8$0A`=#ObiSPP&*)*ivJZZJ0N*qFR`EiZvx_c@4IFKF!4AjpeLZ9
z*SL%>DoBnmPAw`+Eg~E|8=k&m{;SBqP@{@&z7;1UjsyfUAL@L98Gx%sfJ*=vr&pvH
z7_?A=zh4`d`H7_^8S%NP$-s1)S)5x;*b^R6cVn287#Jdeo<Pk7e_U``lAD;B7hjZ`
zm_ke_U8tMw9$^H`##Rgr+9<vVPse2e$oasl4~pY+6Y~<&iLr&P$-}@9m<Jdz!iskm
z0b4+snYaw?*)aW`4KP710hSm#C|;Sp36~`)nMJ@-m82}OETu;LA<!BfVA?{>c4ilF
uS%WAqi1P~S6%@!>yZ9YWJ5Vm9Kq*;S*?>V0yvah8VLz~Poa_nA%nSfBO4>&N

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez
deleted file mode 100644
index 4a28b72f832b0b738a5ea30cad7f8897e05845d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55937
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
Y|CdQ&qHG=jz(+kqsL=NH*zdjn0iQ?}8vp<R

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb
deleted file mode 100644
index 474e12885ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fact: rabbitmq_erlang_cookie
-#
-# Purpose: To determine the current erlang cookie value.
-#
-# Resolution: Returns the cookie.
-Facter.add(:rabbitmq_erlang_cookie) do
-  confine :osfamily => %w[Debian RedHat Suse]
-
-  setcode do
-    if File.exists?('/var/lib/rabbitmq/.erlang.cookie')
-      File.read('/var/lib/rabbitmq/.erlang.cookie')
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
deleted file mode 100644
index 8e0d6ab862d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'puppet'
-Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin) do
-
-  commands :rabbitmqctl => '/usr/sbin/rabbitmqctl'
-  has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
-    environment( { 'HOME' => '' })
-  end
-  defaultfor :feature => :posix
-
-  def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:name].split('@')[1]
-    end
-  end
-
-  def self.all_vhosts
-    vhosts = []
-    parse_command(rabbitmqctl('list_vhosts')).collect do |vhost|
-        vhosts.push(vhost)
-    end
-    vhosts
-  end
-
-  def self.all_exchanges(vhost)
-    exchanges = []
-    parse_command(rabbitmqctl('list_exchanges', '-p', vhost, 'name', 'type'))
-  end
-
-  def self.parse_command(cmd_output)
-    # first line is:
-    # Listing exchanges/vhosts ...
-    # while the last line is
-    # ...done.
-    #
-    cmd_output.split(/\n/)[1..-2]
-  end
-
-  def self.instances
-    resources = []
-    all_vhosts.each do |vhost|
-        all_exchanges(vhost).collect do |line|
-            name, type = line.split()
-            if type.nil?
-                # if name is empty, it will wrongly get the type's value.
-                # This way type will get the correct value
-                type = name
-                name = ''
-            end
-            exchange = {
-              :type   => type,
-              :ensure => :present,
-              :name   => "%s@%s" % [name, vhost],
-            }
-            resources << new(exchange) if exchange[:type]
-        end
-    end
-    resources
-  end
-
-  def self.prefetch(resources)
-    packages = instances
-    resources.keys.each do |name|
-      if provider = packages.find{ |pkg| pkg.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present
-  end
-
-  def create
-    vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
-    name = resource[:name].split('@')[0]
-    rabbitmqadmin('declare', 'exchange', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", "name=#{name}", "type=#{resource[:type]}")
-    @property_hash[:ensure] = :present
-  end
-
-  def destroy
-    vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
-    name = resource[:name].split('@')[0]
-    rabbitmqadmin('delete', 'exchange', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", "name=#{name}")
-    @property_hash[:ensure] = :absent
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
deleted file mode 100644
index eefc9fb2541..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-Puppet::Type.type(:rabbitmq_plugin).provide(:rabbitmqplugins) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    if Facter.value(:osfamily) == 'RedHat'
-      commands :rabbitmqplugins => '/usr/lib/rabbitmq/bin/rabbitmq-plugins'
-    else
-      commands :rabbitmqplugins => 'rabbitmq-plugins'
-    end
-  else
-    if Facter.value(:osfamily) == 'RedHat'
-      has_command(:rabbitmqplugins, '/usr/lib/rabbitmq/bin/rabbitmq-plugins') do
-        environment :HOME => "/tmp"
-      end
-    else
-      has_command(:rabbitmqplugins, 'rabbitmq-plugins') do
-        environment :HOME => "/tmp"
-      end
-    end
-  end
-
-  defaultfor :feature => :posix
-
-  def self.instances
-    rabbitmqplugins('list', '-E').split(/\n/).map do |line|
-      if line.split(/\s+/)[1] =~ /^(\S+)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid plugins line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqplugins('enable', resource[:name])
-  end
-
-  def destroy
-    rabbitmqplugins('disable', resource[:name])
-  end
-
-  def exists?
-    rabbitmqplugins('list', '-E').split(/\n/).detect do |line|
-      line.split(/\s+/)[1].match(/^#{resource[:name]}$/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
deleted file mode 100644
index ef284bdcdc6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'puppet'
-require 'set'
-Puppet::Type.type(:rabbitmq_user).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  defaultfor :feature => :posix
-
-  def self.instances
-    rabbitmqctl('list_users').split(/\n/)[1..-2].collect do |line|
-      if line =~ /^(\S+)(\s+\[.*?\]|)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid user line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqctl('add_user', resource[:name], resource[:password])
-    if resource[:admin] == :true
-      make_user_admin()
-    end
-    if !resource[:tags].nil?
-      set_user_tags(resource[:tags])
-    end
-  end
-
-  def destroy
-    rabbitmqctl('delete_user', resource[:name])
-  end
-
-  def exists?
-    rabbitmqctl('list_users').split(/\n/)[1..-2].detect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}(\s+(\[.*?\]|\S+)|)$/)
-    end
-  end
-
- 
-  def tags
-    get_user_tags.entries.sort
-  end
-
-
-  def tags=(tags)
-    if ! tags.nil?
-      set_user_tags(tags)
-    end
-  end
-
-  def admin
-    if usertags = get_user_tags
-      (:true if usertags.include?('administrator')) || :false
-    else
-      raise Puppet::Error, "Could not match line '#{resource[:name]} (true|false)' from list_users (perhaps you are running on an older version of rabbitmq that does not support admin users?)"
-    end
-  end
-
-  def admin=(state)
-    if state == :true
-      make_user_admin()
-    else
-      usertags = get_user_tags
-      usertags.delete('administrator')
-      rabbitmqctl('set_user_tags', resource[:name], usertags.entries.sort)
-    end
-  end
-
-  def set_user_tags(tags)
-    is_admin = get_user_tags().member?("administrator") \
-               || resource[:admin] == :true
-    usertags = Set.new(tags)
-    if is_admin
-      usertags.add("administrator")
-    end
-    rabbitmqctl('set_user_tags', resource[:name], usertags.entries.sort)
-  end
-
-  def make_user_admin
-    usertags = get_user_tags
-    usertags.add('administrator')
-    rabbitmqctl('set_user_tags', resource[:name], usertags.entries.sort)
-  end
-
-  private
-  def get_user_tags
-    match = rabbitmqctl('list_users').split(/\n/)[1..-2].collect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}\s+\[(.*?)\]/)
-    end.compact.first
-    Set.new(match[1].split(/, /)) if match
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
deleted file mode 100644
index 83bd808e2ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-Puppet::Type.type(:rabbitmq_user_permissions).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  defaultfor :feature=> :posix
-
-  # cache users permissions
-  def self.users(name, vhost)
-    @users = {} unless @users
-    unless @users[name]
-      @users[name] = {}
-      rabbitmqctl('list_user_permissions', name).split(/\n/)[1..-2].each do |line|
-        if line =~ /^(\S+)\s+(\S*)\s+(\S*)\s+(\S*)$/
-          @users[name][$1] =
-            {:configure => $2, :read => $4, :write => $3}
-        else
-          raise Puppet::Error, "cannot parse line from list_user_permissions:#{line}"
-        end
-      end
-    end
-    @users[name][vhost]
-  end
-
-  def users(name, vhost)
-    self.class.users(name, vhost)
-  end
-
-  def should_user
-    if @should_user
-      @should_user
-    else
-      @should_user = resource[:name].split('@')[0]
-    end
-  end
-
-  def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:name].split('@')[1]
-    end
-  end
-
-  def create
-    resource[:configure_permission] ||= "''"
-    resource[:read_permission]      ||= "''"
-    resource[:write_permission]     ||= "''"
-    rabbitmqctl('set_permissions', '-p', should_vhost, should_user, resource[:configure_permission], resource[:write_permission], resource[:read_permission]) 
-  end
-
-  def destroy
-    rabbitmqctl('clear_permissions', '-p', should_vhost, should_user)
-  end
-
-  # I am implementing prefetching in exists b/c I need to be sure
-  # that the rabbitmq package is installed before I make this call.
-  def exists?
-    users(should_user, should_vhost)
-  end
-
-  def configure_permission
-    users(should_user, should_vhost)[:configure]
-  end
-
-  def configure_permission=(perm)
-    set_permissions
-  end
-
-  def read_permission
-    users(should_user, should_vhost)[:read]
-  end
-
-  def read_permission=(perm)
-    set_permissions
-  end
-
-  def write_permission
-    users(should_user, should_vhost)[:write]
-  end
-
-  def write_permission=(perm)
-    set_permissions
-  end
-
-  # implement memoization so that we only call set_permissions once
-  def set_permissions
-    unless @permissions_set
-      @permissions_set = true
-      resource[:configure_permission] ||= configure_permission
-      resource[:read_permission]      ||= read_permission
-      resource[:write_permission]     ||= write_permission
-      rabbitmqctl('set_permissions', '-p', should_vhost, should_user,
-        resource[:configure_permission], resource[:write_permission],
-        resource[:read_permission]
-      )
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
deleted file mode 100644
index 2ee45c31119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-Puppet::Type.type(:rabbitmq_vhost).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  def self.instances
-    rabbitmqctl('list_vhosts').split(/\n/)[1..-2].map do |line|
-      if line =~ /^(\S+)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid user line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqctl('add_vhost', resource[:name])
-  end
-
-  def destroy
-    rabbitmqctl('delete_vhost', resource[:name])
-  end
-
-  def exists?
-    out = rabbitmqctl('list_vhosts').split(/\n/)[1..-2].detect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}$/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
deleted file mode 100644
index 6a96520c681..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_exchange) do
-  desc 'Native type for managing rabbitmq exchanges'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'Name of exchange'
-    newvalues(/^\S*@\S+$/)
-  end
-
-  newparam(:type) do
-    desc 'Exchange type to be set *on creation*'
-    newvalues(/^\S+$/)
-  end
-
-  newparam(:user) do
-    desc 'The user to use to connect to rabbitmq'
-    defaultto('guest')
-    newvalues(/^\S+$/)
-  end
-
-  newparam(:password) do
-    desc 'The password to use to connect to rabbitmq'
-    defaultto('guest')
-    newvalues(/\S+/)
-  end
-
-  validate do
-    if self[:ensure] == :present and self[:type].nil?
-      raise ArgumentError, "must set type when creating exchange for #{self[:name]} whose type is #{self[:type]}"
-    end
-  end
-
-  autorequire(:rabbitmq_vhost) do
-    [self[:name].split('@')[1]]
-  end
-
-  autorequire(:rabbitmq_user) do
-    [self[:user]]
-  end
-
-  autorequire(:rabbitmq_user_permissions) do
-    ["#{self[:user]}@#{self[:name].split('@')[1]}"]
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
deleted file mode 100644
index 497ced4e6b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_plugin) do
-  desc 'manages rabbitmq plugins'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    'name of the plugin to enable'
-    newvalues(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
deleted file mode 100644
index be5219d5c90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_user) do
-  desc 'Native type for managing rabbitmq users'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  autorequire(:service) { 'rabbitmq-server' }
-
-  newparam(:name, :namevar => true) do
-    desc 'Name of user'
-    newvalues(/^\S+$/)
-  end
-
-  # newproperty(:password) do
-  newparam(:password) do
-    desc 'User password to be set *on creation*'
-  end
-
-  newproperty(:admin) do
-    desc 'rather or not user should be an admin'
-    newvalues(/true|false/)
-    munge do |value|
-      # converting to_s incase its a boolean
-      value.to_s.to_sym
-    end
-    defaultto :false
-  end
-
-  newproperty(:tags, :array_matching => :all) do
-    desc 'additional tags for the user'
-  end
-
-  validate do
-    if self[:ensure] == :present and ! self[:password]
-      raise ArgumentError, 'must set password when creating user' unless self[:password]
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
deleted file mode 100644
index 493d47c88a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_user_permissions) do
-  desc 'Type for managing rabbitmq user permissions'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  autorequire(:service) { 'rabbitmq-server' }
-
-  newparam(:name, :namevar => true) do
-    desc 'combination of user@vhost to grant privileges to'
-    newvalues(/^\S+@\S+$/)
-  end
-
-  newproperty(:configure_permission) do
-    desc 'regexp representing configuration permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  newproperty(:read_permission) do
-    desc 'regexp representing read permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  newproperty(:write_permission) do
-    desc 'regexp representing write permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  autorequire(:rabbitmq_vhost) do
-    [self[:name].split('@')[1]]
-  end
-
-  autorequire(:rabbitmq_user) do
-    [self[:name].split('@')[0]]
-  end
-
-  # I may want to dissalow whitespace
-  def validate_permissions(value)
-    begin
-      Regexp.new(value)
-    rescue RegexpError
-      raise ArgumentError, "Invalid regexp #{value}"
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
deleted file mode 100644
index 9dd0982dcac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_vhost) do
-  desc 'manages rabbitmq vhosts'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    'name of the vhost to add'
-    newvalues(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
deleted file mode 100644
index 8894280f6de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-class rabbitmq::config {
-
-  $cluster_disk_nodes         = $rabbitmq::cluster_disk_nodes
-  $cluster_node_type          = $rabbitmq::cluster_node_type
-  $cluster_nodes              = $rabbitmq::cluster_nodes
-  $config                     = $rabbitmq::config
-  $config_cluster             = $rabbitmq::config_cluster
-  $config_path                = $rabbitmq::config_path
-  $config_stomp               = $rabbitmq::config_stomp
-  $default_user               = $rabbitmq::default_user
-  $default_pass               = $rabbitmq::default_pass
-  $env_config                 = $rabbitmq::env_config
-  $env_config_path            = $rabbitmq::env_config_path
-  $erlang_cookie              = $rabbitmq::erlang_cookie
-  $node_ip_address            = $rabbitmq::node_ip_address
-  $plugin_dir                 = $rabbitmq::plugin_dir
-  $port                       = $rabbitmq::port
-  $service_name               = $rabbitmq::service_name
-  $ssl                        = $rabbitmq::ssl
-  $ssl_only                   = $rabbitmq::ssl_only
-  $ssl_cacert                 = $rabbitmq::ssl_cacert
-  $ssl_cert                   = $rabbitmq::ssl_cert
-  $ssl_key                    = $rabbitmq::ssl_key
-  $ssl_management_port        = $rabbitmq::ssl_management_port
-  $ssl_stomp_port             = $rabbitmq::ssl_stomp_port
-  $ssl_verify                 = $rabbitmq::ssl_verify
-  $ssl_fail_if_no_peer_cert   = $rabbitmq::ssl_fail_if_no_peer_cert
-  $stomp_port                 = $rabbitmq::stomp_port
-  $wipe_db_on_cookie_change   = $rabbitmq::wipe_db_on_cookie_change
-  $config_variables           = $rabbitmq::config_variables
-  $config_kernel_variables    = $rabbitmq::config_kernel_variables
-  $cluster_partition_handling = $rabbitmq::cluster_partition_handling
-  $default_env_variables      =  {
-    'RABBITMQ_NODE_PORT'        => $port,
-    'RABBITMQ_NODE_IP_ADDRESS'  => $node_ip_address
-  }
-
-  # Handle env variables.
-  $environment_variables = merge($default_env_variables, $rabbitmq::environment_variables)
-
-  # Handle deprecated option.
-  if $cluster_disk_nodes != [] {
-    notify { 'cluster_disk_nodes':
-      message => 'WARNING: The cluster_disk_nodes is deprecated.
-       Use cluster_nodes instead.',
-    }
-    $r_cluster_nodes = $cluster_disk_nodes
-  } else {
-    $r_cluster_nodes = $cluster_nodes
-  }
-
-  file { '/etc/rabbitmq':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-  }
-
-  file { '/etc/rabbitmq/ssl':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-  }
-
-  file { 'rabbitmq.config':
-    ensure  => file,
-    path    => $config_path,
-    content => template($config),
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-    notify  => Class['rabbitmq::service'],
-  }
-
-  file { 'rabbitmq-env.config':
-    ensure  => file,
-    path    => $env_config_path,
-    content => template($env_config),
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-    notify  => Class['rabbitmq::service'],
-  }
-
-
-  if $config_cluster {
-
-    file { 'erlang_cookie':
-      ensure  => 'present',
-      path    => '/var/lib/rabbitmq/.erlang.cookie',
-      owner   => 'rabbitmq',
-      group   => 'rabbitmq',
-      mode    => '0400',
-      content => $erlang_cookie,
-      replace => true,
-      before  => File['rabbitmq.config'],
-      notify  => Class['rabbitmq::service'],
-    }
-
-    # rabbitmq_erlang_cookie is a fact in this module.
-    if $erlang_cookie != $::rabbitmq_erlang_cookie {
-      # Safety check.
-      if $wipe_db_on_cookie_change {
-        exec { 'wipe_db':
-          command    => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
-          path       => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-        }
-        File['erlang_cookie'] {
-          require => Exec['wipe_db'],
-        }
-      } else {
-        fail("ERROR: The current erlang cookie is ${::rabbitmq_erlang_cookie} and needs to change to ${erlang_cookie}. In order to do this the RabbitMQ database needs to be wiped.  Please set the parameter called wipe_db_on_cookie_change to true to allow this to happen automatically.")
-      }
-    }
-
-  }
-
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
deleted file mode 100644
index c96128a792e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
+++ /dev/null
@@ -1,176 +0,0 @@
-  #
-class rabbitmq(
-  $admin_enable               = $rabbitmq::params::admin_enable,
-  $cluster_disk_nodes         = $rabbitmq::params::cluster_disk_nodes,
-  $cluster_node_type          = $rabbitmq::params::cluster_node_type,
-  $cluster_nodes              = $rabbitmq::params::cluster_nodes,
-  $config                     = $rabbitmq::params::config,
-  $config_cluster             = $rabbitmq::params::config_cluster,
-  $config_mirrored_queues     = $rabbitmq::params::config_mirrored_queues,
-  $config_path                = $rabbitmq::params::config_path,
-  $config_stomp               = $rabbitmq::params::config_stomp,
-  $default_user               = $rabbitmq::params::default_user,
-  $default_pass               = $rabbitmq::params::default_pass,
-  $delete_guest_user          = $rabbitmq::params::delete_guest_user,
-  $env_config                 = $rabbitmq::params::env_config,
-  $env_config_path            = $rabbitmq::params::env_config_path,
-  $erlang_cookie              = $rabbitmq::params::erlang_cookie,
-  $management_port            = $rabbitmq::params::management_port,
-  $node_ip_address            = $rabbitmq::params::node_ip_address,
-  $package_apt_pin            = $rabbitmq::params::package_apt_pin,
-  $package_ensure             = $rabbitmq::params::package_ensure,
-  $package_gpg_key            = $rabbitmq::params::package_gpg_key,
-  $package_name               = $rabbitmq::params::package_name,
-  $package_provider           = $rabbitmq::params::package_provider,
-  $package_source             = $rabbitmq::params::package_source,
-  $manage_repos               = $rabbitmq::params::manage_repos,
-  $plugin_dir                 = $rabbitmq::params::plugin_dir,
-  $port                       = $rabbitmq::params::port,
-  $service_ensure             = $rabbitmq::params::service_ensure,
-  $service_manage             = $rabbitmq::params::service_manage,
-  $service_name               = $rabbitmq::params::service_name,
-  $ssl                        = $rabbitmq::params::ssl,
-  $ssl_only                   = $rabbitmq::params::ssl_only,
-  $ssl_cacert                 = $rabbitmq::params::ssl_cacert,
-  $ssl_cert                   = $rabbitmq::params::ssl_cert,
-  $ssl_key                    = $rabbitmq::params::ssl_key,
-  $ssl_management_port        = $rabbitmq::params::ssl_management_port,
-  $ssl_stomp_port             = $rabbitmq::params::ssl_stomp_port,
-  $ssl_verify                 = $rabbitmq::params::ssl_verify,
-  $ssl_fail_if_no_peer_cert   = $rabbitmq::params::ssl_fail_if_no_peer_cert,
-  $stomp_ensure               = $rabbitmq::params::stomp_ensure,
-  $ldap_auth                  = $rabbitmq::params::ldap_auth,
-  $ldap_server                = $rabbitmq::params::ldap_server,
-  $ldap_user_dn_pattern       = $rabbitmq::params::ldap_user_dn_pattern,
-  $ldap_use_ssl               = $rabbitmq::params::ldap_use_ssl,
-  $ldap_port                  = $rabbitmq::params::ldap_port,
-  $ldap_log                   = $rabbitmq::params::ldap_log,
-  $stomp_port                 = $rabbitmq::params::stomp_port,
-  $version                    = $rabbitmq::params::version,
-  $wipe_db_on_cookie_change   = $rabbitmq::params::wipe_db_on_cookie_change,
-  $cluster_partition_handling = $rabbitmq::params::cluster_partition_handling,
-  $environment_variables      = $rabbitmq::params::environment_variables,
-  $config_variables           = $rabbitmq::params::config_variables,
-  $config_kernel_variables    = $rabbitmq::params::config_kernel_variables,
-) inherits rabbitmq::params {
-
-  validate_bool($admin_enable)
-  # Validate install parameters.
-  validate_re($package_apt_pin, '^(|\d+)$')
-  validate_string($package_ensure)
-  validate_string($package_gpg_key)
-  validate_string($package_name)
-  validate_string($package_provider)
-  validate_bool($manage_repos)
-  validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
-  # Validate config parameters.
-  validate_array($cluster_disk_nodes)
-  validate_re($cluster_node_type, '^(ram|disc)$')
-  validate_array($cluster_nodes)
-  validate_string($config)
-  validate_absolute_path($config_path)
-  validate_bool($config_cluster)
-  validate_bool($config_mirrored_queues)
-  validate_bool($config_stomp)
-  validate_string($default_user)
-  validate_string($default_pass)
-  validate_bool($delete_guest_user)
-  validate_string($env_config)
-  validate_absolute_path($env_config_path)
-  validate_string($erlang_cookie)
-  validate_re($management_port, '\d+')
-  validate_string($node_ip_address)
-  validate_absolute_path($plugin_dir)
-  validate_re($port, ['\d+','UNSET'])
-  validate_re($stomp_port, '\d+')
-  validate_bool($wipe_db_on_cookie_change)
-  # Validate service parameters.
-  validate_re($service_ensure, '^(running|stopped)$')
-  validate_bool($service_manage)
-  validate_string($service_name)
-  validate_bool($ssl)
-  validate_bool($ssl_only)
-  validate_string($ssl_cacert)
-  validate_string($ssl_cert)
-  validate_string($ssl_key)
-  validate_string($ssl_management_port)
-  validate_re($ssl_management_port, '\d+')
-  validate_string($ssl_stomp_port)
-  validate_re($ssl_stomp_port, '\d+')
-  validate_bool($stomp_ensure)
-  validate_bool($ldap_auth)
-  validate_string($ldap_server)
-  validate_string($ldap_user_dn_pattern)
-  validate_bool($ldap_use_ssl)
-  validate_re($ldap_port, '\d+')
-  validate_bool($ldap_log)
-  validate_hash($environment_variables)
-  validate_hash($config_variables)
-  validate_hash($config_kernel_variables)
-
-  if $ssl_only and ! $ssl {
-    fail('$ssl_only => true requires that $ssl => true')
-  }
-
-  include '::rabbitmq::install'
-  include '::rabbitmq::config'
-  include '::rabbitmq::service'
-  include '::rabbitmq::management'
-
-  if $rabbitmq::manage_repos == true {
-    case $::osfamily {
-      'RedHat', 'SUSE':
-        { include '::rabbitmq::repo::rhel' }
-      'Debian':
-        { include '::rabbitmq::repo::apt' }
-      default:
-        { }
-    }
-  }
-
-  if $admin_enable and $service_manage {
-    include '::rabbitmq::install::rabbitmqadmin'
-
-    rabbitmq_plugin { 'rabbitmq_management':
-      ensure  => present,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins'
-    }
-
-    Class['::rabbitmq::service'] -> Class['::rabbitmq::install::rabbitmqadmin']
-  }
-
-  if $stomp_ensure {
-    rabbitmq_plugin { 'rabbitmq_stomp':
-      ensure  => $stomp_ensure,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins'
-    }
-  }
-
-  if ($ldap_auth) {
-    rabbitmq_plugin { 'rabbitmq_auth_backend_ldap':
-      ensure   => present,
-      require  => Class['rabbitmq::install'],
-      notify   => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins',
-    }
-  }
-
-  # Anchor this as per #8040 - this ensures that classes won't float off and
-  # mess everything up.  You can read about this at:
-  # http://docs.puppetlabs.com/puppet/2.7/reference/lang_containment.html#known-issues
-  anchor { 'rabbitmq::begin': }
-  anchor { 'rabbitmq::end': }
-
-  Anchor['rabbitmq::begin'] -> Class['::rabbitmq::install']
-    -> Class['::rabbitmq::config'] ~> Class['::rabbitmq::service']
-    -> Class['::rabbitmq::management'] -> Anchor['rabbitmq::end']
-
-  # Make sure the various providers have their requirements in place.
-  Class['::rabbitmq::install'] -> Rabbitmq_plugin<| |>
-  Class['::rabbitmq::install::rabbitmqadmin'] -> Rabbitmq_exchange<| |>
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp
deleted file mode 100644
index 09fe3b32134..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class rabbitmq::install {
-
-  $package_ensure   = $rabbitmq::package_ensure
-  $package_name     = $rabbitmq::package_name
-  $package_provider = $rabbitmq::package_provider
-  $package_source   = $rabbitmq::package_source
-
-  package { 'rabbitmq-server':
-    ensure   => $package_ensure,
-    name     => $package_name,
-    provider => $package_provider,
-    notify   => Class['rabbitmq::service'],
-  }
-
-  if $package_source {
-    Package['rabbitmq-server'] {
-      source  => $package_source,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
deleted file mode 100644
index aae05f928c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-class rabbitmq::install::rabbitmqadmin {
-
-  $management_port = $rabbitmq::management_port
-
-  staging::file { 'rabbitmqadmin':
-    target  => '/var/lib/rabbitmq/rabbitmqadmin',
-    source  => "http://localhost:${management_port}/cli/rabbitmqadmin",
-    require => [
-      Class['rabbitmq::service'],
-      Rabbitmq_plugin['rabbitmq_management']
-    ],
-  }
-
-  file { '/usr/local/bin/rabbitmqadmin':
-    owner   => 'root',
-    group   => 'root',
-    source  => '/var/lib/rabbitmq/rabbitmqadmin',
-    mode    => '0755',
-    require => Staging::File['rabbitmqadmin'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
deleted file mode 100644
index 078e9a95f00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-class rabbitmq::management {
-
-  $delete_guest_user = $rabbitmq::delete_guest_user
-
-  if $delete_guest_user {
-    rabbitmq_user{ 'guest':
-      ensure   => absent,
-      provider => 'rabbitmqctl',
-    }
-  }
-
-  if $rabbitmq::config_mirrored_queues {
-    rabbitmq::policy { 'ha-all':
-      pattern  => '.*',
-      definition => '{"ha-mode":"all","ha-sync-mode":"automatic"}'
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
deleted file mode 100644
index 63e2e491ee1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
+++ /dev/null
@@ -1,98 +0,0 @@
-  # Class: rabbitmq::params
-#
-#   The RabbitMQ Module configuration settings.
-#
-class rabbitmq::params {
-
-  case $::osfamily {
-    'Archlinux': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq'
-      $service_name     = 'rabbitmq'
-      $package_source   = ''
-      $version          = '3.1.3-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first
-    }
-    'Debian': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'apt'
-      $package_source   = ''
-      $version          = '3.1.5'
-    }
-    'RedHat': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'yum'
-      $version          = '3.1.5-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first.
-      $package_source   = "http://www.rabbitmq.com/releases/rabbitmq-server/v${base_version}/rabbitmq-server-${version}.noarch.rpm"
-    }
-    'SUSE': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'zypper'
-      $version          = '3.1.5-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first.
-      $package_source   = "http://www.rabbitmq.com/releases/rabbitmq-server/v${base_version}/rabbitmq-server-${version}.noarch.rpm"
-    }
-    default: {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
-    }
-  }
-
-  #install
-  $admin_enable               = true
-  $management_port            = '15672'
-  $package_apt_pin            = ''
-  $package_gpg_key            = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc'
-  $manage_repos               = true
-  $service_ensure             = 'running'
-  $service_manage             = true
-  #config
-  $cluster_disk_nodes         = []
-  $cluster_node_type          = 'disc'
-  $cluster_nodes              = []
-  $config                     = 'rabbitmq/rabbitmq.config.erb'
-  $config_cluster             = false
-  $config_mirrored_queues     = false
-  $config_path                = '/etc/rabbitmq/rabbitmq.config'
-  $config_stomp               = false
-  $default_user               = 'guest'
-  $default_pass               = 'guest'
-  $delete_guest_user          = false
-  $env_config                 = 'rabbitmq/rabbitmq-env.conf.erb'
-  $env_config_path            = '/etc/rabbitmq/rabbitmq-env.conf'
-  $erlang_cookie              = 'EOKOWXQREETZSHFNTPEY'
-  $node_ip_address            = 'UNSET'
-  $plugin_dir                 = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version}/plugins"
-  $port                       = '5672'
-  $ssl                        = false
-  $ssl_only                   = false
-  $ssl_cacert                 = 'UNSET'
-  $ssl_cert                   = 'UNSET'
-  $ssl_key                    = 'UNSET'
-  $ssl_management_port        = '5671'
-  $ssl_stomp_port             = '6164'
-  $ssl_verify                 = 'verify_none'
-  $ssl_fail_if_no_peer_cert   = 'false'
-  $stomp_ensure               = false
-  $ldap_auth                  = false
-  $ldap_server                = 'ldap'
-  $ldap_user_dn_pattern       = 'cn=${username},ou=People,dc=example,dc=com'
-  $ldap_use_ssl               = false
-  $ldap_port                  = '389'
-  $ldap_log                   = false
-  $stomp_port                 = '6163'
-  $wipe_db_on_cookie_change   = false
-  $cluster_partition_handling = 'ignore'
-  $environment_variables      = {}
-  $config_variables           = {}
-  $config_kernel_variables    = {}
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/policy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/policy.pp
deleted file mode 100644
index 204fb36a9cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/policy.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-define rabbitmq::policy (
-  $pattern,
-  $definition,
-  $vhost    = '/',
-  $priority = 0,
-) {
-
-  exec { "rabbitmq policy: ${title}":
-    command => "rabbitmqctl set_policy -p ${vhost} '${name}' '${pattern}' '${definition}' ${priority}",
-    unless  => "rabbitmqctl list_policies | grep -qE '^${vhost}\\s+${name}\\s+${pattern}\\s+${definition}\\s+${priority}$'",
-    path    => ['/bin','/sbin','/usr/bin','/usr/sbin'],
-    require => Class['rabbitmq::service'],
-    before  => Anchor['rabbitmq::end']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp
deleted file mode 100644
index 28635f6783f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# requires
-#   puppetlabs-apt
-#   puppetlabs-stdlib
-class rabbitmq::repo::apt(
-  $location    = 'http://www.rabbitmq.com/debian/',
-  $release     = 'testing',
-  $repos       = 'main',
-  $include_src = false,
-  $key         = '056E8E56',
-  $key_source  = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc',
-  ) {
-
-  $pin = $rabbitmq::package_apt_pin
-
-  Class['rabbitmq::repo::apt'] -> Package<| title == 'rabbitmq-server' |>
-
-  apt::source { 'rabbitmq':
-    location    => $location,
-    release     => $release,
-    repos       => $repos,
-    include_src => $include_src,
-    key         => $key,
-    key_source  => $key_source,
-  }
-
-  if $pin {
-    validate_re($pin, '\d\d\d')
-    apt::pin { 'rabbitmq':
-      packages => 'rabbitmq-server',
-      priority => $pin,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp
deleted file mode 100644
index f2271cd4677..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class rabbitmq::repo::rhel {
-
-  $package_gpg_key = $rabbitmq::package_gpg_key
-
-  Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>
-
-  exec { "rpm --import ${package_gpg_key}":
-    path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
-    onlyif => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
deleted file mode 100644
index 8ad26cb5bb6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Class: rabbitmq::server
-#
-# This module manages the installation and config of the rabbitmq server
-#   it has only been tested on certain version of debian-ish systems
-# Parameters:
-#  [*port*] - port where rabbitmq server is hosted
-#  [*delete_guest_user*] - rather or not to delete the default user
-#  [*version*] - version of rabbitmq-server to install
-#  [*package_name*] - name of rabbitmq package
-#  [*service_name*] - name of rabbitmq service
-#  [*service_ensure*] - desired ensure state for service
-#  [*stomp_port*] - port stomp should be listening on
-#  [*node_ip_address*] - ip address for rabbitmq to bind to
-#  [*config*] - contents of config file
-#  [*env_config*] - contents of env-config file
-#  [*config_cluster*] - whether to configure a RabbitMQ cluster
-#  [*config_mirrored_queues*] - DEPRECATED (doesn't do anything)
-#  [*cluster_disk_nodes*] - DEPRECATED (use cluster_nodes instead)
-#  [*cluster_nodes*] - which nodes to cluster with (including the current one)
-#  [*cluster_node_type*] - Type of cluster node (disc or ram)
-#  [*erlang_cookie*] - erlang cookie, must be the same for all nodes in a cluster
-#  [*wipe_db_on_cookie_change*] - whether to wipe the RabbitMQ data if the specified
-#    erlang_cookie differs from the current one. This is a sad parameter: actually,
-#    if the cookie indeed differs, then wiping the database is the *only* thing you
-#    can do. You're only required to set this parameter to true as a sign that you
-#    realise this.
-# Requires:
-#  stdlib
-# Sample Usage:
-#
-# This module is used as backward compability layer for modules
-# which require rabbitmq::server instead of rabbitmq class.
-# It's still common uasge in many modules.
-#
-#
-# [Remember: No empty lines between comments and class definition]
-class rabbitmq::server(
-  $port                     = $rabbitmq::params::port,
-  $delete_guest_user        = $rabbitmq::params::delete_guest_user,
-  $package_name             = $rabbitmq::params::package_name,
-  $version                  = $rabbitmq::params::version,
-  $service_name             = $rabbitmq::params::service_name,
-  $service_ensure           = $rabbitmq::params::service_ensure,
-  $service_manage           = $rabbitmq::params::service_manage,
-  $config_stomp             = $rabbitmq::params::config_stomp,
-  $stomp_port               = $rabbitmq::params::stomp_port,
-  $config_cluster           = $rabbitmq::params::config_cluster,
-  $cluster_disk_nodes       = $rabbitmq::params::cluster_disk_nodes,
-  $cluster_nodes            = $rabbitmq::params::cluster_nodes,
-  $cluster_node_type        = $rabbitmq::params::cluster_node_type,
-  $node_ip_address          = $rabbitmq::params::node_ip_address,
-  $config                   = $rabbitmq::params::config,
-  $env_config               = $rabbitmq::params::env_config,
-  $erlang_cookie            = $rabbitmq::params::erlang_cookie,
-  $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change,
-  # DEPRECATED
-  $manage_service           = undef,
-  $config_mirrored_queues   = undef,
-) inherits rabbitmq::params {
-
-  if $manage_service != undef {
-    warning('The $manage_service parameter is deprecated; please use $service_manage instead')
-    $_service_manage = $manage_service
-  } else {
-    $_service_manage = $service_manage
-  }
-
-  if $config_mirrored_queues != undef {
-    warning('The $config_mirrored_queues parameter is deprecated in this class, use the rabbitmq class')
-  }
-
-  anchor {'before::rabbimq::class':
-    before => Class['rabbitmq'],
-  }
-
-  anchor {'after::rabbimq::class':
-    require => Class['rabbitmq'],
-  }
-
-  class { 'rabbitmq':
-    port                      => $port,
-    delete_guest_user         => $delete_guest_user,
-    package_name              => $package_name,
-    version                   => $version,
-    service_name              => $service_name,
-    service_ensure            => $service_ensure,
-    service_manage            => $_service_manage,
-    config_stomp              => $config_stomp,
-    stomp_port                => $stomp_port,
-    config_cluster            => $config_cluster,
-    cluster_disk_nodes        => $cluster_disk_nodes,
-    cluster_nodes             => $cluster_nodes,
-    cluster_node_type         => $cluster_node_type,
-    node_ip_address           => $node_ip_address,
-    config                    => $config,
-    env_config                => $env_config,
-    erlang_cookie             => $erlang_cookie,
-    wipe_db_on_cookie_change  => $wipe_db_on_cookie_change,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp
deleted file mode 100644
index c01aa64ad35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Class: rabbitmq::service
-#
-#   This class manages the rabbitmq server service itself.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class rabbitmq::service(
-  $service_ensure = $rabbitmq::service_ensure,
-  $service_manage = $rabbitmq::service_manage,
-  $service_name   = $rabbitmq::service_name,
-) inherits rabbitmq {
-
-  validate_re($service_ensure, '^(running|stopped)$')
-  validate_bool($service_manage)
-
-  if ($service_manage) {
-    if $service_ensure == 'running' {
-      $ensure_real = 'running'
-      $enable_real = true
-    } else {
-      $ensure_real = 'stopped'
-      $enable_real = false
-    }
-
-    service { 'rabbitmq-server':
-      ensure     => $ensure_real,
-      enable     => $enable_real,
-      hasstatus  => true,
-      hasrestart => true,
-      name       => $service_name,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown
deleted file mode 100644
index 286d3417dc6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown
+++ /dev/null
@@ -1,7 +0,0 @@
-Specs
-=====
-
-The Puppet project uses RSpec for testing.
-
-For more information on RSpec, see http://rspec.info/
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
deleted file mode 100644
index c0b5576736a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq class:' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'SUSE'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Debian'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Archlinux'
-    package_name = 'rabbitmq'
-    service_name = 'rabbitmq'
-  end
-
-  context "default class inclusion" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      # Apply twice to ensure no errors the second time.
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_changes => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }      
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context "disable and stop service" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        service_ensure => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should_not be_enabled }
-      it { should_not be_running }
-    end
-  end
-
-  context "service is unmanaged" do
-    it 'should run successfully' do
-      pp_pre = <<-EOS
-      class { 'rabbitmq': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      pp = <<-EOS
-      class { 'rabbitmq':
-        service_manage => false,
-        service_ensure  => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      
-      apply_manifest(pp_pre, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
deleted file mode 100644
index 04627fa6ff6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq clustering' do
-  context 'rabbitmq::config_cluster => true' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': 
-        config_cluster           => true,
-        cluster_nodes            => ['rabbit1', 'rabbit2'],
-        cluster_node_type        => 'ram',
-        wipe_db_on_cookie_change => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
- 
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/rabbitmq/rabbitmq.config') do
-      it { should be_file }
-      it { should contain 'cluster_nodes' }
-      it { should contain 'rabbit@rabbit1' }
-      it { should contain 'rabbit@rabbit2' }
-      it { should contain 'ram' }
-    end
-
-    describe file('/var/lib/rabbitmq/.erlang.cookie') do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
deleted file mode 100644
index d480e88438d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq with delete_guest_user' do
-  context 'delete_guest_user' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': 
-        port              => '5672',
-        delete_guest_user => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      shell('rabbitmqctl list_users > /tmp/rabbitmqctl_users')
-    end
-
-    describe file('/tmp/rabbitmqctl_users') do
-      it { should be_file }
-      it { should_not contain 'guest' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
deleted file mode 100644
index f4b2366f3bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1310-x64:
-    roles:
-      - master
-    platform: ubuntu-13.10-amd64
-    box : ubuntu-server-1310-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index 4cb4ad43090..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : trusty-server-cloudimg-amd64-vagrant-disk1
-    box_url : https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
deleted file mode 100644
index 618f8203428..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq::install::rabbitmqadmin class' do
-  context 'does nothing if service is unmanaged' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        admin_enable   => true,
-        service_manage => false,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/var/lib/rabbitmq/rabbitmqadmin') do
-      it { should_not be_file }
-    end
-  end
-
-  context 'downloads the cli tools' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        admin_enable   => true,
-        service_manage => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/var/lib/rabbitmq/rabbitmqadmin') do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
deleted file mode 100644
index d99f995db53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq server:' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'SUSE'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Debian'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Archlinux'
-    package_name = 'rabbitmq'
-    service_name = 'rabbitmq'
-  end
-
-  context "default class inclusion" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      # Apply twice to ensure no errors the second time.
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_changes => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }      
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context "disable and stop service" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq::server':
-        service_ensure => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should_not be_enabled }
-      it { should_not be_running }
-    end
-  end
-
-  context "service is unmanaged" do
-    it 'should run successfully' do
-      pp_pre = <<-EOS
-      class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      pp = <<-EOS
-      class { 'rabbitmq::server':
-        service_manage => false,
-        service_ensure  => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      
-      apply_manifest(pp_pre, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
deleted file mode 100644
index ff93fd4e3fc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
+++ /dev/null
@@ -1,531 +0,0 @@
-require 'spec_helper'
-
-describe 'rabbitmq' do
-
-  context 'on unsupported distributions' do
-    let(:facts) {{ :osfamily => 'Unsupported' }}
-
-    it 'we fail' do
-      expect { subject }.to raise_error(/not supported on an Unsupported/)
-    end
-  end
-
-  context 'on Debian' do
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
-    it 'includes rabbitmq::repo::apt' do
-      should contain_class('rabbitmq::repo::apt')
-    end
-
-    describe 'apt::source default values' do
-      let(:facts) {{ :osfamily => 'Debian' }}
-      it 'should add a repo with defaults values' do
-        contain_file('/etc/apt/sources.list.d/rabbitmq.list')\
-          .with_content(%r|deb http\://www\.rabbitmq.com/debian/ testing main|)
-      end
-    end
-
-    describe 'apt::source custom values' do
-      let(:params) {
-        { :location => 'http://www.foorepo.com/debian',
-          :release => 'unstable',
-          :repos => 'main'
-        }}
-      it 'should add a repo with custom new values' do
-        contain_file('/etc/apt/sources.list.d/rabbitmq.list')\
-          .with_content(%r|deb http\://www\.foorepo.com/debian/ unstable main|)
-      end
-    end
-  end
-
-  context 'on Debian' do
-    let(:params) {{ :manage_repos => false }}
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
-    it 'does not include rabbitmq::repo::apt when manage_repos is false' do
-      should_not contain_class('rabbitmq::repo::apt')
-    end
-  end
-
-  context 'on Redhat' do
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    it 'includes rabbitmq::repo::rhel' do
-      should contain_class('rabbitmq::repo::rhel')
-    end
-  end
-
-  context 'on Redhat' do
-    let(:params) {{ :manage_repos => false }}
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    it 'does not include rabbitmq::repo::rhel when manage_repos is false' do
-      should_not contain_class('rabbitmq::repo::rhel')
-    end
-  end
-
-  ['Debian', 'RedHat', 'SUSE', 'Archlinux'].each do |distro|
-    context "on #{distro}" do
-      let(:facts) {{
-        :osfamily => distro,
-        :rabbitmq_erlang_cookie => 'EOKOWXQREETZSHFNTPEY',
-        :lsbdistcodename => 'squeeze',
-        :lsbdistid => 'Debian'
-      }}
-
-      it { should contain_class('rabbitmq::install') }
-      it { should contain_class('rabbitmq::config') }
-      it { should contain_class('rabbitmq::service') }
-
-
-      context 'with admin_enable set to true' do
-        let(:params) {{ :admin_enable => true }}
-        context 'with service_manage set to true' do
-          it 'we enable the admin interface by default' do
-            should contain_class('rabbitmq::install::rabbitmqadmin')
-            should contain_rabbitmq_plugin('rabbitmq_management').with(
-              'require' => 'Class[Rabbitmq::Install]',
-              'notify'  => 'Class[Rabbitmq::Service]'
-            )
-          end
-        end
-        context 'with service_manage set to false' do
-          let(:params) {{ :admin_enable => true, :service_manage => false }}
-          it 'should do nothing' do
-            should_not contain_class('rabbitmq::install::rabbitmqadmin')
-            should_not contain_rabbitmq_plugin('rabbitmq_management')
-          end
-        end
-      end
-
-      context 'deprecated parameters' do
-        describe 'cluster_disk_nodes' do
-          let(:params) {{ :cluster_disk_nodes => ['node1', 'node2'] }}
-
-          it { should contain_notify('cluster_disk_nodes') }
-        end
-      end
-
-      describe 'manages configuration directory correctly' do
-        it { should contain_file('/etc/rabbitmq').with(
-          'ensure' => 'directory'
-        )}
-      end
-
-      describe 'manages configuration file correctly' do
-        it { should contain_file('rabbitmq.config') }
-      end
-
-      context 'configures config_cluster' do
-        let(:facts) {{ :osfamily => distro, :rabbitmq_erlang_cookie => 'ORIGINAL', :lsbdistid => 'Debian' }}
-        let(:params) {{
-          :config_cluster           => true,
-          :cluster_nodes            => ['hare-1', 'hare-2'],
-          :cluster_node_type        => 'ram',
-          :erlang_cookie            => 'TESTCOOKIE',
-          :wipe_db_on_cookie_change => false
-        }}
-
-        describe 'with defaults' do
-          it 'fails' do
-            expect{subject}.to raise_error(/^ERROR: The current erlang cookie is ORIGINAL/)
-          end
-        end
-
-        describe 'with wipe_db_on_cookie_change set' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'TESTCOOKIE',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'wipes the database' do
-            should contain_exec('wipe_db')
-            should contain_file('erlang_cookie')
-          end
-        end
-
-        describe 'correctly when cookies match' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'ORIGINAL',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'and doesnt wipe anything' do
-            should contain_file('erlang_cookie')
-          end
-        end
-
-        describe 'and sets appropriate configuration' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'ORIGINAL',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'for cluster_nodes' do
-            should contain_file('rabbitmq.config').with({
-              'content' => /cluster_nodes.*\['rabbit@hare-1', 'rabbit@hare-2'\], ram/,
-            })
-          end
-
-          it 'for erlang_cookie' do
-            should contain_file('erlang_cookie').with({
-              'content' => 'ORIGINAL',
-            })
-          end
-        end
-      end
-
-      describe 'rabbitmq-env configuration' do
-        let(:params) {{ :environment_variables => {
-          'RABBITMQ_NODE_IP_ADDRESS'    => '1.1.1.1',
-          'RABBITMQ_NODE_PORT'          => '5656',
-          'RABBITMQ_NODENAME'           => 'HOSTNAME',
-          'RABBITMQ_SERVICENAME'        => 'RabbitMQ',
-          'RABBITMQ_CONSOLE_LOG'        => 'RabbitMQ.debug',
-          'RABBITMQ_CTL_ERL_ARGS'       => 'verbose',
-          'RABBITMQ_SERVER_ERL_ARGS'    => 'v',
-          'RABBITMQ_SERVER_START_ARGS'  => 'debug'
-        }}}
-        it 'should set environment variables' do
-          should contain_file('rabbitmq-env.config') \
-            .with_content(/RABBITMQ_NODE_IP_ADDRESS=1.1.1.1/) \
-            .with_content(/RABBITMQ_NODE_PORT=5656/) \
-            .with_content(/RABBITMQ_NODENAME=HOSTNAME/) \
-            .with_content(/RABBITMQ_SERVICENAME=RabbitMQ/) \
-            .with_content(/RABBITMQ_CONSOLE_LOG=RabbitMQ.debug/) \
-            .with_content(/RABBITMQ_CTL_ERL_ARGS=verbose/) \
-            .with_content(/RABBITMQ_SERVER_ERL_ARGS=v/) \
-            .with_content(/RABBITMQ_SERVER_START_ARGS=debug/)
-        end
-      end
-
-      context 'delete_guest_user' do
-        describe 'should do nothing by default' do
-          it { should_not contain_rabbitmq_user('guest') }
-        end
-
-        describe 'delete user when delete_guest_user set' do
-          let(:params) {{ :delete_guest_user => true }}
-          it 'removes the user' do
-            should contain_rabbitmq_user('guest').with(
-              'ensure'   => 'absent',
-              'provider' => 'rabbitmqctl'
-            )
-          end
-        end
-      end
-
-      context 'configuration setting' do
-        describe 'node_ip_address when set' do
-          let(:params) {{ :node_ip_address => '172.0.0.1' }}
-          it 'should set RABBITMQ_NODE_IP_ADDRESS to specified value' do
-            contain_file('rabbitmq-env.config').with({
-              'content' => 'RABBITMQ_NODE_IP_ADDRESS=172.0.0.1',
-            })
-          end
-        end
-
-        describe 'stomp by default' do
-          it 'should not specify stomp parameters in rabbitmq.config' do
-            contain_file('rabbitmq.config').without({
-              'content' => /stomp/,})
-          end
-        end
-        describe 'stomp when set' do
-          let(:params) {{ :config_stomp => true, :stomp_port => 5679 }}
-          it 'should specify stomp port in rabbitmq.config' do
-            contain_file('rabbitmq.config').with({
-              'content' => /rabbitmq_stomp.*tcp_listeners, \[5679\]/,
-            })
-          end
-        end
-        describe 'stomp when set with ssl' do
-          let(:params) {{ :config_stomp => true, :stomp_port => 5679, :ssl_stomp_port => 5680 }}
-          it 'should specify stomp port and ssl stomp port in rabbitmq.config' do
-            contain_file('rabbitmq.config').with({
-              'content' => /rabbitmq_stomp.*tcp_listeners, \[5679\].*ssl_listeners, \[5680\]/,
-            })
-          end
-        end
-      end
-
-      describe 'configuring ldap authentication' do
-        let :params do
-          { :config_stomp         => true,
-            :ldap_auth            => true,
-            :ldap_server          => 'ldap.example.com',
-            :ldap_user_dn_pattern => 'ou=users,dc=example,dc=com',
-            :ldap_use_ssl         => false,
-            :ldap_port            => '389',
-            :ldap_log             => true
-          }
-        end
-
-        it { should contain_rabbitmq_plugin('rabbitmq_auth_backend_ldap') }
-
-        it 'should contain ldap parameters' do
-          verify_contents(subject, 'rabbitmq.config', 
-                          ['[', '  {rabbit, [', '    {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},', '  ]}',
-                            '  {rabbitmq_auth_backend_ldap, [', '    {other_bind, anon},',
-                            '    {servers, ["ldap.example.com"]},',
-                            '    {user_dn_pattern, "ou=users,dc=example,dc=com"},', '    {use_ssl, false},',
-                            '    {port, 389},', '    {log, true}'])
-        end
-      end
-
-      describe 'configuring ldap authentication' do
-        let :params do
-          { :config_stomp         => false,
-            :ldap_auth            => true,
-            :ldap_server          => 'ldap.example.com',
-            :ldap_user_dn_pattern => 'ou=users,dc=example,dc=com',
-            :ldap_use_ssl         => false,
-            :ldap_port            => '389',
-            :ldap_log             => true
-          }
-        end
-
-        it { should contain_rabbitmq_plugin('rabbitmq_auth_backend_ldap') }
-
-        it 'should contain ldap parameters' do
-          verify_contents(subject, 'rabbitmq.config', 
-                          ['[', '  {rabbit, [', '    {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},', '  ]}',
-                            '  {rabbitmq_auth_backend_ldap, [', '    {other_bind, anon},',
-                            '    {servers, ["ldap.example.com"]},',
-                            '    {user_dn_pattern, "ou=users,dc=example,dc=com"},', '    {use_ssl, false},',
-                            '    {port, 389},', '    {log, true}'])
-        end
-      end
-
-      describe 'default_user and default_pass set' do
-        let(:params) {{ :default_user => 'foo', :default_pass => 'bar' }}
-        it 'should set default_user and default_pass to specified values' do
-          contain_file('rabbitmq.config').with({
-            'content' => /default_user, <<"foo">>.*default_pass, <<"bar">>/,
-          })
-        end
-      end
-
-      describe 'ssl options' do
-        let(:params) {
-          { :ssl => true,
-            :ssl_management_port => 3141,
-            :ssl_cacert => '/path/to/cacert',
-            :ssl_cert => '/path/to/cert',
-            :ssl_key => '/path/to/key'
-        } }
-
-        it 'should set ssl options to specified values' do
-          contain_file('rabbitmq.config').with({
-            'content' => %r|ssl_listeners, \[3141\].*
-            ssl_options, \[{cacertfile,"/path/to/cacert".*
-            certfile="/path/to/cert".*
-            keyfile,"/path/to/key|,
-          })
-        end
-      end
-
-      describe 'ssl options with ssl_only' do
-        let(:params) {
-          { :ssl => true,
-            :ssl_only => true,
-            :ssl_management_port => 3141,
-            :ssl_cacert => '/path/to/cacert',
-            :ssl_cert => '/path/to/cert',
-            :ssl_key => '/path/to/key'
-        } }
-
-        it 'should set ssl options to specified values' do
-          contain_file('rabbitmq.config').with({
-            'content' => %r|tcp_listeners, \[\].*
-            ssl_listeners, \[3141\].*
-            ssl_options, \[{cacertfile,"/path/to/cacert".*
-            certfile="/path/to/cert".*
-            keyfile,"/path/to/key|,
-          })
-        end
-      end
-
-      describe 'config_variables options' do
-        let(:params) {{ :config_variables => {
-            'hipe_compile'                  => true,
-            'vm_memory_high_watermark'      => 0.4,
-            'frame_max'                     => 131072,
-            'collect_statistics'            => "none",
-            'auth_mechanisms'               => "['PLAIN', 'AMQPLAIN']",
-        }}}
-        it 'should set environment variables' do
-          should contain_file('rabbitmq.config') \
-            .with_content(/\{hipe_compile, true\}/) \
-            .with_content(/\{vm_memory_high_watermark, 0.4\}/) \
-            .with_content(/\{frame_max, 131072\}/) \
-            .with_content(/\{collect_statistics, none\}/) \
-            .with_content(/\{auth_mechanisms, \['PLAIN', 'AMQPLAIN'\]\}/)
-        end
-      end
-
-      describe 'config_kernel_variables options' do
-        let(:params) {{ :config_kernel_variables => {
-            'inet_dist_listen_min'      => 9100,
-            'inet_dist_listen_max'      => 9105,
-        }}}
-        it 'should set config variables' do
-          should contain_file('rabbitmq.config') \
-            .with_content(/\{inet_dist_listen_min, 9100\}/) \
-            .with_content(/\{inet_dist_listen_max, 9105\}/) 
-        end
-      end
-
-      context 'delete_guest_user' do
-        describe 'should do nothing by default' do
-          it { should_not contain_rabbitmq_user('guest') }
-        end
-
-        describe 'delete user when delete_guest_user set' do
-          let(:params) {{ :delete_guest_user => true }}
-          it 'removes the user' do
-            should contain_rabbitmq_user('guest').with(
-              'ensure'   => 'absent',
-              'provider' => 'rabbitmqctl'
-            )
-          end
-        end
-      end
-
-      ##
-      ## rabbitmq::service
-      ##
-      describe 'service with default params' do
-        it { should contain_service('rabbitmq-server').with(
-          'ensure'     => 'running',
-          'enable'     => 'true',
-          'hasstatus'  => 'true',
-          'hasrestart' => 'true'
-        )}
-      end
-
-      describe 'service with ensure stopped' do
-        let :params do
-          { :service_ensure => 'stopped' }
-        end
-
-        it { should contain_service('rabbitmq-server').with(
-          'ensure'    => 'stopped',
-          'enable'    => false
-        ) }
-      end
-
-      describe 'service with ensure neither running neither stopped' do
-        let :params do
-          { :service_ensure => 'foo' }
-        end
-
-        it 'should raise an error' do
-          expect {
-            should contain_service('rabbitmq-server').with(
-              'ensure' => 'stopped' )
-          }.to raise_error(Puppet::Error, /validate_re\(\): "foo" does not match "\^\(running\|stopped\)\$"/)
-        end
-      end
-
-      describe 'service with service_manage equal to false' do
-        let :params do
-          { :service_manage => false }
-        end
-
-        it { should_not contain_service('rabbitmq-server') }
-      end
-
-    end
-  end
-
-  ##
-  ## rabbitmq::install
-  ##
-  context "on RHEL" do
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    let(:params) {{ :package_source => 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.3/rabbitmq-server-3.2.3-1.noarch.rpm' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq-server',
-        'provider' => 'yum',
-        'source'   => 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.3/rabbitmq-server-3.2.3-1.noarch.rpm'
-      )
-    end
-  end
-
-  context "on Debian" do
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'precise' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq-server',
-        'provider' => 'apt'
-      )
-    end
-  end
-
-  context "on Archlinux" do
-    let(:facts) {{ :osfamily => 'Archlinux' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq')
-    end
-  end
-
-  describe 'repo management on Debian' do
-    let(:facts)  {{ :osfamily => 'Debian', :lsbdistid => 'Debian' }}
-
-    context 'with no pin' do
-      let(:params) {{ :package_apt_pin => '' }}
-      describe 'it sets up an apt::source' do
-
-        it { should contain_apt__source('rabbitmq').with(
-          'location'    => 'http://www.rabbitmq.com/debian/',
-          'release'     => 'testing',
-          'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '056E8E56'
-        ) }
-      end
-    end
-
-    context 'with pin' do
-      let(:params) {{ :package_apt_pin => '700' }}
-      describe 'it sets up an apt::source and pin' do
-
-        it { should contain_apt__source('rabbitmq').with(
-          'location'    => 'http://www.rabbitmq.com/debian/',
-          'release'     => 'testing',
-          'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '056E8E56'
-        ) }
-
-        it { should contain_apt__pin('rabbitmq').with(
-          'packages' => 'rabbitmq-server',
-          'priority' => '700'
-        ) }
-
-      end
-    end
-  end
-
-  ['RedHat', 'SuSE'].each do |distro|
-    describe "repo management on #{distro}" do
-      describe 'imports the key' do
-        let(:facts) {{ :osfamily => distro }}
-        let(:params) {{ :package_gpg_key => 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc' }}
-
-        it { should contain_exec("rpm --import #{params[:package_gpg_key]}").with(
-          'path' => ['/bin','/usr/bin','/sbin','/usr/sbin']
-        ) }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 1dbc82a8658..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on hosts, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'rabbitmq')
-    hosts.each do |host|
-
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib', { :acceptable_exit_codes => [0,1] })
-      if fact('osfamily') == 'Debian'
-        shell('puppet module install puppetlabs-apt', { :acceptable_exit_codes => [0,1] })
-      end
-      shell('puppet module install nanliu-staging', { :acceptable_exit_codes => [0,1] })
-      if fact('osfamily') == 'RedHat'
-        shell('puppet module install garethr-erlang', { :acceptable_exit_codes => [0,1] })
-      end
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb
deleted file mode 100644
index f4daf79bd62..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'rabbitmq_erlang_cookie', :type => :fact do
-  before(:each) { Facter.clear }
-
-  it 'works correctly' do
-    Facter.fact(:osfamily).stubs(:value).returns('RedHat')
-    File.stubs(:exists?).with('/var/lib/rabbitmq/.erlang.cookie').returns(true)
-    File.stubs(:read).with('/var/lib/rabbitmq/.erlang.cookie').returns('THISISACOOKIE')
-    Facter.fact(:rabbitmq_erlang_cookie).value.should == 'THISISACOOKIE'
-  end
-
-  it 'fails if file doesnt exist' do
-    Facter.fact(:osfamily).stubs(:value).returns('RedHat')
-    File.stubs(:exists?).with('/var/lib/rabbitmq/.erlang.cookie').returns(false)
-    Facter.fact(:rabbitmq_erlang_cookie).value.should == nil
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
deleted file mode 100644
index ac68970cf75..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_exchange).provider(:rabbitmqadmin)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_exchange.new(
-      {:name => 'amq.direct@/',
-       :type => :topic}
-    )
-    @provider = provider_class.new(@resource)
-  end
-
-  it 'should return instances' do
-    provider_class.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-/
-...done.
-EOT
-    provider_class.expects(:rabbitmqctl).with('list_exchanges', '-p', '/', 'name', 'type').returns <<-EOT
-Listing exchanges ...
-        direct
-	amq.direct      direct
-	amq.fanout      fanout
-	amq.headers     headers
-	amq.match       headers
-	amq.rabbitmq.log        topic
-	amq.rabbitmq.trace      topic
-	amq.topic       topic
-	...done.
-EOT
-    instances = provider_class.instances
-    instances.size.should == 8
-  end
-
-  it 'should call rabbitmqadmin to create' do
-    @provider.expects(:rabbitmqadmin).with('declare', 'exchange', '--vhost=/', '--user=guest', '--password=guest', 'name=amq.direct', 'type=topic')
-    @provider.create
-  end
-
-  it 'should call rabbitmqadmin to destroy' do
-    @provider.expects(:rabbitmqadmin).with('delete', 'exchange', '--vhost=/', '--user=guest', '--password=guest', 'name=amq.direct')
-    @provider.destroy
-  end
-
-  context 'specifying credentials' do
-    before :each do
-      @resource = Puppet::Type::Rabbitmq_exchange.new(
-        {:name => 'amq.direct@/',
-        :type => :topic,
-        :user => 'colin',
-        :password => 'secret',
-        }
-      )
-      @provider = provider_class.new(@resource)
-    end
-
-    it 'should call rabbitmqadmin to create' do
-      @provider.expects(:rabbitmqadmin).with('declare', 'exchange', '--vhost=/', '--user=colin', '--password=secret', 'name=amq.direct', 'type=topic')
-      @provider.create
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
deleted file mode 100644
index 2c13b886a8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,236 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_user).provider(:rabbitmqctl)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_user.new(
-      {:name => 'foo', :password => 'bar'}
-    )
-    @provider = provider_class.new(@resource)
-  end
-  it 'should match user names' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should match user names with 2.4.1 syntax' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo bar
-...done.
-EOT
-    @provider.exists?.should == 'foo bar'
-  end
-  it 'should not match if no users on system' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should not match if no matching users on system' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-fooey
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should match user names from list' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one
-two three
-foo
-bar
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should create user and set password' do
-    @resource[:password] = 'bar'
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.create
-  end
-  it 'should create user, set password and set to admin' do
-    @resource[:password] = 'bar'
-    @resource[:admin] = 'true'
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   []
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['administrator'])
-    @provider.create
-  end
-  it 'should call rabbitmqctl to delete' do
-    @provider.expects(:rabbitmqctl).with('delete_user', 'foo')
-    @provider.destroy
-  end
-  it 'should be able to retrieve admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo [administrator]
-...done.
-EOT
-    @provider.admin.should == :true
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo []
-...done.
-EOT
-    @provider.admin.should == :false
-  end
-  it 'should fail if admin value is invalid' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo fail
-...done.
-EOT
-    expect { @provider.admin }.to raise_error(Puppet::Error, /Could not match line/)
-  end
-  it 'should be able to set admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   []
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['administrator'])
-    @provider.admin=:true
-  end
-  it 'should not interfere with existing tags on the user when setting admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   [bar, baz]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['bar','baz', 'administrator'].sort) 
-    @provider.admin=:true
-  end
-  it 'should be able to unset admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo     [administrator]
-guest   [administrator]
-icinga  []
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', [])
-    @provider.admin=:false
-  end
-  it 'should not interfere with existing tags on the user when unsetting admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   [administrator, bar, baz]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['bar','baz'].sort) 
-    @provider.admin=:false
-  end
-
-  it 'should clear all tags on existing user' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo [tag1,tag2]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', [])
-    @provider.tags=[]
-  end
-
-  it 'should set multiple tags' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo []
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['tag1','tag2'])
-    @provider.tags=['tag1','tag2']
-  end
-
-  it 'should clear tags while keep admin tag' do
-    @resource[:admin]  = true
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo [administrator, tag1, tag2]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ["administrator"])
-    @provider.tags=[]
-  end
-
-  it 'should change tags while keep admin tag' do
-    @resource[:admin]  = true
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo [administrator, tag1, tag2]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ["administrator","tag1","tag3","tag7"])
-    @provider.tags=['tag1','tag7','tag3']
-  end
-
-  it 'should create user with tags and without admin' do
-    @resource[:tags] = [ "tag1", "tag2" ]
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ["tag1","tag2"])
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo []
-...done.
-EOT
-    @provider.create
-  end
-
-  it 'should create user with tags and with admin' do
-    @resource[:tags] = [ "tag1", "tag2" ]
-    @resource[:admin]  = true
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.expects(:rabbitmqctl).with('list_users').twice.returns <<-EOT
-Listing users ...
-foo []
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ["administrator"])
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ["administrator","tag1","tag2"])
-    @provider.create
-  end
-  
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
deleted file mode 100644
index a8824fdf429..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-describe 'Puppet::Type.type(:rabbitmq_user_permissions).provider(:rabbitmqctl)' do
-  before :each do
-    @provider_class = Puppet::Type.type(:rabbitmq_user_permissions).provider(:rabbitmqctl)
-    @resource = Puppet::Type::Rabbitmq_user_permissions.new(
-      {:name => 'foo@bar'}
-    )
-    @provider = @provider_class.new(@resource)
-  end
-  after :each do
-    @provider_class.instance_variable_set(:@users, nil)
-  end
-  it 'should match user permissions from list' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-    @provider.exists?.should == {:configure=>"1", :write=>"2", :read=>"3"}
-  end
-  it 'should match user permissions with empty columns' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar			3
-...done.
-EOT
-    @provider.exists?.should == {:configure=>"", :write=>"", :read=>"3"}
-  end
-  it 'should not match user permissions with more than 3 columns' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3 4
-...done.
-EOT
-    expect { @provider.exists? }.to raise_error(Puppet::Error, /cannot parse line from list_user_permissions/)
-  end
-  it 'should not match an empty list' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-...done.
-EOT
-    @provider.exists?.should == nil
-  end
-  it 'should create default permissions' do
-    @provider.instance_variable_set(:@should_vhost, "bar")
-    @provider.instance_variable_set(:@should_user, "foo")
-    @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', "''", "''", "''")
-    @provider.create 
-  end
-  it 'should destroy permissions' do
-    @provider.instance_variable_set(:@should_vhost, "bar")
-    @provider.instance_variable_set(:@should_user, "foo")
-    @provider.expects(:rabbitmqctl).with('clear_permissions', '-p', 'bar', 'foo')
-    @provider.destroy 
-  end
-  {:configure_permission => '1', :write_permission => '2', :read_permission => '3'}.each do |k,v|
-    it "should be able to retrieve #{k}" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.send(k).should == v
-    end
-  end
-  {:configure_permission => '1', :write_permission => '2', :read_permission => '3'}.each do |k,v|
-    it "should be able to retrieve #{k} after exists has been called" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.exists?
-      @provider.send(k).should == v
-    end
-  end
-  {:configure_permission => ['foo', '2', '3'],
-   :read_permission      => ['1', '2', 'foo'],
-   :write_permission     => ['1', 'foo', '3']
-  }.each do |perm, columns|
-    it "should be able to sync #{perm}" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.resource[perm] = 'foo'
-      @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', *columns)
-      @provider.send("#{perm}=".to_sym, 'foo')
-    end
-  end
-  it 'should only call set_permissions once' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-    @provider.resource[:configure_permission] = 'foo'
-    @provider.resource[:read_permission] = 'foo'
-    @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', 'foo', '2', 'foo').once
-    @provider.configure_permission='foo'
-    @provider.read_permission='foo'
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
deleted file mode 100644
index a1f89ad2ce3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_vhost).provider(:rabbitmqctl)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_vhost.new(
-      {:name => 'foo'}
-    )
-    @provider = provider_class.new(@resource)
-  end
-  it 'should match vhost names' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-foo
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should not match if no vhosts on system' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should not match if no matching vhosts on system' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-fooey
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should call rabbitmqctl to create' do
-    @provider.expects(:rabbitmqctl).with('add_vhost', 'foo')
-    @provider.create
-  end
-  it 'should call rabbitmqctl to create' do
-    @provider.expects(:rabbitmqctl).with('delete_vhost', 'foo')
-    @provider.destroy
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
deleted file mode 100644
index c4c2caa98bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_exchange'
-describe Puppet::Type.type(:rabbitmq_exchange) do
-  before :each do
-    @exchange = Puppet::Type.type(:rabbitmq_exchange).new(
-      :name => 'foo@bar',
-      :type => :topic
-    )
-  end
-  it 'should accept an exchange name' do
-    @exchange[:name] = 'dan@pl'
-    @exchange[:name].should == 'dan@pl'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_exchange).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @exchange[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  it 'should not allow names without @' do
-    expect {
-      @exchange[:name] = 'b_r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-
-  it 'should accept an exchange type' do
-    @exchange[:type] = :direct
-    @exchange[:type].should == :direct
-  end
-  it 'should require a type' do
-    expect {
-      Puppet::Type.type(:rabbitmq_exchange).new(:name => 'foo@bar')
-    }.to raise_error(/.*must set type when creating exchange.*/)
-  end
-  it 'should not require a type when destroying' do
-    expect {
-            Puppet::Type.type(:rabbitmq_exchange).new(:name => 'foo@bar', :ensure => :absent)
-    }.to_not raise_error
-  end
-
-  it 'should accept a user' do
-    @exchange[:user] = :root
-    @exchange[:user].should == :root
-  end
-
-  it 'should accept a password' do
-    @exchange[:password] = :PaSsw0rD
-    @exchange[:password].should == :PaSsw0rD
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
deleted file mode 100644
index 7cb66eac366..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_user_permissions'
-describe Puppet::Type.type(:rabbitmq_user_permissions) do
-  before :each do
-    @perms = Puppet::Type.type(:rabbitmq_user_permissions).new(:name => 'foo@bar')
-  end
-  it 'should accept a valid hostname name' do
-    @perms[:name] = 'dan@bar'
-    @perms[:name].should == 'dan@bar'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user_permissions).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should fail when names dont have a @' do
-    expect {
-      @perms[:name] = 'bar'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  [:configure_permission, :read_permission, :write_permission].each do |param|
-    it 'should not default to anything' do
-       @perms[param].should == nil
-    end
-    it "should accept a valid regex for #{param}" do
-      @perms[param] = '.*?'
-      @perms[param].should == '.*?'  
-    end
-    it "should accept an empty string for #{param}" do
-      @perms[param] = ''
-      @perms[param].should == ''  
-    end
-    it "should not accept invalid regex for #{param}" do
-      expect {
-        @perms[param] = '*'
-      }.to raise_error(Puppet::Error, /Invalid regexp/)
-    end
-  end
-  {:rabbitmq_vhost => 'dan@test', :rabbitmq_user => 'test@dan'}.each do |k,v|
-    it "should autorequire #{k}" do
-      if k == :rabbitmq_vhost
-        vhost = Puppet::Type.type(k).new(:name => "test")
-      else
-        vhost = Puppet::Type.type(k).new(:name => "test", :password => 'pass')
-      end
-      perm  = Puppet::Type.type(:rabbitmq_user_permissions).new(:name => v)
-      config = Puppet::Resource::Catalog.new :testing do |conf|
-        [vhost, perm].each { |resource| conf.add_resource resource }
-      end
-      rel = perm.autorequire[0]
-      rel.source.ref.should == vhost.ref
-      rel.target.ref.should == perm.ref
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
deleted file mode 100644
index 92e69055797..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_user'
-describe Puppet::Type.type(:rabbitmq_user) do
-  before :each do
-    @user = Puppet::Type.type(:rabbitmq_user).new(:name => 'foo', :password => 'pass')
-  end
-  it 'should accept a user name' do
-    @user[:name] = 'dan'
-    @user[:name].should == 'dan'
-    @user[:admin].should == :false
-  end
-  it 'should accept a password' do
-    @user[:password] = 'foo'
-    @user[:password].should == 'foo'
-  end
-  it 'should require a password' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user).new(:name => 'foo')
-    }.to raise_error(/must set password/)
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @user[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  [true, false, 'true', 'false'].each do |val|
-    it "admin property should accept #{val}" do
-      @user[:admin] = val
-      @user[:admin].should == val.to_s.to_sym
-    end
-  end
-  it 'should not accept non-boolean values for admin' do
-    expect {
-      @user[:admin] = 'yes'
-    }.to raise_error(Puppet::Error, /Invalid value/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
deleted file mode 100644
index 70b8e374149..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_vhost'
-describe Puppet::Type.type(:rabbitmq_vhost) do
-  before :each do
-    @vhost = Puppet::Type.type(:rabbitmq_vhost).new(:name => 'foo')
-  end
-  it 'should accept a vhost name' do
-    @vhost[:name] = 'dan'
-    @vhost[:name].should == 'dan'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_vhost).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @vhost[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown
deleted file mode 100644
index 575bbeaef8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown
+++ /dev/null
@@ -1,23 +0,0 @@
-Templates
-=========
-
-Puppet supports templates and templating via ERB, which is part of the Ruby
-standard library and is used for many other projects including Ruby on Rails.
-Templates allow you to manage the content of template files, for example
-configuration files that cannot yet be managed as a Puppet type. Learn more at
-http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Templating
-
-You can use templates like this: 
-
-    class myclass {
-      package { mypackage: ensure => latest }
-      service { myservice: ensure => running }
-      file { "/etc/myfile":
-        content => template("mymodule/myfile.erb")
-      }
-    }
-
-The templates are searched for in:
-
-    $templatedir/mymodule/myfile.erb
-    $modulepath/mymodule/templates/myfile.erb
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
deleted file mode 100644
index 0c6b5d19849..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%- @environment_variables.keys.sort.each do |key| -%>
-<%- if @environment_variables[key] != 'UNSET' -%>
-<%= key %>=<%= @environment_variables[key] %>
-<%- end -%>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
deleted file mode 100644
index 2d7f81bf21d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-% This file managed by Puppet
-% Template Path: <%= @module_name %>/templates/rabbitmq.config
-[
-  {rabbit, [
-<% if @ldap_auth -%>
-    {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},
-<% end -%>
-<% if @config_cluster -%>
-    {cluster_nodes, {[<%= @r_cluster_nodes.map { |n| "\'rabbit@#{n}\'" }.join(', ') %>], <%= @cluster_node_type %>}},
-    {cluster_partition_handling, <%= @cluster_partition_handling %>},
-<% end -%>
-<%- if @ssl_only -%>
-    {tcp_listeners, []},
-<%- end -%>
-<%- if @ssl -%>
-    {ssl_listeners, [<%= @ssl_management_port %>]},
-    {ssl_options, [{cacertfile,"<%= @ssl_cacert %>"},
-                    {certfile,"<%= @ssl_cert %>"},
-                    {keyfile,"<%= @ssl_key %>"},
-                    {verify,<%= @ssl_verify %>},
-                    {fail_if_no_peer_cert,<%= @ssl_fail_if_no_peer_cert %>}]},
-<%- end -%>
-<% if @config_variables -%>
-<%- @config_variables.keys.sort.each do |key| -%>
-    {<%= key %>, <%= @config_variables[key] %>},
-<%- end -%>
-<%- end -%>
-    {default_user, <<"<%= @default_user %>">>},
-    {default_pass, <<"<%= @default_pass %>">>}
-  ]}<% if @config_kernel_variables -%>,
-  {kernel, [
-    <%= @config_kernel_variables.sort.map{|k,v| "{#{k}, #{v}}"}.join(",\n    ") %>
-  ]}
-<%- end -%>
-<% if @config_stomp -%>,
-% Configure the Stomp Plugin listening port
-  {rabbitmq_stomp, [
-    {tcp_listeners, [<%= @stomp_port %>]}
-  <%- if @ssl_stomp_port -%>,
-    {ssl_listeners, [<%= @ssl_stomp_port %>]}
-  <%- end -%>
-  ]}
-<% end -%>
-<%- if @ldap_auth -%>,
-% Configure the LDAP authentication plugin
-  {rabbitmq_auth_backend_ldap, [
-    {other_bind, anon},
-    {servers, ["<%= @ldap_server %>"]},
-    {user_dn_pattern, "<%= @ldap_user_dn_pattern %>"},
-    {use_ssl, <%= @ldap_use_ssl %>},
-    {port, <%= @ldap_port %>},
-    {log, <%= @ldap_log %>}
-  ]}
-<%- end -%>
-].
-% EOF
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp
deleted file mode 100644
index d34d9441f14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# install first the garethr-erlang module. See README.md
-include 'erlang'
-
-class { 'erlang': epel_enable => true}
-Class['erlang'] -> Class['rabbitmq']
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp
deleted file mode 100644
index c6dfc5cf0ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class { 'rabbitmq::repo::apt':
-  pin => '900',
-}->
-class { 'rabbitmq::server':
-  delete_guest_user => true,
-#  version           => '2.4.1',
-}->
-rabbitmq_user { 'dan':
-  admin    => true,
-  password => 'pass',
-  provider => 'rabbitmqctl',
-}->
-rabbitmq_vhost { 'myhost':
-  provider => 'rabbitmqctl',
-}
-rabbitmq_user_permissions { 'dan@myhost':
-  configure_permission => '.*',
-  read_permission      => '.*',
-  write_permission     => '.*',
-  provider             => 'rabbitmqctl',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp
deleted file mode 100644
index fb71af14317..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-rabbitmq_user { 'blah7':
-  password => 'foo',
-}
-rabbitmq_vhost { 'test5': }
-rabbitmq_user_permissions { 'blah7@test5':
-  configure_permission => 'config2',
-  read_permission      => 'ready',
-  #write_permission     => 'ready',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp
deleted file mode 100644
index 6c5605b9e2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class { 'rabbitmq::server':
-    config_stomp => true,
-}
-
-$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
-
-rabbitmq_plugin { $rabbitmq_plugins:
-  ensure   => present,
-  require  => Class['rabbitmq::server'],
-  provider => 'rabbitmqplugins',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp
deleted file mode 100644
index f1373737fdc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-# requires pupetlabs-apt
-include rabbitmq::repo::apt
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp
deleted file mode 100644
index caea893772f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class { 'rabbitmq::server':
-  port              => '5672',
-  delete_guest_user => true,
-  version           => 'latest',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp
deleted file mode 100644
index 9a00d2b6d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'rabbitmq::service': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp
deleted file mode 100644
index 75ebcfed325..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-node default {
-
-  $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
-
-  class { 'rabbitmq::server':
-    config => '[ {rabbit_stomp, [{tcp_listeners, [1234]} ]} ].',
-  }
-
-  # Required for MCollective
-  rabbitmq_plugin { $rabbitmq_plugins:
-    ensure   => present,
-    require  => Class['rabbitmq::server'],
-    provider => 'rabbitmqplugins',
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp
deleted file mode 100644
index 2c3a87096af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-rabbitmq_user { ['blah2', 'blah3', 'blah4']:
-  password => 'phoey!',
-  #provider => 'rabbitmqctl',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp
deleted file mode 100644
index d818a1923d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp
+++ /dev/null
@@ -1 +0,0 @@
-rabbitmq_vhost { ['fooey', 'blah']: }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml
deleted file mode 100644
index 079eb44c72c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-language: ruby
-rvm:
-- 1.8.7
-- 1.9.3
-script:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-- .forge-releng/publish
-branches:
-  only:
-  - master
-env:
-  global:
-  - PUBLISHER_LOGIN=fsalum
-  - secure: "DENnYQVOgU9VOxYGjKsCdsoCNeZ42yf751SFhK9s7Fmu790KiQvnY7Vjs+Sj\nrQ3xYXProkMYtx+KVbtzQo02oSYRF+sVYyBza3066bir0GK1YPdgrpT9Q3vo\nuT4+kfaeJK8StiBRWvPlyY3QrDbVsnIuQ+NxBFxjnZdDg350G8Q="
-  matrix:
-  - PUPPET_VERSION=2.7.25
-  - PUPPET_VERSION=3.1.1
-  - PUPPET_VERSION=3.2.4
-  - PUPPET_VERSION=3.3.2
-  - PUPPET_VERSION=3.4.2
-notifications:
-  email: false
-gemfile: Gemfile
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG
deleted file mode 100644
index 02800f976de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG
+++ /dev/null
@@ -1,63 +0,0 @@
-## fsalum-redis changelog
-
-Release notes for the fsalum-redis module.
-
-------------------------------------------
-
-#### 0.0.11 - 2014-02-19
-
-* system_sysctl parameter for redis class (@tehmaspc)
-
-#### 0.0.10 - 2014-02-19
-
-* Allow conf_bind to be unset (@stevelacey)
-* Changing default of glueoutputbuf to UNSET (@tehmaspc)
-
-#### 0.0.9 - 2014-01-09
-
-* Add quotes around all instances of UNSET (@charlesdunbar)
-
-#### 0.0.8 - 2013-12-20
-
-* Setting mode permission for conf_dir (@KlavsKlavsen)
-
-#### 0.0.7 - 2013-12-11
-
-* Add glueoutputbuf config option (@kryptx)
-* Add support for Amazon Linux AMI (@mattboston)
-
-#### 0.0.6 - 2013-08-01
-
-* Install package before poking config (@doismellburning)
-
-#### 0.0.5 - 2013-06-06
-
-* Fix Puppet 3.2.1 deprecation warnings (@ripienaar)
-* Fix duplicate entry for logrotate on Debian/RHEL using different paths (@arthurfurlan)
-* Add $conf_nosave parameter (@fsalum)
-* Minor changes to params variables (@fsalum)
-* Update CHANGELOG format
-
-------------------------------------------
-
-#### 0.0.4 - 2013-04-18
-
-* Creates conf_dir directory if it doesn't exist
-
-------------------------------------------
-
-#### 0.0.3 - 2013-02-25
-
-* Fixing redis.conf less options on Debian
-
-------------------------------------------
-
-#### 0.0.2 - 2013-02-25
-
-* Fixing redis.conf location for Debian
-
-------------------------------------------
-
-#### 0.0.1 - 2013-02-25
-
-* Initial Forge release
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile
deleted file mode 100644
index 2df03ec63cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-gem 'rake'
-gem 'puppet-lint'
-gem 'puppet', puppetversion
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE
deleted file mode 100644
index f31e47dd22e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Felipe Salum
-
-Felipe Salum can be contacted at: fsalum@gmail.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile
deleted file mode 100644
index 3d9432ecc9e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'fsalum-redis'
-version '0.0.11'
-source 'git://github.com/fsalum/puppet-redis.git'
-author 'Felipe Salum'
-license 'Apache License, Version 2.0'
-summary 'Puppet module for Redis Server'
-description 'Module to install and configure a Redis server'
-project_page 'https://github.com/fsalum/puppet-redis'
-
-## Add dependencies, if any:
-
-# https://forge.puppetlabs.com/thias/sysctl
-dependency 'thias/sysctl', '0.3.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md
deleted file mode 100644
index 3fcd7d4d65f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-Redis Module for Puppet
-=======================
-[![Build Status](https://secure.travis-ci.org/fsalum/puppet-redis.png)](http://travis-ci.org/fsalum/puppet-redis)
-
-This module installs and manages a Redis server. All redis.conf options are
-accepted in the parameterized class.
-
-Operating System
-----------------
-
-Tested on CentOS 6.3 and Debian Squeeze.
-
-Quick Start
------------
-
-Use the default parameters:
-
-    class { 'redis': }
-
-To change the port and listening network interface:
-
-    class { 'redis':
-      conf_port => '6379',
-      conf_bind => '0.0.0.0',
-    }
-
-Parameters
-----------
-
-Check the [init.pp](https://github.com/fsalum/puppet-redis/blob/master/manifests/init.pp) file for a complete list of parameters accepted.
-
-To enable and set important Linux kernel sysctl parameters as described in the [Redis Admin Guide](http://redis.io/topics/admin) - use the following configuration option:
-
-    class { 'redis':
-      system_sysctl => true
-    }
-
-By default, this sysctl parameter will not be enabled. Furthermore, you will need the sysctl module defined in the [Modulefile](https://github.com/fsalum/puppet-redis/blob/master/Modulefile) file.
-
-Copyright and License
----------------------
-
-Copyright (C) 2012 Felipe Salum
-
-Felipe Salum can be contacted at: fsalum@gmail.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile
deleted file mode 100644
index d29667f8cad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-
-task :default => :lint
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile
deleted file mode 100644
index 2c687ecd457..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile
+++ /dev/null
@@ -1,18 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vbguest.auto_update = false
-  config.hostmanager.enabled = false
-
-  config.vm.define 'redis' do |node|
-      node.vm.box = "centos65"
-      node.vm.hostname = "redis.local"
-      node.vm.network :private_network, ip: "192.168.100.100"
-      node.vm.provision :shell, :inline => "yum install -y git && gem install librarian-puppet --no-ri --no-rdoc"
-      node.vm.provision :shell, :inline => "cd /vagrant ; librarian-puppet install --clean --path /etc/puppet/modules"
-      node.vm.provision :puppet do |puppet|
-        puppet.manifests_path = ["vm", "/etc/puppet/modules/redis/tests"]
-        puppet.manifest_file  = "init.pp"
-      end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp
deleted file mode 100644
index 41854941ee5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp
+++ /dev/null
@@ -1,160 +0,0 @@
-# == Class: redis
-#
-# Install and configure a Redis server
-#
-# === Parameters
-#
-# All the redis.conf parameters can be passed to the class.
-# See below for a complete list of parameters accepted.
-#
-# Check the README.md file for any further information about parameters for this class.
-#
-# === Examples
-#
-#  class { redis:
-#    conf_port => '6380',
-#    conf_bind => '0.0.0.0',
-#  }
-#
-# === Authors
-#
-# Felipe Salum <fsalum@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Felipe Salum, unless otherwise noted.
-#
-class redis (
-  $package_ensure                   = 'present',
-  $service_ensure                   = 'running',
-  $service_enable                   = true,
-  $system_sysctl                    = false,
-  $conf_daemonize                   = 'yes',
-  $conf_pidfile                     = 'UNSET',
-  $conf_port                        = '6379',
-  $conf_bind                        = '127.0.0.1',
-  $conf_timeout                     = '0',
-  $conf_loglevel                    = 'notice',
-  $conf_logfile                     = 'UNSET',
-  $conf_syslog_enabled              = 'UNSET',
-  $conf_syslog_ident                = 'UNSET',
-  $conf_syslog_facility             = 'UNSET',
-  $conf_databases                   = '16',
-  $conf_save                        = 'UNSET',
-  $conf_nosave                      = 'UNSET',
-  $conf_rdbcompression              = 'yes',
-  $conf_dbfilename                  = 'dump.rdb',
-  $conf_dir                         = '/var/lib/redis/',
-  $conf_slaveof                     = 'UNSET',
-  $conf_masterauth                  = 'UNSET',
-  $conf_slave_server_stale_data     = 'yes',
-  $conf_repl_ping_slave_period      = '10',
-  $conf_repl_timeout                = '60',
-  $conf_requirepass                 = 'UNSET',
-  $conf_maxclients                  = 'UNSET',
-  $conf_maxmemory                   = 'UNSET',
-  $conf_maxmemory_policy            = 'UNSET',
-  $conf_maxmemory_samples           = 'UNSET',
-  $conf_appendonly                  = 'no',
-  $conf_appendfilename              = 'UNSET',
-  $conf_appendfsync                 = 'everysec',
-  $conf_no_appendfsync_on_rewrite   = 'no',
-  $conf_auto_aof_rewrite_percentage = '100',
-  $conf_auto_aof_rewrite_min_size   = '64mb',
-  $conf_slowlog_log_slower_than     = '10000',
-  $conf_slowlog_max_len             = '1024',
-  $conf_vm_enabled                  = 'no',
-  $conf_vm_swap_file                = '/tmp/redis.swap',
-  $conf_vm_max_memory               = '0',
-  $conf_vm_page_size                = '32',
-  $conf_vm_pages                    = '134217728',
-  $conf_vm_max_threads              = '4',
-  $conf_hash_max_zipmap_entries     = '512',
-  $conf_hash_max_zipmap_value       = '64',
-  $conf_list_max_ziplist_entries    = '512',
-  $conf_list_max_ziplist_value      = '64',
-  $conf_set_max_intset_entries      = '512',
-  $conf_zset_max_ziplist_entries    = '128',
-  $conf_zset_max_ziplist_value      = '64',
-  $conf_activerehashing             = 'yes',
-  $conf_include                     = 'UNSET',
-  $conf_glueoutputbuf               = 'UNSET',
-) {
-
-  include redis::params
-
-  $conf_template  = $redis::params::conf_template
-  $conf_redis     = $redis::params::conf
-  $conf_logrotate = $redis::params::conf_logrotate
-  $package        = $redis::params::package
-  $service        = $redis::params::service
-
-  $conf_pidfile_real = $conf_pidfile ? {
-    'UNSET' => $::redis::params::pidfile,
-    default => $conf_pidfile,
-  }
-
-  $conf_logfile_real = $conf_logfile ? {
-    'UNSET' => $::redis::params::logfile,
-    default => $conf_logfile,
-  }
-
-  package { 'redis':
-    ensure => $package_ensure,
-    name   => $package,
-  }
-
-  service { 'redis':
-    ensure     => $service_ensure,
-    name       => $service,
-    enable     => $service_enable,
-    hasrestart => true,
-    hasstatus  => true,
-    require    => Package['redis'],
-  }
-
-  file { $conf_redis:
-    path    => $conf_redis,
-    content => template("redis/${conf_template}"),
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    require => Package['redis'],
-    notify  => Service['redis'],
-  }
-
-  file { $conf_logrotate:
-    path    => $conf_logrotate,
-    content => template('redis/redis.logrotate.erb'),
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-  }
-
-  exec { $conf_dir:
-    path    => '/bin:/usr/bin:/sbin:/usr/sbin',
-    command => "mkdir -p ${conf_dir}",
-    user    => root,
-    group   => root,
-    creates => $conf_dir,
-    before  => Service['redis'],
-    require => Package['redis'],
-    notify  => Service['redis'],
-  }
-
-  file { $conf_dir:
-    ensure  => directory,
-    owner   => redis,
-    group   => redis,
-    mode    => 0755,
-    before  => Service['redis'],
-    require => Exec[$conf_dir],
-  }
-
-  if ( $system_sysctl == true ) {
-    # add necessary kernel parameters
-    # see the redis admin guide here: http://redis.io/topics/admin
-    sysctl { 'vm.overcommit_memory': value => '1' }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp
deleted file mode 100644
index 8983eeadf71..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Class: redis::params
-#
-# This class configures parameters for the puppet-redis module.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class redis::params {
-
-  case $::operatingsystem {
-    'centos', 'redhat', 'fedora', 'amazon': {
-      $package        = 'redis'
-      $service        = 'redis'
-      $conf           = '/etc/redis.conf'
-      $conf_template  = 'redis.rhel.conf.erb'
-      $conf_logrotate = '/etc/logrotate.d/redis'
-      $pidfile        = '/var/run/redis/redis.pid'
-      $logfile        = '/var/log/redis/redis.log'
-    }
-    'ubuntu', 'debian': {
-      $package        = 'redis-server'
-      $service        = 'redis-server'
-      $conf           = '/etc/redis/redis.conf'
-      $conf_template  = 'redis.debian.conf.erb'
-      $conf_logrotate = '/etc/logrotate.d/redis-server'
-      $pidfile        = '/var/run/redis/redis-server.pid'
-      $logfile        = '/var/log/redis/redis-server.log'
-    }
-    default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb
deleted file mode 100644
index 5fda58875b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-require 'mocha'
-require 'puppet'
-require 'rspec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb
deleted file mode 100644
index e6706d061d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb
+++ /dev/null
@@ -1,221 +0,0 @@
-# Redis configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize <%= @conf_daemonize %>
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile <%= @conf_pidfile_real %>
-
-# Accept connections on the specified port, default is 6379
-port <%= @conf_port %>
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-<% if @conf_bind != 'UNSET' %>
-bind <%= @conf_bind %>
-<% end %>
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout <%= @conf_timeout %>
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel <%= @conf_loglevel %>
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile <%= @conf_logfile_real %>
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases <%= @conf_databases %>
-
-################################ SNAPSHOTTING  #################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-<% if @conf_nosave != 'UNSET' %>
-#do not persist to disk:
-#save 900 1
-#save 300 10
-#save 60 10000
-<% else %>
-  <% if @conf_save != 'UNSET' %>
-  save <%= @conf_save %>
-  <% else %>
-  save 900 1
-  save 300 10
-  save 60 10000
-  <% end %>
-<% end %>
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression <%= @conf_rdbcompression %>
-
-# The filename where to dump the DB
-dbfilename <%= @conf_dbfilename %>
-
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir <%= @conf_dir %>
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-#
-# slaveof <masterip> <masterport>
-<% if @conf_slaveof != 'UNSET' %>
-slaveof <%= @conf_slaveof %>
-<% end %>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-<% if @conf_masterauth != 'UNSET' %>
-masterauth <%= @conf_masterauth %>
-<% end %>
-
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# requirepass foobared
-<% if @conf_requirepass != 'UNSET' %>
-requirepass <%= @conf_requirepass %>
-<% end %>
-
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limts.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 128
-<% if @conf_maxclients != 'UNSET' %>
-maxclients <%= @conf_maxclients %>
-<% end %>
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys with an
-# EXPIRE set. It will try to start freeing keys that are going to expire
-# in little time and preserve keys with a longer time to live.
-# Redis will also try to remove objects from free lists if possible.
-#
-# If all this fails, Redis will start to reply with errors to commands
-# that will use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to most read-only commands like GET.
-#
-# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
-# 'state' server or cache, not as a real DB. When Redis is used as a real
-# database the memory usage will grow over the weeks, it will be obvious if
-# it is going to use too much memory in the long run, and you'll have the time
-# to upgrade. With maxmemory after the limit is reached you'll start to get
-# errors for write operations, and this may even lead to DB inconsistency.
-#
-# maxmemory <bytes>
-<% if @conf_maxmemory != 'UNSET' %>
-maxmemory <%= @conf_maxmemory %>
-<% end %>
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. If you can live
-# with the idea that the latest records will be lost if something like a crash
-# happens this is the preferred way to run Redis. If instead you care a lot
-# about your data and don't want to that a single record can get lost you should
-# enable the append only mode: when this mode is enabled Redis will append
-# every write operation received in the file appendonly.log. This file will
-# be read on startup in order to rebuild the full dataset in memory.
-#
-# Note that you can have both the async dumps and the append only file if you
-# like (you have to comment the "save" statements above to disable the dumps).
-# Still if append only mode is enabled Redis will load the data from the
-# log file at startup ignoring the dump.rdb file.
-#
-# The name of the append only file is "appendonly.log"
-#
-# IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append
-# log file in background when it gets too big.
-
-appendonly <%= @conf_appendonly %>
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead to wait for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log . Slow, Safest.
-# everysec: fsync only if one second passed since the last fsync. Compromise.
-#
-# The default is "always" that's the safer of the options. It's up to you to
-# understand if you can relax this to "everysec" that will fsync every second
-# or to "no" that will let the operating system flush the output buffer when
-# it want, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting).
-
-appendfsync <%= @conf_appendfsync %>
-# appendfsync everysec
-# appendfsync no
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-<% if @conf_glueoutputbuf != 'UNSET' %>
-glueoutputbuf <%= @conf_glueoutputbuf %>
-<% end %>
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-#
-# When object sharing is enabled (shareobjects yes) you can use
-# shareobjectspoolsize to control the size of the pool used in order to try
-# object sharing. A bigger pool size will lead to better sharing capabilities.
-# In general you want this value to be at least the double of the number of
-# very common strings you have in your dataset.
-#
-# WARNING: object sharing is experimental, don't enable this feature
-# in production before of Redis 1.0-stable. Still please try this feature in
-# your development environment so that we can test it better.
-# shareobjects no
-# shareobjectspoolsize 1024
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb
deleted file mode 100644
index b9ba724a590..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= @conf_logfile_real %> {
-    weekly
-    rotate 10
-    copytruncate
-    delaycompress
-    compress
-    notifempty
-    missingok
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb
deleted file mode 100644
index 51d1e07e164..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb
+++ /dev/null
@@ -1,549 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specifiy
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize <%= @conf_daemonize %>
-
-# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
-# default. You can specify a custom pid file location here.
-pidfile <%= @conf_pidfile_real %>
-
-# Accept connections on the specified port, default is 6379.
-# If port 0 is specified Redis will not listen on a TCP socket.
-port <%= @conf_port %>
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for incoming connections.
-#
-<% if @conf_bind != 'UNSET' %>
-bind <%= @conf_bind %>
-<% end %>
-
-# Specify the path for the unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-# unixsocket /tmp/redis.sock
-# unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout <%= @conf_timeout %>
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel <%= @conf_loglevel %>
-
-# Specify the log file name. Also 'stdout' can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile <%= @conf_logfile_real %>
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-<% if @conf_syslog_enabled != 'UNSET' %>
-syslog-enabled <%= @conf_syslog_enabled %>
-<% else %>
-# syslog-enabled no
-<% end %>
-
-# Specify the syslog identity.
-<% if @conf_syslog_ident != 'UNSET' %>
-syslog-ident <%= @conf_syslog_ident %>
-<% else %>
-# syslog-ident redis
-<% end %>
-
-# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
-<% if @conf_syslog_facility != 'UNSET' %>
-syslog-facility <%= @conf_syslog_facility %>
-<% else %>
-# syslog-facility local0
-<% end %>
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases <%= @conf_databases %>
-
-################################ SNAPSHOTTING  #################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving at all commenting all the "save" lines.
-
-<% if @conf_nosave != 'UNSET' %>
-#do not persist to disk:
-#save 900 1
-#save 300 10
-#save 60 10000
-<% else %>
-  <% if @conf_save != 'UNSET' %>
-  save <%= @conf_save %>
-  <% else %>
-  save 900 1
-  save 300 10
-  save 60 10000
-  <% end %>
-<% end %>
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression <%= @conf_rdbcompression %>
-
-# The filename where to dump the DB
-dbfilename <%= @conf_dbfilename %>
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# Also the Append Only File will be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir <%= @conf_dir %>
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-#
-<% if @conf_slaveof != 'UNSET' %>
-slaveof <%= @conf_slaveof %>
-<% else %>
-# slaveof <masterip> <masterport>
-<% end %>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-<% if @conf_masterauth != 'UNSET' %>
-masterauth <%= @conf_masterauth %>
-<% else %>
-# masterauth <master-password>
-<% end %>
-
-# When a slave lost the connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of data data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data <%= @conf_slave_server_stale_data %>
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-repl-ping-slave-period <%= @conf_repl_ping_slave_period %>
-
-# The following option sets a timeout for both Bulk transfer I/O timeout and
-# master data or ping response timeout. The default value is 60 seconds.
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-repl-timeout <%= @conf_repl_timeout %>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-<% if @conf_requirepass != 'UNSET' %>
-requirepass <%= @conf_requirepass %>
-<% else %>
-# requirepass foobared
-<% end %>
-
-# Command renaming.
-#
-# It is possilbe to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# of hard to guess so that it will be still available for internal-use
-# tools but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possilbe to completely kill a command renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limits.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 128
-<% if @conf_maxclients != 'UNSET' %>
-maxclients <%= @conf_maxclients %>
-<% end %>
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# accordingly to the eviction policy selected (see maxmemmory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# an hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-<% if @conf_maxmemory != 'UNSET' %>
-maxmemory <%= @conf_maxmemory %>
-<% end %>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached? You can select among five behavior:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key accordingly to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys->random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with all the kind of policies, Redis will return an error on write
-#       operations, when there are not suitable keys for eviction.
-#
-#       At the date of writing this commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy volatile-lru
-<% if @conf_maxmemory_policy != 'UNSET' %>
-maxmemory-policy <%= @conf_maxmemory_policy %>
-<% end %>
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can select as well the sample
-# size to check. For instance for default Redis will check three keys and
-# pick the one that was used less recently, you can change the sample size
-# using the following configuration directive.
-#
-# maxmemory-samples 3
-<% if @conf_maxmemory_samples != 'UNSET' %>
-maxmemory-samples <%= @conf_maxmemory_samples %>
-<% end %>
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. If you can live
-# with the idea that the latest records will be lost if something like a crash
-# happens this is the preferred way to run Redis. If instead you care a lot
-# about your data and don't want to that a single record can get lost you should
-# enable the append only mode: when this mode is enabled Redis will append
-# every write operation received in the file appendonly.aof. This file will
-# be read on startup in order to rebuild the full dataset in memory.
-#
-# Note that you can have both the async dumps and the append only file if you
-# like (you have to comment the "save" statements above to disable the dumps).
-# Still if append only mode is enabled Redis will load the data from the
-# log file at startup ignoring the dump.rdb file.
-#
-# IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append
-# log file in background when it gets too big.
-
-appendonly <%= @conf_appendonly %>
-
-# The name of the append only file (default: "appendonly.aof")
-# appendfilename appendonly.aof
-<% if @conf_appendfilename != 'UNSET' %>
-appendfilename <%= @conf_appendfilename %>
-<% end %>
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead to wait for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log . Slow, Safest.
-# everysec: fsync only if one second passed since the last fsync. Compromise.
-#
-# The default is "everysec" that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-appendfsync <%= @conf_appendfsync %>
-# appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving the durability of Redis is
-# the same as "appendfsync none", that in pratical terms means that it is
-# possible to lost up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-no-appendfsync-on-rewrite <%= @conf_no_appendfsync_on_rewrite %>
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size will growth by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (or if no rewrite happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a precentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage <%= @conf_auto_aof_rewrite_percentage %>
-auto-aof-rewrite-min-size <%= @conf_auto_aof_rewrite_min_size %>
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than <%= @conf_slowlog_log_slower_than %>
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len <%= @conf_slowlog_max_len %>
-
-################################ VIRTUAL MEMORY ###############################
-
-### WARNING! Virtual Memory is deprecated in Redis 2.4
-### The use of Virtual Memory is strongly discouraged.
-
-# Virtual Memory allows Redis to work with datasets bigger than the actual
-# amount of RAM needed to hold the whole dataset in memory.
-# In order to do so very used keys are taken in memory while the other keys
-# are swapped into a swap file, similarly to what operating systems do
-# with memory pages.
-#
-# To enable VM just set 'vm-enabled' to yes, and set the following three
-# VM parameters accordingly to your needs.
-
-#vm-enabled <%= @conf_vm_enabled %>
-# vm-enabled yes
-
-# This is the path of the Redis swap file. As you can guess, swap files
-# can't be shared by different Redis instances, so make sure to use a swap
-# file for every redis process you are running. Redis will complain if the
-# swap file is already in use.
-#
-# The best kind of storage for the Redis swap file (that's accessed at random)
-# is a Solid State Disk (SSD).
-#
-# *** WARNING *** if you are using a shared hosting the default of putting
-# the swap file under /tmp is not secure. Create a dir with access granted
-# only to Redis user and configure Redis to create the swap file there.
-#vm-swap-file <%= @conf_vm_swap_file %>
-
-# vm-max-memory configures the VM to use at max the specified amount of
-# RAM. Everything that deos not fit will be swapped on disk *if* possible, that
-# is, if there is still enough contiguous space in the swap file.
-#
-# With vm-max-memory 0 the system will swap everything it can. Not a good
-# default, just specify the max amount of RAM you can in bytes, but it's
-# better to leave some margin. For instance specify an amount of RAM
-# that's more or less between 60 and 80% of your free RAM.
-#vm-max-memory <%= @conf_vm_max_memory %>
-
-# Redis swap files is split into pages. An object can be saved using multiple
-# contiguous pages, but pages can't be shared between different objects.
-# So if your page is too big, small objects swapped out on disk will waste
-# a lot of space. If you page is too small, there is less space in the swap
-# file (assuming you configured the same number of total swap file pages).
-#
-# If you use a lot of small objects, use a page size of 64 or 32 bytes.
-# If you use a lot of big objects, use a bigger page size.
-# If unsure, use the default :)
-#vm-page-size <%= @conf_vm_page_size %>
-
-# Number of total memory pages in the swap file.
-# Given that the page table (a bitmap of free/used pages) is taken in memory,
-# every 8 pages on disk will consume 1 byte of RAM.
-#
-# The total swap size is vm-page-size * vm-pages
-#
-# With the default of 32-bytes memory pages and 134217728 pages Redis will
-# use a 4 GB swap file, that will use 16 MB of RAM for the page table.
-#
-# It's better to use the smallest acceptable value for your application,
-# but the default is large in order to work in most conditions.
-#vm-pages <%= @conf_vm_pages %>
-
-# Max number of VM I/O threads running at the same time.
-# This threads are used to read/write data from/to swap file, since they
-# also encode and decode objects from disk to memory or the reverse, a bigger
-# number of threads can help with big objects even if they can't help with
-# I/O itself as the physical device may not be able to couple with many
-# reads/writes operations at the same time.
-#
-# The special value of 0 turn off threaded I/O and enables the blocking
-# Virtual Memory implementation.
-#vm-max-threads <%= @conf_vm_max_threads %>
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded in a special way (much more memory efficient) when they
-# have at max a given numer of elements, and the biggest element does not
-# exceed a given threshold. You can configure this limits with the following
-# configuration directives.
-#hash-max-zipmap-entries <%= @conf_hash_max_zipmap_entries %>
-#hash-max-zipmap-value <%= @conf_hash_max_zipmap_value %>
-
-# Similarly to hashes, small lists are also encoded in a special way in order
-# to save a lot of space. The special representation is only used when
-# you are under the following limits:
-list-max-ziplist-entries <%= @conf_list_max_ziplist_entries %>
-list-max-ziplist-value <%= @conf_list_max_ziplist_value %>
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happens to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries <%= @conf_set_max_intset_entries %>
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries <%= @conf_zset_max_ziplist_entries %>
-zset-max-ziplist-value <%= @conf_zset_max_ziplist_value %>
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into an hash table
-# that is rhashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# active rehashing the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply form time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing <%= @conf_activerehashing %>
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all redis server but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-<% if @conf_include != 'UNSET' %>
-include <%= @conf_include %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp
deleted file mode 100644
index b9859818e83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-node default {
-
-  package { 'epel-release':
-    ensure   => present,
-    source   => 'http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm',
-    provider => rpm,
-  }
-
-  class { 'redis':
-    conf_port     => '6379',
-    conf_bind     => '0.0.0.0',
-    system_sysctl => true,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/Modulefile
deleted file mode 100644
index 19228ff3dbb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'puppetlabs-sqlite'
-version '0.0.1'
-source 'https://github.com/puppetlabs/puppetlabs-sqlite/'
-author 'puppetlabs'
-license 'Apache'
-summary 'Manage a sqlite installation and databases'
-description 'This module provides a sqlite class to manage
-the installation of sqlite on a node.  It also provides
-a sqlite::db defined type to manage databases on a system'
-project_page 'http://projects.puppetlabs.com/projects/modules/issues'
-
-## Add dependencies, if any:
-# dependency 'username/name', '>= 1.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/README.md
deleted file mode 100644
index 1eb43afa55e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-sqlite
-======
-
-Author: Carl Caum <carl@puppetlabs.com>
-Copyright (c) 2011, Puppet Labs Inc.
-
-ABOUT
-=====
-
-This module manages [sqlite](http://www.sqlite.org). Through declarion of the `sqlite` class, sqlite will be installed on the system.
-
-The `sqlite::db` defined type allows for the management of a sqlite database on the node
-
-CONFIGURATION
-=============
-
-The main class (sqlite) only needs to be declared.  No class parameters or top scope variables are needed.
-
-The `sqlite::db` defined type can be used to manage a sqlite database on the system.
-The following parameters are available for the resources declaration:
-
-location    What directory the database should go in.  The presence of the directory must be managed separately of the defined type.
-owner       The owner of the sqlite database file on disk
-group       The group owning the sqlite database file on disk
-mode        The mode of the sqlite database file on disk
-ensure      Whether the database should be `present` or `absent`.  Default to `present`
-sqlite_cmd  The sqlite command for the node's platform.  Defaults to `sqlite3`
-
-TODO
-====
-
- * Allow for sql commands to be based to sqlite::db for use during creation
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/db.pp
deleted file mode 100644
index 8b780462e9e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/db.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Define: sqlite::db
-#
-# This define allows for managing the existance of a sqlite database
-#
-# Parameters:
-#  $location:
-#    The location on disk to store the sqlite database
-#  $owner:
-#    The owner of the sqlite database file on disk
-#  $group:
-#    The group owning the sqlite database file on disk
-#  $mode:
-#    The mode of the sqlite datbase file on disk
-#  $ensure:
-#    Whether the database should be `present` or `absent`. Defaults to `present`
-#  $sqlite_cmd:
-#    The sqlite command for the node's platform.  Defaults to `sqlite3`
-define sqlite::db(
-    $location   = '',
-    $owner      = 'root',
-    $group      = 0,
-    $mode       = '755',
-    $ensure     = present,
-    $sqlite_cmd = 'sqlite3'
-  ) {
-
-  $safe_location = $location ? {
-    ''      => "/var/lib/sqlite/${name}.db",
-    default => $location,
-  }
-
-  file { $safe_location:
-    ensure => $ensure,
-    owner  => $owner,
-    group  => $group,
-    notify => Exec["create_${name}_db"],
-  }
-
-  exec { "create_${name}_db":
-    command     => "${sqlite_cmd} $safe_location",
-    path        => '/usr/bin:/usr/local/bin',
-    refreshonly => true,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/init.pp
deleted file mode 100644
index 46b25062812..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/init.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Class: sqlite
-#
-# This class manages the installation of the sqlite
-# database.
-#
-# Sample Usage:
-# class { 'sqlite': }
-class sqlite {
-  package { 'sqlite':
-    ensure => installed,
-  }
-
-  file { '/var/lib/sqlite/':
-    ensure => directory,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/metadata.json
deleted file mode 100644
index 8ce7797ff33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/metadata.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-+-----------------------------------------------------------------------+
-|                                                                       |
-|                    ==> DO NOT EDIT THIS FILE! <==                     |
-|                                                                       |
-|   You should edit the `Modulefile` and run `puppet-module build`      |
-|   to generate the `metadata.json` file for your releases.             |
-|                                                                       |
-+-----------------------------------------------------------------------+
-*/
-
-{}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec_helper.rb
deleted file mode 100644
index a4aeeae232f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec_helper.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'pathname'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
-
-require 'mocha'
-require 'puppet'
-gem 'rspec', '=1.2.9'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/tests/init.pp
deleted file mode 100644
index 520d095142b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include sqlite
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml
deleted file mode 100644
index d64f95571e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-  symlinks:
-    staging: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml
deleted file mode 100644
index 1a4302e6dfa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: ruby
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system 2.1.11
-  - gem --version
-rvm:
-  - 1.8.7
-  - 1.9.3
-env:
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION=">= 3.0.0"
-branches:
-  only:
-    - master
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION=">= 3.0.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile
deleted file mode 100644
index dbc5ead104d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile
+++ /dev/null
@@ -1,25 +0,0 @@
-source "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake'
-  gem 'rspec', "~> 2.11.0", :require => false
-  gem 'mocha', "~> 0.10.5", :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', :require => false
-  gem 'puppet-lint'
-end
-
-facterversion = ENV['GEM_FACTER_VERSION']
-if facterversion
-  gem 'facter', facterversion
-else
-  gem 'facter', :require => false
-end
-
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
-if puppetversion
-  gem 'puppet', puppetversion
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE
deleted file mode 100644
index 51fca54c2a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile
deleted file mode 100644
index 3750abc30c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name    'nanliu-staging'
-version '0.4.0'
-source  'git@github.com:nanliu/puppet-staging.git'
-author  'nanliu'
-license 'Apache License Version 2.0'
-summary 'Compressed file staging and deployment'
-description 'Manages compressed file staging and deployment.'
-project_page 'https://github.com/nanliu/puppet-staging'
-
-## Add dependencies, if any:
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md
deleted file mode 100644
index a0d3e37ccbf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Staging module for Puppet
-
-Manages staging directory, along with download/extraction of compressed files.
-
-[![Build Status](https://secure.travis-ci.org/nanliu/puppet-staging.png?branch=master)](http://travis-ci.org/nanliu/puppet-staging)
-
-WARNING: Version 0.2.0 no longer uses hiera functions. The same behavior should be available in Puppet 3.0.
-
-## Usage
-
-Specify a different default staging path (must be declared before using resource):
-
-    class { 'staging':
-      path  => '/var/staging',
-      owner => 'puppet',
-      group => 'puppet',
-    }
-
-Staging files from various sources:
-
-    staging::file { 'sample':
-      source => 'puppet://modules/staging/sample',
-    }
-
-    staging::file { 'apache-tomcat-6.0.35':
-      source => 'http://apache.cs.utah.edu/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz',
-    }
-
-
-Staging and extracting files:
-
-    staging::file { 'sample.tar.gz':
-      source => 'puppet:///modules/staging/sample.tar.gz'
-    }
-
-    staging::extract { 'sample.tar.gz':
-      target  => '/tmp/staging',
-      creates => '/tmp/staging/sample',
-      require => Staging::File['sample.tar.gz'],
-    }
-
-Staging files currently support the following source:
-
-* http(s)://
-* puppet://
-* ftp://
-* local (though this doesn't serve any real purpose.)
-
-## Contributor
-
-* Adrien Thebo
-* gizero
-* Harald Skoglund
-* Hunter Haugen
-* Justin Clayton
-* Owen Jacobson
-* Reid Vandewiele
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile
deleted file mode 100644
index 5bc13983e88..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-
-def io_popen(command)
-  IO.popen(command) do |io|
-    io.each do |line|
-      print line
-      yield line if block_given?
-    end
-  end
-end
-
-# Customize lint option
-task :lint do
-  PuppetLint.configuration.send("disable_80chars")
-  PuppetLint.configuration.send("disable_class_parameter_defaults")
-end
-
-desc "Validate manifests, templates, and ruby files in lib."
-task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
-  Dir['lib/**/*.rb'].each do |lib_file|
-    sh "ruby -c #{lib_file}"
-  end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
-end
-
-# Initialize vagrant instance for testing
-desc "Powers on Vagrant VMs with specific manifests"
-task :vagrant, :manifest do |t, args|
-  Rake::Task["spec_prep"].execute
-
-  prefix = "VAGRANT_MANIFEST='#{args[:manifest]||'init.pp'}'"
-
-  puts args[:manifest]
-  provision = false
-  io_popen("export #{prefix}; vagrant up --provider=vmware_fusion") do |line|
-    provision = true if line =~ /Machine is already running./
-  end
-  io_popen("export #{prefix}; vagrant provision") if provision
-end
-
-# Cleanup vagrant environment
-task :vagrant_clean do
-  `vagrant destroy -f`
-  Rake::Task["spec_clean"].execute
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile
deleted file mode 100644
index 9f9ac91e712..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  #config.vm.synced_folder "manifests", "/tmp/manifests", "tests"
-  config.vm.synced_folder "./", "/etc/puppet/modules/staging"
-
-  config.vm.define :staging do |m|
-    m.vm.box = "centos63"
-    m.vm.box_url = "https://dl.dropbox.com/s/eqdrqnla4na8qax/centos63.box"
-
-    m.vm.hostname = 'staging'
-    m.vm.provider :vmware_fusion do |v|
-      v.vmx["displayName"] = "staging"
-      v.vmx["memsize"] = 512
-      v.vmx["numvcpus"] = 4
-    end
-
-    m.vm.provision :puppet do |puppet|
-      puppet.manifests_path = "tests"
-      puppet.module_path    = "spec/fixtures/modules/"
-      puppet.manifest_file  = "init.pp"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html
deleted file mode 100644
index fdcdc34e184..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>deploy.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>deploy.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::deploy'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::deploy">&#182;</a>
-        </div>
-        <h3>Define: staging::deploy</h3>
-
-<p>The define resource extracts compressed file to a staging location.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>source</em>]:  the source file location, supports local files, puppet://, http://, https://, ftp:// (default: )</li>
-<li>[<em>target</em>]:  the target extraction directory (default: )</li>
-<li>[<em>staging_path</em>]:  the staging location for compressed file. defaults to ${staging::path}/${caller_module_name} (default: undef)</li>
-<li>[<em>username</em>]:  https or ftp username (default: undef)</li>
-<li>[<em>certificate</em>]:  https certifcate file (default: undef)</li>
-<li>[<em>password</em>]:  https or ftp user password or https certificate password (default: undef)</li>
-<li>[<em>environment</em>]:  environment variable for settings such as http_proxy (default: undef)</li>
-<li>[<em>timeout</em>]:  the time to wait for the file transfer to complete (default: undef)</li>
-<li>[<em>user</em>]:  extract file as this user (default: undef)</li>
-<li>[<em>group</em>]:  extract group as this group (default: undef)</li>
-<li>[<em>creates</em>]:  the file/folder created after extraction. if unspecified defaults to ${target}/${name} (default: undef)</li>
-<li>[<em>unless</em>]:  alternative way to conditionally extract file (default: undef)</li>
-<li>[<em>onlyif</em>]:  alternative way to conditionally extract file (default: undef)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>staging::deploy { 'sample.tar.gz':
-  source =&gt; 'puppet:///modules/staging/sample.tar.gz',
-  target =&gt; '/usr/local',
-}
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">deploy</span> <span class="p">(</span>
-  <span class="vg">$source</span><span class="p">,</span>               
-  <span class="vg">$target</span><span class="p">,</span>               
-  <span class="vg">$staging_path</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$username</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$certificate</span>  <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$password</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span>  <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$timeout</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$user</span>         <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$group</span>        <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$creates</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$unless</span>       <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$onlyif</span>       <span class="o">=</span> <span class="k">undef</span>  
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="n">staging</span><span class="o">::</span><span class="n">file</span> <span class="p">{</span> <span class="vg">$name</span><span class="p">:</span>
-    <span class="n">source</span>      <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-    <span class="n">target</span>      <span class="o">=&gt;</span> <span class="vg">$staging_path</span><span class="p">,</span>
-    <span class="n">username</span>    <span class="o">=&gt;</span> <span class="vg">$username</span><span class="p">,</span>
-    <span class="n">certificate</span> <span class="o">=&gt;</span> <span class="vg">$certificate</span><span class="p">,</span>
-    <span class="n">password</span>    <span class="o">=&gt;</span> <span class="vg">$password</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">subdir</span>      <span class="o">=&gt;</span> <span class="vg">$caller_module_name</span><span class="p">,</span>
-    <span class="n">timeout</span>     <span class="o">=&gt;</span> <span class="vg">$timeout</span><span class="p">,</span>
-  <span class="p">}</span>
-
-  <span class="n">staging</span><span class="o">::</span><span class="n">extract</span> <span class="p">{</span> <span class="vg">$name</span><span class="p">:</span>
-    <span class="n">target</span>      <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-    <span class="n">source</span>      <span class="o">=&gt;</span> <span class="vg">$staging_path</span><span class="p">,</span>
-    <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-    <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">subdir</span>      <span class="o">=&gt;</span> <span class="vg">$caller_module_name</span><span class="p">,</span>
-    <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates</span><span class="p">,</span>
-    <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-    <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-    <span class="nb">require</span>     <span class="o">=&gt;</span> <span class="no">Staging</span><span class="o">::</span><span class="no">File</span><span class="o">[</span><span class="vg">$name</span><span class="o">]</span><span class="p">,</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html
deleted file mode 100644
index 0f46958a3db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>extract.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>extract.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::extract'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::extract">&#182;</a>
-        </div>
-        <h3>Define: staging::extract</h3>
-
-<p>Define resource to extract files from staging directories to target directories.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>target</em>]:  the target extraction directory (default: )</li>
-<li>[<em>source</em>]:  the source compression file, supports tar, tar.gz, zip, war (default: undef)</li>
-<li>[<em>creates</em>]:  the file created after extraction. if unspecified defaults ${staging::path}/${caller_module_name}/${name} ${target}/${name} (default: undef)</li>
-<li>[<em>unless</em>]:  alternative way to conditionally check whether to extract file. (default: undef)</li>
-<li>[<em>onlyif</em>]:  alternative way to conditionally check whether to extract file. (default: undef)</li>
-<li>[<em>user</em>]:  extract file as this user. (default: undef)</li>
-<li>[<em>group</em>]:   extract file as this group. (default: undef)</li>
-<li>[<em>environment</em>]:  environment variables. (default: undef)</li>
-<li>[<em>subdir</em>]:  subdir per module in staging directory. (default: $caller_module_name)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>$caller_module_name = 'demo'
-
-class { 'staging':
-  path =&gt; '/tmp/staging',
-}
-
-staging::file { 'sample.tar.gz':
-  source =&gt; 'puppet:///modules/staging/sample.tar.gz'
-}
-
-staging::extract { 'sample.tar.gz':
-  target  =&gt; '/tmp/staging',
-  creates =&gt; '/tmp/staging/sample',
-  require =&gt; Staging::File['sample.tar.gz'],
-}
-</code></pre>
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">extract</span> <span class="p">(</span>
-  <span class="vg">$target</span><span class="p">,</span>              
-  <span class="vg">$source</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$creates</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$unless</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$onlyif</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$user</span>        <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$group</span>       <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$subdir</span>      <span class="o">=</span> <span class="vg">$caller_module_name</span> 
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="kp">include</span> <span class="n">staging</span>
-
-  <span class="k">if</span> <span class="vg">$source</span> <span class="p">{</span>
-    <span class="vg">$source_path</span> <span class="o">=</span> <span class="vg">$source</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="vg">$source_path</span> <span class="o">=</span> <span class="s2">&quot;${staging::path}/${subdir}/${name}&quot;</span>
-  <span class="p">}</span></pre></div>
-      </td>
-    </tr>
-    <tr id='section-2'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-2">&#182;</a>
-        </div>
-        <p>Use user supplied creates path, set default value if creates, unless or
-onlyif is not supplied.</p>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre>  <span class="k">if</span> <span class="vg">$creates</span> <span class="p">{</span>
-    <span class="vg">$creates_path</span> <span class="o">=</span> <span class="vg">$creates</span>
-  <span class="p">}</span> <span class="k">elsif</span> <span class="o">!</span> <span class="p">(</span><span class="vg">$unless</span> <span class="ow">or</span> <span class="vg">$onlyif</span><span class="p">)</span> <span class="p">{</span>
-    <span class="k">if</span> <span class="vg">$name</span> <span class="o">=~</span> <span class="sr">/.tar.gz$/</span> <span class="p">{</span>
-      <span class="vg">$folder</span>       <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$name</span><span class="p">,</span> <span class="s1">&#39;basename&#39;</span><span class="p">,</span> <span class="s1">&#39;.tar.gz&#39;</span><span class="p">)</span>
-      <span class="vg">$creates_path</span> <span class="o">=</span> <span class="s2">&quot;${target}/${folder}&quot;</span>
-    <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-      <span class="vg">$folder</span>       <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$name</span><span class="p">,</span> <span class="s1">&#39;basename&#39;</span><span class="p">)</span>
-      <span class="vg">$creates_path</span> <span class="o">=</span> <span class="s2">&quot;${target}/${folder}&quot;</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="k">if</span> <span class="n">scope_defaults</span><span class="p">(</span><span class="s1">&#39;Exec&#39;</span><span class="p">,</span><span class="s1">&#39;path&#39;</span><span class="p">)</span> <span class="p">{</span>
-    <span class="no">Exec</span><span class="p">{</span>
-      <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-      <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-      <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-      <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-      <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates_path</span><span class="p">,</span>
-      <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-      <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-      <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-    <span class="p">}</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="no">Exec</span><span class="p">{</span>
-      <span class="n">path</span>        <span class="o">=&gt;</span> <span class="vg">$:</span><span class="ss">:path</span><span class="p">,</span>
-      <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-      <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-      <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-      <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-      <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates_path</span><span class="p">,</span>
-      <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-      <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-      <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="k">case</span> <span class="vg">$name</span> <span class="p">{</span>
-    <span class="sr">/.tar$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;tar xf ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="sr">/(.tgz|.tar.gz)$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$:</span><span class="ss">:osfamily</span> <span class="o">==</span> <span class="s1">&#39;Solaris&#39;</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;gunzip -dc &lt; ${source_path} | tar xf - &quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;tar xzf ${source_path}&quot;</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/.zip$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;unzip ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="sr">/.war$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;jar xf ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="n">default</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">fail</span><span class="p">(</span><span class="s2">&quot;staging::extract: unsupported file format ${name}.&quot;</span><span class="p">)</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="nb">exec</span> <span class="p">{</span> <span class="s2">&quot;extract ${name}&quot;</span><span class="p">:</span>
-    <span class="n">command</span> <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-  <span class="p">}</span>
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html
deleted file mode 100644
index 38aa0da55c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>file.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>file.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::file'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::file">&#182;</a>
-        </div>
-        <h3>Define: staging::file</h3>
-
-<h4>Overview:</h4>
-
-<p>Define resource to retrieve files to staging directories. It is
-intententionally not replacing files, as these intend to be large binaries
-that are versioned.</p>
-
-<h4>Notes:</h4>
-
-<p>  If you specify a different staging location, please manage the file
-  resource as necessary.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>source</em>]:  the source file location, supports local files, puppet://, http://, https://, ftp:// (default: )</li>
-<li>[<em>target</em>]:  the target staging directory, if unspecified ${staging::path}/${caller_module_name} (default: undef)</li>
-<li>[<em>username</em>]:  https or ftp username (default: undef)</li>
-<li>[<em>certificate</em>]:  https certificate file (default: undef)</li>
-<li>[<em>password</em>]:  https or ftp user password or https certificate password (default: undef)</li>
-<li>[<em>environment</em>]:  environment variable for settings such as http_proxy, https_proxy, of ftp_proxy (default: undef)</li>
-<li>[<em>timeout</em>]:  the the time to wait for the file transfer to complete (default: undef)</li>
-<li>[<em>subdir</em>]:  (default: $caller_module_name)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>$caller_module_name = 'demo'
-
-class { 'staging':
-  path =&gt; '/tmp/staging',
-}
-
-staging::file { 'sample':
-  source =&gt; 'puppet:///modules/staging/sample',
-}
-
-staging::file { 'passwd':
-  source =&gt; '/etc/passwd',
-}
-
-staging::file { 'manpage.html':
-  source =&gt; 'http://curl.haxx.se/docs/manpage.html',
-}
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">file</span> <span class="p">(</span>
-  <span class="vg">$source</span><span class="p">,</span>              
-  <span class="vg">$target</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$username</span>    <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$certificate</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$password</span>    <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$timeout</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$subdir</span>      <span class="o">=</span> <span class="vg">$caller_module_name</span>
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="kp">include</span> <span class="n">staging</span>
-
-  <span class="k">if</span> <span class="vg">$target</span> <span class="p">{</span>
-    <span class="vg">$target_file</span> <span class="o">=</span> <span class="vg">$target</span>
-    <span class="vg">$staging_dir</span> <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$target</span><span class="p">,</span> <span class="s1">&#39;parent&#39;</span><span class="p">)</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="vg">$staging_dir</span> <span class="o">=</span> <span class="s2">&quot;${staging::path}/${subdir}&quot;</span>
-    <span class="vg">$target_file</span> <span class="o">=</span> <span class="s2">&quot;${staging_dir}/${name}&quot;</span>
-
-    <span class="k">if</span> <span class="o">!</span> <span class="n">defined</span><span class="p">(</span><span class="no">File</span><span class="o">[</span><span class="vg">$staging_dir</span><span class="o">]</span><span class="p">)</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$staging_dir</span><span class="p">:</span>
-        <span class="k">ensure</span><span class="o">=&gt;</span><span class="n">directory</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="no">Exec</span> <span class="p">{</span>
-    <span class="n">path</span>        <span class="o">=&gt;</span> <span class="s1">&#39;/usr/local/bin:/usr/bin:/bin&#39;</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$staging_dir</span><span class="p">,</span>
-    <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$target_file</span><span class="p">,</span>
-    <span class="n">timeout</span>     <span class="o">=&gt;</span> <span class="vg">$timeout</span><span class="p">,</span>
-    <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-  <span class="p">}</span>
-
-  <span class="k">case</span> <span class="vg">$source</span> <span class="p">{</span>
-    <span class="sr">/^\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">source</span>  <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-        <span class="n">replace</span> <span class="o">=&gt;</span> <span class="kp">false</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^puppet:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">source</span>  <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-        <span class="n">replace</span> <span class="o">=&gt;</span> <span class="kp">false</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^http:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="s2">&quot;curl -L -o ${name} ${source}&quot;</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^https:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$username</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} -u ${username}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">elsif</span> <span class="vg">$certificate</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} -E ${certificate}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} ${source}&quot;</span>
-      <span class="p">}</span>
-
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^ftp:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$username</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -o ${name} -u ${username}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -o ${name} ${source}&quot;</span>
-      <span class="p">}</span>
-
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="n">default</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">fail</span><span class="p">(</span><span class="s2">&quot;stage::file: do not recognize source ${source}.&quot;</span><span class="p">)</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html
deleted file mode 100644
index da5b2be9a9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>init.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>init.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Class:_staging'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Class:_staging">&#182;</a>
-        </div>
-        <h3>Class: staging</h3>
-
-<p>This module manages staging and extraction of files from various sources.</p>
-
-<h4>Actions:</h4>
-
-<p>Creates the root staging directory. By default files will be created in a subdirectory matching the caller_module_name.</p>
-
-<p>   /opt/staging/</p>
-
-<pre><code>          |-- puppet
-          |   `-- puppet.enterprise.2.0.tar.gz
-          `-- tomcat
-              `-- tomcat.5.0.tar.gz
-</code></pre>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>path</em>]:  staging directory filepath (default: &lsquo;/opt/staging&rsquo;)</li>
-<li>[<em>owner</em>]:  staging directory owner (default: &lsquo;0&rsquo;)</li>
-<li>[<em>group</em>]:  staging directory group (default: &lsquo;0&rsquo;)</li>
-<li>[<em>mode</em>]:  staging directory permission (default: &lsquo;0755&rsquo;)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>include staging
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="k">class</span> <span class="n">staging</span> <span class="p">(</span>
-  <span class="vg">$path</span>  <span class="o">=</span> <span class="s1">&#39;/opt/staging&#39;</span><span class="p">,</span> 
-  <span class="vg">$owner</span> <span class="o">=</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>            
-  <span class="vg">$group</span> <span class="o">=</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>            
-  <span class="vg">$mode</span>  <span class="o">=</span> <span class="s1">&#39;0755&#39;</span>          
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="n">file</span> <span class="p">{</span> <span class="vg">$path</span><span class="p">:</span>
-    <span class="k">ensure</span> <span class="o">=&gt;</span> <span class="n">directory</span><span class="p">,</span>
-    <span class="n">owner</span>  <span class="o">=&gt;</span> <span class="vg">$owner</span><span class="p">,</span>
-    <span class="n">group</span>  <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-    <span class="n">mode</span>   <span class="o">=&gt;</span> <span class="vg">$mode</span><span class="p">,</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample
deleted file mode 100644
index 01e34c31d91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample
+++ /dev/null
@@ -1 +0,0 @@
-sample file to test module.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2
deleted file mode 100644
index f7fbcf229f0fc0c218a89c7de41d9b62ef6406b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27984
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
X_gU(!I=^6v|Dx_lrwS4YNz&IKx*L$2

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz
deleted file mode 100644
index 9bb95d11a56f1108eb94b2552952f81ad0fa2c7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb
deleted file mode 100644
index 19784a690eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-Facter.add("staging_http_get") do
-  setcode do
-
-    fact = nil
-
-    which = lambda do |cmd|
-      result = nil
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          result = exe if File.executable? exe
-          break if result
-        end
-        break if result
-      end
-      result
-    end
-
-    ['curl', 'wget', 'powershell'].each do |cmd|
-      available = which.call(cmd)
-      fact = available ? cmd : nil
-      break if fact
-    end
-
-    fact
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb
deleted file mode 100644
index 82086336512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:staging_windir) do
-  confine :osfamily => :windows
-  setcode do
-    program_data = `echo %SYSTEMDRIVE%\\ProgramData`.chomp
-    if File.directory? program_data
-      "#{program_data}\\staging"
-    else
-      "C:\\staging"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
deleted file mode 100644
index 6c814849a0d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:scope_defaults, :type => :rvalue, :doc => <<-EOS
-Determine if specified resource defaults have a attribute defined in
-current scope.
-EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "scope_defaults(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    # auto capitalize puppet resource for lookup:
-    res_type = arguments[0].split('::').collect{ |x| x.capitalize }.join('::')
-    res_attr = arguments[1]
-
-    return self.lookupdefaults(res_type).has_key?(res_attr.to_sym)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
deleted file mode 100644
index 666c887e3c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'uri'
-
-module Puppet::Parser::Functions
-  newfunction(:staging_parse, :type => :rvalue, :doc => <<-EOS
-Parse filepath to retrieve information about the file.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "staging_parse(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1, 2, 3)") if arguments.size < 1 || arguments.size > 3
-
-    source    = arguments[0]
-    path      = URI.parse(source).path
-
-    raise Puppet::ParseError, "staging_parse(): #{source.inspect} has no URI " +
-      "'path' component" if path.nil?
-
-    info      = arguments[1] ? arguments[1] : 'filename'
-    extension = arguments[2] ? arguments[2] : File.extname(path)
-
-    case info
-    when 'filename'
-      result = File.basename(path)
-    when 'basename'
-      result = File.basename(path, extension)
-    when 'extname'
-      result = File.extname(path)
-    when 'parent'
-      result = File.expand_path(File.join(path, '..'))
-    else
-      raise Puppet::ParseError, "staging_parse(), unknown parse info #{info}."
-    end
-
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp
deleted file mode 100644
index 565038701f1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# The define resource extracts compressed file to a staging location.
-define staging::deploy (
-  $source,               #: the source file location, supports local files, puppet://, http://, https://, ftp://
-  $target,               #: the target extraction directory
-  $staging_path = undef, #: the staging location for compressed file. defaults to ${staging::path}/${caller_module_name}
-  $username     = undef, #: https or ftp username
-  $certificate  = undef, #: https certifcate file
-  $password     = undef, #: https or ftp user password or https certificate password
-  $environment  = undef, #: environment variable for settings such as http_proxy
-  $timeout      = undef, #: the time to wait for the file transfer to complete
-  $user         = undef, #: extract file as this user
-  $group        = undef, #: extract group as this group
-  $creates      = undef, #: the file/folder created after extraction. if unspecified defaults to ${target}/${name}
-  $unless       = undef, #: alternative way to conditionally extract file
-  $onlyif       = undef  #: alternative way to conditionally extract file
-) {
-
-  staging::file { $name:
-    source      => $source,
-    target      => $staging_path,
-    username    => $username,
-    certificate => $certificate,
-    password    => $password,
-    environment => $environment,
-    subdir      => $caller_module_name,
-    timeout     => $timeout,
-  }
-
-  staging::extract { $name:
-    target      => $target,
-    source      => $staging_path,
-    user        => $user,
-    group       => $group,
-    environment => $environment,
-    subdir      => $caller_module_name,
-    creates     => $creates,
-    unless      => $unless,
-    onlyif      => $onlyif,
-    require     => Staging::File[$name],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp
deleted file mode 100644
index 163da149265..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Define resource to extract files from staging directories to target directories.
-define staging::extract (
-  $target,              #: the target extraction directory
-  $source      = undef, #: the source compression file, supports tar, tar.gz, zip, war
-  $creates     = undef, #: the file created after extraction. if unspecified defaults ${staging::path}/${caller_module_name}/${name} ${target}/${name}
-  $unless      = undef, #: alternative way to conditionally check whether to extract file.
-  $onlyif      = undef, #: alternative way to conditionally check whether to extract file.
-  $user        = undef, #: extract file as this user.
-  $group       = undef, #:  extract file as this group.
-  $environment = undef, #: environment variables.
-  $subdir      = $caller_module_name #: subdir per module in staging directory.
-) {
-
-  include staging
-
-  if $source {
-    $source_path = $source
-  } else {
-    $source_path = "${staging::path}/${subdir}/${name}"
-  }
-
-  # Use user supplied creates path, set default value if creates, unless or
-  # onlyif is not supplied.
-  if $creates {
-    $creates_path = $creates
-  } elsif ! ($unless or $onlyif) {
-    if $name =~ /.tar.gz$/ {
-      $folder       = staging_parse($name, 'basename', '.tar.gz')
-    } elsif $name =~ /.tar.bz2$/ {
-      $folder       = staging_parse($name, 'basename', '.tar.bz2')
-    } else {
-      $folder       = staging_parse($name, 'basename')
-    }
-    $creates_path = "${target}/${folder}"
-  }
-
-  if scope_defaults('Exec','path') {
-    Exec{
-      cwd         => $target,
-      user        => $user,
-      group       => $group,
-      environment => $environment,
-      creates     => $creates_path,
-      unless      => $unless,
-      onlyif      => $onlyif,
-      logoutput   => on_failure,
-    }
-  } else {
-    Exec{
-      path        => $::path,
-      cwd         => $target,
-      user        => $user,
-      group       => $group,
-      environment => $environment,
-      creates     => $creates_path,
-      unless      => $unless,
-      onlyif      => $onlyif,
-      logoutput   => on_failure,
-    }
-  }
-
-  case $name {
-    /.tar$/: {
-      $command = "tar xf ${source_path}"
-    }
-
-    /(.tgz|.tar.gz)$/: {
-      if $::osfamily == 'Solaris' {
-        $command = "gunzip -dc < ${source_path} | tar xf - "
-      } else {
-        $command = "tar xzf ${source_path}"
-      }
-    }
-
-    /.tar.bz2$/: {
-      $command = "tar xjf ${source_path}"
-    }
-
-    /.zip$/: {
-      $command = "unzip ${source_path}"
-    }
-
-    /(.war|.jar)$/: {
-      $command = "jar xf ${source_path}"
-    }
-
-    default: {
-      fail("staging::extract: unsupported file format ${name}.")
-    }
-  }
-
-  exec { "extract ${name}":
-    command => $command,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp
deleted file mode 100644
index 60b69d796b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp
+++ /dev/null
@@ -1,115 +0,0 @@
-# #### Overview:
-#
-# Define resource to retrieve files to staging directories. It is
-# intententionally not replacing files, as these intend to be large binaries
-# that are versioned.
-#
-# #### Notes:
-#
-#   If you specify a different staging location, please manage the file
-#   resource as necessary.
-#
-define staging::file (
-  $source,              #: the source file location, supports local files, puppet://, http://, https://, ftp://
-  $target      = undef, #: the target staging directory, if unspecified ${staging::path}/${caller_module_name}
-  $username    = undef, #: https or ftp username
-  $certificate = undef, #: https certificate file
-  $password    = undef, #: https or ftp user password or https certificate password
-  $environment = undef, #: environment variable for settings such as http_proxy, https_proxy, of ftp_proxy
-  $timeout     = undef, #: the the time to wait for the file transfer to complete
-  $curl_option = undef, #: options to pass to curl
-  $wget_option = undef, #: options to pass to wget
-  $subdir      = $caller_module_name
-) {
-
-  include staging
-
-  $quoted_source = shellquote($source)
-
-  if $target {
-    $target_file = $target
-    $staging_dir = staging_parse($target, 'parent')
-  } else {
-    $staging_dir = "${staging::path}/${subdir}"
-    $target_file = "${staging_dir}/${name}"
-
-    if ! defined(File[$staging_dir]) {
-      file { $staging_dir:
-        ensure=>directory,
-      }
-    }
-  }
-
-  Exec {
-    path        => $staging::exec_path,
-    environment => $environment,
-    cwd         => $staging_dir,
-    creates     => $target_file,
-    timeout     => $timeout,
-    logoutput   => on_failure,
-  }
-
-  case $::staging_http_get {
-    'curl', default: {
-      $http_get        = "curl ${curl_option} -f -L -o ${name} ${quoted_source}"
-      $http_get_passwd = "curl ${curl_option} -f -L -o ${name} -u ${username}:${password} ${quoted_source}"
-      $http_get_cert   = "curl ${curl_option} -f -L -o ${name} -E ${certificate}:${password} ${quoted_source}"
-      $ftp_get         = "curl ${curl_option} -o ${name} ${quoted_source}"
-      $ftp_get_passwd  = "curl ${curl_option} -o ${name} -u ${username}:${password} ${quoted_source}"
-    }
-    'wget': {
-      $http_get        = "wget ${wget_option} -O ${name} ${quoted_source}"
-      $http_get_passwd = "wget ${wget_option} -O ${name} --user=${username} --password=${password} ${quoted_source}"
-      $http_get_cert   = "wget ${wget_option} -O ${name} --user=${username} --certificate=${certificate} ${quoted_source}"
-      $ftp_get         = $http_get
-      $ftp_get_passwd  = $http_get_passwd
-    }
-    'powershell':{
-      $http_get           = "powershell.exe -Command \"\$wc = New-Object System.Net.WebClient;\$wc.DownloadFile('${source}','${target_file}')\""
-      $ftp_get            = $http_get
-      $http_get_password  = "powershell.exe -Command \"\$wc = (New-Object System.Net.WebClient);\$wc.Credentials = New-Object System.Net.NetworkCredential('${username}','${password}');\$wc.DownloadFile(${source},${target_file})\""
-      $ftp_get_password   = $http_get_password
-    }
-  }
-
-  case $source {
-    /^\//: {
-      file { $target_file:
-        source  => $source,
-        replace => false,
-      }
-    }
-    /^puppet:\/\//: {
-      file { $target_file:
-        source  => $source,
-        replace => false,
-      }
-    }
-    /^http:\/\//: {
-      if $username { $command = $http_get_passwd }
-      else         { $command = $http_get        }
-      exec { $target_file:
-        command   => $command,
-      }
-    }
-    /^https:\/\//: {
-      if $username       { $command = $http_get_passwd }
-      elsif $certificate { $command = $http_get_cert   }
-      else               { $command = $http_get        }
-      exec { $target_file:
-        command => $command,
-      }
-    }
-    /^ftp:\/\//: {
-      if $username       { $command = $ftp_get_passwd }
-      else               { $command = $ftp_get        }
-      exec { $target_file:
-        command     => $command,
-      }
-    }
-    default: {
-      fail("stage::file: do not recognize source ${source}.")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp
deleted file mode 100644
index 19bb2da40e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-#   This module manages staging and extraction of files from various sources.
-#
-# #### Actions:
-#
-#   Creates the root staging directory. By default files will be created in a subdirectory matching the caller_module_name.
-#
-#      /opt/staging/
-#                 |-- puppet
-#                 |   `-- puppet.enterprise.2.0.tar.gz
-#                 `-- tomcat
-#                     `-- tomcat.5.0.tar.gz
-#
-class staging (
-  $path      = $staging::params::path,     #: staging directory filepath
-  $owner     = $staging::params::owner,    #: staging directory owner
-  $group     = $staging::params::group,    #: staging directory group
-  $mode      = $staging::params::mode,     #: staging directory permission
-  $exec_path = $staging::params::exec_path #: executable default path
-) inherits staging::params {
-
-  file { $path:
-    ensure => directory,
-    owner  => $owner,
-    group  => $group,
-    mode   => $mode,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp
deleted file mode 100644
index 95ee0a134d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# OS specific parameters
-class staging::params {
-  case $::osfamily {
-    default: {
-      $path      = '/opt/staging'
-      $owner     = '0'
-      $group     = '0'
-      $mode      = '0755'
-      $exec_path = '/usr/local/bin:/usr/bin:/bin'
-    }
-    'Solaris': {
-      $path      = '/opt/staging'
-      $owner     = '0'
-      $group     = '0'
-      $mode      = '0755'
-      $exec_path = '/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin'
-    }
-    'windows': {
-      $path      = $::staging_windir
-      $owner     = undef
-      $group     = undef
-      $mode      = '0755'
-      $exec_path = $::path
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
deleted file mode 100644
index 66541d22f1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-describe 'staging::deploy', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name => 'spec',
-                  :osfamily           => 'RedHat',
-                  :path               => '/usr/local/bin:/usr/bin:/bin', } }
-
-  describe 'when deploying tar.gz' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'puppet:///modules/staging/sample.tar.gz',
-      :target => '/usr/local' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/opt/staging/spec/sample.tar.gz')
-      should contain_exec('extract sample.tar.gz').with({
-        :command => 'tar xzf /opt/staging/spec/sample.tar.gz',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/usr/local',
-        :creates => '/usr/local/sample'
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb
deleted file mode 100644
index a3d742245df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'staging::extract', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name => 'spec',
-                  :osfamily           => 'RedHat',
-                  :path               => '/usr/local/bin:/usr/bin:/bin' } }
-
-  describe 'when deploying tar.gz' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :target => '/opt' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('extract sample.tar.gz').with({
-        :command => 'tar xzf /opt/staging/spec/sample.tar.gz',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying zip' do
-    let(:title) { 'sample.zip' }
-    let(:params) { { :target => '/opt' } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('extract sample.zip').with({
-        :command => 'unzip /opt/staging/spec/sample.zip',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying war' do
-    let(:title) { 'sample.war' }
-    let(:params) { { :target => '/opt' } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('extract sample.war').with({
-        :command => 'jar xf /opt/staging/spec/sample.war',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying unknown' do
-     let(:title) { 'sample.zzz'}
-     let(:params) { { :target => '/opt' } }
-
-     it { expect { should contain_exec("exec sample.zzz") }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb
deleted file mode 100644
index ab1ee59e119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require 'spec_helper'
-describe 'staging::file', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name=> 'spec' } }
-
-  describe 'when deploying via puppet' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'puppet:///modules/staging/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/opt/staging/spec/sample.tar.gz')
-      should_not contain_exec('/opt/staging/spec/sample.tar.gz')
-    }
-  end
-
-  describe 'when deploying via local' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => '/nfs/sample.tar.gz',
-      :target => '/usr/local/sample.tar.gz',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/usr/local/sample.tar.gz')
-      should_not contain_exec('/opt/staging/spec/sample.tar.gz')
-    }
-  end
-
-  describe 'when deploying via http' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'http://webserver/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via http with custom curl options' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { {
-      :source => 'http://webserver/sample.tar.gz',
-      :curl_option => '-b',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl -b -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via http with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'http://webserver/sample.tar.gz',
-      :target => '/usr/local/sample.tar.gz',
-    } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('/usr/local/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/usr/local',
-        :creates     => '/usr/local/sample.tar.gz',
-      })
-    }
-  end
-
-  describe 'when deploying via https' do
-     let(:title) { 'sample.tar.gz' }
-     let(:params) { { :source => 'https://webserver/sample.tar.gz' } }
-
-     it { should contain_file('/opt/staging') }
-     it { should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-       :command => 'curl  -f -L -o sample.tar.gz https://webserver/sample.tar.gz',
-       :path        => '/usr/local/bin:/usr/bin:/bin',
-       :environment => nil,
-       :cwd         => '/opt/staging/spec',
-       :creates     => '/opt/staging/spec/sample.tar.gz',
-       :logoutput   => 'on_failure',
-     }) }
-  end
-
-  describe 'when deploying via https with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'https://webserver/sample.tar.gz',
-      :username => 'puppet',
-      :password => 'puppet',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz -u puppet:puppet https://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via ftp' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'ftp://webserver/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -o sample.tar.gz ftp://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via ftp with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'ftp://webserver/sample.tar.gz',
-      :username => 'puppet',
-      :password => 'puppet',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -o sample.tar.gz -u puppet:puppet ftp://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml
deleted file mode 100644
index 771e483f53c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-:backends: - puppet
-
-:hierarchy: - common
-
-:puppet:
-    :datasource: data
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
deleted file mode 100644
index 50c460de732..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the scope_defaults function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("scope_defaults").should == "function_scope_defaults"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    expect{ scope.function_scope_defaults([]) }.
-      to raise_error(Puppet::ParseError)
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    expect{ scope.function_scope_defaults(['exec', 'path', 'error']) }.
-      to raise_error(Puppet::ParseError)
-  end
-
-  it "should return false for invalid resource" do
-    result = scope.function_scope_defaults(['foo', 'path'])
-    result.should(eq(false))
-  end
-
-  it "should return false for resource without default attributes" do
-    if scope.respond_to? :define_settings
-      scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    else
-      scope.setdefaults('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    end
-    result = scope.function_scope_defaults(['Exec', 'foo'])
-    result.should(eq(false))
-  end
-
-  it "should return true for resource with default attributes" do
-    if scope.respond_to? :define_settings
-      scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    else
-      scope.setdefaults('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    end
-    result = scope.function_scope_defaults(['Exec', 'path'])
-    result.should(eq(true))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
deleted file mode 100755
index c7c9c69f6de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the staging parser function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("staging_parse").should == "function_staging_parse"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_staging_parse([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 3 arguments" do
-    lambda { scope.function_staging_parse(['/etc', 'filename', '.zip', 'error']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is an invalid info request" do
-    lambda { scope.function_staging_parse(['/etc', 'sheep', '.zip']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if 'source' doesn't have a URI path component" do
-    lambda { scope.function_staging_parse(['uri:without-path']) }.should( raise_error(Puppet::ParseError, /has no URI 'path' component/))
-  end
-
-  it "should return the filename by default" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz"])
-    result.should(eq('sample.tar.gz'))
-  end
-
-  it "should return the file basename" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "basename"])
-    result.should(eq('sample.tar'))
-  end
-
-  it "should return the file basename with custom extensions" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "basename", ".tar.gz"])
-    result.should(eq('sample'))
-  end
-
-  it "should return the file extname" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "extname"])
-    result.should(eq('.gz'))
-  end
-
-  it "should return the file parent" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "parent"])
-    result.should(eq('/etc/puppet'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp
deleted file mode 100644
index cf9ac58d5ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-staging::deploy { 'sample.tar.gz':
-  source => 'puppet:///modules/staging/sample.tar.gz',
-  target => '/usr/local',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp
deleted file mode 100644
index 257f478cfd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-$caller_module_name = 'demo'
-
-class { 'staging':
-  path => '/tmp/staging',
-}
-
-staging::file { 'sample.tar.gz':
-  source => 'puppet:///modules/staging/sample.tar.gz'
-}
-
-staging::extract { 'sample.tar.gz':
-  target  => '/tmp/staging',
-  creates => '/tmp/staging/sample',
-  require => Staging::File['sample.tar.gz'],
-}
-
-staging::file { 'sample.tar.bz2':
-  source => 'puppet:///modules/staging/sample.tar.bz2'
-}
-
-staging::extract { 'sample.tar.bz2':
-  target  => '/tmp/staging',
-  creates => '/tmp/staging/sample-tar-bz2',
-  require => Staging::File['sample.tar.bz2'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp
deleted file mode 100644
index 475cf5628c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-$caller_module_name = 'demo'
-
-class { 'staging':
-  path => '/tmp/staging',
-}
-
-staging::file { 'sample':
-  source => 'puppet:///modules/staging/sample',
-}
-
-staging::file { 'passwd':
-  source => '/etc/passwd',
-}
-
-staging::file { 'manpage.html':
-  source => 'http://curl.haxx.se/docs/manpage.html',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp
deleted file mode 100644
index 3015c10f047..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include staging
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp
deleted file mode 100644
index 3073ff4aaff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-Exec {
-  path => '/bin',
-}
-
-if scope_defaults('Exec', 'path') {
-  notice('good')
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp
deleted file mode 100644
index 117ad166845..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-$file      = '/etc/puppetlabs/foo.bar.tar.gz'
-$filename  = staging_parse($file)
-$basename  = staging_parse($file, 'basename')
-$extname   = staging_parse($file, 'extname')
-$parent    = staging_parse($file, 'parent')
-$rbasename = staging_parse($file, 'basename', '.tar.gz')
-
-notice($filename)
-notice($basename)
-notice($extname)
-notice($parent)
-notice($rbasename)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md
deleted file mode 100644
index 5a3597e3404..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md
+++ /dev/null
@@ -1,413 +0,0 @@
-## 2014-05-08 - Release - 4.2.1
-### Summary
-This release moves a stray symlink that can cause problems.
-
-## 2014-05-08 - Release - 4.2.0
-### Summary
-This release adds many new functions and fixes, and continues to be backwards compatible with stdlib 3.x
-
-#### Features
-- New `base64()` function
-- New `deep_merge()` function
-- New `delete_undef_values()` function
-- New `delete_values()` function
-- New `difference()` function
-- New `intersection()` function
-- New `is_bool()` function
-- New `pick_default()` function
-- New `union()` function
-- New `validate_ipv4_address` function
-- New `validate_ipv6_address` function
-- Update `ensure_packages()` to take an option hash as a second parameter.
-- Update `range()` to take an optional third argument for range step
-- Update `validate_slength()` to take an optional third argument for minimum length
-- Update `file_line` resource to take `after` and `multiple` attributes
-
-#### Bugfixes
-- Correct `is_string`, `is_domain_name`, `is_array`, `is_float`, and `is_function_available` for parsing odd types such as bools and hashes.
-- Allow facts.d facts to contain `=` in the value
-- Fix `root_home` fact on darwin systems
-- Fix `concat()` to work with a second non-array argument
-- Fix `floor()` to work with integer strings
-- Fix `is_integer()` to return true if passed integer strings
-- Fix `is_numeric()` to return true if passed integer strings
-- Fix `merge()` to work with empty strings
-- Fix `pick()` to raise the correct error type
-- Fix `uriescape()` to use the default URI.escape list
-- Add/update unit & acceptance tests.
-
-
-##2014-03-04 - Supported Release - 3.2.1
-###Summary
-This is a supported release
-
-####Bugfixes
-- Fixed `is_integer`/`is_float`/`is_numeric` for checking the value of arithmatic expressions.
-
-####Known bugs
-* No known bugs
-
----
-
-##### 2013-05-06 - Jeff McCune <jeff@puppetlabs.com> - 4.1.0
-
- * (#20582) Restore facter\_dot\_d to stdlib for PE users (3b887c8)
- * (maint) Update Gemfile with GEM\_FACTER\_VERSION (f44d535)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> - 4.1.0
-
- * Terser method of string to array conversion courtesy of ethooz. (d38bce0)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * Refactor ensure\_resource expectations (b33cc24)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * Changed str-to-array conversion and removed abbreviation. (de253db)
-
-##### 2013-05-03 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * (#20548) Allow an array of resource titles to be passed into the ensure\_resource function (e08734a)
-
-##### 2013-05-02 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.1.0
-
- * Add a dirname function (2ba9e47)
-
-##### 2013-04-29 - Mark Smith-Guerrero <msmithgu@gmail.com> - 4.1.0
-
- * (maint) Fix a small typo in hash() description (928036a)
-
-##### 2013-04-12 - Jeff McCune <jeff@puppetlabs.com> - 4.0.2
-
- * Update user information in gemspec to make the intent of the Gem clear.
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.1
-
- * Fix README function documentation (ab3e30c)
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * stdlib 4.0 drops support with Puppet 2.7
- * stdlib 4.0 preserves support with Puppet 3
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Add ability to use puppet from git via bundler (9c5805f)
-
-##### 2013-04-10 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * (maint) Make stdlib usable as a Ruby GEM (e81a45e)
-
-##### 2013-04-10 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * Add a count function (f28550e)
-
-##### 2013-03-31 - Amos Shapira <ashapira@atlassian.com> - 4.0.0
-
- * (#19998) Implement any2array (7a2fb80)
-
-##### 2013-03-29 - Steve Huff <shuff@vecna.org> - 4.0.0
-
- * (19864) num2bool match fix (8d217f0)
-
-##### 2013-03-20 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * Allow comparisons of Numeric and number as String (ff5dd5d)
-
-##### 2013-03-26 - Richard Soderberg <rsoderberg@mozilla.com> - 4.0.0
-
- * add suffix function to accompany the prefix function (88a93ac)
-
-##### 2013-03-19 - Kristof Willaert <kristof.willaert@gmail.com> - 4.0.0
-
- * Add floor function implementation and unit tests (0527341)
-
-##### 2012-04-03 - Eric Shamow <eric@puppetlabs.com> - 4.0.0
-
- * (#13610) Add is\_function\_available to stdlib (961dcab)
-
-##### 2012-12-17 - Justin Lambert <jlambert@eml.cc> - 4.0.0
-
- * str2bool should return a boolean if called with a boolean (5d5a4d4)
-
-##### 2012-10-23 - Uwe Stuehler <ustuehler@team.mobile.de> - 4.0.0
-
- * Fix number of arguments check in flatten() (e80207b)
-
-##### 2013-03-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Add contributing document (96e19d0)
-
-##### 2013-03-04 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.0.0
-
- * Add missing documentation for validate\_augeas and validate\_cmd to README.markdown (a1510a1)
-
-##### 2013-02-14 - Joshua Hoblitt <jhoblitt@cpan.org> - 4.0.0
-
- * (#19272) Add has\_element() function (95cf3fe)
-
-##### 2013-02-07 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.0.0
-
- * validate\_cmd(): Use Puppet::Util::Execution.execute when available (69248df)
-
-##### 2012-12-06 - Raphaël Pinson <raphink@gmail.com> - 4.0.0
-
- * Add validate\_augeas function (3a97c23)
-
-##### 2012-12-06 - Raphaël Pinson <raphink@gmail.com> - 4.0.0
-
- * Add validate\_cmd function (6902cc5)
-
-##### 2013-01-14 - David Schmitt <david@dasz.at> - 4.0.0
-
- * Add geppetto project definition (b3fc0a3)
-
-##### 2013-01-02 - Jaka Hudoklin <jakahudoklin@gmail.com> - 4.0.0
-
- * Add getparam function to get defined resource parameters (20e0e07)
-
-##### 2013-01-05 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * (maint) Add Travis CI Support (d082046)
-
-##### 2012-12-04 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Clarify that stdlib 3 supports Puppet 3 (3a6085f)
-
-##### 2012-11-30 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * maint: style guideline fixes (7742e5f)
-
-##### 2012-11-09 - James Fryman <james@frymanet.com> - 4.0.0
-
- * puppet-lint cleanup (88acc52)
-
-##### 2012-11-06 - Joe Julian <me@joejulian.name> - 4.0.0
-
- * Add function, uriescape, to URI.escape strings. Redmine #17459 (fd52b8d)
-
-##### 2012-09-18 - Chad Metcalf <chad@wibidata.com> - 3.2.0
-
- * Add an ensure\_packages function. (8a8c09e)
-
-##### 2012-11-23 - Erik Dalén <dalen@spotify.com> - 3.2.0
-
- * (#17797) min() and max() functions (9954133)
-
-##### 2012-05-23 - Peter Meier <peter.meier@immerda.ch> - 3.2.0
-
- * (#14670) autorequire a file\_line resource's path (dfcee63)
-
-##### 2012-11-19 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 3.2.0
-
- * Add join\_keys\_to\_values function (ee0f2b3)
-
-##### 2012-11-17 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 3.2.0
-
- * Extend delete function for strings and hashes (7322e4d)
-
-##### 2012-08-03 - Gary Larizza <gary@puppetlabs.com> - 3.2.0
-
- * Add the pick() function (ba6dd13)
-
-##### 2012-03-20 - Wil Cooley <wcooley@pdx.edu> - 3.2.0
-
- * (#13974) Add predicate functions for interface facts (f819417)
-
-##### 2012-11-06 - Joe Julian <me@joejulian.name> - 3.2.0
-
- * Add function, uriescape, to URI.escape strings. Redmine #17459 (70f4a0e)
-
-##### 2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 3.1.1
-
- * (maint) Fix spec failures resulting from Facter API changes (97f836f)
-
-##### 2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
-
- * Add PE facts to stdlib (cdf3b05)
-
-##### 2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.1
-
- * Fix accidental removal of facts\_dot\_d.rb in 3.0.0 release
-
-##### 2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.0
-
- * stdlib 3.0 drops support with Puppet 2.6
- * stdlib 3.0 preserves support with Puppet 2.7
-
-##### 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 3.0.0
-
- * Add function ensure\_resource and defined\_with\_params (ba789de)
-
-##### 2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 3.0.0
-
- * (#2157) Remove facter\_dot\_d for compatibility with external facts (f92574f)
-
-##### 2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0
-
- * (#13693) moving logic from local spec\_helper to puppetlabs\_spec\_helper (85f96df)
-
-##### 2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1
-
- * (maint) Fix spec failures resulting from Facter API changes (97f836f)
-
-##### 2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0
-
- * Add PE facts to stdlib (cdf3b05)
-
-##### 2012-08-15 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Explicitly load functions used by ensure\_resource (9fc3063)
-
-##### 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Add better docs about duplicate resource failures (97d327a)
-
-##### 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Handle undef for parameter argument (4f8b133)
-
-##### 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Add function ensure\_resource and defined\_with\_params (a0cb8cd)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * Disable tests that fail on 2.6.x due to #15912 (c81496e)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * (Maint) Fix mis-use of rvalue functions as statements (4492913)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * Add .rspec file to repo root (88789e8)
-
-##### 2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0
-
- * Add support for a 'match' parameter to file\_line (a06c0d8)
-
-##### 2012-08-07 - Erik Dalén <dalen@spotify.com> - 2.4.0
-
- * (#15872) Add to\_bytes function (247b69c)
-
-##### 2012-07-19 - Jeff McCune <jeff@puppetlabs.com> - 2.4.0
-
- * (Maint) use PuppetlabsSpec::PuppetInternals.scope (master) (deafe88)
-
-##### 2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 2.4.0
-
- * (#2157) Make facts\_dot\_d compatible with external facts (5fb0ddc)
-
-##### 2012-03-16 - Steve Traylen <steve.traylen@cern.ch> - 2.4.0
-
- * (#13205) Rotate array/string randomley based on fqdn, fqdn\_rotate() (fef247b)
-
-##### 2012-05-22 - Peter Meier <peter.meier@immerda.ch> - 2.3.3
-
- * fix regression in #11017 properly (f0a62c7)
-
-##### 2012-05-10 - Jeff McCune <jeff@puppetlabs.com> - 2.3.3
-
- * Fix spec tests using the new spec\_helper (7d34333)
-
-##### 2012-05-10 - Puppet Labs <support@puppetlabs.com> - 2.3.2
-
- * Make file\_line default to ensure => present (1373e70)
- * Memoize file\_line spec instance variables (20aacc5)
- * Fix spec tests using the new spec\_helper (1ebfa5d)
- * (#13595) initialize\_everything\_for\_tests couples modules Puppet ver (3222f35)
- * (#13439) Fix MRI 1.9 issue with spec\_helper (15c5fd1)
- * (#13439) Fix test failures with Puppet 2.6.x (665610b)
- * (#13439) refactor spec helper for compatibility with both puppet 2.7 and master (82194ca)
- * (#13494) Specify the behavior of zero padded strings (61891bb)
-
-##### 2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3
-
-* (#11607) Add Rakefile to enable spec testing
-* (#12377) Avoid infinite loop when retrying require json
-
-##### 2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1
-
-* (#13091) Fix LoadError bug with puppet apply and puppet\_vardir fact
-
-##### 2012-03-12 Puppet Labs <support@puppetlabs.com> - 2.3.0
-
-* Add a large number of new Puppet functions
-* Backwards compatibility preserved with 2.2.x
-
-##### 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
-
-* Documentation only release for the Forge
-
-##### 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
-
-* Documentation only release for PE 2.0.x
-
-##### 2011-11-08 Puppet Labs <support@puppetlabs.com> - 2.2.0
-
-* #10285 - Refactor json to use pson instead.
-* Maint  - Add watchr autotest script
-* Maint  - Make rspec tests work with Puppet 2.6.4
-* #9859  - Add root\_home fact and tests
-
-##### 2011-08-18 Puppet Labs <support@puppetlabs.com> - 2.1.1
-
-* Change facts.d paths to match Facter 2.0 paths.
-* /etc/facter/facts.d
-* /etc/puppetlabs/facter/facts.d
-
-##### 2011-08-17 Puppet Labs <support@puppetlabs.com> - 2.1.0
-
-* Add R.I. Pienaar's facts.d custom facter fact
-* facts defined in /etc/facts.d and /etc/puppetlabs/facts.d are
-  automatically loaded now.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 2.0.0
-
-* Rename whole\_line to file\_line
-* This is an API change and as such motivating a 2.0.0 release according to semver.org.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 1.1.0
-
-* Rename append\_line to whole\_line
-* This is an API change and as such motivating a 1.1.0 release.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 1.0.0
-
-* Initial stable release
-* Add validate\_array and validate\_string functions
-* Make merge() function work with Ruby 1.8.5
-* Add hash merging function
-* Add has\_key function
-* Add loadyaml() function
-* Add append\_line native
-
-##### 2011-06-21 Jeff McCune <jeff@puppetlabs.com> - 0.1.7
-
-* Add validate\_hash() and getvar() functions
-
-##### 2011-06-15 Jeff McCune <jeff@puppetlabs.com> - 0.1.6
-
-* Add anchor resource type to provide containment for composite classes
-
-##### 2011-06-03 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
-
-* Add validate\_bool() function to stdlib
-
-##### 0.1.4 2011-05-26 Jeff McCune <jeff@puppetlabs.com>
-
-* Move most stages after main
-
-##### 0.1.3 2011-05-25 Jeff McCune <jeff@puppetlabs.com>
-
-* Add validate\_re() function
-
-##### 0.1.2 2011-05-24 Jeff McCune <jeff@puppetlabs.com>
-
-* Update to add annotated tag
-
-##### 0.1.1 2011-05-24 Jeff McCune <jeff@puppetlabs.com>
-
-* Add stdlib::stages class with a standard set of stages
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md
deleted file mode 100644
index 5280da15ecc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# How to contribute
-
-Third-party patches are essential for keeping stdlib great. We simply can't
-access the huge number of platforms and myriad configurations for running
-stdlib. We want to keep it as easy as possible to contribute changes that
-get things working in your environment. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
-
-## Making Changes
-
-* Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
-    `master` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (#99999) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-
-## Submitting Changes
-
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the puppetlabs organization.
-* Update your ticket to mark that you have submitted code and are ready for it to be reviewed.
-  * Include a link to the pull request in the ticket
-
-# Additional Resources
-
-* [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
-* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppetlabs.com/cla)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #puppet-dev IRC channel on freenode.org
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile
deleted file mode 100644
index bbef720351c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile
+++ /dev/null
@@ -1,33 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-def location_for(place, fake_version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-group :development, :test do
-  gem 'rake', '~> 10.1.0',       :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
-if puppetversion
-  gem 'puppet', *location_for(puppetversion)
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock
deleted file mode 100644
index cf4881eaaa7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock
+++ /dev/null
@@ -1,174 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.7)
-    addressable (2.3.6)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    aws-sdk (1.38.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    beaker (1.10.0)
-      aws-sdk (~> 1.38)
-      blimpy (~> 0.6)
-      fission (~> 0.4)
-      google-api-client (~> 0.6.4)
-      inifile (~> 2.0)
-      json (~> 1.8)
-      mime-types (~> 1.25)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (= 1.5.10)
-      rbvmomi (= 1.8.1)
-      unf (~> 0.1)
-    beaker-rspec (2.0.0)
-      beaker
-      rspec
-    blimpy (0.6.7)
-      fog
-      minitar
-      thor
-    builder (3.2.2)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    excon (0.31.0)
-    extlib (0.9.16)
-    facter (2.0.1)
-      CFPropertyList (~> 2.2.6)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.19.0)
-      builder
-      excon (~> 0.31.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
-    google-api-client (0.6.4)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (~> 0.8.4)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      signet (~> 0.4.5)
-      uuidtools (>= 2.1.0)
-    hiera (1.3.2)
-      json_pure
-    highline (1.6.21)
-    inifile (2.0.2)
-    json (1.8.1)
-    json_pure (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    kwalify (0.7.2)
-    launchy (2.4.2)
-      addressable (~> 2.3)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitar (0.5.4)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.9.2)
-    multipart-post (1.2.0)
-    net-scp (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    nokogiri (1.5.10)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    puppet (3.5.1)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
-      rgen (~> 0.6.5)
-    puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
-      rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.1)
-    rbvmomi (1.8.1)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    rgen (0.6.6)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-system (2.5.1)
-      kwalify (~> 0.7.2)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (~> 1.5.9)
-      rbvmomi (~> 1.6)
-      rspec (~> 2.13)
-      systemu (~> 2.5)
-    rspec-system-puppet (2.2.1)
-      rspec-system (~> 2.0)
-    rspec-system-serverspec (1.0.0)
-      rspec-system (~> 2.0)
-      serverspec (~> 0.6.0)
-    ruby-hmac (0.4.0)
-    serverspec (0.6.30)
-      highline
-      net-ssh
-      rspec (~> 2.13.0)
-    signet (0.4.5)
-      addressable (>= 2.2.3)
-      faraday (~> 0.8.1)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.5.0)
-    systemu (2.6.4)
-    thor (0.19.1)
-    trollop (2.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.6)
-    uuidtools (2.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beaker
-  beaker-rspec
-  pry
-  puppet
-  puppet-lint
-  puppetlabs_spec_helper
-  rake (~> 10.1.0)
-  rspec-puppet
-  rspec-system
-  rspec-system-puppet
-  rspec-system-serverspec
-  serverspec
-  simplecov
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE
deleted file mode 100644
index ec0587c0d9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011 Puppet Labs Inc
-
-and some parts:
-
-Copyright (C) 2011 Krzysztof Wilczynski
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile
deleted file mode 100644
index c5da72daccd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'puppetlabs-stdlib'
-version '4.2.1'
-source 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet Module Standard Library'
-description 'Standard Library for Puppet Modules'
-project_page 'https://github.com/puppetlabs/puppetlabs-stdlib'
-
-## Add dependencies, if any:
-# dependency 'username/name', '>= 1.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown
deleted file mode 100644
index e9ad53b8b9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown
+++ /dev/null
@@ -1,1304 +0,0 @@
-# Puppet Labs Standard Library #
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-stdlib.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-stdlib)
-
-This module provides a "standard library" of resources for developing Puppet
-Modules.  This modules will include the following additions to Puppet
-
- * Stages
- * Facts
- * Functions
- * Defined resource types
- * Types
- * Providers
-
-This module is officially curated and provided by Puppet Labs.  The modules
-Puppet Labs writes and distributes will make heavy use of this standard
-library.
-
-To report or research a bug with any part of this module, please go to
-[http://tickets.puppetlabs.com/browse/PUP](http://tickets.puppetlabs.com/browse/PUP)
-
-# Versions #
-
-This module follows semver.org (v1.0.0) versioning guidelines.  The standard
-library module is released as part of [Puppet
-Enterprise](http://puppetlabs.com/puppet/puppet-enterprise/) and as a result
-older versions of Puppet Enterprise that Puppet Labs still supports will have
-bugfix maintenance branches periodically "merged up" into master.  The current
-list of integration branches are:
-
- * v2.1.x (v2.1.1 released in PE 1)
- * v2.2.x (Never released as part of PE, only to the Forge)
- * v2.3.x (Released in PE 2)
- * v3.0.x (Released in PE 3)
- * v4.0.x (Maintains compatibility with v3.x despite the major semantic version bump.  Compatible with Puppet 2.7.x)
- * v5.x (To be released when stdlib can drop support for Puppet 2.7.x.  Please see [this discussion](https://github.com/puppetlabs/puppetlabs-stdlib/pull/176#issuecomment-30251414))
- * master (mainline development branch)
-
-The first Puppet Enterprise version including the stdlib module is Puppet
-Enterprise 1.2.
-
-# Compatibility #
-
-Puppet Versions | < 2.6 | 2.6 | 2.7 | 3.x |
-:---------------|:-----:|:---:|:---:|:----:
-**stdlib 2.x**  | no    | **yes** | **yes** | no
-**stdlib 3.x**  | no    | no  | **yes** | **yes**
-**stdlib 4.x**  | no    | no  | **yes** | **yes**
-
-The stdlib module does not work with Puppet versions released prior to Puppet
-2.6.0.
-
-## stdlib 2.x ##
-
-All stdlib releases in the 2.0 major version support Puppet 2.6 and Puppet 2.7.
-
-## stdlib 3.x ##
-
-The 3.0 major release of stdlib drops support for Puppet 2.6.  Stdlib 3.x
-supports Puppet 2 and Puppet 3.
-
-## stdlib 4.x ##
-
-The 4.0 major release of stdlib was intended to drop support for Puppet 2.7,
-but the impact on end users was too high.  The decision was made to treat
-stdlib 4.x as a continuation of stdlib 3.x support.  Stdlib 4.x supports Puppet
-2.7 and 3.  Notably, ruby 1.8.5 is no longer supported though ruby
-1.8.7, 1.9.3, and 2.0.0 are fully supported.
-
-# Functions #
-
-abs
----
-Returns the absolute value of a number, for example -34.56 becomes
-34.56. Takes a single integer and float value as an argument.
-
-
-- *Type*: rvalue
-
-any2array
----------
-This converts any object to an array containing that object. Empty argument
-lists are converted to an empty array. Arrays are left untouched. Hashes are
-converted to arrays of alternating keys and values.
-
-
-- *Type*: rvalue
-
-base64
---------
-Converts a string to and from base64 encoding.
-Requires an action ['encode','decode'] and either a plain or base64 encoded
-string
-
-
-- *Type*: rvalue
-
-bool2num
---------
-Converts a boolean to a number. Converts the values:
-false, f, 0, n, and no to 0
-true, t, 1, y, and yes to 1
-    Requires a single boolean or string as an input.
-
-
-- *Type*: rvalue
-
-capitalize
-----------
-Capitalizes the first letter of a string or array of strings.
-Requires either a single string or an array as an input.
-
-
-- *Type*: rvalue
-
-chomp
------
-Removes the record separator from the end of a string or an array of
-strings, for example `hello\n` becomes `hello`.
-Requires a single string or array as an input.
-
-
-- *Type*: rvalue
-
-chop
-----
-Returns a new string with the last character removed. If the string ends
-with `\r\n`, both characters are removed. Applying chop to an empty
-string returns an empty string. If you wish to merely remove record
-separators then you should use the `chomp` function.
-Requires a string or array of strings as input.
-
-
-- *Type*: rvalue
-
-concat
-------
-Appends the contents of array 2 onto array 1.
-
-*Example:*
-
-    concat(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-  ['1','2','3','4','5','6']
-
-  concat(['1','2','3'],'4')
-
-Would result in:
-
-  ['1','2','3','4']
-
-- *Type*: rvalue
-
-count
------
-Takes an array as first argument and an optional second argument.
-Count the number of elements in array that matches second argument.
-If called with only an array it counts the number of elements that are not nil/undef.
-
-
-- *Type*: rvalue
-
-defined_with_params
--------------------
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-
-
-- *Type*: rvalue
-
-delete
-------
-Deletes all instances of a given element from an array, substring from a
-string, or key from a hash.
-
-*Examples:*
-
-    delete(['a','b','c','b'], 'b')
-    Would return: ['a','c']
-
-    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
-    Would return: {'a'=>1,'c'=>3}
-
-    delete('abracadabra', 'bra')
-    Would return: 'acada'
-
-
-- *Type*: rvalue
-
-delete_at
----------
-Deletes a determined indexed value from an array.
-
-*Examples:*
-
-    delete_at(['a','b','c'], 1)
-
-Would return: ['a','c']
-
-
-- *Type*: rvalue
-
-delete_values
--------------
-Deletes all instances of a given value from a hash.
-
-*Examples:*
-
-    delete_values({'a'=>'A','b'=>'B','c'=>'C','B'=>'D'}, 'B')
-
-Would return: {'a'=>'A','c'=>'C','B'=>'D'}
-
-
-- *Type*: rvalue
-
-delete_undef_values
--------------------
-Deletes all instances of the undef value from an array or hash.
-
-*Examples:*
-
-    $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-
-Would return: {a => 'A', b => '', d => false}
-
-    $array = delete_undef_values(['A','',undef,false])
-
-Would return: ['A','',false]
-
-- *Type*: rvalue
-
-difference
-----------
-This function returns the difference between two arrays.
-The returned array is a copy of the original array, removing any items that
-also appear in the second array.
-
-*Examples:*
-
-    difference(["a","b","c"],["b","c","d"])
-
-Would return: ["a"]
-
-dirname
--------
-Returns the `dirname` of a path.
-
-*Examples:*
-
-    dirname('/path/to/a/file.ext')
-
-Would return: '/path/to/a'
-
-downcase
---------
-Converts the case of a string or all strings in an array to lower case.
-
-
-- *Type*: rvalue
-
-empty
------
-Returns true if the variable is empty.
-
-
-- *Type*: rvalue
-
-ensure_packages
----------------
-Takes a list of packages and only installs them if they don't already exist.
-It optionally takes a hash as a second parameter that will be passed as the
-third argument to the ensure_resource() function.
-
-
-- *Type*: statement
-
-ensure_resource
----------------
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-This example only creates the resource if it does not already exist:
-
-    ensure_resource('user', 'dan', {'ensure' => 'present' })
-
-If the resource already exists but does not match the specified parameters,
-this function will attempt to recreate the resource leading to a duplicate
-resource definition error.
-
-An array of resources can also be passed in and each will be created with
-the type and parameters specified if it doesn't already exist.
-
-    ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
-
-
-
-- *Type*: statement
-
-file_line
----------
-This resource ensures that a given line is contained within a file. You can also use 
-"match" to replace existing lines.
-
-*Examples:*
-
-    file_line { 'sudo_rule':
-      path => '/etc/sudoers',
-      line => '%sudo ALL=(ALL) ALL',
-    }
-
-    file_line { 'change_mount':
-      path  => '/etc/fstab',
-      line  => '10.0.0.1:/vol/data /opt/data nfs defaults 0 0',
-      match => '^172.16.17.2:/vol/old',
-    }
-
-- *Type*: resource
-
-flatten
--------
-This function flattens any deeply nested arrays and returns a single flat array
-as a result.
-
-*Examples:*
-
-    flatten(['a', ['b', ['c']]])
-
-Would return: ['a','b','c']
-
-
-- *Type*: rvalue
-
-floor
------
-Returns the largest integer less or equal to the argument.
-Takes a single numeric value as an argument.
-
-
-- *Type*: rvalue
-
-fqdn_rotate
------------
-Rotates an array a random number of times based on a nodes fqdn.
-
-
-- *Type*: rvalue
-
-get_module_path
----------------
-Returns the absolute path of the specified module for the current
-environment.
-
-Example:
-  $module_path = get_module_path('stdlib')
-
-
-- *Type*: rvalue
-
-getparam
---------
-Takes a resource reference and name of the parameter and
-returns value of resource's parameter.
-
-*Examples:*
-
-    define example_resource($param) {
-    }
-
-    example_resource { "example_resource_instance":
-        param => "param_value"
-    }
-
-    getparam(Example_resource["example_resource_instance"], "param")
-
-Would return: param_value
-
-
-- *Type*: rvalue
-
-getvar
-------
-Lookup a variable in a remote namespace.
-
-For example:
-
-    $foo = getvar('site::data::foo')
-    # Equivalent to $foo = $site::data::foo
-
-This is useful if the namespace itself is stored in a string:
-
-    $datalocation = 'site::data'
-    $bar = getvar("${datalocation}::bar")
-    # Equivalent to $bar = $site::data::bar
-
-
-- *Type*: rvalue
-
-grep
-----
-This function searches through an array and returns any elements that match
-the provided regular expression.
-
-*Examples:*
-
-    grep(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['aaa','aaaddd']
-
-
-- *Type*: rvalue
-
-has_interface_with
-------------------
-Returns boolean based on kind and value:
-* macaddress
-* netmask
-* ipaddress
-* network
-
-*Examples:*
-
-    has_interface_with("macaddress", "x:x:x:x:x:x")
-    has_interface_with("ipaddress", "127.0.0.1")    => true
-
-etc.
-
-If no "kind" is given, then the presence of the interface is checked:
-
-    has_interface_with("lo")                        => true
-
-
-- *Type*: rvalue
-
-has_ip_address
---------------
-Returns true if the client has the requested IP address on some interface.
-
-This function iterates through the 'interfaces' fact and checks the
-'ipaddress_IFACE' facts, performing a simple string comparison.
-
-
-- *Type*: rvalue
-
-has_ip_network
---------------
-Returns true if the client has an IP address within the requested network.
-
-This function iterates through the 'interfaces' fact and checks the
-'network_IFACE' facts, performing a simple string comparision.
-
-
-- *Type*: rvalue
-
-has_key
--------
-Determine if a hash has a certain key value.
-
-Example:
-
-    $my_hash = {'key_one' => 'value_one'}
-    if has_key($my_hash, 'key_two') {
-      notice('we will not reach here')
-    }
-    if has_key($my_hash, 'key_one') {
-      notice('this will be printed')
-    }
-
-
-
-- *Type*: rvalue
-
-hash
-----
-This function converts an array into a hash.
-
-*Examples:*
-
-    hash(['a',1,'b',2,'c',3])
-
-Would return: {'a'=>1,'b'=>2,'c'=>3}
-
-
-- *Type*: rvalue
-
-intersection
------------
-This function returns an array an intersection of two.
-
-*Examples:*
-
-    intersection(["a","b","c"],["b","c","d"])
-
-Would return: ["b","c"]
-
-is_array
---------
-Returns true if the variable passed to this function is an array.
-
-- *Type*: rvalue
-
-is_bool
---------
-Returns true if the variable passed to this function is a boolean.
-
-- *Type*: rvalue
-
-is_domain_name
---------------
-Returns true if the string passed to this function is a syntactically correct domain name.
-
-- *Type*: rvalue
-
-is_float
---------
-Returns true if the variable passed to this function is a float.
-
-- *Type*: rvalue
-
-is_function_available
----------------------
-This function accepts a string as an argument, determines whether the
-Puppet runtime has access to a function by that name.  It returns a
-true if the function exists, false if not.
-
-- *Type*: rvalue
-
-is_hash
--------
-Returns true if the variable passed to this function is a hash.
-
-- *Type*: rvalue
-
-is_integer
-----------
-Returns true if the variable returned to this string is an integer.
-
-- *Type*: rvalue
-
-is_ip_address
--------------
-Returns true if the string passed to this function is a valid IP address.
-
-- *Type*: rvalue
-
-is_mac_address
---------------
-Returns true if the string passed to this function is a valid mac address.
-
-- *Type*: rvalue
-
-is_numeric
-----------
-Returns true if the variable passed to this function is a number.
-
-- *Type*: rvalue
-
-is_string
----------
-Returns true if the variable passed to this function is a string.
-
-- *Type*: rvalue
-
-join
-----
-This function joins an array into a string using a separator.
-
-*Examples:*
-
-    join(['a','b','c'], ",")
-
-Would result in: "a,b,c"
-
-- *Type*: rvalue
-
-join_keys_to_values
--------------------
-This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
-which each element is one joined key/value pair.
-
-*Examples:*
-
-    join_keys_to_values({'a'=>1,'b'=>2}, " is ")
-
-Would result in: ["a is 1","b is 2"]
-
-- *Type*: rvalue
-
-keys
-----
-Returns the keys of a hash as an array.
-
-- *Type*: rvalue
-
-loadyaml
---------
-Load a YAML file containing an array, string, or hash, and return the data
-in the corresponding native data type.
-
-For example:
-
-    $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
-
-
-- *Type*: rvalue
-
-lstrip
-------
-Strips leading spaces to the left of a string.
-
-- *Type*: rvalue
-
-max
----
-Returns the highest value of all arguments.
-Requires at least one argument.
-
-- *Type*: rvalue
-
-member
-------
-This function determines if a variable is a member of an array.
-
-*Examples:*
-
-    member(['a','b'], 'b')
-
-Would return: true
-
-    member(['a','b'], 'c')
-
-Would return: false
-
-- *Type*: rvalue
-
-merge
------
-Merges two or more hashes together and returns the resulting hash.
-
-For example:
-
-    $hash1 = {'one' => 1, 'two' => 2}
-    $hash2 = {'two' => 'dos', 'three' => 'tres'}
-    $merged_hash = merge($hash1, $hash2)
-    # The resulting hash is equivalent to:
-    # $merged_hash =  {'one' => 1, 'two' => 'dos', 'three' => 'tres'}
-
-When there is a duplicate key, the key in the rightmost hash will "win."
-
-- *Type*: rvalue
-
-min
----
-Returns the lowest value of all arguments.
-Requires at least one argument.
-
-- *Type*: rvalue
-
-num2bool
---------
-This function converts a number or a string representation of a number into a
-true boolean. Zero or anything non-numeric becomes false. Numbers higher then 0
-become true.
-
-- *Type*: rvalue
-
-parsejson
----------
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
-
-- *Type*: rvalue
-
-parseyaml
----------
-This function accepts YAML as a string and converts it into the correct
-Puppet structure.
-
-- *Type*: rvalue
-
-pick
-----
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). Typically,
-this function is used to check for a value in the Puppet Dashboard/Enterprise
-Console, and failover to a default value like the following:
-
-    $real_jenkins_version = pick($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-- *Type*: rvalue
-
-prefix
-------
-This function applies a prefix to all elements in an array.
-
-*Examples:*
-
-    prefix(['a','b','c'], 'p')
-
-Will return: ['pa','pb','pc']
-
-- *Type*: rvalue
-
-range
------
-When given range in the form of (start, stop) it will extrapolate a range as
-an array.
-
-*Examples:*
-
-    range("0", "9")
-
-Will return: [0,1,2,3,4,5,6,7,8,9]
-
-    range("00", "09")
-
-Will return: [0,1,2,3,4,5,6,7,8,9] - Zero padded strings are converted to
-integers automatically
-
-    range("a", "c")
-
-Will return: ["a","b","c"]
-
-    range("host01", "host10")
-
-Will return: ["host01", "host02", ..., "host09", "host10"]
-
-- *Type*: rvalue
-
-reject
-------
-This function searches through an array and rejects all elements that match
-the provided regular expression.
-
-*Examples:*
-
-    reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['bbb','ccc']
-
-
-- *Type*: rvalue
-
-reverse
--------
-Reverses the order of a string or array.
-
-- *Type*: rvalue
-
-rstrip
-------
-Strips leading spaces to the right of the string.
-
-- *Type*: rvalue
-
-shuffle
--------
-Randomizes the order of a string or array elements.
-
-- *Type*: rvalue
-
-size
-----
-Returns the number of elements in a string or array.
-
-- *Type*: rvalue
-
-sort
-----
-Sorts strings and arrays lexically.
-
-- *Type*: rvalue
-
-squeeze
--------
-Returns a new string where runs of the same character that occur in this set
-are replaced by a single character.
-
-- *Type*: rvalue
-
-str2bool
---------
-This converts a string to a boolean. This attempts to convert strings that
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-
-
-- *Type*: rvalue
-
-str2saltedsha512
-----------------
-This converts a string to a salted-SHA512 password hash (which is used for
-OS X versions >= 10.7). Given any simple string, you will get a hex version
-of a salted-SHA512 password hash that can be inserted into your Puppet
-manifests as a valid password attribute.
-
-
-- *Type*: rvalue
-
-strftime
---------
-This function returns formatted time.
-
-*Examples:*
-
-To return the time since epoch:
-
-    strftime("%s")
-
-To return the date:
-
-    strftime("%Y-%m-%d")
-
-*Format meaning:*
-
-    %a - The abbreviated weekday name (``Sun'')
-    %A - The  full  weekday  name (``Sunday'')
-    %b - The abbreviated month name (``Jan'')
-    %B - The  full  month  name (``January'')
-    %c - The preferred local date and time representation
-    %C - Century (20 in 2009)
-    %d - Day of the month (01..31)
-    %D - Date (%m/%d/%y)
-    %e - Day of the month, blank-padded ( 1..31)
-    %F - Equivalent to %Y-%m-%d (the ISO 8601 date format)
-    %h - Equivalent to %b
-    %H - Hour of the day, 24-hour clock (00..23)
-    %I - Hour of the day, 12-hour clock (01..12)
-    %j - Day of the year (001..366)
-    %k - hour, 24-hour clock, blank-padded ( 0..23)
-    %l - hour, 12-hour clock, blank-padded ( 0..12)
-    %L - Millisecond of the second (000..999)
-    %m - Month of the year (01..12)
-    %M - Minute of the hour (00..59)
-    %n - Newline (\n)
-    %N - Fractional seconds digits, default is 9 digits (nanosecond)
-            %3N  millisecond (3 digits)
-            %6N  microsecond (6 digits)
-            %9N  nanosecond (9 digits)
-    %p - Meridian indicator (``AM''  or  ``PM'')
-    %P - Meridian indicator (``am''  or  ``pm'')
-    %r - time, 12-hour (same as %I:%M:%S %p)
-    %R - time, 24-hour (%H:%M)
-    %s - Number of seconds since 1970-01-01 00:00:00 UTC.
-    %S - Second of the minute (00..60)
-    %t - Tab character (	)
-    %T - time, 24-hour (%H:%M:%S)
-    %u - Day of the week as a decimal, Monday being 1. (1..7)
-    %U - Week  number  of the current year,
-            starting with the first Sunday as the first
-            day of the first week (00..53)
-    %v - VMS date (%e-%b-%Y)
-    %V - Week number of year according to ISO 8601 (01..53)
-    %W - Week  number  of the current year,
-            starting with the first Monday as the first
-            day of the first week (00..53)
-    %w - Day of the week (Sunday is 0, 0..6)
-    %x - Preferred representation for the date alone, no time
-    %X - Preferred representation for the time alone, no date
-    %y - Year without a century (00..99)
-    %Y - Year with century
-    %z - Time zone as  hour offset from UTC (e.g. +0900)
-    %Z - Time zone name
-    %% - Literal ``%'' character
-
-
-- *Type*: rvalue
-
-strip
------
-This function removes leading and trailing whitespace from a string or from
-every string inside an array.
-
-*Examples:*
-
-    strip("    aaa   ")
-
-Would result in: "aaa"
-
-
-- *Type*: rvalue
-
-suffix
-------
-This function applies a suffix to all elements in an array.
-
-*Examples:*
-
-    suffix(['a','b','c'], 'p')
-
-Will return: ['ap','bp','cp']
-
-
-- *Type*: rvalue
-
-swapcase
---------
-This function will swap the existing case of a string.
-
-*Examples:*
-
-    swapcase("aBcD")
-
-Would result in: "AbCd"
-
-
-- *Type*: rvalue
-
-time
-----
-This function will return the current time since epoch as an integer.
-
-*Examples:*
-
-    time()
-
-Will return something like: 1311972653
-
-
-- *Type*: rvalue
-
-to_bytes
---------
-Converts the argument into bytes, for example 4 kB becomes 4096.
-Takes a single string value as an argument.
-
-
-- *Type*: rvalue
-
-type
-----
-Returns the type when passed a variable. Type can be one of:
-
-* string
-* array
-* hash
-* float
-* integer
-* boolean
-
-
-- *Type*: rvalue
-
-union
------
-This function returns a union of two arrays.
-
-*Examples:*
-
-    union(["a","b","c"],["b","c","d"])
-
-Would return: ["a","b","c","d"]
-
-
-unique
-------
-This function will remove duplicates from strings and arrays.
-
-*Examples:*
-
-    unique("aabbcc")
-
-Will return:
-
-    abc
-
-You can also use this with arrays:
-
-    unique(["a","a","b","b","c","c"])
-
-This returns:
-
-    ["a","b","c"]
-
-
-- *Type*: rvalue
-
-upcase
-------
-Converts a string or an array of strings to uppercase.
-
-*Examples:*
-
-    upcase("abcd")
-
-Will return:
-
-    ABCD
-
-
-- *Type*: rvalue
-
-uriescape
----------
-Urlencodes a string or array of strings.
-Requires either a single string or an array as an input.
-
-
-- *Type*: rvalue
-
-validate_absolute_path
-----------------------
-Validate the string represents an absolute path in the filesystem.  This function works
-for windows and unix style paths.
-
-The following values will pass:
-
-    $my_path = "C:/Program Files (x86)/Puppet Labs/Puppet"
-    validate_absolute_path($my_path)
-    $my_path2 = "/var/lib/puppet"
-    validate_absolute_path($my_path2)
-
-
-The following values will fail, causing compilation to abort:
-
-    validate_absolute_path(true)
-    validate_absolute_path([ 'var/lib/puppet', '/var/foo' ])
-    validate_absolute_path([ '/var/lib/puppet', 'var/foo' ])
-    $undefined = undef
-    validate_absolute_path($undefined)
-
-
-
-- *Type*: statement
-
-validate_array
---------------
-Validate that all passed values are array data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_array = [ 'one', 'two' ]
-    validate_array($my_array)
-
-The following values will fail, causing compilation to abort:
-
-    validate_array(true)
-    validate_array('some_string')
-    $undefined = undef
-    validate_array($undefined)
-
-
-
-- *Type*: statement
-
-validate_augeas
----------------
-Perform validation of a string using an Augeas lens
-The first argument of this function should be a string to
-test, and the second argument should be the name of the Augeas lens to use.
-If Augeas fails to parse the string with the lens, the compilation will
-abort with a parse error.
-
-A third argument can be specified, listing paths which should
-not be found in the file. The `$file` variable points to the location
-of the temporary file being tested in the Augeas tree.
-
-For example, if you want to make sure your passwd content never contains
-a user `foo`, you could write:
-
-    validate_augeas($passwdcontent, 'Passwd.lns', ['$file/foo'])
-
-Or if you wanted to ensure that no users used the '/bin/barsh' shell,
-you could use:
-
-    validate_augeas($passwdcontent, 'Passwd.lns', ['$file/*[shell="/bin/barsh"]']
-
-If a fourth argument is specified, this will be the error message raised and
-seen by the user.
-
-A helpful error message can be returned like this:
-
-    validate_augeas($sudoerscontent, 'Sudoers.lns', [], 'Failed to validate sudoers content with Augeas')
-
-
-
-- *Type*: statement
-
-validate_bool
--------------
-Validate that all passed values are either true or false. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $iamtrue = true
-    validate_bool(true)
-    validate_bool(true, true, false, $iamtrue)
-
-The following values will fail, causing compilation to abort:
-
-    $some_array = [ true ]
-    validate_bool("false")
-    validate_bool("true")
-    validate_bool($some_array)
-
-
-
-- *Type*: statement
-
-validate_cmd
-------------
-Perform validation of a string with an external command.
-The first argument of this function should be a string to
-test, and the second argument should be a path to a test command
-taking a file as last argument. If the command, launched against
-a tempfile containing the passed string, returns a non-null value,
-compilation will abort with a parse error.
-
-If a third argument is specified, this will be the error message raised and
-seen by the user.
-
-A helpful error message can be returned like this:
-
-Example:
-
-    validate_cmd($sudoerscontent, '/usr/sbin/visudo -c -f', 'Visudo failed to validate sudoers content')
-
-
-
-- *Type*: statement
-
-validate_hash
--------------
-Validate that all passed values are hash data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_hash = { 'one' => 'two' }
-    validate_hash($my_hash)
-
-The following values will fail, causing compilation to abort:
-
-    validate_hash(true)
-    validate_hash('some_string')
-    $undefined = undef
-    validate_hash($undefined)
-
-
-
-- *Type*: statement
-
-validate_re
------------
-Perform simple validation of a string against one or more regular
-expressions. The first argument of this function should be a string to
-test, and the second argument should be a stringified regular expression
-(without the // delimiters) or an array of regular expressions.  If none
-of the regular expressions match the string passed in, compilation will
-abort with a parse error.
-
-If a third argument is specified, this will be the error message raised and
-seen by the user.
-
-The following strings will validate against the regular expressions:
-
-    validate_re('one', '^one$')
-    validate_re('one', [ '^one', '^two' ])
-
-The following strings will fail to validate, causing compilation to abort:
-
-    validate_re('one', [ '^two', '^three' ])
-
-A helpful error message can be returned like this:
-
-    validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7')
-
-
-
-- *Type*: statement
-
-validate_slength
-----------------
-Validate that the first argument is a string (or an array of strings), and
-less/equal to than the length of the second argument.  It fails if the first
-argument is not a string or array of strings, and if arg 2 is not convertable
-to a number.
-
-The following values will pass:
-
-    validate_slength("discombobulate",17)
-    validate_slength(["discombobulate","moo"],17)
-
-The following values will not:
-
-    validate_slength("discombobulate",1)
-    validate_slength(["discombobulate","thermometer"],5)
-
-
-
-- *Type*: statement
-
-validate_string
----------------
-Validate that all passed values are string data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_string = "one two"
-    validate_string($my_string, 'three')
-
-The following values will fail, causing compilation to abort:
-
-    validate_string(true)
-    validate_string([ 'some', 'array' ])
-    $undefined = undef
-    validate_string($undefined)
-
-
-- *Type*: statement
-
-values
-------
-When given a hash this function will return the values of that hash.
-
-*Examples:*
-
-    $hash = {
-      'a' => 1,
-      'b' => 2,
-      'c' => 3,
-    }
-    values($hash)
-
-This example would return:
-
-    [1,2,3]
-
-
-- *Type*: rvalue
-
-values_at
----------
-Finds value inside an array based on location.
-
-The first argument is the array you want to analyze, and the second element can
-be a combination of:
-
-* A single numeric index
-* A range in the form of 'start-stop' (eg. 4-9)
-* An array combining the above
-
-*Examples*:
-
-    values_at(['a','b','c'], 2)
-
-Would return ['c'].
-
-    values_at(['a','b','c'], ["0-1"])
-
-Would return ['a','b'].
-
-    values_at(['a','b','c','d','e'], [0, "2-3"])
-
-Would return ['a','c','d'].
-
-
-- *Type*: rvalue
-
-zip
----
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
-
-*Example:*
-
-    zip(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-    ["1", "4"], ["2", "5"], ["3", "6"]
-
-
-- *Type*: rvalue
-
-*This page autogenerated on 2013-04-11 13:54:25 -0700*
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown
deleted file mode 100644
index 04349ed79b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown
+++ /dev/null
@@ -1,35 +0,0 @@
-Puppet Specific Facts
-=====================
-
-Facter is meant to stand alone and apart from Puppet.  However, Facter often
-runs inside Puppet and all custom facts included in the stdlib module will
-almost always be evaluated in the context of Puppet and Facter working
-together.
-
-Still, we don't want to write custom facts that blow up in the users face if
-Puppet is not loaded in memory.  This is often the case if the user runs
-`facter` without also supplying the `--puppet` flag.
-
-Ah! But Jeff, the custom fact won't be in the `$LOAD_PATH` unless the user
-supplies `--facter`! You might say...
-
-Not (always) true I say!  If the user happens to have a CWD of
-`<modulepath>/stdlib/lib` then the facts will automatically be evaluated and
-blow up.
-
-In any event, it's pretty easy to write a fact that has no value if Puppet is
-not loaded.  Simply do it like this:
-
-    Facter.add(:node_vardir) do
-      setcode do
-        # This will be nil if Puppet is not available.
-        Facter::Util::PuppetSettings.with_puppet do
-          Puppet[:vardir]
-        end
-      end
-    end
-
-The `Facter::Util::PuppetSettings.with_puppet` method accepts a block and
-yields to it only if the Puppet library is loaded.  If the Puppet library is
-not loaded, then the method silently returns `nil` which Facter interprets as
-an undefined fact value.  The net effect is that the fact won't be set.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown
deleted file mode 100644
index 917b6310dd2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown
+++ /dev/null
@@ -1,7 +0,0 @@
-NOTE
-====
-
-This project's specs depend on puppet core, and thus they require the
-`puppetlabs_spec_helper` project.  For more information please see the README
-in that project, which can be found here: [puppetlabs spec
-helper](https://github.com/puppetlabs/puppetlabs_spec_helper)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown
deleted file mode 100644
index 0f9328ed0fa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributing to this module #
-
- * Work in a topic branch
- * Submit a github pull request
- * Address any comments / feeback
- * Merge into master using --no-ff
-
-# Releasing this module #
-
- * This module adheres to http://semver.org/
- * Look for API breaking changes using git diff vX.Y.Z..master
-   * If no API breaking changes, the minor version may be bumped.
-   * If there are API breaking changes, the major version must be bumped.
-   * If there are only small minor changes, the patch version may be bumped.
- * Update the CHANGELOG
- * Update the Modulefile
- * Commit these changes with a message along the lines of "Update CHANGELOG and
-   Modulefile for release"
- * Create an annotated tag with git tag -a vX.Y.Z -m 'version X.Y.Z' (NOTE the
-   leading v as per semver.org)
- * Push the tag with git push origin --tags
- * Build a new package with puppet-module or the rake build task if it exists
- * Publish the new package to the forge
- * Bonus points for an announcement to puppet-users.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile
deleted file mode 100644
index 4ed1327a3be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
-
-desc "Validate manifests, templates, and ruby files in lib."
-task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
-  Dir['lib/**/*.rb'].each do |lib_file|
-    sh "ruby -c #{lib_file}"
-  end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
deleted file mode 100644
index 2c096b049d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# A Facter plugin that loads facts from /etc/facter/facts.d
-# and /etc/puppetlabs/facter/facts.d.
-#
-# Facts can be in the form of JSON, YAML or Text files
-# and any executable that returns key=value pairs.
-#
-# In the case of scripts you can also create a file that
-# contains a cache TTL.  For foo.sh store the ttl as just
-# a number in foo.sh.ttl
-#
-# The cache is stored in /tmp/facts_cache.yaml as a mode
-# 600 file and will have the end result of not calling your
-# fact scripts more often than is needed
-
-class Facter::Util::DotD
-  require 'yaml'
-
-  def initialize(dir="/etc/facts.d", cache_file="/tmp/facts_cache.yml")
-    @dir = dir
-    @cache_file = cache_file
-    @cache = nil
-    @types = {".txt" => :txt, ".json" => :json, ".yaml" => :yaml}
-  end
-
-  def entries
-    Dir.entries(@dir).reject{|f| f =~ /^\.|\.ttl$/}.sort.map {|f| File.join(@dir, f) }
-  rescue
-    []
-  end
-
-  def fact_type(file)
-    extension = File.extname(file)
-
-    type = @types[extension] || :unknown
-
-    type = :script if type == :unknown && File.executable?(file)
-
-    return type
-  end
-
-  def txt_parser(file)
-    File.readlines(file).each do |line|
-      if line =~ /^([^=]+)=(.+)$/
-        var = $1; val = $2
-
-        Facter.add(var) do
-          setcode { val }
-        end
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
-  end
-
-  def json_parser(file)
-    begin
-      require 'json'
-    rescue LoadError
-      retry if require 'rubygems'
-      raise
-    end
-
-    JSON.load(File.read(file)).each_pair do |f, v|
-      Facter.add(f) do
-        setcode { v }
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
-  end
-
-  def yaml_parser(file)
-    require 'yaml'
-
-    YAML.load_file(file).each_pair do |f, v|
-      Facter.add(f) do
-        setcode { v }
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
-  end
-
-  def script_parser(file)
-    result = cache_lookup(file)
-    ttl = cache_time(file)
-
-    unless result
-      result = Facter::Util::Resolution.exec(file)
-
-      if ttl > 0
-        Facter.debug("Updating cache for #{file}")
-        cache_store(file, result)
-        cache_save!
-      end
-    else
-      Facter.debug("Using cached data for #{file}")
-    end
-
-    result.split("\n").each do |line|
-      if line =~ /^(.+)=(.+)$/
-        var = $1; val = $2
-
-        Facter.add(var) do
-          setcode { val }
-        end
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
-    Facter.debug(e.backtrace.join("\n\t"))
-  end
-
-  def cache_save!
-    cache = load_cache
-    File.open(@cache_file, "w", 0600) {|f| f.write(YAML.dump(cache)) }
-  rescue
-  end
-
-  def cache_store(file, data)
-    load_cache
-
-    @cache[file] = {:data => data, :stored => Time.now.to_i}
-  rescue
-  end
-
-  def cache_lookup(file)
-    cache = load_cache
-
-    return nil if cache.empty?
-
-    ttl = cache_time(file)
-
-    if cache[file]
-      now = Time.now.to_i
-
-      return cache[file][:data] if ttl == -1
-      return cache[file][:data] if (now - cache[file][:stored]) <= ttl
-      return nil
-    else
-      return nil
-    end
-  rescue
-    return nil
-  end
-
-  def cache_time(file)
-    meta = file + ".ttl"
-
-    return File.read(meta).chomp.to_i
-  rescue
-    return 0
-  end
-
-  def load_cache
-    unless @cache
-      if File.exist?(@cache_file)
-        @cache = YAML.load_file(@cache_file)
-      else
-        @cache = {}
-      end
-    end
-
-    return @cache
-  rescue
-    @cache = {}
-    return @cache
-  end
-
-  def create
-    entries.each do |fact|
-      type = fact_type(fact)
-      parser = "#{type}_parser"
-
-      if respond_to?("#{type}_parser")
-        Facter.debug("Parsing #{fact} using #{parser}")
-
-        send(parser, fact)
-      end
-    end
-  end
-end
-
-
-mdata = Facter.version.match(/(\d+)\.(\d+)\.(\d+)/)
-if mdata
-  (major, minor, patch) = mdata.captures.map { |v| v.to_i }
-  if major < 2
-    # Facter 1.7 introduced external facts support directly
-    unless major == 1 and minor > 6
-      Facter::Util::DotD.new("/etc/facter/facts.d").create
-      Facter::Util::DotD.new("/etc/puppetlabs/facter/facts.d").create
-
-      # Windows has a different configuration directory that defaults to a vendor
-      # specific sub directory of the %COMMON_APPDATA% directory.
-      if Dir.const_defined? 'COMMON_APPDATA' then
-        windows_facts_dot_d = File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'facter', 'facts.d')
-        Facter::Util::DotD.new(windows_facts_dot_d).create
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb
deleted file mode 100644
index 0cc0f64e950..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Fact: is_pe, pe_version, pe_major_version, pe_minor_version, pe_patch_version
-#
-# Purpose: Return various facts about the PE state of the system
-#
-# Resolution: Uses a regex match against puppetversion to determine whether the
-#   machine has Puppet Enterprise installed, and what version (overall, major,
-#   minor, patch) is installed.
-#
-# Caveats:
-#
-Facter.add("pe_version") do
-  setcode do
-    pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
-    pe_ver[1] if pe_ver
-  end
-end
-
-Facter.add("is_pe") do
-  setcode do
-    if Facter.value(:pe_version).to_s.empty? then
-      false
-    else
-      true
-    end
-  end
-end
-
-Facter.add("pe_major_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[0]
-    end
-  end
-end
-
-Facter.add("pe_minor_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[1]
-    end
-  end
-end
-
-Facter.add("pe_patch_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[2]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
deleted file mode 100644
index 0e6af40e49a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This facter fact returns the value of the Puppet vardir setting for the node
-# running puppet or puppet agent.  The intent is to enable Puppet modules to
-# automatically have insight into a place where they can place variable data,
-# regardless of the node's platform.
-#
-# The value should be directly usable in a File resource path attribute.
-
-
-begin
-  require 'facter/util/puppet_settings'
-rescue LoadError => e
-  # puppet apply does not add module lib directories to the $LOAD_PATH (See
-  # #4248). It should (in the future) but for the time being we need to be
-  # defensive which is what this rescue block is doing.
-  rb_file = File.join(File.dirname(__FILE__), 'util', 'puppet_settings.rb')
-  load rb_file if File.exists?(rb_file) or raise e
-end
-
-Facter.add(:puppet_vardir) do
-  setcode do
-    # This will be nil if Puppet is not available.
-    Facter::Util::PuppetSettings.with_puppet do
-      Puppet[:vardir]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb
deleted file mode 100644
index b4f87ff2ab2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# A facter fact to determine the root home directory.
-# This varies on PE supported platforms and may be
-# reconfigured by the end user.
-
-module Facter::Util::RootHome
-  class << self
-  def get_root_home
-    root_ent = Facter::Util::Resolution.exec("getent passwd root")
-    # The home directory is the sixth element in the passwd entry
-    # If the platform doesn't have getent, root_ent will be nil and we should
-    # return it straight away.
-    root_ent && root_ent.split(":")[5]
-  end
-  end
-end
-
-Facter.add(:root_home) do
-  setcode { Facter::Util::RootHome.get_root_home }
-end
-
-Facter.add(:root_home) do
-  confine :kernel => :darwin
-  setcode do
-    str = Facter::Util::Resolution.exec("dscacheutil -q user -a name root")
-    hash = {}
-    str.split("\n").each do |pair|
-      key,value = pair.split(/:/)
-      hash[key] = value
-    end
-    hash['dir'].strip
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
deleted file mode 100644
index 1ad945218ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Facter
-  module Util
-    module PuppetSettings
-      # This method is intended to provide a convenient way to evaluate a
-      # Facter code block only if Puppet is loaded.  This is to account for the
-      # situation where the fact happens to be in the load path, but Puppet is
-      # not loaded for whatever reason.  Perhaps the user is simply running
-      # facter without the --puppet flag and they happen to be working in a lib
-      # directory of a module.
-      def self.with_puppet
-        begin
-          Module.const_get("Puppet")
-        rescue NameError
-          nil
-        else
-          yield
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
deleted file mode 100644
index 11d2d7feade..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# abs.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:abs, :type => :rvalue, :doc => <<-EOS
-    Returns the absolute value of a number, for example -34.56 becomes
-    34.56. Takes a single integer and float value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-
-    # Numbers in Puppet are often string-encoded which is troublesome ...
-    if value.is_a?(String)
-      if value.match(/^-?(?:\d+)(?:\.\d+){1}$/)
-        value = value.to_f
-      elsif value.match(/^-?\d+$/)
-        value = value.to_i
-      else
-        raise(Puppet::ParseError, 'abs(): Requires float or ' +
-          'integer to work with')
-      end
-    end
-
-    # We have numeric value to handle ...
-    result = value.abs
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
deleted file mode 100644
index e71407e89e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# any2array.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:any2array, :type => :rvalue, :doc => <<-EOS
-This converts any object to an array containing that object. Empty argument
-lists are converted to an empty array. Arrays are left untouched. Hashes are
-converted to arrays of alternating keys and values.
-    EOS
-  ) do |arguments|
-
-    if arguments.empty?
-        return []
-    end
-
-    if arguments.length == 1
-        if arguments[0].kind_of?(Array)
-            return arguments[0]
-        elsif arguments[0].kind_of?(Hash)
-            result = []
-            arguments[0].each do |key, value|
-                result << key << value
-            end
-            return result
-        end
-    end
-
-    return arguments
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
deleted file mode 100644
index 617ba31b6e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:base64, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Base64 encode or decode a string based on the command and the string submitted
-
-    Usage:
-
-      $encodestring = base64('encode','thestring')
-      $decodestring = base64('decode','dGhlc3RyaW5n')
-
-    ENDHEREDOC
-
-    require 'base64'
-
-    raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be = 2)") unless args.length == 2
-
-    actions = ['encode','decode']
-
-    unless actions.include?(args[0])
-      raise Puppet::ParseError, ("base64(): the first argument must be one of 'encode' or 'decode'")
-    end
-
-    unless args[1].is_a?(String)
-      raise Puppet::ParseError, ("base64(): the second argument must be a string to base64")
-    end
-
-    case args[0]
-      when 'encode'
-        result = Base64.encode64(args[1])
-      when 'decode'
-        result = Base64.decode64(args[1])
-    end
-
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
deleted file mode 100644
index 9a07a8a1192..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# bool2num.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:bool2num, :type => :rvalue, :doc => <<-EOS
-    Converts a boolean to a number. Converts the values:
-      false, f, 0, n, and no to 0
-      true, t, 1, y, and yes to 1
-    Requires a single boolean or string as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    # We can have either true or false, or string which resembles boolean ...
-    unless [FalseClass, TrueClass, String].include?(klass)
-      raise(Puppet::ParseError, 'bool2num(): Requires either ' +
-        'boolean or string to work with')
-    end
-
-    if value.is_a?(String)
-      # We consider all the yes, no, y, n and so on too ...
-      value = case value
-        #
-        # This is how undef looks like in Puppet ...
-        # We yield 0 (or false if you wish) in this case.
-        #
-        when /^$/, '' then false # Empty string will be false ...
-        when /^(1|t|y|true|yes)$/  then true
-        when /^(0|f|n|false|no)$/  then false
-        when /^(undef|undefined)$/ then false # This is not likely to happen ...
-        else
-          raise(Puppet::ParseError, 'bool2num(): Unknown type of boolean given')
-      end
-    end
-
-    # We have real boolean values as well ...
-    result = value ? 1 : 0
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
deleted file mode 100644
index 640d00b82fa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  capitalize.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:capitalize, :type => :rvalue, :doc => <<-EOS
-    Capitalizes the first letter of a string or array of strings.
-    Requires either a single string or an array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'capitalize(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.capitalize : i }
-    else
-      result = value.capitalize
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
deleted file mode 100644
index 4564a000abe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  chomp.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:chomp, :type => :rvalue, :doc => <<-'EOS'
-    Removes the record separator from the end of a string or an array of
-    strings, for example `hello\n` becomes `hello`.
-    Requires a single string or array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'chomp(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.chomp : i }
-    else
-      result = value.chomp
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
deleted file mode 100644
index f242af39ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  chop.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:chop, :type => :rvalue, :doc => <<-'EOS'
-    Returns a new string with the last character removed. If the string ends
-    with `\r\n`, both characters are removed. Applying chop to an empty
-    string returns an empty string. If you wish to merely remove record
-    separators then you should use the `chomp` function.
-    Requires a string or array of strings as input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "chop(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'chop(): Requires either an ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.chop : i }
-    else
-      result = value.chop
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
deleted file mode 100644
index 6c8638222ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# concat.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:concat, :type => :rvalue, :doc => <<-EOS
-Appends the contents of array 2 onto array 1.
-
-*Example:*
-
-    concat(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-  ['1','2','3','4','5','6']
-    EOS
-  ) do |arguments|
-
-    # Check that 2 arguments have been given ...
-    raise(Puppet::ParseError, "concat(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    a = arguments[0]
-    b = arguments[1]
-
-    # Check that the first parameter is an array
-    unless a.is_a?(Array)
-      raise(Puppet::ParseError, 'concat(): Requires array to work with')
-    end
-
-    if b.is_a?(Array)
-      result = a.concat(b)
-    else
-      result = a << b
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
deleted file mode 100644
index 52de1b8a5a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:count, :type => :rvalue, :arity => -2, :doc => <<-EOS
-Takes an array as first argument and an optional second argument.
-Count the number of elements in array that matches second argument.
-If called with only an array it counts the number of elements that are not nil/undef.
-    EOS
-  ) do |args|
-
-    if (args.size > 2) then
-      raise(ArgumentError, "count(): Wrong number of arguments "+
-        "given #{args.size} for 1 or 2.")
-    end
-
-    collection, item = args
-
-    if item then
-      collection.count item
-    else
-      collection.count { |obj| obj != nil && obj != :undef && obj != '' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
deleted file mode 100644
index 6df32e9c567..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:deep_merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Recursively merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-        $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-        $merged_hash = deep_merge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }
-
-    When there is a duplicate key that is a hash, they are recursively merged.
-    When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    deep_merge = Proc.new do |hash1,hash2|
-      hash1.merge(hash2) do |key,old_value,new_value|
-        if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-          deep_merge.call(old_value, new_value)
-        else
-          new_value
-        end
-      end
-    end
-
-    result = Hash.new
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "deep_merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-
-      result = deep_merge.call(result, arg)
-    end
-    return( result )
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
deleted file mode 100644
index d7df306c793..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:defined_with_params,
-                                      :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-ENDOFDOC
-) do |vals|
-  reference, params = vals
-  raise(ArgumentError, 'Must specify a reference') unless reference
-  if (! params) || params == ''
-    params = {}
-  end
-  ret = false
-  if resource = findresource(reference.to_s)
-    matches = params.collect do |key, value|
-      resource[key] == value
-    end
-    ret = params.empty? || !matches.include?(false)
-  end
-  Puppet.debug("Resource #{reference} was not determined to be defined")
-  ret
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
deleted file mode 100644
index d03a29355e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# delete.rb
-#
-
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
-module Puppet::Parser::Functions
-  newfunction(:delete, :type => :rvalue, :doc => <<-EOS
-Deletes all instances of a given element from an array, substring from a
-string, or key from a hash.
-
-*Examples:*
-
-    delete(['a','b','c','b'], 'b')
-    Would return: ['a','c']
-
-    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
-    Would return: {'a'=>1,'c'=>3}
-
-    delete('abracadabra', 'bra')
-    Would return: 'acada'
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-        "given #{arguments.size} for 2.")
-    end
-
-    collection = arguments[0].dup
-    item = arguments[1]
-
-    case collection
-    when Array, Hash
-      collection.delete item
-    when String
-      collection.gsub! item, ''
-    else
-      raise(TypeError, "delete(): First argument must be an Array, " +
-            "String, or Hash. Given an argument of class #{collection.class}.")
-    end
-    collection
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
deleted file mode 100644
index 3eb4b53756a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# delete_at.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:delete_at, :type => :rvalue, :doc => <<-EOS
-Deletes a determined indexed value from an array.
-
-*Examples:*
-
-    delete_at(['a','b','c'], 1)
-
-Would return: ['a','c']
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "delete_at(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'delete_at(): Requires array to work with')
-    end
-
-    index = arguments[1]
-
-    if index.is_a?(String) and not index.match(/^\d+$/)
-      raise(Puppet::ParseError, 'delete_at(): You must provide ' +
-        'non-negative numeric index')
-    end
-
-    result = array.clone
-
-    # Numbers in Puppet are often string-encoded which is troublesome ...
-    index = index.to_i
-
-    if index > result.size - 1 # First element is at index 0 is it not?
-      raise(Puppet::ParseError, 'delete_at(): Given index ' +
-        'exceeds size of array given')
-    end
-
-    result.delete_at(index) # We ignore the element that got deleted ...
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
deleted file mode 100644
index f94d4da8d42..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:delete_undef_values, :type => :rvalue, :doc => <<-EOS
-Returns a copy of input hash or array with all undefs deleted.
-
-*Examples:*
-
-    $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-
-Would return: {a => 'A', b => '', d => false}
-
-    $array = delete_undef_values(['A','',undef,false])
-
-Would return: ['A','',false]
-
-      EOS
-    ) do |args|
-
-    raise(Puppet::ParseError,
-          "delete_undef_values(): Wrong number of arguments given " +
-          "(#{args.size})") if args.size < 1
-
-    unless args[0].is_a? Array or args[0].is_a? Hash
-      raise(Puppet::ParseError,
-            "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
-    end
-    result = args[0].dup
-    if result.is_a?(Hash)
-      result.delete_if {|key, val| val.equal? :undef}
-    elsif result.is_a?(Array)
-      result.delete :undef
-    end
-    result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
deleted file mode 100644
index f6c8c0e6b6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:delete_values, :type => :rvalue, :doc => <<-EOS
-Deletes all instances of a given value from a hash.
-
-*Examples:*
-
-    delete_values({'a'=>'A','b'=>'B','c'=>'C','B'=>'D'}, 'B')
-
-Would return: {'a'=>'A','c'=>'C','B'=>'D'}
-
-      EOS
-    ) do |arguments|
-
-    raise(Puppet::ParseError,
-          "delete_values(): Wrong number of arguments given " +
-          "(#{arguments.size} of 2)") if arguments.size != 2
-
-    hash, item = arguments
-
-    if not hash.is_a?(Hash)
-      raise(TypeError, "delete_values(): First argument must be a Hash. " + \
-                       "Given an argument of class #{hash.class}.")
-    end
-    hash.dup.delete_if { |key, val| item == val }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
deleted file mode 100644
index cd258f75165..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# difference.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:difference, :type => :rvalue, :doc => <<-EOS
-This function returns the difference between two arrays.
-The returned array is a copy of the original array, removing any items that
-also appear in the second array.
-
-*Examples:*
-
-    difference(["a","b","c"],["b","c","d"])
-
-Would return: ["a"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "difference(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'difference(): Requires 2 arrays')
-    end
-
-    result = first - second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
deleted file mode 100644
index ea8cc1e081e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:dirname, :type => :rvalue, :doc => <<-EOS
-    Returns the dirname of a path.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "dirname(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    path = arguments[0]
-    return File.dirname(path)
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
deleted file mode 100644
index 4066d210f77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  downcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:downcase, :type => :rvalue, :doc => <<-EOS
-Converts the case of a string or all strings in an array to lower case.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "downcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'downcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.downcase : i }
-    else
-      result = value.downcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
deleted file mode 100644
index 80ebb86b891..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# empty.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:empty, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable is empty.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "empty(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, Hash, String].include?(klass)
-      raise(Puppet::ParseError, 'empty(): Requires either ' +
-        'array, hash or string to work with')
-    end
-
-    result = value.empty?
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
deleted file mode 100644
index f1da4aaaafe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# ensure_packages.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:ensure_packages, :type => :statement, :doc => <<-EOS
-Takes a list of packages and only installs them if they don't already exist.
-It optionally takes a hash as a second parameter that will be passed as the
-third argument to the ensure_resource() function.
-    EOS
-  ) do |arguments|
-
-    if arguments.size > 2 or arguments.size == 0
-      raise(Puppet::ParseError, "ensure_packages(): Wrong number of arguments " +
-        "given (#{arguments.size} for 1 or 2)")
-    elsif arguments.size == 2 and !arguments[1].is_a?(Hash) 
-      raise(Puppet::ParseError, 'ensure_packages(): Requires second argument to be a Hash')
-    end
-
-    packages = Array(arguments[0])
-
-    if arguments[1]
-      defaults = { 'ensure' => 'present' }.merge(arguments[1])
-    else
-      defaults = { 'ensure' => 'present' }
-    end
-
-    Puppet::Parser::Functions.function(:ensure_resource)
-    packages.each { |package_name|
-      function_ensure_resource(['package', package_name, defaults ])
-    }
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
deleted file mode 100644
index 05e5593fc17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:ensure_resource,
-                                      :type => :statement,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-This example only creates the resource if it does not already exist:
-
-    ensure_resource('user', 'dan', {'ensure' => 'present' })
-
-If the resource already exists but does not match the specified parameters,
-this function will attempt to recreate the resource leading to a duplicate
-resource definition error.
-
-An array of resources can also be passed in and each will be created with
-the type and parameters specified if it doesn't already exist.
-
-    ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
-
-ENDOFDOC
-) do |vals|
-  type, title, params = vals
-  raise(ArgumentError, 'Must specify a type') unless type
-  raise(ArgumentError, 'Must specify a title') unless title
-  params ||= {}
-
-  items = [title].flatten
-
-  items.each do |item|
-    Puppet::Parser::Functions.function(:defined_with_params)
-    if function_defined_with_params(["#{type}[#{item}]", params])
-      Puppet.debug("Resource #{type}[#{item}] not created because it already exists")
-    else
-      Puppet::Parser::Functions.function(:create_resources)
-      function_create_resources([type.capitalize, { item => params }])
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
deleted file mode 100644
index a1ed1832901..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# flatten.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:flatten, :type => :rvalue, :doc => <<-EOS
-This function flattens any deeply nested arrays and returns a single flat array
-as a result.
-
-*Examples:*
-
-    flatten(['a', ['b', ['c']]])
-
-Would return: ['a','b','c']
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "flatten(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'flatten(): Requires array to work with')
-    end
-
-    result = array.flatten
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
deleted file mode 100644
index 9a6f014d7c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:floor, :type => :rvalue, :doc => <<-EOS
-    Returns the largest integer less or equal to the argument.
-    Takes a single numeric value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "floor(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    begin
-      arg = Float(arguments[0])
-    rescue TypeError, ArgumentError => e
-      raise(Puppet::ParseError, "floor(): Wrong argument type " +
-            "given (#{arguments[0]} for Numeric)")
-    end
-
-    raise(Puppet::ParseError, "floor(): Wrong argument type " +
-          "given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
-
-    arg.floor
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
deleted file mode 100644
index 6558206055f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# fqdn_rotate.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:fqdn_rotate, :type => :rvalue, :doc => <<-EOS
-Rotates an array a random number of times based on a nodes fqdn.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "fqdn_rotate(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-    require 'digest/md5'
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'fqdn_rotate(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # Check whether it makes sense to rotate ...
-    return result if result.size <= 1
-
-    # We turn any string value into an array to be able to rotate ...
-    result = string ? result.split('') : result
-
-    elements = result.size
-
-    srand(Digest::MD5.hexdigest([lookupvar('::fqdn'),arguments].join(':')).hex)
-    rand(elements).times {
-       result.push result.shift
-    }
-
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
deleted file mode 100644
index 1421b91f52f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:get_module_path, :type =>:rvalue, :doc => <<-EOT
-    Returns the absolute path of the specified module for the current
-    environment.
-
-    Example:
-      $module_path = get_module_path('stdlib')
-  EOT
-  ) do |args|
-    raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1
-    if module_path = Puppet::Module.find(args[0], compiler.environment.to_s)
-      module_path.path
-    else
-      raise(Puppet::ParseError, "Could not find module #{args[0]} in environment #{compiler.environment}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
deleted file mode 100644
index 6d510069f90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:getparam,
-                                      :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and name of the parameter and
-returns value of resource's parameter.
-
-*Examples:*
-
-    define example_resource($param) {
-    }
-
-    example_resource { "example_resource_instance":
-        param => "param_value"
-    }
-
-    getparam(Example_resource["example_resource_instance"], "param")
-
-Would return: param_value
-ENDOFDOC
-) do |vals|
-  reference, param = vals
-  raise(ArgumentError, 'Must specify a reference') unless reference
-  raise(ArgumentError, 'Must specify name of a parameter') unless param and param.instance_of? String
-
-  return '' if param.empty?
-
-  if resource = findresource(reference.to_s)
-    return resource[param] if resource[param]
-  end
-
-  return ''
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
deleted file mode 100644
index 162114995b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:getvar, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Lookup a variable in a remote namespace.
-
-    For example:
-
-        $foo = getvar('site::data::foo')
-        # Equivalent to $foo = $site::data::foo
-
-    This is useful if the namespace itself is stored in a string:
-
-        $datalocation = 'site::data'
-        $bar = getvar("${datalocation}::bar")
-        # Equivalent to $bar = $site::data::bar
-    ENDHEREDOC
-
-    unless args.length == 1
-      raise Puppet::ParseError, ("getvar(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    self.lookupvar("#{args[0]}")
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
deleted file mode 100644
index ceba9ecc8ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# grep.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:grep, :type => :rvalue, :doc => <<-EOS
-This function searches through an array and returns any elements that match
-the provided regular expression.
-
-*Examples:*
-
-    grep(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['aaa','aaaddd']
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "grep(): Wrong number of arguments "+
-        "given #{arguments.size} for 2")
-    end
-
-    a = arguments[0]
-    pattern = Regexp.new(arguments[1])
-
-    a.grep(pattern)
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
deleted file mode 100644
index 7f150a7176c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# has_interface_with
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_interface_with, :type => :rvalue, :doc => <<-EOS
-Returns boolean based on kind and value:
-  * macaddress
-  * netmask
-  * ipaddress
-  * network
-
-has_interface_with("macaddress", "x:x:x:x:x:x")
-has_interface_with("ipaddress", "127.0.0.1")    => true
-etc.
-
-If no "kind" is given, then the presence of the interface is checked:
-has_interface_with("lo")                        => true
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_interface_with(): Wrong number of arguments " +
-          "given (#{args.size} for 1 or 2)") if args.size < 1 or args.size > 2
-
-    interfaces = lookupvar('interfaces')
-
-    # If we do not have any interfaces, then there are no requested attributes
-    return false if (interfaces == :undefined)
-
-    interfaces = interfaces.split(',')
-
-    if args.size == 1
-      return interfaces.member?(args[0])
-    end
-
-    kind, value = args
-
-    if lookupvar(kind) == value
-      return true
-    end
-
-    result = false
-    interfaces.each do |iface|
-      if value == lookupvar("#{kind}_#{iface}")
-        result = true
-        break
-      end
-    end
-
-    result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
deleted file mode 100644
index 842c8ec6743..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# has_ip_address
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_ip_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the client has the requested IP address on some interface.
-
-This function iterates through the 'interfaces' fact and checks the
-'ipaddress_IFACE' facts, performing a simple string comparison.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_ip_address(): Wrong number of arguments " +
-          "given (#{args.size} for 1)") if args.size != 1
-
-    Puppet::Parser::Functions.autoloader.load(:has_interface_with) \
-      unless Puppet::Parser::Functions.autoloader.loaded?(:has_interface_with)
-
-    function_has_interface_with(['ipaddress', args[0]])
-
-  end
-end
-
-# vim:sts=2 sw=2
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
deleted file mode 100644
index 9ccf9024f78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# has_ip_network
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_ip_network, :type => :rvalue, :doc => <<-EOS
-Returns true if the client has an IP address within the requested network.
-
-This function iterates through the 'interfaces' fact and checks the
-'network_IFACE' facts, performing a simple string comparision.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_ip_network(): Wrong number of arguments " +
-          "given (#{args.size} for 1)") if args.size != 1
-
-    Puppet::Parser::Functions.autoloader.load(:has_interface_with) \
-      unless Puppet::Parser::Functions.autoloader.loaded?(:has_interface_with)
-
-    function_has_interface_with(['network', args[0]])
-
-  end
-end
-
-# vim:sts=2 sw=2
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
deleted file mode 100644
index 4657cc29cd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:has_key, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Determine if a hash has a certain key value.
-
-    Example:
-
-        $my_hash = {'key_one' => 'value_one'}
-        if has_key($my_hash, 'key_two') {
-          notice('we will not reach here')
-        }
-        if has_key($my_hash, 'key_one') {
-          notice('this will be printed')
-        }
-
-    ENDHEREDOC
-
-    unless args.length == 2
-      raise Puppet::ParseError, ("has_key(): wrong number of arguments (#{args.length}; must be 2)")
-    end
-    unless args[0].is_a?(Hash)
-      raise Puppet::ParseError, "has_key(): expects the first argument to be a hash, got #{args[0].inspect} which is of type #{args[0].class}"
-    end
-    args[0].has_key?(args[1])
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
deleted file mode 100644
index 8cc4823be5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# hash.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:hash, :type => :rvalue, :doc => <<-EOS
-This function converts an array into a hash.
-
-*Examples:*
-
-    hash(['a',1,'b',2,'c',3])
-
-Would return: {'a'=>1,'b'=>2,'c'=>3}
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "hash(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'hash(): Requires array to work with')
-    end
-
-    result = {}
-
-    begin
-      # This is to make it compatible with older version of Ruby ...
-      array  = array.flatten
-      result = Hash[*array]
-    rescue Exception
-      raise(Puppet::ParseError, 'hash(): Unable to compute ' +
-        'hash from array given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
deleted file mode 100644
index 48f02e9d379..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# intersection.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:intersection, :type => :rvalue, :doc => <<-EOS
-This function returns an array an intersection of two.
-
-*Examples:*
-
-    intersection(["a","b","c"],["b","c","d"])
-
-Would return: ["b","c"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "intersection(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'intersection(): Requires 2 arrays')
-    end
-
-    result = first & second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
deleted file mode 100644
index b39e184ae54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_array.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_array, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is an array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_array(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    type = arguments[0]
-
-    result = type.is_a?(Array)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
deleted file mode 100644
index 8bbdbc8a146..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_bool, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a boolean.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    type = arguments[0]
-
-    result = type.is_a?(TrueClass) || type.is_a?(FalseClass)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
deleted file mode 100644
index b3fee965a0b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# is_domain_name.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_domain_name, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a syntactically correct domain name.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_domain_name(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    domain = arguments[0]
-
-    # Limits (rfc1035, 3.1)
-    domain_max_length=255
-    label_min_length=1
-    label_max_length=63
-
-    # Only allow string types
-    return false unless domain.is_a?(String)
-
-    # Allow ".", it is the top level domain
-    return true if domain == '.'
-
-    # Remove the final dot, if present.
-    domain.chomp!('.')
-
-    # Check the whole domain
-    return false if domain.empty?
-    return false if domain.length > domain_max_length
-
-    # Check each label in the domain
-    labels = domain.split('.')
-    vlabels = labels.each do |label|
-      break if label.length < label_min_length
-      break if label.length > label_max_length
-      break if label[-1..-1] == '-'
-      break if label[0..0] == '-'
-      break unless /^[a-z\d-]+$/i.match(label)
-    end
-    return vlabels == labels
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
deleted file mode 100644
index a2da94385be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# is_float.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_float, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a float.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_float(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Only allow Numeric or String types
-    return false unless value.is_a?(Numeric) or value.is_a?(String)
-
-    if value != value.to_f.to_s and !value.is_a? Float then
-      return false
-    else
-      return true
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
deleted file mode 100644
index 6da82c8c170..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# is_function_available.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_function_available, :type => :rvalue, :doc => <<-EOS
-This function accepts a string as an argument, determines whether the
-Puppet runtime has access to a function by that name.  It returns a
-true if the function exists, false if not.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_function_available?(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    # Only allow String types
-    return false unless arguments[0].is_a?(String)
-
-    function = Puppet::Parser::Functions.function(arguments[0].to_sym)
-    function.is_a?(String) and not function.empty?
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
deleted file mode 100644
index ad907f086f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_hash.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_hash, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a hash.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_hash(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    type = arguments[0]
-
-    result = type.is_a?(Hash)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
deleted file mode 100644
index c03d28df920..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# is_integer.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_integer, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is an Integer or
-a decimal (base 10) integer in String form. The string may
-start with a '-' (minus). A value of '0' is allowed, but a leading '0' digit may not
-be followed by other digits as this indicates that the value is octal (base 8).
-
-If given any other argument `false` is returned.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_integer(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Regex is taken from the lexer of puppet
-    # puppet/pops/parser/lexer.rb but modified to match also
-    # negative values and disallow numbers prefixed with multiple
-    # 0's
-    #
-    # TODO these parameter should be a constant but I'm not sure
-    # if there is no risk to declare it inside of the module
-    # Puppet::Parser::Functions
-
-    # Integer numbers like
-    # -1234568981273
-    # 47291
-    numeric = %r{^-?(?:(?:[1-9]\d*)|0)$}
-
-    if value.is_a? Integer or (value.is_a? String and value.match numeric)
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
deleted file mode 100644
index a90adabe15a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# is_ip_address.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_ip_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a valid IP address.
-    EOS
-  ) do |arguments|
-
-    require 'ipaddr'
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_ip_address(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    begin
-      ip = IPAddr.new(arguments[0])
-    rescue ArgumentError
-      return false
-    end
-
-    if ip.ipv4? or ip.ipv6? then
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
deleted file mode 100644
index 1b3088a26aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# is_mac_address.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_mac_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a valid mac address.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_mac_address(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    mac = arguments[0]
-
-    if /^[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}$/.match(mac) then
-      return true
-    else
-      return false
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
deleted file mode 100644
index e7e1d2a746f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# is_numeric.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_numeric, :type => :rvalue, :doc => <<-EOS
-Returns true if the given argument is a Numeric (Integer or Float),
-or a String containing either a valid integer in decimal base 10 form, or
-a valid floating point string representation.
-
-The function recognizes only decimal (base 10) integers and float but not
-integers in hex (base 16) or octal (base 8) form.
-
-The string representation may start with a '-' (minus). If a decimal '.' is used,
-it must be followed by at least one digit.
-
-Valid examples:
-
-  77435
-  10e-12
-  -8475
-  0.2343
-  -23.561e3
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_numeric(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Regex is taken from the lexer of puppet
-    # puppet/pops/parser/lexer.rb but modified to match also
-    # negative values and disallow invalid octal numbers or
-    # numbers prefixed with multiple 0's (except in hex numbers)
-    #
-    # TODO these parameters should be constants but I'm not sure
-    # if there is no risk to declare them inside of the module
-    # Puppet::Parser::Functions
-
-    # TODO decide if this should be used
-    # HEX numbers like
-    # 0xaa230F
-    # 0X1234009C
-    # 0x0012
-    # -12FcD
-    #numeric_hex = %r{^-?0[xX][0-9A-Fa-f]+$}
-
-    # TODO decide if this should be used
-    # OCTAL numbers like
-    # 01234567
-    # -045372
-    #numeric_oct = %r{^-?0[1-7][0-7]*$}
-
-    # Integer/Float numbers like
-    # -0.1234568981273
-    # 47291
-    # 42.12345e-12
-    numeric = %r{^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$}
-
-    if value.is_a? Numeric or (value.is_a? String and (
-      value.match(numeric) #or
-    #  value.match(numeric_hex) or
-    #  value.match(numeric_oct)
-    ))
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
deleted file mode 100644
index f5bef0457f7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# is_string.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_string, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_string(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    type = arguments[0]
-
-    result = type.is_a?(String)
-
-    if result and (type == type.to_f.to_s or type == type.to_i.to_s) then
-      return false
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
deleted file mode 100644
index 6c0a6ba026c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# join.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:join, :type => :rvalue, :doc => <<-EOS
-This function joins an array into a string using a separator.
-
-*Examples:*
-
-    join(['a','b','c'], ",")
-
-Would result in: "a,b,c"
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "join(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'join(): Requires array to work with')
-    end
-
-    suffix = arguments[1] if arguments[1]
-
-    if suffix
-      unless suffix.is_a?(String)
-        raise(Puppet::ParseError, 'join(): Requires string to work with')
-      end
-    end
-
-    result = suffix ? array.join(suffix) : array.join
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
deleted file mode 100644
index e9924fe2e63..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# join.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:join_keys_to_values, :type => :rvalue, :doc => <<-EOS
-This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
-which each element is one joined key/value pair.
-
-*Examples:*
-
-    join_keys_to_values({'a'=>1,'b'=>2}, " is ")
-
-Would result in: ["a is 1","b is 2"]
-    EOS
-  ) do |arguments|
-
-    # Validate the number of arguments.
-    if arguments.size != 2
-      raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two " +
-            "arguments, but #{arguments.size} given.")
-    end
-
-    # Validate the first argument.
-    hash = arguments[0]
-    if not hash.is_a?(Hash)
-      raise(TypeError, "join_keys_to_values(): The first argument must be a " +
-            "hash, but a #{hash.class} was given.")
-    end
-
-    # Validate the second argument.
-    separator = arguments[1]
-    if not separator.is_a?(String)
-      raise(TypeError, "join_keys_to_values(): The second argument must be a " +
-            "string, but a #{separator.class} was given.")
-    end
-
-    # Join the keys to their values.
-    hash.map do |k,v|
-      String(k) + separator + String(v)
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
deleted file mode 100644
index f0d13b64760..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# keys.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:keys, :type => :rvalue, :doc => <<-EOS
-Returns the keys of a hash as an array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "keys(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    hash = arguments[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'keys(): Requires hash to work with')
-    end
-
-    result = hash.keys
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
deleted file mode 100644
index 10c400501be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:loadyaml, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Load a YAML file containing an array, string, or hash, and return the data
-    in the corresponding native data type.
-
-    For example:
-
-        $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
-    ENDHEREDOC
-
-    unless args.length == 1
-      raise Puppet::ParseError, ("loadyaml(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    YAML.load_file(args[0])
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
deleted file mode 100644
index 3a64de33766..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  lstrip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:lstrip, :type => :rvalue, :doc => <<-EOS
-Strips leading spaces to the left of a string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "lstrip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'lstrip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.lstrip : i }
-    else
-      result = value.lstrip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
deleted file mode 100644
index 60fb94ac041..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:max, :type => :rvalue, :doc => <<-EOS
-    Returns the highest value of all arguments.
-    Requires at least one argument.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "max(): Wrong number of arguments " +
-          "need at least one") if args.size == 0
-
-    # Sometimes we get numbers as numerics and sometimes as strings.
-    # We try to compare them as numbers when possible
-    return args.max do |a,b|
-      if a.to_s =~ /\A-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then
-        a.to_f <=> b.to_f
-      else
-        a.to_s <=> b.to_s
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
deleted file mode 100644
index 43d76affd9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# member.rb
-#
-
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-# TODO(Krzysztof Wilczynski): Support for strings and hashes too ...
-
-module Puppet::Parser::Functions
-  newfunction(:member, :type => :rvalue, :doc => <<-EOS
-This function determines if a variable is a member of an array.
-
-*Examples:*
-
-    member(['a','b'], 'b')
-
-Would return: true
-
-    member(['a','b'], 'c')
-
-Would return: false
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "member(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'member(): Requires array to work with')
-    end
-
-    item = arguments[1]
-
-    raise(Puppet::ParseError, 'member(): You must provide item ' +
-      'to search for within array given') if item.empty?
-
-    result = array.include?(item)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
deleted file mode 100644
index 1b39f20600f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two', => 2}
-        $hash2 = {'two' => 'dos', 'three', => 'tres'}
-        $merged_hash = merge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash =  {'one' => 1, 'two' => 'dos', 'three' => 'tres'}
-
-    When there is a duplicate key, the key in the rightmost hash will "win."
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("merge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    # The hash we accumulate into
-    accumulator = Hash.new
-    # Merge into the accumulator hash
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-      accumulator.merge!(arg)
-    end
-    # Return the fully merged hash
-    accumulator
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
deleted file mode 100644
index 6bd6ebf20cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:min, :type => :rvalue, :doc => <<-EOS
-    Returns the lowest value of all arguments.
-    Requires at least one argument.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "min(): Wrong number of arguments " +
-          "need at least one") if args.size == 0
-
-    # Sometimes we get numbers as numerics and sometimes as strings.
-    # We try to compare them as numbers when possible
-    return args.min do |a,b|
-      if a.to_s =~ /\A^-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then
-        a.to_f <=> b.to_f
-      else
-        a.to_s <=> b.to_s
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
deleted file mode 100644
index af0e6ed7895..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# num2bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:num2bool, :type => :rvalue, :doc => <<-EOS
-This function converts a number or a string representation of a number into a
-true boolean. Zero or anything non-numeric becomes false. Numbers higher then 0
-become true.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "num2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    number = arguments[0]
-
-    case number
-    when Numeric
-      # Yay, it's a number
-    when String
-      begin
-        number = Float(number)
-      rescue ArgumentError => ex
-        raise(Puppet::ParseError, "num2bool(): '#{number}' does not look like a number: #{ex.message}")
-      end
-    else
-      begin
-        number = number.to_s
-      rescue NoMethodError => ex
-        raise(Puppet::ParseError, "num2bool(): Unable to parse argument: #{ex.message}")
-      end
-    end
-
-    # Truncate Floats
-    number = number.to_i
-
-    # Return true for any positive number and false otherwise
-    return number > 0
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
deleted file mode 100644
index a9a16a4524b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# parsejson.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parsejson(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    json = arguments[0]
-
-    # PSON is natively available in puppet
-    PSON.load(json)
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
deleted file mode 100644
index 53d54faff74..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# parseyaml.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
-This function accepts YAML as a string and converts it into the correct
-Puppet structure.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parseyaml(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    require 'yaml'
-
-    YAML::load(arguments[0])
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
deleted file mode 100644
index fdd0aefd722..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:pick, :type => :rvalue, :doc => <<-EOS
-
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). Typically,
-this function is used to check for a value in the Puppet Dashboard/Enterprise
-Console, and failover to a default value like the following:
-
-  $real_jenkins_version = pick($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-EOS
-) do |args|
-   args = args.compact
-   args.delete(:undef)
-   args.delete(:undefined)
-   args.delete("")
-   if args[0].to_s.empty? then
-     fail Puppet::ParseError, "pick(): must receive at least one non empty value"
-   else
-     return args[0]
-   end
- end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
deleted file mode 100644
index 36e33abfa9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:pick_default, :type => :rvalue, :doc => <<-EOS
-
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). If no value is
-found, it will return the last argument.
-
-Typically, this function is used to check for a value in the Puppet
-Dashboard/Enterprise Console, and failover to a default value like the
-following:
-
-  $real_jenkins_version = pick_default($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-Note that, contrary to the pick() function, the pick_default does not fail if
-all arguments are empty. This allows pick_default to use an empty value as
-default.
-
-EOS
-) do |args|
-   fail "Must receive at least one argument." if args.empty?
-   default = args.last
-   args = args[0..-2].compact
-   args.delete(:undef)
-   args.delete(:undefined)
-   args.delete("")
-   args << default
-   return args[0]
- end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
deleted file mode 100644
index d02286afac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# prefix.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:prefix, :type => :rvalue, :doc => <<-EOS
-This function applies a prefix to all elements in an array.
-
-*Examples:*
-
-    prefix(['a','b','c'], 'p')
-
-Will return: ['pa','pb','pc']
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "prefix(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "prefix(): expected first argument to be an Array, got #{array.inspect}"
-    end
-
-    prefix = arguments[1] if arguments[1]
-
-    if prefix
-      unless prefix.is_a?(String)
-        raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{prefix.inspect}"
-      end
-    end
-
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      prefix ? prefix + i : i
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
deleted file mode 100644
index ffbdf84630d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# range.rb
-#
-
-# TODO(Krzysztof Wilczynski): We probably need to approach numeric values differently ...
-
-module Puppet::Parser::Functions
-  newfunction(:range, :type => :rvalue, :doc => <<-EOS
-When given range in the form of (start, stop) it will extrapolate a range as
-an array.
-
-*Examples:*
-
-    range("0", "9")
-
-Will return: [0,1,2,3,4,5,6,7,8,9]
-
-    range("00", "09")
-
-Will return: [0,1,2,3,4,5,6,7,8,9] (Zero padded strings are converted to
-integers automatically)
-
-    range("a", "c")
-
-Will return: ["a","b","c"]
-
-    range("host01", "host10")
-
-Will return: ["host01", "host02", ..., "host09", "host10"]
-
-Passing a third argument will cause the generated range to step by that
-interval, e.g.
-
-    range("0", "9", "2")
-
-Will return: [0,2,4,6,8]
-    EOS
-  ) do |arguments|
-
-    # We support more than one argument but at least one is mandatory ...
-    raise(Puppet::ParseError, "range(): Wrong number of " +
-      "arguments given (#{arguments.size} for 1)") if arguments.size < 1
-
-    if arguments.size > 1
-      start = arguments[0]
-      stop  = arguments[1]
-      step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
-
-      type = '..' # We select simplest type for Range available in Ruby ...
-
-    elsif arguments.size > 0
-      value = arguments[0]
-
-      if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
-        start = m[1]
-        stop  = m[3]
-
-        type = m[2]
-
-      elsif value.match(/^.+$/)
-        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
-          'from the value given')
-      else
-        raise(Puppet::ParseError, 'range(): Unknown format of range given')
-      end
-    end
-
-      # Check whether we have integer value if so then make it so ...
-      if start.match(/^\d+$/)
-        start = start.to_i
-        stop  = stop.to_i
-      else
-        start = start.to_s
-        stop  = stop.to_s
-      end
-
-      range = case type
-        when /^(\.\.|\-)$/ then (start .. stop)
-        when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-      end
-
-      result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
deleted file mode 100644
index 1953ffcf118..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# reject.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:reject, :type => :rvalue, :doc => <<-EOS) do |args|
-This function searches through an array and rejects all elements that match
-the provided regular expression.
-
-*Examples:*
-
-    reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['bbb','ccc']
-EOS
-
-    if (args.size != 2)
-      raise Puppet::ParseError,
-        "reject(): Wrong number of arguments given #{args.size} for 2"
-    end
-
-    ary = args[0]
-    pattern = Regexp.new(args[1])
-
-    ary.reject { |e| e =~ pattern }
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
deleted file mode 100644
index fe048690cdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# reverse.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:reverse, :type => :rvalue, :doc => <<-EOS
-Reverses the order of a string or array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "reverse(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'reverse(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.reverse
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
deleted file mode 100644
index 29b0998205f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  rstrip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:rstrip, :type => :rvalue, :doc => <<-EOS
-Strips leading spaces to the right of the string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "rstrip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'rstrip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      result = value.collect { |i| i.is_a?(String) ? i.rstrip : i }
-    else
-      result = value.rstrip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
deleted file mode 100644
index 18134ab633e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# shuffle.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:shuffle, :type => :rvalue, :doc => <<-EOS
-Randomizes the order of a string or array elements.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "shuffle(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'shuffle(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # Check whether it makes sense to shuffle ...
-    return result if result.size <= 1
-
-    # We turn any string value into an array to be able to shuffle ...
-    result = string ? result.split('') : result
-
-    elements = result.size
-
-    # Simple implementation of Fisher–Yates in-place shuffle ...
-    elements.times do |i|
-      j = rand(elements - i) + i
-      result[j], result[i] = result[i], result[j]
-    end
-
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
deleted file mode 100644
index cc207e3fadc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# size.rb
-#
-
-# TODO(Krzysztof Wilczynski): Support for hashes would be nice too ...
-
-module Puppet::Parser::Functions
-  newfunction(:size, :type => :rvalue, :doc => <<-EOS
-Returns the number of elements in a string or array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "size(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    item = arguments[0]
-
-    if item.is_a?(String)
-
-      begin
-        #
-        # Check whether your item is a numeric value or not ...
-        # This will take care about positive and/or negative numbers
-        # for both integer and floating-point values ...
-        #
-        # Please note that Puppet has no notion of hexadecimal
-        # nor octal numbers for its DSL at this point in time ...
-        #
-        Float(item)
-
-        raise(Puppet::ParseError, 'size(): Requires either ' +
-          'string or array to work with')
-
-      rescue ArgumentError
-        result = item.size
-      end
-
-    elsif item.is_a?(Array)
-      result = item.size
-    else
-      raise(Puppet::ParseError, 'size(): Unknown type given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
deleted file mode 100644
index cefbe5463b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# sort.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:sort, :type => :rvalue, :doc => <<-EOS
-Sorts strings and arrays lexically.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "sort(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    if value.is_a?(Array) then
-      value.sort
-    elsif value.is_a?(String) then
-      value.split("").sort.join("")
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
deleted file mode 100644
index 81fadfdb2f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# squeeze.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:squeeze, :type => :rvalue, :doc => <<-EOS
-Returns a new string where runs of the same character that occur in this set are replaced by a single character.
-    EOS
-  ) do |arguments|
-
-    if ((arguments.size != 2) and (arguments.size != 1)) then
-      raise(Puppet::ParseError, "squeeze(): Wrong number of arguments "+
-        "given #{arguments.size} for 2 or 1")
-    end
-
-    item = arguments[0]
-    squeezeval = arguments[1]
-
-    if item.is_a?(Array) then
-      if squeezeval then
-        item.collect { |i| i.squeeze(squeezeval) }
-      else
-        item.collect { |i| i.squeeze }
-      end
-    else
-      if squeezeval then
-        item.squeeze(squeezeval)
-      else
-        item.squeeze
-      end
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
deleted file mode 100644
index 446732ece40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# str2bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:str2bool, :type => :rvalue, :doc => <<-EOS
-This converts a string to a boolean. This attempt to convert strings that
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "str2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-    # If string is already Boolean, return it
-    if !!string == string
-      return string
-    end
-
-    unless string.is_a?(String)
-      raise(Puppet::ParseError, 'str2bool(): Requires either ' +
-        'string to work with')
-    end
-
-    # We consider all the yes, no, y, n and so on too ...
-    result = case string
-      #
-      # This is how undef looks like in Puppet ...
-      # We yield false in this case.
-      #
-      when /^$/, '' then false # Empty string will be false ...
-      when /^(1|t|y|true|yes)$/  then true
-      when /^(0|f|n|false|no)$/  then false
-      when /^(undef|undefined)$/ then false # This is not likely to happen ...
-      else
-        raise(Puppet::ParseError, 'str2bool(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
deleted file mode 100644
index 7fe7b0128ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# str2saltedsha512.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:str2saltedsha512, :type => :rvalue, :doc => <<-EOS
-This converts a string to a salted-SHA512 password hash (which is used for
-OS X versions >= 10.7). Given any simple string, you will get a hex version
-of a salted-SHA512 password hash that can be inserted into your Puppet
-manifests as a valid password attribute.
-    EOS
-  ) do |arguments|
-    require 'digest/sha2'
-
-    raise(Puppet::ParseError, "str2saltedsha512(): Wrong number of arguments " +
-      "passed (#{arguments.size} but we require 1)") if arguments.size != 1
-
-    password = arguments[0]
-
-    unless password.is_a?(String)
-      raise(Puppet::ParseError, 'str2saltedsha512(): Requires a ' +
-        "String argument, you passed: #{password.class}")
-    end
-
-    seedint    = rand(2**31 - 1)
-    seedstring = Array(seedint).pack("L")
-    saltedpass = Digest::SHA512.digest(seedstring + password)
-    (seedstring + saltedpass).unpack('H*')[0]
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
deleted file mode 100644
index 0b52adecdbf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# strftime.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:strftime, :type => :rvalue, :doc => <<-EOS
-This function returns formatted time.
-
-*Examples:*
-
-To return the time since epoch:
-
-    strftime("%s")
-
-To return the date:
-
-    strftime("%Y-%m-%d")
-
-*Format meaning:*
-
-    %a - The abbreviated weekday name (``Sun'')
-    %A - The  full  weekday  name (``Sunday'')
-    %b - The abbreviated month name (``Jan'')
-    %B - The  full  month  name (``January'')
-    %c - The preferred local date and time representation
-    %C - Century (20 in 2009)
-    %d - Day of the month (01..31)
-    %D - Date (%m/%d/%y)
-    %e - Day of the month, blank-padded ( 1..31)
-    %F - Equivalent to %Y-%m-%d (the ISO 8601 date format)
-    %h - Equivalent to %b
-    %H - Hour of the day, 24-hour clock (00..23)
-    %I - Hour of the day, 12-hour clock (01..12)
-    %j - Day of the year (001..366)
-    %k - hour, 24-hour clock, blank-padded ( 0..23)
-    %l - hour, 12-hour clock, blank-padded ( 0..12)
-    %L - Millisecond of the second (000..999)
-    %m - Month of the year (01..12)
-    %M - Minute of the hour (00..59)
-    %n - Newline (\n)
-    %N - Fractional seconds digits, default is 9 digits (nanosecond)
-            %3N  millisecond (3 digits)
-            %6N  microsecond (6 digits)
-            %9N  nanosecond (9 digits)
-    %p - Meridian indicator (``AM''  or  ``PM'')
-    %P - Meridian indicator (``am''  or  ``pm'')
-    %r - time, 12-hour (same as %I:%M:%S %p)
-    %R - time, 24-hour (%H:%M)
-    %s - Number of seconds since 1970-01-01 00:00:00 UTC.
-    %S - Second of the minute (00..60)
-    %t - Tab character (\t)
-    %T - time, 24-hour (%H:%M:%S)
-    %u - Day of the week as a decimal, Monday being 1. (1..7)
-    %U - Week  number  of the current year,
-            starting with the first Sunday as the first
-            day of the first week (00..53)
-    %v - VMS date (%e-%b-%Y)
-    %V - Week number of year according to ISO 8601 (01..53)
-    %W - Week  number  of the current year,
-            starting with the first Monday as the first
-            day of the first week (00..53)
-    %w - Day of the week (Sunday is 0, 0..6)
-    %x - Preferred representation for the date alone, no time
-    %X - Preferred representation for the time alone, no date
-    %y - Year without a century (00..99)
-    %Y - Year with century
-    %z - Time zone as  hour offset from UTC (e.g. +0900)
-    %Z - Time zone name
-    %% - Literal ``%'' character
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "strftime(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    format = arguments[0]
-
-    raise(Puppet::ParseError, 'strftime(): You must provide ' +
-      'format for evaluation') if format.empty?
-
-    # The Time Zone argument is optional ...
-    time_zone = arguments[1] if arguments[1]
-
-    time = Time.new
-
-    # There is probably a better way to handle Time Zone ...
-    if time_zone and not time_zone.empty?
-      original_zone = ENV['TZ']
-
-      local_time = time.clone
-      local_time = local_time.utc
-
-      ENV['TZ'] = time_zone
-
-      time = local_time.localtime
-
-      ENV['TZ'] = original_zone
-    end
-
-    result = time.strftime(format)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
deleted file mode 100644
index 5f4630d7de9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  strip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:strip, :type => :rvalue, :doc => <<-EOS
-This function removes leading and trailing whitespace from a string or from
-every string inside an array.
-
-*Examples:*
-
-    strip("    aaa   ")
-
-Would result in: "aaa"
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "strip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'strip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      result = value.collect { |i| i.is_a?(String) ? i.strip : i }
-    else
-      result = value.strip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
deleted file mode 100644
index f7792d6f7a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# suffix.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:suffix, :type => :rvalue, :doc => <<-EOS
-This function applies a suffix to all elements in an array.
-
-*Examples:*
-
-    suffix(['a','b','c'], 'p')
-
-Will return: ['ap','bp','cp']
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "suffix(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "suffix(): expected first argument to be an Array, got #{array.inspect}"
-    end
-
-    suffix = arguments[1] if arguments[1]
-
-    if suffix
-      unless suffix.is_a? String
-        raise Puppet::ParseError, "suffix(): expected second argument to be a String, got #{suffix.inspect}"
-      end
-    end
-
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      suffix ? i + suffix : i
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
deleted file mode 100644
index b9e66325338..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  swapcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:swapcase, :type => :rvalue, :doc => <<-EOS
-This function will swap the existing case of a string.
-
-*Examples:*
-
-    swapcase("aBcD")
-
-Would result in: "AbCd"
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "swapcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'swapcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.swapcase : i }
-    else
-      result = value.swapcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
deleted file mode 100644
index 0cddaf86b93..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# time.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:time, :type => :rvalue, :doc => <<-EOS
-This function will return the current time since epoch as an integer.
-
-*Examples:*
-
-    time()
-
-Will return something like: 1311972653
-    EOS
-  ) do |arguments|
-
-    # The Time Zone argument is optional ...
-    time_zone = arguments[0] if arguments[0]
-
-    if (arguments.size != 0) and (arguments.size != 1) then
-      raise(Puppet::ParseError, "time(): Wrong number of arguments "+
-        "given #{arguments.size} for 0 or 1")
-    end
-
-    time = Time.new
-
-    # There is probably a better way to handle Time Zone ...
-    if time_zone and not time_zone.empty?
-      original_zone = ENV['TZ']
-
-      local_time = time.clone
-      local_time = local_time.utc
-
-      ENV['TZ'] = time_zone
-
-      time = local_time.localtime
-
-      ENV['TZ'] = original_zone
-    end
-
-    # Calling Time#to_i on a receiver changes it.  Trust me I am the Doctor.
-    result = time.strftime('%s')
-    result = result.to_i
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
deleted file mode 100644
index 8ff73d10b41..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:to_bytes, :type => :rvalue, :doc => <<-EOS
-    Converts the argument into bytes, for example 4 kB becomes 4096.
-    Takes a single string value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "to_bytes(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    arg = arguments[0]
-
-    return arg if arg.is_a? Numeric
-
-    value,prefix = */([0-9.e+-]*)\s*([^bB]?)/.match(arg)[1,2]
-
-    value = value.to_f
-    case prefix
-    when '' then return value.to_i
-    when 'k' then return (value*(1<<10)).to_i
-    when 'M' then return (value*(1<<20)).to_i
-    when 'G' then return (value*(1<<30)).to_i
-    when 'T' then return (value*(1<<40)).to_i
-    when 'E' then return (value*(1<<50)).to_i
-    else raise Puppet::ParseError, "to_bytes(): Unknown prefix #{prefix}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
deleted file mode 100644
index 8d85f11585e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# type.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:type, :type => :rvalue, :doc => <<-EOS
-Returns the type when passed a variable. Type can be one of:
-
-* string
-* array
-* hash
-* float
-* integer
-* boolean
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "type(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-
-    klass = value.class
-
-    if not [TrueClass, FalseClass, Array, Bignum, Fixnum, Float, Hash, String].include?(klass)
-      raise(Puppet::ParseError, 'type(): Unknown type')
-    end
-
-    klass = klass.to_s # Ugly ...
-
-    # We note that Integer is the parent to Bignum and Fixnum ...
-    result = case klass
-      when /^(?:Big|Fix)num$/ then 'integer'
-      when /^(?:True|False)Class$/ then 'boolean'
-      else klass
-    end
-
-    if result == "String" then
-      if value == value.to_i.to_s then
-        result = "Integer"
-      elsif value == value.to_f.to_s then
-        result = "Float"
-      end
-    end
-
-    return result.downcase
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
deleted file mode 100644
index c91bb805373..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# union.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:union, :type => :rvalue, :doc => <<-EOS
-This function returns a union of two arrays.
-
-*Examples:*
-
-    union(["a","b","c"],["b","c","d"])
-
-Would return: ["a","b","c","d"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "union(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'union(): Requires 2 arrays')
-    end
-
-    result = first | second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
deleted file mode 100644
index 8844a741852..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# unique.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:unique, :type => :rvalue, :doc => <<-EOS
-This function will remove duplicates from strings and arrays.
-
-*Examples:*
-
-    unique("aabbcc")
-
-Will return:
-
-    abc
-
-You can also use this with arrays:
-
-    unique(["a","a","b","b","c","c"])
-
-This returns:
-
-    ["a","b","c"]
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "unique(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'unique(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # We turn any string value into an array to be able to shuffle ...
-    result = string ? result.split('') : result
-    result = result.uniq # Remove duplicates ...
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
deleted file mode 100644
index fe6cadc3cce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# upcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:upcase, :type => :rvalue, :doc => <<-EOS
-Converts a string or an array of strings to uppercase.
-
-*Examples:*
-
-    upcase("abcd")
-
-Will return:
-
-    ASDF
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "upcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'upcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
-    else
-      result = value.upcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
deleted file mode 100644
index 0d81de5d108..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  uriescape.rb
-#
-require 'uri'
-
-module Puppet::Parser::Functions
-  newfunction(:uriescape, :type => :rvalue, :doc => <<-EOS
-    Urlencodes a string or array of strings.
-    Requires either a single string or an array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "uriescape(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'uriescape(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? URI.escape(i,unsafe) : i }
-    else
-      result = URI.escape(value)
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
deleted file mode 100644
index fe279744ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_absolute_path, :doc => <<-'ENDHEREDOC') do |args|
-    Validate the string represents an absolute path in the filesystem.  This function works
-    for windows and unix style paths.
-
-    The following values will pass:
-
-        $my_path = "C:/Program Files (x86)/Puppet Labs/Puppet"
-        validate_absolute_path($my_path)
-        $my_path2 = "/var/lib/puppet"
-        validate_absolute_path($my_path2)
-
-
-    The following values will fail, causing compilation to abort:
-
-        validate_absolute_path(true)
-        validate_absolute_path([ 'var/lib/puppet', '/var/foo' ])
-        validate_absolute_path([ '/var/lib/puppet', 'var/foo' ])
-        $undefined = undef
-        validate_absolute_path($undefined)
-
-    ENDHEREDOC
-
-    require 'puppet/util'
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_absolute_path(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      # This logic was borrowed from
-      # [lib/puppet/file_serving/base.rb](https://github.com/puppetlabs/puppet/blob/master/lib/puppet/file_serving/base.rb)
-
-      # Puppet 2.7 and beyond will have Puppet::Util.absolute_path?  Fall back to a back-ported implementation otherwise.
-      if Puppet::Util.respond_to?(:absolute_path?) then
-        unless Puppet::Util.absolute_path?(arg, :posix) or Puppet::Util.absolute_path?(arg, :windows)
-          raise Puppet::ParseError, ("#{arg.inspect} is not an absolute path.")
-        end
-      else
-        # This code back-ported from 2.7.x's lib/puppet/util.rb Puppet::Util.absolute_path?
-        # Determine in a platform-specific way whether a path is absolute. This
-        # defaults to the local platform if none is specified.
-        # Escape once for the string literal, and once for the regex.
-        slash = '[\\\\/]'
-        name = '[^\\\\/]+'
-        regexes = {
-          :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
-          :posix   => %r!^/!,
-        }
-
-        rval = (!!(arg =~ regexes[:posix])) || (!!(arg =~ regexes[:windows]))
-        rval or raise Puppet::ParseError, ("#{arg.inspect} is not an absolute path.")
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
deleted file mode 100644
index 34b511825cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_array, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are array data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_array = [ 'one', 'two' ]
-        validate_array($my_array)
-
-    The following values will fail, causing compilation to abort:
-
-        validate_array(true)
-        validate_array('some_string')
-        $undefined = undef
-        validate_array($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_array(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(Array)
-        raise Puppet::ParseError, ("#{arg.inspect} is not an Array.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
deleted file mode 100644
index 154d66091cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_augeas, :doc => <<-'ENDHEREDOC') do |args|
-    Perform validation of a string using an Augeas lens
-    The first argument of this function should be a string to
-    test, and the second argument should be the name of the Augeas lens to use.
-    If Augeas fails to parse the string with the lens, the compilation will
-    abort with a parse error.
-
-    A third argument can be specified, listing paths which should
-    not be found in the file. The `$file` variable points to the location
-    of the temporary file being tested in the Augeas tree.
-
-    For example, if you want to make sure your passwd content never contains
-    a user `foo`, you could write:
-
-        validate_augeas($passwdcontent, 'Passwd.lns', ['$file/foo'])
-
-    Or if you wanted to ensure that no users used the '/bin/barsh' shell,
-    you could use:
-
-        validate_augeas($passwdcontent, 'Passwd.lns', ['$file/*[shell="/bin/barsh"]']
-
-    If a fourth argument is specified, this will be the error message raised and
-    seen by the user.
-
-    A helpful error message can be returned like this:
-
-        validate_augeas($sudoerscontent, 'Sudoers.lns', [], 'Failed to validate sudoers content with Augeas')
-
-    ENDHEREDOC
-    unless Puppet.features.augeas?
-      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Augeas#Pre-requisites for how to activate it.")
-    end
-
-    if (args.length < 2) or (args.length > 4) then
-      raise Puppet::ParseError, ("validate_augeas(): wrong number of arguments (#{args.length}; must be 2, 3, or 4)")
-    end
-
-    msg = args[3] || "validate_augeas(): Failed to validate content against #{args[1].inspect}"
-
-    require 'augeas'
-    aug = Augeas::open(nil, nil, Augeas::NO_MODL_AUTOLOAD)
-    begin
-      content = args[0]
-
-      # Test content in a temporary file
-      tmpfile = Tempfile.new("validate_augeas")
-      begin
-        tmpfile.write(content)
-      ensure
-        tmpfile.close
-      end
-
-      # Check for syntax
-      lens = args[1]
-      aug.transform(
-        :lens => lens,
-        :name => 'Validate_augeas',
-        :incl => tmpfile.path
-      )
-      aug.load!
-
-      unless aug.match("/augeas/files#{tmpfile.path}//error").empty?
-        error = aug.get("/augeas/files#{tmpfile.path}//error/message")
-        msg += " with error: #{error}"
-        raise Puppet::ParseError, (msg)
-      end
-
-      # Launch unit tests
-      tests = args[2] || []
-      aug.defvar('file', "/files#{tmpfile.path}")
-      tests.each do |t|
-        msg += " testing path #{t}"
-        raise Puppet::ParseError, (msg) unless aug.match(t).empty?
-      end
-    ensure
-      aug.close
-      tmpfile.unlink
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
deleted file mode 100644
index 59a08056b09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_bool, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are either true or false. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $iamtrue = true
-        validate_bool(true)
-        validate_bool(true, true, false, $iamtrue)
-
-    The following values will fail, causing compilation to abort:
-
-        $some_array = [ true ]
-        validate_bool("false")
-        validate_bool("true")
-        validate_bool($some_array)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless function_is_bool([arg])
-        raise Puppet::ParseError, ("#{arg.inspect} is not a boolean.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
deleted file mode 100644
index 2ebe91cf78e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'puppet/util/execution'
-
-module Puppet::Parser::Functions
-  newfunction(:validate_cmd, :doc => <<-'ENDHEREDOC') do |args|
-    Perform validation of a string with an external command.
-    The first argument of this function should be a string to
-    test, and the second argument should be a path to a test command
-    taking a file as last argument. If the command, launched against
-    a tempfile containing the passed string, returns a non-null value,
-    compilation will abort with a parse error.
-
-    If a third argument is specified, this will be the error message raised and
-    seen by the user.
-
-    A helpful error message can be returned like this:
-
-    Example:
-
-        validate_cmd($sudoerscontent, '/usr/sbin/visudo -c -f', 'Visudo failed to validate sudoers content')
-
-    ENDHEREDOC
-    if (args.length < 2) or (args.length > 3) then
-      raise Puppet::ParseError, ("validate_cmd(): wrong number of arguments (#{args.length}; must be 2 or 3)")
-    end
-
-    msg = args[2] || "validate_cmd(): failed to validate content with command #{args[1].inspect}"
-
-    content = args[0]
-    checkscript = args[1]
-
-    # Test content in a temporary file
-    tmpfile = Tempfile.new("validate_cmd")
-    begin
-      tmpfile.write(content)
-      tmpfile.close
-      if Puppet::Util::Execution.respond_to?('execute')
-        Puppet::Util::Execution.execute("#{checkscript} #{tmpfile.path}")
-      else
-        Puppet::Util.execute("#{checkscript} #{tmpfile.path}")
-      end
-    rescue Puppet::ExecutionFailure => detail
-      msg += "\n#{detail}"
-      raise Puppet::ParseError, msg
-    ensure
-      tmpfile.unlink
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
deleted file mode 100644
index 9bdd543283d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_hash, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are hash data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_hash = { 'one' => 'two' }
-        validate_hash($my_hash)
-
-    The following values will fail, causing compilation to abort:
-
-        validate_hash(true)
-        validate_hash('some_string')
-        $undefined = undef
-        validate_hash($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_hash(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, ("#{arg.inspect} is not a Hash.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
deleted file mode 100644
index fc02748e816..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_ipv4_address, :doc => <<-ENDHEREDOC
-    Validate that all values passed are valid IPv4 addresses.
-    Fail compilation if any value fails this check.
-
-    The following values will pass:
-
-    $my_ip = "1.2.3.4"
-    validate_ipv4_address($my_ip)
-    validate_bool("8.8.8.8", "172.16.0.1", $my_ip)
-
-    The following values will fail, causing compilation to abort:
-
-    $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
-    validate_ipv4_address($some_array)
-
-    ENDHEREDOC
-  ) do |args|
-
-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
-
-    if defined?(IPAddr::InvalidAddressError)
-      rescuable_exceptions << IPAddr::InvalidAddressError
-    end
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, "#{arg.inspect} is not a string."
-      end
-
-      begin
-        unless IPAddr.new(arg).ipv4?
-          raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
-        end
-      rescue *rescuable_exceptions
-        raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
deleted file mode 100644
index b0f2558df77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_ipv6_address, :doc => <<-ENDHEREDOC
-    Validate that all values passed are valid IPv6 addresses.
-    Fail compilation if any value fails this check.
-
-    The following values will pass:
-
-    $my_ip = "3ffe:505:2"
-    validate_ipv6_address(1)
-    validate_ipv6_address($my_ip)
-    validate_bool("fe80::baf6:b1ff:fe19:7507", $my_ip)
-
-    The following values will fail, causing compilation to abort:
-
-    $some_array = [ true, false, "garbage string", "1.2.3.4" ]
-    validate_ipv6_address($some_array)
-
-    ENDHEREDOC
-  ) do |args|
-
-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
-
-    if defined?(IPAddr::InvalidAddressError)
-      rescuable_exceptions << IPAddr::InvalidAddressError
-    end
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ipv6_address(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, "#{arg.inspect} is not a string."
-      end
-
-      begin
-        unless IPAddr.new(arg).ipv6?
-          raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv6 address."
-        end
-      rescue *rescuable_exceptions
-        raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv6 address."
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
deleted file mode 100644
index ca25a702c58..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_re, :doc => <<-'ENDHEREDOC') do |args|
-    Perform simple validation of a string against one or more regular
-    expressions. The first argument of this function should be a string to
-    test, and the second argument should be a stringified regular expression
-    (without the // delimiters) or an array of regular expressions.  If none
-    of the regular expressions match the string passed in, compilation will
-    abort with a parse error.
-
-    If a third argument is specified, this will be the error message raised and
-    seen by the user.
-
-    The following strings will validate against the regular expressions:
-
-        validate_re('one', '^one$')
-        validate_re('one', [ '^one', '^two' ])
-
-    The following strings will fail to validate, causing compilation to abort:
-
-        validate_re('one', [ '^two', '^three' ])
-
-    A helpful error message can be returned like this:
-
-        validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7')
-
-    ENDHEREDOC
-    if (args.length < 2) or (args.length > 3) then
-      raise Puppet::ParseError, ("validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)")
-    end
-
-    msg = args[2] || "validate_re(): #{args[0].inspect} does not match #{args[1].inspect}"
-
-    # We're using a flattened array here because we can't call String#any? in
-    # Ruby 1.9 like we can in Ruby 1.8
-    raise Puppet::ParseError, (msg) unless [args[1]].flatten.any? do |re_str|
-      args[0] =~ Regexp.compile(re_str)
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
deleted file mode 100644
index 7d534f3703e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_slength, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that the first argument is a string (or an array of strings), and
-    less/equal to than the length of the second argument. An optional third
-    parameter can be given a the minimum length. It fails if the first
-    argument is not a string or array of strings, and if arg 2 and arg 3 are
-    not convertable to a number.
-
-    The following values will pass:
-
-      validate_slength("discombobulate",17)
-      validate_slength(["discombobulate","moo"],17)
-      validate_slength(["discombobulate","moo"],17,3)
-
-    The following valueis will not:
-
-      validate_slength("discombobulate",1)
-      validate_slength(["discombobulate","thermometer"],5)
-      validate_slength(["discombobulate","moo"],17,10)
-
-    ENDHEREDOC
-
-    raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
-
-    input, max_length, min_length = *args
-
-    begin
-      max_length = Integer(max_length)
-      raise ArgumentError if max_length <= 0
-    rescue ArgumentError, TypeError
-      raise Puppet::ParseError, "validate_slength(): Expected second argument to be a positive Numeric, got #{max_length}:#{max_length.class}"
-    end
-
-    if min_length
-      begin
-        min_length = Integer(min_length)
-        raise ArgumentError if min_length < 0
-    rescue ArgumentError, TypeError
-        raise Puppet::ParseError, "validate_slength(): Expected third argument to be unset or a positive Numeric, got #{min_length}:#{min_length.class}"
-      end
-    else
-      min_length = 0
-    end
-
-    if min_length > max_length
-      raise Puppet::ParseError, "validate_slength(): Expected second argument to be larger than third argument"
-    end
-
-    validator = lambda do |str|
-      unless str.length <= max_length and str.length >= min_length
-        raise Puppet::ParseError, "validate_slength(): Expected length of #{input.inspect} to be between #{min_length} and #{max_length}, was #{input.length}"
-      end
-    end
-
-    case input
-    when String
-      validator.call(input)
-    when Array
-      input.each_with_index do |arg, pos|
-        if arg.is_a? String
-          validator.call(arg)
-        else
-          raise Puppet::ParseError, "validate_slength(): Expected element at array position #{pos} to be a String, got #{arg.class}"
-        end
-      end
-    else
-      raise Puppet::ParseError, "validate_slength(): Expected first argument to be a String or Array, got #{input.class}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
deleted file mode 100644
index e667794a679..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_string, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are string data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_string = "one two"
-        validate_string($my_string, 'three')
-
-    The following values will fail, causing compilation to abort:
-
-        validate_string(true)
-        validate_string([ 'some', 'array' ])
-        $undefined = undef
-        validate_string($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_string(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, ("#{arg.inspect} is not a string.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
deleted file mode 100644
index 16067561b40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# values.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:values, :type => :rvalue, :doc => <<-EOS
-When given a hash this function will return the values of that hash.
-
-*Examples:*
-
-    $hash = {
-      'a' => 1,
-      'b' => 2,
-      'c' => 3,
-    }
-    values($hash)
-
-This example would return:
-
-    [1,2,3]
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "values(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    hash = arguments[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'values(): Requires hash to work with')
-    end
-
-    result = hash.values
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
deleted file mode 100644
index d3e69d97fc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# values_at.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:values_at, :type => :rvalue, :doc => <<-EOS
-Finds value inside an array based on location.
-
-The first argument is the array you want to analyze, and the second element can
-be a combination of:
-
-* A single numeric index
-* A range in the form of 'start-stop' (eg. 4-9)
-* An array combining the above
-
-*Examples*:
-
-    values_at(['a','b','c'], 2)
-
-Would return ['c'].
-
-    values_at(['a','b','c'], ["0-1"])
-
-Would return ['a','b'].
-
-    values_at(['a','b','c','d','e'], [0, "2-3"])
-
-Would return ['a','c','d'].
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "values_at(): Wrong number of " +
-      "arguments given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments.shift
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'values_at(): Requires array to work with')
-    end
-
-    indices = [arguments.shift].flatten() # Get them all ... Pokemon ...
-
-    if not indices or indices.empty?
-      raise(Puppet::ParseError, 'values_at(): You must provide ' +
-        'at least one positive index to collect')
-    end
-
-    result       = []
-    indices_list = []
-
-    indices.each do |i|
-      if m = i.match(/^(\d+)(\.\.\.?|\-)(\d+)$/)
-        start = m[1].to_i
-        stop  = m[3].to_i
-
-        type = m[2]
-
-        if start > stop
-          raise(Puppet::ParseError, 'values_at(): Stop index in ' +
-            'given indices range is smaller than the start index')
-        elsif stop > array.size - 1 # First element is at index 0 is it not?
-          raise(Puppet::ParseError, 'values_at(): Stop index in ' +
-            'given indices range exceeds array size')
-        end
-
-        range = case type
-          when /^(\.\.|\-)$/ then (start .. stop)
-          when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-        end
-
-        range.each { |i| indices_list << i.to_i }
-      else
-        # Only positive numbers allowed in this case ...
-        if not i.match(/^\d+$/)
-          raise(Puppet::ParseError, 'values_at(): Unknown format ' +
-            'of given index')
-        end
-
-        # In Puppet numbers are often string-encoded ...
-        i = i.to_i
-
-        if i > array.size - 1 # Same story.  First element is at index 0 ...
-          raise(Puppet::ParseError, 'values_at(): Given index ' +
-            'exceeds array size')
-        end
-
-        indices_list << i
-      end
-    end
-
-    # We remove nil values as they make no sense in Puppet DSL ...
-    result = indices_list.collect { |i| array[i] }.compact
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
deleted file mode 100644
index 2b56e9ca070..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# zip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:zip, :type => :rvalue, :doc => <<-EOS
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
-
-*Example:*
-
-    zip(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-    ["1", "4"], ["2", "5"], ["3", "6"]
-    EOS
-  ) do |arguments|
-
-    # Technically we support three arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "zip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    a = arguments[0]
-    b = arguments[1]
-
-    unless a.is_a?(Array) and b.is_a?(Array)
-      raise(Puppet::ParseError, 'zip(): Requires array to work with')
-    end
-
-    flatten = arguments[2] if arguments[2]
-
-    if flatten
-      klass = flatten.class
-
-      # We can have either true or false, or string which resembles boolean ...
-      unless [FalseClass, TrueClass, String].include?(klass)
-        raise(Puppet::ParseError, 'zip(): Requires either ' +
-          'boolean or string to work with')
-      end
-
-      if flatten.is_a?(String)
-        # We consider all the yes, no, y, n and so on too ...
-        flatten = case flatten
-          #
-          # This is how undef looks like in Puppet ...
-          # We yield false in this case.
-          #
-          when /^$/, '' then false # Empty string will be false ...
-          when /^(1|t|y|true|yes)$/  then true
-          when /^(0|f|n|false|no)$/  then false
-          when /^(undef|undefined)$/ then false # This is not likely to happen ...
-          else
-            raise(Puppet::ParseError, 'zip(): Unknown type of boolean given')
-        end
-      end
-    end
-
-    result = a.zip(b)
-    result = flatten ? result.flatten : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
deleted file mode 100644
index 94e7fac9196..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-Puppet::Type.type(:file_line).provide(:ruby) do
-  def exists?
-    lines.find do |line|
-      line.chomp == resource[:line].chomp
-    end
-  end
-
-  def create
-    if resource[:match]
-      handle_create_with_match
-    elsif resource[:after]
-      handle_create_with_after
-    else
-      append_line
-    end
-  end
-
-  def destroy
-    local_lines = lines
-    File.open(resource[:path],'w') do |fh|
-      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
-    end
-  end
-
-  private
-  def lines
-    # If this type is ever used with very large files, we should
-    #  write this in a different way, using a temp
-    #  file; for now assuming that this type is only used on
-    #  small-ish config files that can fit into memory without
-    #  too much trouble.
-    @lines ||= File.readlines(resource[:path])
-  end
-
-  def handle_create_with_match()
-    regex = resource[:match] ? Regexp.new(resource[:match]) : nil
-    match_count = lines.select { |l| regex.match(l) }.size
-    if match_count > 1 && resource[:multiple].to_s != 'true'
-     raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
-    end
-    File.open(resource[:path], 'w') do |fh|
-      lines.each do |l|
-        fh.puts(regex.match(l) ? resource[:line] : l)
-      end
-
-      if (match_count == 0)
-        fh.puts(resource[:line])
-      end
-    end
-  end
-
-  def handle_create_with_after
-    regex = Regexp.new(resource[:after])
-
-    count = lines.count {|l| l.match(regex)}
-
-    case count
-    when 1 # find the line to put our line after
-      File.open(resource[:path], 'w') do |fh|
-        lines.each do |l|
-          fh.puts(l)
-          if regex.match(l) then
-            fh.puts(resource[:line])
-          end
-        end
-      end
-    when 0 # append the line to the end of the file
-      append_line
-    else
-      raise Puppet::Error, "#{count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'.  One or no line must match the pattern."
-    end
-  end
-
-  ##
-  # append the line to the file.
-  #
-  # @api private
-  def append_line
-    File.open(resource[:path], 'a') do |fh|
-      fh.puts resource[:line]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb
deleted file mode 100644
index fe1e5aa1952..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-Puppet::Type.newtype(:anchor) do
-  desc <<-'ENDOFDESC'
-  A simple resource type intended to be used as an anchor in a composite class.
-
-  In Puppet 2.6, when a class declares another class, the resources in the
-  interior class are not contained by the exterior class. This interacts badly
-  with the pattern of composing complex modules from smaller classes, as it
-  makes it impossible for end users to specify order relationships between the
-  exterior class and other modules.
-
-  The anchor type lets you work around this. By sandwiching any interior
-  classes between two no-op resources that _are_ contained by the exterior
-  class, you can ensure that all resources in the module are contained.
-
-      class ntp {
-        # These classes will have the correct order relationship with each
-        # other. However, without anchors, they won't have any order
-        # relationship to Class['ntp'].
-        class { 'ntp::package': }
-        -> class { 'ntp::config': }
-        -> class { 'ntp::service': }
-
-        # These two resources "anchor" the composed classes within the ntp
-        # class.
-        anchor { 'ntp::begin': } -> Class['ntp::package']
-        Class['ntp::service']    -> anchor { 'ntp::end': }
-      }
-
-  This allows the end user of the ntp module to establish require and before
-  relationships with Class['ntp']:
-
-      class { 'ntp': } -> class { 'mcollective': }
-      class { 'mcollective': } -> class { 'ntp': }
-
-  ENDOFDESC
-
-  newparam :name do
-    desc "The name of the anchor resource."
-  end
-
-  def refresh
-    # We don't do anything with them, but we need this to
-    #   show that we are "refresh aware" and not break the
-    #   chain of propagation.
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb
deleted file mode 100644
index 323fc4c9c7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-Puppet::Type.newtype(:file_line) do
-
-  desc <<-EOT
-    Ensures that a given line is contained within a file.  The implementation
-    matches the full line, including whitespace at the beginning and end.  If
-    the line is not contained in the given file, Puppet will add the line to
-    ensure the desired state.  Multiple resources may be declared to manage
-    multiple lines in the same file.
-
-    Example:
-
-        file_line { 'sudo_rule':
-          path => '/etc/sudoers',
-          line => '%sudo ALL=(ALL) ALL',
-        }
-        file_line { 'sudo_rule_nopw':
-          path => '/etc/sudoers',
-          line => '%sudonopw ALL=(ALL) NOPASSWD: ALL',
-        }
-
-    In this example, Puppet will ensure both of the specified lines are
-    contained in the file /etc/sudoers.
-
-  EOT
-
-  ensurable do
-    defaultvalues
-    defaultto :present
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'An arbitrary name used as the identity of the resource.'
-  end
-
-  newparam(:match) do
-    desc 'An optional regular expression to run against existing lines in the file;\n' +
-        'if a match is found, we replace that line rather than adding a new line.'
-  end
-
-  newparam(:multiple) do
-    desc 'An optional value to determine if match can change multiple lines.'
-    newvalues(true, false)
-  end
-
-  newparam(:after) do
-    desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)'
-  end
-
-  newparam(:line) do
-    desc 'The line to be appended to the file located by the path parameter.'
-  end
-
-  newparam(:path) do
-    desc 'The file Puppet will ensure contains the line specified by the line parameter.'
-    validate do |value|
-      unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/))
-        raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'")
-      end
-    end
-  end
-
-  # Autorequire the file resource if it's being managed
-  autorequire(:file) do
-    self[:path]
-  end
-
-  validate do
-    unless self[:line] and self[:path]
-      raise(Puppet::Error, "Both line and path are required attributes")
-    end
-
-    if (self[:match])
-      unless Regexp.new(self[:match]).match(self[:line])
-        raise(Puppet::Error, "When providing a 'match' parameter, the value must be a regex that matches against the value of your 'line' parameter")
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp
deleted file mode 100644
index 500ad770d53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Class: stdlib
-#
-# This module manages stdlib. Most of stdlib's features are automatically
-# loaded by Puppet, but this class should be declared in order to use the
-# standardized run stages.
-#
-# Parameters: none
-#
-# Actions:
-#
-#   Declares all other classes in the stdlib module. Currently, this consists
-#   of stdlib::stages.
-#
-# Requires: nothing
-#
-class stdlib {
-
-  class { 'stdlib::stages': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp
deleted file mode 100644
index eb15fd650d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Class: stdlib::stages
-#
-# This class manages a standard set of run stages for Puppet. It is managed by
-# the stdlib class, and should not be declared independently.
-#
-# The high level stages are (in order):
-#
-#  * setup
-#  * main
-#  * runtime
-#  * setup_infra
-#  * deploy_infra
-#  * setup_app
-#  * deploy_app
-#  * deploy
-#
-# Parameters: none
-#
-# Actions:
-#
-#   Declares various run-stages for deploying infrastructure,
-#   language runtimes, and application layers.
-#
-# Requires: nothing
-#
-# Sample Usage:
-#
-#  node default {
-#    include stdlib
-#    class { java: stage => 'runtime' }
-#  }
-#
-class stdlib::stages {
-
-  stage { 'setup':  before => Stage['main'] }
-  stage { 'runtime': require => Stage['main'] }
-  -> stage { 'setup_infra': }
-  -> stage { 'deploy_infra': }
-  -> stage { 'setup_app': }
-  -> stage { 'deploy_app': }
-  -> stage { 'deploy': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json
deleted file mode 100644
index e3bacbe75f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json
+++ /dev/null
@@ -1,509 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    },
-    {
-      "operatingsystem": "Solaris",
-      "operatingsystemrelease": [
-        "10",
-        "11"
-      ]
-    },
-    {
-      "operatingsystem": "Windows",
-      "operatingsystemrelease": [
-        "Server 2003",
-        "Server 2003 R2",
-        "Server 2008",
-        "Server 2008 R2",
-        "Server 2012",
-        "Server 2012 R2",
-        "7",
-        "8"
-      ]
-    },
-    {
-      "operatingsystem": "AIX",
-      "operatingsystemrelease": [
-        "5.3",
-        "6.1",
-        "7.1"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": ">=2.7.20 <4.0.0"
-    }
-  ],
-  "name": "puppetlabs-stdlib",
-  "version": "4.2.1",
-  "source": "git://github.com/puppetlabs/puppetlabs-stdlib.git",
-  "author": "puppetlabs",
-  "license": "Apache 2.0",
-  "summary": "Puppet Module Standard Library",
-  "description": "Standard Library for Puppet Modules",
-  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
-  "dependencies": [
-
-  ],
-  "types": [
-    {
-      "name": "anchor",
-      "doc": "A simple resource type intended to be used as an anchor in a composite class.\n\nIn Puppet 2.6, when a class declares another class, the resources in the\ninterior class are not contained by the exterior class. This interacts badly\nwith the pattern of composing complex modules from smaller classes, as it\nmakes it impossible for end users to specify order relationships between the\nexterior class and other modules.\n\nThe anchor type lets you work around this. By sandwiching any interior\nclasses between two no-op resources that _are_ contained by the exterior\nclass, you can ensure that all resources in the module are contained.\n\n    class ntp {\n      # These classes will have the correct order relationship with each\n      # other. However, without anchors, they won't have any order\n      # relationship to Class['ntp'].\n      class { 'ntp::package': }\n      -> class { 'ntp::config': }\n      -> class { 'ntp::service': }\n\n      # These two resources \"anchor\" the composed classes within the ntp\n      # class.\n      anchor { 'ntp::begin': } -> Class['ntp::package']\n      Class['ntp::service']    -> anchor { 'ntp::end': }\n    }\n\nThis allows the end user of the ntp module to establish require and before\nrelationships with Class['ntp']:\n\n    class { 'ntp': } -> class { 'mcollective': }\n    class { 'mcollective': } -> class { 'ntp': }",
-      "properties": [
-
-      ],
-      "parameters": [
-        {
-          "name": "name",
-          "doc": "The name of the anchor resource.\n\n"
-        }
-      ]
-    },
-    {
-      "name": "file_line",
-      "doc": "Ensures that a given line is contained within a file.  The implementation\nmatches the full line, including whitespace at the beginning and end.  If\nthe line is not contained in the given file, Puppet will add the line to\nensure the desired state.  Multiple resources may be declared to manage\nmultiple lines in the same file.\n\nExample:\n\n    file_line { 'sudo_rule':\n      path => '/etc/sudoers',\n      line => '%sudo ALL=(ALL) ALL',\n    }\n    file_line { 'sudo_rule_nopw':\n      path => '/etc/sudoers',\n      line => '%sudonopw ALL=(ALL) NOPASSWD: ALL',\n    }\n\nIn this example, Puppet will ensure both of the specified lines are\ncontained in the file /etc/sudoers.",
-      "properties": [
-        {
-          "name": "ensure",
-          "doc": "The basic property that the resource should be in.\n\nValid values are `present`, `absent`. "
-        }
-      ],
-      "parameters": [
-        {
-          "name": "name",
-          "doc": "An arbitrary name used as the identity of the resource.\n\n"
-        },
-        {
-          "name": "match",
-          "doc": "An optional regular expression to run against existing lines in the file;\\nif a match is found, we replace that line rather than adding a new line.\n\n"
-        },
-        {
-          "name": "multiple",
-          "doc": "An optional value to determine if match can change multiple lines.\n\nValid values are `true`, `false`. "
-        },
-        {
-          "name": "after",
-          "doc": "An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)\n\n"
-        },
-        {
-          "name": "line",
-          "doc": "The line to be appended to the file located by the path parameter.\n\n"
-        },
-        {
-          "name": "path",
-          "doc": "The file Puppet will ensure contains the line specified by the line parameter.\n\n"
-        }
-      ],
-      "providers": [
-        {
-          "name": "ruby",
-          "doc": ""
-        }
-      ]
-    }
-  ],
-  "checksums": {
-    "CHANGELOG.md": "82acb10a79b6dba5b3a8d464e0c9fecf",
-    "CONTRIBUTING.md": "7fcaaec4913b3d7c123510329ecc4b2d",
-    "Gemfile": "38895f95212fe38cf47474a05cff2ad2",
-    "Gemfile.lock": "d30f1ca4792bd19fa9561557f4982a55",
-    "LICENSE": "38a048b9d82e713d4e1b2573e370a756",
-    "Modulefile": "9786075c3cc32e7ba85888727e37851f",
-    "README.markdown": "21410cab41d903b5c39c55739846b6b3",
-    "README_DEVELOPER.markdown": "220a8b28521b5c5d2ea87c4ddb511165",
-    "README_SPECS.markdown": "82bb4c6abbb711f40778b162ec0070c1",
-    "RELEASE_PROCESS.markdown": "94b92bc99ac4106ba1a74d5c04e520f9",
-    "Rakefile": "dfa334598bfd087adf11533a72d71106",
-    "lib/facter/facter_dot_d.rb": "1f1fcf1bde3443e42a445d3573602304",
-    "lib/facter/pe_version.rb": "4a9353952963b011759f3e6652a10da5",
-    "lib/facter/puppet_vardir.rb": "c7ddc97e8a84ded3dd93baa5b9b3283d",
-    "lib/facter/root_home.rb": "d9c8276acdceb7340d95f60c36dcdcc5",
-    "lib/facter/util/puppet_settings.rb": "9f1d2593d0ae56bfca89d4b9266aeee1",
-    "lib/puppet/parser/functions/abs.rb": "32161bd0435fdfc2aec2fc559d2b454b",
-    "lib/puppet/parser/functions/any2array.rb": "a81e71d6b67a551d38770ba9a1948a75",
-    "lib/puppet/parser/functions/base64.rb": "ae25adf92295df67ebd9edfabc9ecdd6",
-    "lib/puppet/parser/functions/bool2num.rb": "8e627eee990e811e35e7e838c586bd77",
-    "lib/puppet/parser/functions/capitalize.rb": "14481fc8c7c83fe002066ebcf6722f17",
-    "lib/puppet/parser/functions/chomp.rb": "719d46923d75251f7b6b68b6e015cccc",
-    "lib/puppet/parser/functions/chop.rb": "4691a56e6064b792ed4575e4ad3f3d20",
-    "lib/puppet/parser/functions/concat.rb": "c522e67e558336e1ac26b0a3cfeeed2d",
-    "lib/puppet/parser/functions/count.rb": "9eb74eccd93e2b3c87fd5ea14e329eba",
-    "lib/puppet/parser/functions/deep_merge.rb": "d83696855578fb81b64b9e92b9c7cc7c",
-    "lib/puppet/parser/functions/defined_with_params.rb": "ffab4433d03f32b551f2ea024a2948fc",
-    "lib/puppet/parser/functions/delete.rb": "96e569dac96b8c9387e9303445d73048",
-    "lib/puppet/parser/functions/delete_at.rb": "6bc24b79390d463d8be95396c963381a",
-    "lib/puppet/parser/functions/delete_undef_values.rb": "b32d4a3925753b2eb2c318cbd7f14404",
-    "lib/puppet/parser/functions/delete_values.rb": "39b147f7d369bb5f809044b6341954a2",
-    "lib/puppet/parser/functions/difference.rb": "e31b95fbaf974cf853a510177368bfb9",
-    "lib/puppet/parser/functions/dirname.rb": "bef7214eb89db3eb8f7ee5fc9dca0233",
-    "lib/puppet/parser/functions/downcase.rb": "9204a04c2a168375a38d502db8811bbe",
-    "lib/puppet/parser/functions/empty.rb": "ae92905c9d94ddca30bf56b7b1dabedf",
-    "lib/puppet/parser/functions/ensure_packages.rb": "fbed5c0c9bf82b7746e01f15f89d184f",
-    "lib/puppet/parser/functions/ensure_resource.rb": "6678127386e77bbc0f09db7b5a32ab6a",
-    "lib/puppet/parser/functions/flatten.rb": "25777b76f9719162a8bab640e5595b7a",
-    "lib/puppet/parser/functions/floor.rb": "42cad4c689231a51526c55a6f0985d1f",
-    "lib/puppet/parser/functions/fqdn_rotate.rb": "20743a138c56fc806a35cb7b60137dbc",
-    "lib/puppet/parser/functions/get_module_path.rb": "d4bf50da25c0b98d26b75354fa1bcc45",
-    "lib/puppet/parser/functions/getparam.rb": "4dd7a0e35f4a3780dcfc9b19b4e0006e",
-    "lib/puppet/parser/functions/getvar.rb": "10bf744212947bc6a7bfd2c9836dbd23",
-    "lib/puppet/parser/functions/grep.rb": "5682995af458b05f3b53dd794c4bf896",
-    "lib/puppet/parser/functions/has_interface_with.rb": "8d3ebca805dc6edb88b6b7a13d404787",
-    "lib/puppet/parser/functions/has_ip_address.rb": "ee207f47906455a5aa49c4fb219dd325",
-    "lib/puppet/parser/functions/has_ip_network.rb": "b4d726c8b2a0afac81ced8a3a28aa731",
-    "lib/puppet/parser/functions/has_key.rb": "7cd9728c38f0b0065f832dabd62b0e7e",
-    "lib/puppet/parser/functions/hash.rb": "9d072527dfc7354b69292e9302906530",
-    "lib/puppet/parser/functions/intersection.rb": "924ac4aceec7b896952166a7ec08fdb1",
-    "lib/puppet/parser/functions/is_array.rb": "875ca4356cb0d7a10606fb146b4a3d11",
-    "lib/puppet/parser/functions/is_bool.rb": "e693b7c4b5366cff1380b6e0c7dd7b11",
-    "lib/puppet/parser/functions/is_domain_name.rb": "cf72726c0fec831eb703ec9deea739eb",
-    "lib/puppet/parser/functions/is_float.rb": "10e0d3ecf75fac15e415aee79acf70dc",
-    "lib/puppet/parser/functions/is_function_available.rb": "628428bbcd9313ce09783d9484330e09",
-    "lib/puppet/parser/functions/is_hash.rb": "8c7d9a05084dab0389d1b779c8a05b1a",
-    "lib/puppet/parser/functions/is_integer.rb": "c665be82686aa4729959bb42c66a7510",
-    "lib/puppet/parser/functions/is_ip_address.rb": "a714a736c1560e8739aaacd9030cca00",
-    "lib/puppet/parser/functions/is_mac_address.rb": "288bd4b38d4df42a83681f13e7eaaee0",
-    "lib/puppet/parser/functions/is_numeric.rb": "93ddc9d4c0834a5e5e0562d7b3cdce91",
-    "lib/puppet/parser/functions/is_string.rb": "2bd9a652bbb2668323eee6c57729ff64",
-    "lib/puppet/parser/functions/join.rb": "a285a05c015ae278608f6454aef211ea",
-    "lib/puppet/parser/functions/join_keys_to_values.rb": "f29da49531228f6ca5b3aa0df00a14c2",
-    "lib/puppet/parser/functions/keys.rb": "eb6ac815ea14fbf423580ed903ef7bad",
-    "lib/puppet/parser/functions/loadyaml.rb": "2b912f257aa078e376d3b3f6a86c2a00",
-    "lib/puppet/parser/functions/lstrip.rb": "210b103f78622e099f91cc2956b6f741",
-    "lib/puppet/parser/functions/max.rb": "f652fd0b46ef7d2fbdb42b141f8fdd1d",
-    "lib/puppet/parser/functions/member.rb": "541e67d06bc4155e79b00843a125e9bc",
-    "lib/puppet/parser/functions/merge.rb": "f3dcc5c83440cdda2036cce69b61a14b",
-    "lib/puppet/parser/functions/min.rb": "0d2a1b7e735ab251c5469e735fa3f4c6",
-    "lib/puppet/parser/functions/num2bool.rb": "605c12fa518c87ed2c66ae153e0686ce",
-    "lib/puppet/parser/functions/parsejson.rb": "e7f968c34928107b84cd0860daf50ab1",
-    "lib/puppet/parser/functions/parseyaml.rb": "00f10ec1e2b050e23d80c256061ebdd7",
-    "lib/puppet/parser/functions/pick.rb": "bf01f13bbfe2318e7f6a302ac7c4433f",
-    "lib/puppet/parser/functions/pick_default.rb": "ad3ea60262de408767786d37a54d45dc",
-    "lib/puppet/parser/functions/prefix.rb": "aebbea0290be82a4ae89ddfffbee1125",
-    "lib/puppet/parser/functions/range.rb": "17a05dbae8f562f882450f9e648d4e2d",
-    "lib/puppet/parser/functions/reject.rb": "689f6a7c961a55fe9dcd240921f4c7f9",
-    "lib/puppet/parser/functions/reverse.rb": "1386371c0f5301055fdf99079e862b3e",
-    "lib/puppet/parser/functions/rstrip.rb": "8a0d69876bdbc88a2054ba41c9c38961",
-    "lib/puppet/parser/functions/shuffle.rb": "6445e6b4dc62c37b184a60eeaf34414b",
-    "lib/puppet/parser/functions/size.rb": "8972d48c0f9e487d659bd7326b40b642",
-    "lib/puppet/parser/functions/sort.rb": "504b033b438461ca4f9764feeb017833",
-    "lib/puppet/parser/functions/squeeze.rb": "541f85b4203b55c9931d3d6ecd5c75f8",
-    "lib/puppet/parser/functions/str2bool.rb": "6320f1a50fd28ec027981cd1fb8ffdd0",
-    "lib/puppet/parser/functions/str2saltedsha512.rb": "49afad7b386be38ce53deaefef326e85",
-    "lib/puppet/parser/functions/strftime.rb": "e02e01a598ca5d7d6eee0ba22440304a",
-    "lib/puppet/parser/functions/strip.rb": "273d547c7b05c0598556464dfd12f5fd",
-    "lib/puppet/parser/functions/suffix.rb": "109279db4180441e75545dbd5f273298",
-    "lib/puppet/parser/functions/swapcase.rb": "4902f38f0b9292afec66d40fee4b02ec",
-    "lib/puppet/parser/functions/time.rb": "08d88d52abd1e230e3a2f82107545d48",
-    "lib/puppet/parser/functions/to_bytes.rb": "83f23c33adbfa42b2a9d9fc2db3daeb4",
-    "lib/puppet/parser/functions/type.rb": "62f914d6c90662aaae40c5539701be60",
-    "lib/puppet/parser/functions/union.rb": "137998fe47decf25aede20f0c0155a4c",
-    "lib/puppet/parser/functions/unique.rb": "217ccce6d23235af92923f50f8556963",
-    "lib/puppet/parser/functions/upcase.rb": "a5744a74577cfa136fca2835e75888d3",
-    "lib/puppet/parser/functions/uriescape.rb": "321b8d2c33a5ea48337e1293774db4e0",
-    "lib/puppet/parser/functions/validate_absolute_path.rb": "385137ac24a2dec6cecc4e6ea75be442",
-    "lib/puppet/parser/functions/validate_array.rb": "72b29289b8af1cfc3662ef9be78911b8",
-    "lib/puppet/parser/functions/validate_augeas.rb": "d4acca7b8a9fdada9ae39e5101902cc1",
-    "lib/puppet/parser/functions/validate_bool.rb": "a712634a000024398b3c6cd4ecc46463",
-    "lib/puppet/parser/functions/validate_cmd.rb": "78fd21cb3fc52efc3b53ba2b3301de18",
-    "lib/puppet/parser/functions/validate_hash.rb": "e9cfaca68751524efe16ecf2f958a9a0",
-    "lib/puppet/parser/functions/validate_ipv4_address.rb": "a8fb6f0ca36aa460d462c07c2af5d5a2",
-    "lib/puppet/parser/functions/validate_ipv6_address.rb": "4699238e4cad60e7e1428905523eaeb7",
-    "lib/puppet/parser/functions/validate_re.rb": "c6664b3943bc820415a43f16372dc2a9",
-    "lib/puppet/parser/functions/validate_slength.rb": "7e67c213509b9383707819cc612b2a29",
-    "lib/puppet/parser/functions/validate_string.rb": "6afcbc51f83f0714348b8d61e06ea7eb",
-    "lib/puppet/parser/functions/values.rb": "066a6e4170e5034edb9a80463dff2bb5",
-    "lib/puppet/parser/functions/values_at.rb": "094ac110ce9f7a5b16d0c80a0cf2243c",
-    "lib/puppet/parser/functions/zip.rb": "a80782461ed9465f0cd0c010936f1855",
-    "lib/puppet/provider/file_line/ruby.rb": "10d65268d2d1e75b5dae014974b79d60",
-    "lib/puppet/type/anchor.rb": "bbd36bb49c3b554f8602d8d3df366c0c",
-    "lib/puppet/type/file_line.rb": "a1eceef6bd7cbfe99892cf3ee57ef2b4",
-    "manifests/init.pp": "f2ba5f36e7227ed87bbb69034fc0de8b",
-    "manifests/stages.pp": "cc6ed1751d334b0ea278c0335c7f0b5a",
-    "spec/acceptance/abs_spec.rb": "435478ef1ba43a6cca1f7b4db14a4bcc",
-    "spec/acceptance/any2array_spec.rb": "78187dc3683c8ecd15774d99024de47d",
-    "spec/acceptance/base64_spec.rb": "1684d5dd176dd5bbd4c3c6b1e64fbcea",
-    "spec/acceptance/bool2num_spec.rb": "c5e3aadb08a437f181247429f4125bab",
-    "spec/acceptance/build_csv.rb": "f28ef587de764ade1513091c4906412c",
-    "spec/acceptance/capitalize_spec.rb": "e77ea2c37144a75a67969c0d0839adfd",
-    "spec/acceptance/chomp_spec.rb": "fb0862a6b7eeb3c290e280788e705061",
-    "spec/acceptance/chop_spec.rb": "0bd1065b9c16a54b86adeb4e3be041fb",
-    "spec/acceptance/concat_spec.rb": "3a0dae19a34bb13d406c8e0ec87d8fe5",
-    "spec/acceptance/count_spec.rb": "5b35e597ae1051f41431812707d4b502",
-    "spec/acceptance/deep_merge_spec.rb": "c335a947f1666e185e0210e661f1c78a",
-    "spec/acceptance/defined_with_params_spec.rb": "f27c54ade9872c63c69316f62b03c119",
-    "spec/acceptance/delete_at_spec.rb": "9c028b703ee0286565c9877757678f3f",
-    "spec/acceptance/delete_spec.rb": "31e6dfcb9cc7c16b20d47c00e6a85a1d",
-    "spec/acceptance/delete_undef_values_spec.rb": "6e6a66aee0c383c843b5f92ef8c8410c",
-    "spec/acceptance/delete_values_spec.rb": "22c9b4914d4cbc0153aa3862cb4fb50e",
-    "spec/acceptance/difference_spec.rb": "289f4f1788feaacb304ffd54971c7e7e",
-    "spec/acceptance/dirname_spec.rb": "84db53878c4400a6c684c924cff05cfc",
-    "spec/acceptance/downcase_spec.rb": "0f094849b94a94df491ee01186473104",
-    "spec/acceptance/empty_spec.rb": "35c1f43e8a3e1fe7dd4335ef86e7efcc",
-    "spec/acceptance/ensure_packages_spec.rb": "ebeaa1624b30f5750cbfdcdce8690640",
-    "spec/acceptance/ensure_resource_spec.rb": "9e03216abb2431e749be76a4302931df",
-    "spec/acceptance/flatten_spec.rb": "83fb08cc168a105c1d5d0df66b1d9e84",
-    "spec/acceptance/floor_spec.rb": "d7267b2914b1da6406224abb7489ca86",
-    "spec/acceptance/fqdn_rotate_spec.rb": "bc3d0a01f91d2a85f3dbf53daf404fd1",
-    "spec/acceptance/get_module_path_spec.rb": "6a6552ff8d6d75ce795b0139c68a7993",
-    "spec/acceptance/getparam_spec.rb": "b62a47524f434b903f9e155ad56959b3",
-    "spec/acceptance/getvar_spec.rb": "ba2f081a88be97c0e7004a6296294f23",
-    "spec/acceptance/grep_spec.rb": "98818b8b0557b80d6ff519f70ea7617c",
-    "spec/acceptance/has_interface_with_spec.rb": "467183aeada0bec74143be6cf0b89a3d",
-    "spec/acceptance/has_ip_address_spec.rb": "e0369b12725695c528e2d47b8ea2b4d8",
-    "spec/acceptance/has_ip_network_spec.rb": "ca8dd6faa6df940784a60a49bec1330d",
-    "spec/acceptance/has_key_spec.rb": "6509a26a0886f7d591eaa926b2f92407",
-    "spec/acceptance/hash_spec.rb": "1c626457ba056bdd3936e28aa5bf503e",
-    "spec/acceptance/intersection_spec.rb": "40f586af7f95408a5d4a2882a4aa98f1",
-    "spec/acceptance/is_array_spec.rb": "c2ff70ce59b90b50a5aed67abaa5399d",
-    "spec/acceptance/is_bool_spec.rb": "c001fdecff6b0a3c9dc78774987a0b15",
-    "spec/acceptance/is_domain_name_spec.rb": "63e84285c26d8717fd5d4dda01e3f432",
-    "spec/acceptance/is_float_spec.rb": "2f0164b4d732166aa46055a2cf7b4ea9",
-    "spec/acceptance/is_function_available_spec.rb": "7745eba89f8719c9ca7ebf04d5b005f7",
-    "spec/acceptance/is_hash_spec.rb": "cff723cd8fddac45033af5dc8406d4e4",
-    "spec/acceptance/is_integer_spec.rb": "c09201d17d3914bba197872897fa3413",
-    "spec/acceptance/is_ip_address_spec.rb": "aa14cf9abf404c3fe1e761ea957871fe",
-    "spec/acceptance/is_mac_address_spec.rb": "30ff4c6a63be58daa3568305617ca2a7",
-    "spec/acceptance/is_numeric_spec.rb": "fb9829c7a1a8d4a58836df6ff4c3386d",
-    "spec/acceptance/is_string_spec.rb": "df3022de123b72f0022728eb2d8ce857",
-    "spec/acceptance/join_keys_to_values_spec.rb": "8aa128bbaeea65aab8d92badee3ca2b5",
-    "spec/acceptance/join_spec.rb": "c6378ed481265152bba9871fc5501ee6",
-    "spec/acceptance/keys_spec.rb": "20486e3ebee53e50dc9de3b78b9d6ae6",
-    "spec/acceptance/loadyaml_spec.rb": "5bce9c4b90e73bccdcd4f66fc988676b",
-    "spec/acceptance/lstrip_spec.rb": "e29ab4039b65660ec2bd76a298adcae0",
-    "spec/acceptance/max_spec.rb": "209cda4b83d677743afb1a8870330618",
-    "spec/acceptance/member_spec.rb": "0dac8ec7c7f670fca429fc26cf8ccc14",
-    "spec/acceptance/merge_spec.rb": "ac61d7627c66565a3a5cbfb2f9db21eb",
-    "spec/acceptance/min_spec.rb": "152a7db28434a0d0378561d4f64cddcc",
-    "spec/acceptance/nodesets/centos-6-vcloud.yml": "bdf9ce9d3b0f0b4995666ae9d64d878d",
-    "spec/acceptance/nodesets/centos-64-x64-pe.yml": "ec075d95760df3d4702abea1ce0a829b",
-    "spec/acceptance/nodesets/centos-64-x64.yml": "092dd2c588a9f87fa1fb12997c0723ef",
-    "spec/acceptance/nodesets/default.yml": "3e5c36e6aa5a690229e720f4048bb8af",
-    "spec/acceptance/nodesets/fedora-18-x64.yml": "80e41b1ee16ea489f53164bfdae58855",
-    "spec/acceptance/nodesets/sles-11-x64.yml": "44e4c6c15c018333bfa9840a5e702f66",
-    "spec/acceptance/nodesets/ubuntu-server-10044-x64.yml": "75e86400b7889888dc0781c0ae1a1297",
-    "spec/acceptance/nodesets/ubuntu-server-12042-x64.yml": "d30d73e34cd50b043c7d14e305955269",
-    "spec/acceptance/num2bool_spec.rb": "e4a00b913b08c68a689837e9f9336cb2",
-    "spec/acceptance/parsejson_spec.rb": "ea3973d412ad6f72425fdfac6fbb2bb4",
-    "spec/acceptance/parseyaml_spec.rb": "278e4f8e1f52e12e05f6ce31f1ffc9f2",
-    "spec/acceptance/pick_default_spec.rb": "1bc2562380ef6f6cded5ec90a03922be",
-    "spec/acceptance/pick_spec.rb": "272c54c8f9398f499768331bdb4276ee",
-    "spec/acceptance/prefix_spec.rb": "da620568c6771e7d492ec1ff697c531c",
-    "spec/acceptance/range_spec.rb": "65e5b98ceca257658604d988fbec7d03",
-    "spec/acceptance/reject_spec.rb": "b5185f1a6071c9bdc7aca92e6f899c3e",
-    "spec/acceptance/reverse_spec.rb": "7bdee543e82532e97bbf7a067140031c",
-    "spec/acceptance/rstrip_spec.rb": "28a64ceb7cb5ae8a93d31f49816190ab",
-    "spec/acceptance/shuffle_spec.rb": "451301879512a0ea3f321b5c78993bbf",
-    "spec/acceptance/size_spec.rb": "ae17d8a55921a0570972200c7c9327e1",
-    "spec/acceptance/sort_spec.rb": "d44b1b8c090f0f00a2f38515fda431ea",
-    "spec/acceptance/squeeze_spec.rb": "adcd65fa4e72203b97f1f14c8835c2cd",
-    "spec/acceptance/str2bool_spec.rb": "55ad165ceef6b9ba32bf20ca3b53b44c",
-    "spec/acceptance/str2saltedsha512_spec.rb": "b684c4214d06ae3d5bae055262a5ccaa",
-    "spec/acceptance/strftime_spec.rb": "0f4eadbd74445b35de4a42c9790fbcc1",
-    "spec/acceptance/strip_spec.rb": "6767da5bc735beb5362aeee6ff692c9e",
-    "spec/acceptance/suffix_spec.rb": "07dfc7eed48b75fcc1b93d0308243eda",
-    "spec/acceptance/swapcase_spec.rb": "5c3c1bc19a09fed6e01881f79b0b4ea5",
-    "spec/acceptance/time_spec.rb": "044b2f634a1fa6ecc735998d68a93b73",
-    "spec/acceptance/to_bytes_spec.rb": "f9df1f234b9409f5eaf56ef24e651c36",
-    "spec/acceptance/type_spec.rb": "d103a7e1607ab9cea74cdef25af610b0",
-    "spec/acceptance/union_spec.rb": "b6092941e0574f3c60910bebf84d2844",
-    "spec/acceptance/unique_spec.rb": "9b00b21cefde3b5391f50eeb9cd2493b",
-    "spec/acceptance/unsupported_spec.rb": "09b9265ecb05252cd5e5a18327c7ae97",
-    "spec/acceptance/upcase_spec.rb": "ffd1d6f9e6ec24131fb78983c53a75f9",
-    "spec/acceptance/uriescape_spec.rb": "13daa387714cbfc63b587aaa8dbf7fcd",
-    "spec/acceptance/validate_absolute_path_spec.rb": "8b9ebfae80329231d84fcab606a3eeaf",
-    "spec/acceptance/validate_array_spec.rb": "382641719e754622ffae562d10e38bf7",
-    "spec/acceptance/validate_augeas_spec.rb": "ec0a9c030e2c3494889973d74d60b2a4",
-    "spec/acceptance/validate_bool_spec.rb": "08bc139459204cf0a35098a5bc30ab95",
-    "spec/acceptance/validate_cmd_spec.rb": "d08eacac4dd5bdb50b5b0f02a6494048",
-    "spec/acceptance/validate_hash_spec.rb": "70ceacc18a0dee97b26ab2e50f925706",
-    "spec/acceptance/validate_ipv4_address_spec.rb": "dc901bbd05c3764a93cb49154cea6e4b",
-    "spec/acceptance/validate_ipv6_address_spec.rb": "c0872c56230ac2800cd5723eaa5bc53a",
-    "spec/acceptance/validate_re_spec.rb": "b289909078d6ae0d015419f518566698",
-    "spec/acceptance/validate_slength_spec.rb": "f0a05c1c2b895b096cb7326df4821594",
-    "spec/acceptance/validate_string_spec.rb": "6c9ced99fb1e263e66e25427d24f8f7b",
-    "spec/acceptance/values_at_spec.rb": "669b26c4d47742051472003518c3aa61",
-    "spec/acceptance/values_spec.rb": "714a13735aa0db3ffd3dfc4cd2c2e330",
-    "spec/acceptance/zip_spec.rb": "0a76aa26bd9552b8dae3294af7d233ab",
-    "spec/classes/anchor_spec.rb": "40600ba2845f9bd360a9504a347f12ba",
-    "spec/fixtures/dscacheutil/root": "e1a7622f55f3d1be258c9a5b16b474be",
-    "spec/functions/abs_spec.rb": "0a5864a29a8e9e99acc483268bd5917c",
-    "spec/functions/any2array_spec.rb": "167e114cfa222de971bf8be141766b6a",
-    "spec/functions/base64_spec.rb": "fe16d992be54dbb06d040f1b0e189571",
-    "spec/functions/bool2num_spec.rb": "67c3055d5d4e4c9fbcaca82038a09081",
-    "spec/functions/capitalize_spec.rb": "82a4209a033fc88c624f708c12e64e2a",
-    "spec/functions/chomp_spec.rb": "3cd8e2fe6b12efeffad94cce5b693b7c",
-    "spec/functions/chop_spec.rb": "4e9534d25b952b261c9f46add677c390",
-    "spec/functions/concat_spec.rb": "d7657b1af27a96072aae711cee041181",
-    "spec/functions/count_spec.rb": "db98ef89752a7112425f0aade10108e0",
-    "spec/functions/deep_merge_spec.rb": "7961a696e1b45167cead127f841f1c99",
-    "spec/functions/defined_with_params_spec.rb": "3bdfac38e3d6f06140ff2e926f4ebed2",
-    "spec/functions/delete_at_spec.rb": "7fd4fe7db8d213925fbc80c992673d10",
-    "spec/functions/delete_spec.rb": "fe66bdf9e61b9c992bc73ee54a37035c",
-    "spec/functions/delete_undef_values_spec.rb": "83b9c3027463f5c8a90a6d47d219acd5",
-    "spec/functions/delete_values_spec.rb": "ddcaa269caa95ad926b8a3ef82976da9",
-    "spec/functions/difference_spec.rb": "e64c1501699fef8eb1037a3ca60a05a6",
-    "spec/functions/dirname_spec.rb": "1d7cf70468c2cfa6dacfc75935322395",
-    "spec/functions/downcase_spec.rb": "b0197829512f2e92a2d2b06ce8e2226f",
-    "spec/functions/empty_spec.rb": "028c30267d648a172d8a81a9262c3abe",
-    "spec/functions/ensure_packages_spec.rb": "f1b60599078cdcb3cff1368346108264",
-    "spec/functions/ensure_resource_spec.rb": "7765dde3b9fc54b7dddb6597e0f7b523",
-    "spec/functions/flatten_spec.rb": "583c9a70f93e492cfb22ffa1811f6aa0",
-    "spec/functions/floor_spec.rb": "d01ef7dfe0245d7a0a73d7df13cb02e3",
-    "spec/functions/fqdn_rotate_spec.rb": "c67b71737bee9936f5261d41a37bad46",
-    "spec/functions/get_module_path_spec.rb": "b7ea196f548b1a9a745ab6671295ab27",
-    "spec/functions/getparam_spec.rb": "75153d949eb122aa18f0c5e2c8e861e5",
-    "spec/functions/getvar_spec.rb": "842bf88d47077a9ae64097b6e39c3364",
-    "spec/functions/grep_spec.rb": "78179537496a7150469e591a95e255d8",
-    "spec/functions/has_interface_with_spec.rb": "7c16d731c518b434c81b8cb2227cc916",
-    "spec/functions/has_ip_address_spec.rb": "f53c7baeaf024ff577447f6c28c0f3a7",
-    "spec/functions/has_ip_network_spec.rb": "885ea8a4c987b735d683b742bf846cb1",
-    "spec/functions/has_key_spec.rb": "3e4e730d98bbdfb88438b6e08e45868e",
-    "spec/functions/hash_spec.rb": "826337a92d8f7a189b7ac19615db0ed7",
-    "spec/functions/intersection_spec.rb": "1b1f1a3900a1f1e165692b056e766fba",
-    "spec/functions/is_array_spec.rb": "8c020af9c360abdbbf1ba887bb26babe",
-    "spec/functions/is_bool_spec.rb": "3219ba1500de75161bfb4f292404d1fa",
-    "spec/functions/is_domain_name_spec.rb": "8eed3a9eb9334bf6a473ad4e2cabc2ec",
-    "spec/functions/is_float_spec.rb": "171fc0e382d9856c2d8db2b70c9ec9cd",
-    "spec/functions/is_function_available.rb": "c8858a3c6253713cce0113a98d229b5d",
-    "spec/functions/is_hash_spec.rb": "408e121a5e30c4c5c4a0a383beb6e209",
-    "spec/functions/is_integer_spec.rb": "c848f20da5f62ac4bbaf0f6c1485c88f",
-    "spec/functions/is_ip_address_spec.rb": "6040a9bae4e5c853966148b634501157",
-    "spec/functions/is_mac_address_spec.rb": "644cd498b426ff2f9ea9cbc5d8e141d7",
-    "spec/functions/is_numeric_spec.rb": "65f2ad0e70d9b60c601740351eba94fd",
-    "spec/functions/is_string_spec.rb": "5c015d8267de852da3a12b984e077092",
-    "spec/functions/join_keys_to_values_spec.rb": "7c7937411b7fe4bb944c0c022d3a96b0",
-    "spec/functions/join_spec.rb": "c3b50c39390a86b493511be2c6722235",
-    "spec/functions/keys_spec.rb": "35cc2ed490dc68da6464f245dfebd617",
-    "spec/functions/loadyaml_spec.rb": "ce86614d8aaceec93653ecf299d3d441",
-    "spec/functions/lstrip_spec.rb": "1fc2c2d80b5f724a358c3cfeeaae6249",
-    "spec/functions/max_spec.rb": "5562bccc643443af7e4fa7c9d1e52b8b",
-    "spec/functions/member_spec.rb": "067c60985efc57022ca1c5508d74d77f",
-    "spec/functions/merge_spec.rb": "c17a7244453f2da22970acc02a6de110",
-    "spec/functions/min_spec.rb": "bf80bf58261117bb24392670b624a611",
-    "spec/functions/num2bool_spec.rb": "8cd5b46b7c8e612dfae3362e3a68a5f9",
-    "spec/functions/parsejson_spec.rb": "37ab84381e035c31d6a3dd9bf73a3d53",
-    "spec/functions/parseyaml_spec.rb": "65dfed872930ffe0d21954c15daaf498",
-    "spec/functions/pick_default_spec.rb": "db0a9d261b7e1b82e2786716dd924e92",
-    "spec/functions/pick_spec.rb": "34382f7483b6c10d38831de2169777c2",
-    "spec/functions/prefix_spec.rb": "7245749e27bafe1b36c1c5bae6f705c7",
-    "spec/functions/range_spec.rb": "c40b3c6d4031fc541c2421ff7b8c41fe",
-    "spec/functions/reject_spec.rb": "8e16c9f064870e958b6278261e480954",
-    "spec/functions/reverse_spec.rb": "48169990e59081ccbd112b6703418ce4",
-    "spec/functions/rstrip_spec.rb": "a408e933753c9c323a05d7079d32cbb3",
-    "spec/functions/shuffle_spec.rb": "2141a54d2fb3cf725b88184d639677f4",
-    "spec/functions/size_spec.rb": "d126b696b21a8cd754d58f78ddba6f06",
-    "spec/functions/sort_spec.rb": "7039cd230a94e95d9d1de2e1094acae2",
-    "spec/functions/squeeze_spec.rb": "df5b349c208a9a2a4d4b8e6d9324756f",
-    "spec/functions/str2bool_spec.rb": "e2a8a4d39680f3ed18621e26d67c6024",
-    "spec/functions/str2saltedsha512_spec.rb": "1de174be8835ba6fef86b590887bb2cc",
-    "spec/functions/strftime_spec.rb": "bf140883ecf3254277306fa5b25f0344",
-    "spec/functions/strip_spec.rb": "a01796bebbdabd3fad12b0662ea5966e",
-    "spec/functions/suffix_spec.rb": "ee875e2d09d7ffc363bf6c34d9ef322f",
-    "spec/functions/swapcase_spec.rb": "0660ce8807608cc8f98ad1edfa76a402",
-    "spec/functions/time_spec.rb": "b6d0279062779efe5153fe5cfafc5bbd",
-    "spec/functions/to_bytes_spec.rb": "80aaf68cf7e938e46b5278c1907af6be",
-    "spec/functions/type_spec.rb": "422f2c33458fe9b0cc9614d16f7573ba",
-    "spec/functions/union_spec.rb": "c4f72a55e186813cd3a47a83ba3e9a61",
-    "spec/functions/unique_spec.rb": "2df8b3b2edb9503943cb4dcb4a371867",
-    "spec/functions/upcase_spec.rb": "813668919bc62cdd1d349dafc19fbbb3",
-    "spec/functions/uriescape_spec.rb": "204e9b1566e330a0234761ac8ac7083f",
-    "spec/functions/validate_absolute_path_spec.rb": "5a0b98675070e511810dab9e60dc43b6",
-    "spec/functions/validate_array_spec.rb": "bcd231229554785c4270ca92ef99cb60",
-    "spec/functions/validate_augeas_spec.rb": "eee1a0c3ef3051bda525b1e17d577ab0",
-    "spec/functions/validate_bool_spec.rb": "7aeb6085fc9601c6bbe6c49e56d209a4",
-    "spec/functions/validate_cmd_spec.rb": "efc88e8e21481acd36c7f948b1f226ea",
-    "spec/functions/validate_hash_spec.rb": "8529c74051ceb71e6b1b97c9cecdf625",
-    "spec/functions/validate_ipv4_address_spec.rb": "19f2f44fbbdf7a2e69aeaa2f0f402695",
-    "spec/functions/validate_ipv6_address_spec.rb": "2d8617be4405bdbd84d140ba8be6c184",
-    "spec/functions/validate_re_spec.rb": "d8ab477f9afcb748f144588ebb3a28a3",
-    "spec/functions/validate_slength_spec.rb": "73273a083a26941b3f7c1e3b2e18b3e2",
-    "spec/functions/validate_string_spec.rb": "64a4f681084cba55775a070f7fab5e0c",
-    "spec/functions/values_at_spec.rb": "de45fd8abbc4c037c3c4fac2dcf186f9",
-    "spec/functions/values_spec.rb": "0ac9e141ed1f612d7cc224f747b2d1d9",
-    "spec/functions/zip_spec.rb": "06a86e4e70d2aea63812582aae1d26c4",
-    "spec/lib/puppet_spec/compiler.rb": "3c1f03dd8ac2f6f90d7e8f879a3ce4c0",
-    "spec/lib/puppet_spec/database.rb": "c74c0cf62980beea88c7749f876ccfa7",
-    "spec/lib/puppet_spec/files.rb": "906da85e399302cee403e10e357d3f4c",
-    "spec/lib/puppet_spec/fixtures.rb": "0722c5ccbfcba1fc27da1900e54b4463",
-    "spec/lib/puppet_spec/matchers.rb": "dd30ba6b936e8c267511d67acb087c35",
-    "spec/lib/puppet_spec/modules.rb": "445d2739aa8754568a14816280727d70",
-    "spec/lib/puppet_spec/pops.rb": "adf661defa460b7189e3750535533d34",
-    "spec/lib/puppet_spec/scope.rb": "01aeb89bdc2d29a2528ced26ec6402ec",
-    "spec/lib/puppet_spec/settings.rb": "5da4e0dad8bf6b21cc4437c73753a56d",
-    "spec/lib/puppet_spec/verbose.rb": "71dbccd9a45ed89d12fd1c44456a6820",
-    "spec/monkey_patches/alias_should_to_must.rb": "b19ee31563afb91a72f9869f9d7362ff",
-    "spec/monkey_patches/publicize_methods.rb": "c690e444b77c871375d321e413e28ca1",
-    "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
-    "spec/spec_helper.rb": "846cc69a2d612d55d130622759aa12e0",
-    "spec/spec_helper_acceptance.rb": "d82b5682eac4ff46bbe5aa08c29d5e28",
-    "spec/unit/facter/facter_dot_d_spec.rb": "cce0748b2671b1b104332a7c757e5206",
-    "spec/unit/facter/pe_version_spec.rb": "ef031cca838f36f99b1dab3259df96a5",
-    "spec/unit/facter/root_home_spec.rb": "ecd851e2b8a4a8578960cce094cf41ee",
-    "spec/unit/facter/util/puppet_settings_spec.rb": "8666142d017e5804445f5596f3be76e8",
-    "spec/unit/puppet/provider/file_line/ruby_spec.rb": "e118a65a3eb0ccd3d1bf99d7bb010669",
-    "spec/unit/puppet/type/anchor_spec.rb": "3c3251acbc1085b121623f4617107fb9",
-    "spec/unit/puppet/type/file_line_spec.rb": "72ba1d9ad9de5df592f3ff03551983cb",
-    "tests/file_line.pp": "67727539aa7b7dd76f06626fe734f7f7",
-    "tests/has_interface_with.pp": "59c98b4af0d39fc11d1ef4c7a6dc8f7a",
-    "tests/has_ip_address.pp": "93ce02915f67ddfb43a049b2b84ef391",
-    "tests/has_ip_network.pp": "abc05686797a776ea8c054657e6f7456",
-    "tests/init.pp": "1d98070412c76824e66db4b7eb74d433"
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
deleted file mode 100755
index 8e056424ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'abs function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should accept a string' do
-      pp = <<-EOS
-      $input  = '-34.56'
-      $output = abs($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
-      end
-    end
-
-    it 'should accept a float' do
-      pp = <<-EOS
-      $input  = -34.56
-      $output = abs($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
deleted file mode 100755
index 467d6afda03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'any2array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should create an empty array' do
-      pp = <<-EOS
-      $input = ''
-      $output = any2array($input)
-      validate_array($output)
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: /)
-      end
-    end
-
-    it 'should leave arrays modified' do
-      pp = <<-EOS
-      $input = ['test', 'array']
-      $output = any2array($input)
-      validate_array($output)
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: testarray/)
-      end
-    end
-
-    it 'should turn a hash into an array' do
-      pp = <<-EOS
-      $input = {'test' => 'array'}
-      $output = any2array($input)
-
-      validate_array($output)
-      # Check each element of the array is a plain string.
-      validate_string($output[0])
-      validate_string($output[1])
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: testarray/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
deleted file mode 100755
index 97e1738ef68..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'base64 function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should encode then decode a string' do
-      pp = <<-EOS
-      $encodestring = base64('encode', 'thestring')
-      $decodestring = base64('decode', $encodestring)
-      notify { $decodestring: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/thestring/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
deleted file mode 100755
index 7a70311ca7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'bool2num function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    ['false', 'f', '0', 'n', 'no'].each do |bool|
-      it 'should convert a given boolean, #{bool}, to 0' do
-        pp = <<-EOS
-        $input = #{bool}
-        $output = bool2num($input)
-        notify { $output: }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: 0/)
-        end
-      end
-    end
-
-    ['true', 't', '1', 'y', 'yes'].each do |bool|
-      it 'should convert a given boolean, #{bool}, to 1' do
-        pp = <<-EOS
-        $input = #{bool}
-        $output = bool2num($input)
-        notify { $output: }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: 1/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb
deleted file mode 100755
index 62ecbf13a40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set sw=2 sts=2 et tw=80 :
-require 'rspec'
-
-#XXX Super ugly hack to keep from starting beaker nodes
-module Kernel
-  # make an alias of the original require
-  alias_method :original_require, :require
-  # rewrite require
-  def require name
-    original_require name if name != 'spec_helper_acceptance'
-  end
-end
-UNSUPPORTED_PLATFORMS = []
-def fact(*args) [] end
-#XXX End hax
-
-# Get a list of functions for test coverage
-function_list = Dir[File.join(File.dirname(__FILE__),"..","..","lib","puppet","parser","functions","*.rb")].collect do |function_rb|
-  File.basename(function_rb,".rb")
-end
-
-## Configure rspec to parse tests
-options = RSpec::Core::ConfigurationOptions.new(['spec/acceptance'])
-configuration = RSpec::configuration
-world = RSpec::world
-options.parse_options
-options.configure(configuration)
-configuration.load_spec_files
-
-## Collect up tests and example groups into a hash
-def get_tests(children)
-  children.inject({}) do |memo,c|
-    memo[c.description] = Hash.new
-    memo[c.description]["groups"] = get_tests(c.children) unless c.children.empty?
-    memo[c.description]["tests"] = c.examples.collect { |e|
-      e.description unless e.pending?
-    }.compact unless c.examples.empty?
-    memo[c.description]["pending_tests"] = c.examples.collect { |e|
-      e.description if e.pending?
-    }.compact unless c.examples.empty?
-    memo
-  end
-end
-
-def count_test_types_in(type,group)
-  return 0 if group.nil?
-  group.inject(0) do |m,(k,v)|
-    m += v.length if k == type
-    m += count_tests_in(v) if v.is_a?(Hash)
-    m
-  end
-end
-def count_tests_in(group)
-  count_test_types_in('tests',group)
-end
-def count_pending_tests_in(group)
-  count_test_types_in('pending_tests',group)
-end
-
-# Convert tests hash to csv format
-def to_csv(function_list,tests)
-  function_list.collect do |function_name|
-    if v = tests["#{function_name} function"]
-      positive_tests = count_tests_in(v["groups"]["success"])
-      negative_tests = count_tests_in(v["groups"]["failure"])
-      pending_tests  =
-        count_pending_tests_in(v["groups"]["failure"]) +
-        count_pending_tests_in(v["groups"]["failure"])
-    else
-      positive_tests = 0
-      negative_tests = 0
-      pending_tests  = 0
-    end
-    sprintf("%-25s, %-9d, %-9d, %-9d", function_name,positive_tests,negative_tests,pending_tests)
-  end.compact
-end
-
-tests = get_tests(world.example_groups)
-csv = to_csv(function_list,tests)
-percentage_tested = "#{tests.count*100/function_list.count}%"
-printf("%-25s,  %-9s, %-9s, %-9s\n","#{percentage_tested} have tests.","Positive","Negative","Pending")
-puts csv
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
deleted file mode 100755
index e5e7b7bf841..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'capitalize function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should capitalize the first letter of a string' do
-      pp = <<-EOS
-      $input = 'this is a string'
-      $output = capitalize($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This is a string/)
-      end
-    end
-
-    it 'should capitalize the first letter of an array of strings' do
-      pp = <<-EOS
-      $input = ['this', 'is', 'a', 'string']
-      $output = capitalize($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This/)
-        expect(r.stdout).to match(/Notice: Is/)
-        expect(r.stdout).to match(/Notice: A/)
-        expect(r.stdout).to match(/Notice: String/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
deleted file mode 100755
index f6c15956e4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'chomp function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should eat the newline' do
-      pp = <<-EOS
-      $input = "test\n"
-      if size($input) != 5 {
-        fail("Size of ${input} is not 5.")
-      }
-      $output = chomp($input)
-      if size($output) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
deleted file mode 100755
index dbc28da7ec3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'chop function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should eat the last character' do
-      pp = <<-EOS
-      $input = "test"
-      if size($input) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      $output = chop($input)
-      if size($output) != 3 {
-        fail("Size of ${input} is not 3.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should eat the last two characters of \r\n' do
-      pp = <<-EOS
-      $input = "test\r\n"
-      if size($input) != 6 {
-        fail("Size of ${input} is not 6.")
-      }
-      $output = chop($input)
-      if size($output) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should not fail on empty strings' do
-      pp = <<-EOS
-      $input = ""
-      $output = chop($input)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
deleted file mode 100755
index 7bda3653a05..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should concat one array to another' do
-      pp = <<-EOS
-      $output = concat(['1','2','3'],['4','5','6'])
-      validate_array($output)
-      if size($output) != 6 {
-        fail("${output} should have 6 elements.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb
deleted file mode 100755
index 51a40ba5c17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'count function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should count elements in an array' do
-      pp = <<-EOS
-      $input = [1,2,3,4]
-      $output = count($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 4/)
-      end
-    end
-
-    it 'should count elements in an array that match a second argument' do
-      pp = <<-EOS
-      $input = [1,1,1,2]
-      $output = count($input, 1)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 3/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
deleted file mode 100755
index c0f9b126d03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'deep_merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should deep merge two hashes' do
-      pp = <<-EOS
-      $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-      $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-      $merged_hash = deep_merge($hash1, $hash2)
-
-      if $merged_hash != { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } {
-        fail("Hash was incorrectly merged.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
deleted file mode 100755
index fc544508b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'defined_with_params function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should successfully notify' do
-      pp = <<-EOS
-      user { 'dan':
-        ensure => present,
-      }
-
-      if defined_with_params(User[dan], {'ensure' => 'present' }) {
-        notify { 'User defined with ensure=>present': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: User defined with ensure=>present/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
deleted file mode 100755
index db0c01f7483..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_at function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete_at(['a','b','c','b'], 1)
-      if $output == ['a','c','b'] {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
deleted file mode 100755
index a28604ceaa0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete(['a','b','c','b'], 'b')
-      if $output == ['a','c'] {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
deleted file mode 100755
index b7eda1926c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_undef_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-      if $output == { a => 'A', b => '', d => false } {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
deleted file mode 100755
index 6d2369c3e81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the hash' do
-      pp = <<-EOS
-      $a = { 'a' => 'A', 'b' => 'B', 'B' => 'C', 'd' => 'B' }
-      $b = { 'a' => 'A', 'B' => 'C' }
-      $o = delete_values($a, 'B')
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles non-hash arguments'
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
deleted file mode 100755
index 2fae5c432f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'difference function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns non-duplicates in the first array' do
-      pp = <<-EOS
-      $a = ['a','b','c']
-      $b = ['b','c','d']
-      $c = ['a']
-      $o = difference($a, $b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles non-array arguments'
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
deleted file mode 100755
index 97913ddb063..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'dirname function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    context 'absolute path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
-        $a = '/path/to/a/file.txt'
-        $b = '/path/to/a'
-        $o = dirname($a)
-        if $o == $b {
-          notify { 'output correct': }
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
-        end
-      end
-    end
-    context 'relative path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
-        $a = 'path/to/a/file.txt'
-        $b = 'path/to/a'
-        $o = dirname($a)
-        if $o == $b {
-          notify { 'output correct': }
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
-        end
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
deleted file mode 100755
index bc4e70692d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'downcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns the downcase' do
-      pp = <<-EOS
-      $a = 'AOEU'
-      $b = 'aoeu'
-      $o = downcase($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'doesn\'t affect lowercase words' do
-      pp = <<-EOS
-      $a = 'aoeu aoeu'
-      $b = 'aoeu aoeu'
-      $o = downcase($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
deleted file mode 100755
index 8b46aacdad8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'empty function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'recognizes empty strings' do
-      pp = <<-EOS
-      $a = ''
-      $b = true
-      $o = empty($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'recognizes non-empty strings' do
-      pp = <<-EOS
-      $a = 'aoeu'
-      $b = false
-      $o = empty($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb
deleted file mode 100755
index 145bdc5e5de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ensure_packages a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
-      pp = <<-EOS
-      $a = "zsh"
-      ensure_packages($a)
-      EOS
-
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
-      end
-    end
-    it 'ensures a package already declared'
-    it 'takes defaults arguments'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
deleted file mode 100755
index c4d8887df29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ensure_resource a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
-      pp = <<-EOS
-      $a = "zsh"
-      ensure_resource('package', $a)
-      EOS
-
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
-      end
-    end
-    it 'ensures a resource already declared'
-    it 'takes defaults arguments'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
deleted file mode 100755
index c4d66e04650..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'flatten function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'flattens arrays' do
-      pp = <<-EOS
-      $a = ["a","b",["c",["d","e"],"f","g"]]
-      $b = ["a","b","c","d","e","f","g"]
-      $o = flatten($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'does not affect flat arrays' do
-      pp = <<-EOS
-      $a = ["a","b","c","d","e","f","g"]
-      $b = ["a","b","c","d","e","f","g"]
-      $o = flatten($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
deleted file mode 100755
index 0dcdad9c2b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'floor function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'floors floats' do
-      pp = <<-EOS
-      $a = 12.8
-      $b = 12
-      $o = floor($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'floors integers' do
-      pp = <<-EOS
-      $a = 7
-      $b = 7
-      $o = floor($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
deleted file mode 100755
index b7f8bf8ab9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    let(:facts_d) do
-      if fact('is_pe') == "true"
-        '/etc/puppetlabs/facter/facts.d'
-      else
-        '/etc/facter/facts.d'
-      end
-    end
-    after :each do
-      shell("if [ -f #{facts_d}/fqdn.txt ] ; then rm #{facts_d}/fqdn.txt ; fi")
-    end
-    it 'fqdn_rotates floats' do
-      shell("echo 'fqdn=fakehost.localdomain' > #{facts_d}/fqdn.txt")
-      pp = <<-EOS
-      $a = ['a','b','c','d']
-      $o = fqdn_rotate($a)
-      notice(inline_template('fqdn_rotate is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/fqdn_rotate is \["c", "d", "a", "b"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
deleted file mode 100755
index 34d91fa3dab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'get_module_paths stdlib' do
-      pp = <<-EOS
-      $a = $::is_pe ? {
-        'true'  => '/opt/puppet/share/puppet/modules/stdlib',
-        'false' => '/etc/puppet/modules/stdlib',
-      }
-      $o = get_module_path('stdlib')
-      if $o == $a {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'get_module_paths dne' do
-      pp = <<-EOS
-      $a = $::is_pe ? {
-        'true'  => '/etc/puppetlabs/puppet/modules/dne',
-        'false' => '/etc/puppet/modules/dne',
-      }
-      $o = get_module_path('dne')
-      if $o == $a {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
deleted file mode 100755
index 91fc9a00f34..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'getparam function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'getparam a package' do
-      pp = <<-EOS
-      user { "rspec":
-        ensure     => present,
-        managehome => true,
-      }
-      $o = getparam(User['rspec'], 'managehome')
-      notice(inline_template('getparam is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/getparam is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
deleted file mode 100755
index 333c467f673..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'getvar function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'getvars from classes' do
-      pp = <<-EOS
-      class a::data { $foo = 'aoeu' }
-      include a::data
-      $b = 'aoeu'
-      $o = getvar("a::data::foo")
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
deleted file mode 100755
index b39d48ecbe6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'grep function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'greps arrays' do
-      pp = <<-EOS
-      $a = ['aaabbb','bbbccc','dddeee']
-      $b = 'bbb'
-      $c = ['aaabbb','bbbccc']
-      $o = grep($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
deleted file mode 100755
index 41ae19fd1c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_interface_with existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.1'
-      $o = has_interface_with('ipaddress', $a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is true/)
-      end
-    end
-    it 'has_interface_with absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.1'
-      $o = has_interface_with('ipaddress', $a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is false/)
-      end
-    end
-    it 'has_interface_with existing interface' do
-      pp = <<-EOS
-      $a = 'lo'
-      $o = has_interface_with($a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
deleted file mode 100755
index 7d5fd872926..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_ip_address existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.1'
-      $o = has_ip_address($a)
-      notice(inline_template('has_ip_address is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_address is true/)
-      end
-    end
-    it 'has_ip_address absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.1'
-      $o = has_ip_address($a)
-      notice(inline_template('has_ip_address is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_address is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
deleted file mode 100755
index 692eaf9b4c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_ip_network function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_ip_network existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.0'
-      $o = has_ip_network($a)
-      notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is true/)
-      end
-    end
-    it 'has_ip_network absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.0'
-      $o = has_ip_network($a)
-      notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
deleted file mode 100755
index c8557cbeb66..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_key function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_keys in hashes' do
-      pp = <<-EOS
-      $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
-      $b = 'bbb'
-      $c = true
-      $o = has_key($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'has_keys not in hashes' do
-      pp = <<-EOS
-      $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
-      $b = 'ccc'
-      $c = false
-      $o = has_key($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-hashes'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
deleted file mode 100755
index ed53834bed2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'hashs arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','bbb','ccc','ddd','eee']
-      $b = { 'aaa' => 'bbb', 'bbb' => 'ccc', 'ddd' => 'eee' }
-      $o = hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'handles odd-length arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
deleted file mode 100755
index 66b86529786..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'intersection function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'intersections arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = ['bbb','ccc','ddd','eee']
-      $c = ['bbb','ccc']
-      $o = intersection($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'intersections empty arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
deleted file mode 100755
index 9c6bad735f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_arrays arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = true
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays empty arrays' do
-      pp = <<-EOS
-      $a = []
-      $b = true
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = false
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
deleted file mode 100755
index 60079f95eff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_bools arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools true' do
-      pp = <<-EOS
-      $a = true
-      $b = true
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools false' do
-      pp = <<-EOS
-      $a = false
-      $b = true
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools strings' do
-      pp = <<-EOS
-      $a = "true"
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
deleted file mode 100755
index e0f03fa878e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_domain_name function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_domain_names arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names false' do
-      pp = <<-EOS
-      $a = false
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names strings with hyphens' do
-      pp = <<-EOS
-      $a = "3foo-bar.2bar-fuzz.com"
-      $b = true
-      $o = is_domain_name($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_domain_names strings beginning with hyphens' do
-      pp = <<-EOS
-      $a = "-bar.2bar-fuzz.com"
-      $b = false
-      $o = is_domain_name($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_domain_names hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
deleted file mode 100755
index 338ba58d468..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_float function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_floats arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-    it 'is_floats true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-    it 'is_floats strings' do
-      pp = <<-EOS
-      $a = "3.5"
-      $b = true
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = true
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = false
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
deleted file mode 100755
index 2b5dd6d1731..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_function_available function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_function_availables arrays' do
-      pp = <<-EOS
-      $a = ['fail','include','require']
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is false/)
-      end
-    end
-    it 'is_function_availables true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is false/)
-      end
-    end
-    it 'is_function_availables strings' do
-      pp = <<-EOS
-      $a = "fail"
-      $b = true
-      $o = is_function_available($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_function_availables function_availables' do
-      pp = <<-EOS
-      $a = "is_function_available"
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
deleted file mode 100755
index 2ef310abccb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_hashs arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $o = is_hash($a)
-      notice(inline_template('is_hash is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_hash is false/)
-      end
-    end
-    it 'is_hashs empty hashs' do
-      pp = <<-EOS
-      $a = {}
-      $b = true
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_hashs strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_hashs hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = true
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
deleted file mode 100755
index bf6902b904c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_integer function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_integers arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers strings' do
-      pp = <<-EOS
-      $a = "3"
-      $b = true
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = true
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
deleted file mode 100755
index ed7a85439d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_ip_addresss ipv4' do
-      pp = <<-EOS
-      $a = '1.2.3.4'
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv6' do
-      pp = <<-EOS
-      $a = "fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv6 compressed' do
-      pp = <<-EOS
-      $a = "fe00::1"
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv4 out of range' do
-      pp = <<-EOS
-      $a = '1.2.3.400'
-      $b = false
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
deleted file mode 100755
index a2c892f435b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_mac_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_mac_addresss a mac' do
-      pp = <<-EOS
-      $a = '00:a0:1f:12:7f:a0'
-      $b = true
-      $o = is_mac_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_mac_addresss a mac out of range' do
-      pp = <<-EOS
-      $a = '00:a0:1f:12:7f:g0'
-      $b = false
-      $o = is_mac_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
deleted file mode 100755
index 21c898841ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_numeric function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_numerics arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics strings' do
-      pp = <<-EOS
-      $a = "3"
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
deleted file mode 100755
index 94d8e967830..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_strings arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $o = is_string($a)
-      notice(inline_template('is_string is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_string is true/)
-      end
-    end
-    it 'is_strings number strings' do
-      pp = <<-EOS
-      $a = "3"
-      $o = is_string($a)
-      notice(inline_template('is_string is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_string is false/)
-      end
-    end
-    it 'is_strings floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
deleted file mode 100755
index 70493fd5a2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'join_keys_to_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'join_keys_to_valuess hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb','ccc'=>'ddd'}
-      $b = ':'
-      $o = join_keys_to_values($a,$b)
-      notice(inline_template('join_keys_to_values is <%= @o.sort.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/join_keys_to_values is \["aaa:bbb", "ccc:ddd"\]/)
-      end
-    end
-    it 'handles non hashes'
-    it 'handles empty hashes'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb
deleted file mode 100755
index 5397ce2c8c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'join function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'joins arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = ':'
-      $c = 'aaa:bbb:ccc'
-      $o = join($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'handles non arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
deleted file mode 100755
index 176918e91c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'keys function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'keyss hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb','ccc'=>'ddd'}
-      $o = keys($a)
-      notice(inline_template('keys is <%= @o.sort.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/keys is \["aaa", "ccc"\]/)
-      end
-    end
-    it 'handles non hashes'
-    it 'handles empty hashes'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
deleted file mode 100644
index 944a727359f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'loadyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'loadyamls array of values' do
-      shell('echo "---
-      aaa: 1
-      bbb: 2
-      ccc: 3
-      ddd: 4" > /testyaml.yaml')
-      pp = <<-EOS
-      $o = loadyaml('/testyaml.yaml')
-      notice(inline_template('loadyaml[aaa] is <%= @o["aaa"].inspect %>'))
-      notice(inline_template('loadyaml[bbb] is <%= @o["bbb"].inspect %>'))
-      notice(inline_template('loadyaml[ccc] is <%= @o["ccc"].inspect %>'))
-      notice(inline_template('loadyaml[ddd] is <%= @o["ddd"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/loadyaml\[aaa\] is 1/)
-        expect(r.stdout).to match(/loadyaml\[bbb\] is 2/)
-        expect(r.stdout).to match(/loadyaml\[ccc\] is 3/)
-        expect(r.stdout).to match(/loadyaml\[ddd\] is 4/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
deleted file mode 100755
index 3dc952fbc65..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'lstrip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'lstrips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = lstrip($a)
-      notice(inline_template('lstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/lstrip is \["the   ", "public   ", "art", "galleries   "\]/)
-      end
-    end
-    it 'lstrips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = lstrip($a)
-      notice(inline_template('lstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/lstrip is "blowzy night-frumps vex'd jack q   "/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb
deleted file mode 100755
index f04e3d28332..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'max function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'maxs arrays' do
-      pp = <<-EOS
-      $o = max("the","public","art","galleries")
-      notice(inline_template('max is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/max is "the"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb
deleted file mode 100755
index b467dbbe9c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'member function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'members arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = 'ccc'
-      $c = true
-      $o = member($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'members arrays without members'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
deleted file mode 100755
index a60e784ee67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should merge two hashes' do
-      pp = <<-EOS
-      $a = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-      $b = {'two' => 'dos', 'three' => { 'five' => 5 } }
-      $o = merge($a, $b)
-      notice(inline_template('merge[one]   is <%= @o["one"].inspect %>'))
-      notice(inline_template('merge[two]   is <%= @o["two"].inspect %>'))
-      notice(inline_template('merge[three] is <%= @o["three"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/merge\[one\]   is "1"/)
-        expect(r.stdout).to match(/merge\[two\]   is "dos"/)
-        expect(r.stdout).to match(/merge\[three\] is {"five"=>"5"}/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb
deleted file mode 100755
index 509092d3c7c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'min function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'mins arrays' do
-      pp = <<-EOS
-      $o = min("the","public","art","galleries")
-      notice(inline_template('min is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/min is "art"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
deleted file mode 100644
index ca9c1d32986..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-HOSTS:
-  'centos-6-vcloud':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
deleted file mode 100755
index 1d99ba02514..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'num2bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'bools positive numbers and numeric strings as true' do
-      pp = <<-EOS
-      $a = 1
-      $b = "1"
-      $c = "50"
-      $ao = num2bool($a)
-      $bo = num2bool($b)
-      $co = num2bool($c)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/a is true/)
-        expect(r.stdout).to match(/b is true/)
-        expect(r.stdout).to match(/c is true/)
-      end
-    end
-    it 'bools negative numbers as false' do
-      pp = <<-EOS
-      $a = 0
-      $b = -0.1
-      $c = ["-50","1"]
-      $ao = num2bool($a)
-      $bo = num2bool($b)
-      $co = num2bool($c)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/a is false/)
-        expect(r.stdout).to match(/b is false/)
-        expect(r.stdout).to match(/c is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails on words' do
-      pp = <<-EOS
-      $a = "a"
-      $ao = num2bool($a)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/not look like a number/)
-    end
-
-    it 'fails on numberwords' do
-      pp = <<-EOS
-      $b = "1b"
-      $bo = num2bool($b)
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/not look like a number/)
-
-    end
-
-    it 'fails on non-numeric/strings' do
-      pending "The function will call .to_s.to_i on anything not a Numeric or
-      String, and results in 0. Is this intended?"
-      pp = <<-EOS
-      $c = {"c" => "-50"}
-      $co = num2bool($c)
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-      expect(apply_manifest(ppc :expect_failures => true).stderr).to match(/Unable to parse/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
deleted file mode 100755
index 50978102726..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'parsejson function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'parses valid json' do
-      pp = <<-EOS
-      $a = '{"hunter": "washere", "tests": "passing"}'
-      $ao = parsejson($a)
-      $tests = $ao['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/tests are "passing"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error on incorrect json' do
-      pp = <<-EOS
-      $a = '{"hunter": "washere", "tests": "passing",}'
-      $ao = parsejson($a)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/expected next name/)
-      end
-    end
-
-    it 'raises error on incorrect number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
deleted file mode 100755
index 4b4bf3df3df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'parseyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'parses valid yaml' do
-      pp = <<-EOS
-      $a = "---\nhunter: washere\ntests: passing\n"
-      $o = parseyaml($a)
-      $tests = $o['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/tests are "passing"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error on incorrect yaml' do
-      pp = <<-EOS
-      $a = "---\nhunter: washere\ntests: passing\n:"
-      $o = parseyaml($a)
-      $tests = $o['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/syntax error/)
-      end
-    end
-
-    it 'raises error on incorrect number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
deleted file mode 100755
index a663f54e8ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'pick_default function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'pick_defaults a default value' do
-      pp = <<-EOS
-      $a = undef
-      $o = pick_default($a, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "default"/)
-      end
-    end
-    it 'pick_defaults with no value' do
-      pp = <<-EOS
-      $a = undef
-      $b = undef
-      $o = pick_default($a,$b)
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is ""/)
-      end
-    end
-    it 'pick_defaults the first set value' do
-      pp = <<-EOS
-      $a = "something"
-      $b = "long"
-      $o = pick_default($a, $b, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "something"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error with no values' do
-      pp = <<-EOS
-      $o = pick_default()
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/Must receive at least one argument/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
deleted file mode 100755
index 46cf63f28fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'pick function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'picks a default value' do
-      pp = <<-EOS
-      $a = undef
-      $o = pick($a, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "default"/)
-      end
-    end
-    it 'picks the first set value' do
-      pp = <<-EOS
-      $a = "something"
-      $b = "long"
-      $o = pick($a, $b, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "something"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error with all undef values' do
-      pp = <<-EOS
-      $a = undef
-      $b = undef
-      $o = pick($a, $b)
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/must receive at least one non empty value/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
deleted file mode 100755
index de55530eb26..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'prefix function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'prefixes array of values' do
-      pp = <<-EOS
-      $o = prefix(['a','b','c'],'p')
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \["pa", "pb", "pc"\]/)
-      end
-    end
-    it 'prefixs with empty array' do
-      pp = <<-EOS
-      $o = prefix([],'p')
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \[\]/)
-      end
-    end
-    it 'prefixs array of values with undef' do
-      pp = <<-EOS
-      $o = prefix(['a','b','c'], undef)
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \["a", "b", "c"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb
deleted file mode 100755
index a3ccd3396aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'range function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ranges letters' do
-      pp = <<-EOS
-      $o = range('a','d')
-      notice(inline_template('range is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/range is \["a", "b", "c", "d"\]/)
-      end
-    end
-    it 'ranges letters with a step' do
-      pp = <<-EOS
-      $o = range('a','d', '2')
-      notice(inline_template('range is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/range is \["a", "c"\]/)
-      end
-    end
-    it 'ranges letters with a negative step'
-    it 'ranges numbers'
-    it 'ranges numbers with a step'
-    it 'ranges numbers with a negative step'
-    it 'ranges numeric strings'
-    it 'ranges zero padded numbers'
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
deleted file mode 100755
index 7f16a008dc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'reject function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'rejects array of values' do
-      pp = <<-EOS
-      $o = reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \["bbb", "ccc"\]/)
-      end
-    end
-    it 'rejects with empty array' do
-      pp = <<-EOS
-      $o = reject([],'aaa')
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \[\]/)
-      end
-    end
-    it 'rejects array of values with undef' do
-      pp = <<-EOS
-      $o = reject(['aaa','bbb','ccc','aaaddd'], undef)
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \[\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
deleted file mode 100755
index c3f01567a64..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'reverse function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'reverses strings' do
-      pp = <<-EOS
-      $a = "the public art galleries"
-      # Anagram: Large picture halls, I bet
-      $o = reverse($a)
-      notice(inline_template('reverse is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reverse is "seirellag tra cilbup eht"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
deleted file mode 100755
index b57a8b04581..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'rstrip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'rstrips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = rstrip($a)
-      notice(inline_template('rstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/rstrip is \["  the", "   public", "   art", "galleries"\]/)
-      end
-    end
-    it 'rstrips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = rstrip($a)
-      notice(inline_template('rstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/rstrip is "   blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
deleted file mode 100755
index 02d1201dd0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'shuffle function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'shuffles arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = shuffle($a)
-      notice(inline_template('shuffle is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/shuffle is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-    it 'shuffles strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = shuffle($a)
-      notice(inline_template('shuffle is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/shuffle is "blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb
deleted file mode 100755
index a52b778bde6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'size function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'single string size' do
-      pp = <<-EOS
-      $a = 'discombobulate'
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 14/)
-      end
-    end
-    it 'with empty string' do
-      pp = <<-EOS
-      $a = ''
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 0/)
-      end
-    end
-    it 'with undef' do
-      pp = <<-EOS
-      $a = undef
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 0/)
-      end
-    end
-    it 'strings in array' do
-      pp = <<-EOS
-      $a = ['discombobulate', 'moo']
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 2/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
deleted file mode 100755
index c85bfabd5c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'sort function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'sorts arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = sort($a)
-      notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is \["art", "galleries", "public", "the"\]/)
-      end
-    end
-    it 'sorts strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = sort($a)
-      notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is "    '-abcdefghijklmnopqrstuvwxyz"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
deleted file mode 100755
index 400a458c9b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'squeeze function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'squeezes arrays' do
-      pp = <<-EOS
-      # Real words!
-      $a = ["wallless", "laparohysterosalpingooophorectomy", "brrr", "goddessship"]
-      $o = squeeze($a)
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is \["wales", "laparohysterosalpingophorectomy", "br", "godeship"\]/)
-      end
-    end
-    it 'squeezez arrays with an argument'
-    it 'squeezes strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = squeeze($a)
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is "wales laparohysterosalpingophorectomy br godeship"/)
-      end
-    end
-
-    it 'squeezes strings with an argument' do
-      pp = <<-EOS
-      $a = "countessship duchessship governessship hostessship"
-      $o = squeeze($a, 's')
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is "counteship ducheship governeship hosteship"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
deleted file mode 100755
index cf549dab886..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'str2bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with "y"' do
-      pp = <<-EOS
-      $o = str2bool('y')
-      notice(inline_template('str2bool is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/str2bool is true/)
-      end
-    end
-    it 'works with "Y"'
-    it 'works with "yes"'
-    it 'works with "1"'
-    it 'works with "true"'
-    it 'works with "n"'
-    it 'works with "N"'
-    it 'works with "no"'
-    it 'works with "0"'
-    it 'works with "false"'
-    it 'works with undef'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays or strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
deleted file mode 100755
index 993e63baceb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'str2saltedsha512 function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with "y"' do
-      pp = <<-EOS
-      $o = str2saltedsha512('password')
-      notice(inline_template('str2saltedsha512 is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/str2saltedsha512 is "[a-f0-9]{136}"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles more than one argument'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
deleted file mode 100755
index 53b7f903bec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'strftime function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'gives the Century' do
-      pp = <<-EOS
-      $o = strftime('%C')
-      notice(inline_template('strftime is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strftime is "20"/)
-      end
-    end
-    it 'takes a timezone argument'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles invalid format strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
deleted file mode 100755
index 906fd7abed3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'strip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'strips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = strip($a)
-      notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-    it 'strips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = strip($a)
-      notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is "blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
deleted file mode 100755
index 630f866d700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'suffix function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'suffixes array of values' do
-      pp = <<-EOS
-      $o = suffix(['a','b','c'],'p')
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \["ap", "bp", "cp"\]/)
-      end
-    end
-    it 'suffixs with empty array' do
-      pp = <<-EOS
-      $o = suffix([],'p')
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \[\]/)
-      end
-    end
-    it 'suffixs array of values with undef' do
-      pp = <<-EOS
-      $o = suffix(['a','b','c'], undef)
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \["a", "b", "c"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
deleted file mode 100755
index b7894fbe274..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'swapcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with strings' do
-      pp = <<-EOS
-      $o = swapcase('aBcD')
-      notice(inline_template('swapcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/swapcase is "AbCd"/)
-      end
-    end
-    it 'works with arrays'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays or strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb
deleted file mode 100755
index cdb296070cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'time function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'gives the time' do
-      pp = <<-EOS
-      $o = time()
-      notice(inline_template('time is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/time is (\d+)\D/)
-
-        # When I wrote this test
-        expect(Integer(m[1])).to be > 1398894170
-      end
-    end
-    it 'takes a timezone argument' do
-      pp = <<-EOS
-      $o = time('UTC')
-      notice(inline_template('time is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/time is (\d+)\D/)
-
-        expect(Integer(m[1])).to be > 1398894170
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles more arguments'
-    it 'handles invalid timezones'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
deleted file mode 100755
index 2b4c61f48db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'to_bytes function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'converts kB to B' do
-      pp = <<-EOS
-      $o = to_bytes('4 kB')
-      notice(inline_template('to_bytes is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/to_bytes is (\d+)\D/)
-        expect(m[1]).to eq("4096")
-      end
-    end
-    it 'works without the B in unit'
-    it 'works without a space before unit'
-    it 'works without a unit'
-    it 'converts fractions'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non integer arguments'
-    it 'handles unknown units like uB'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb
deleted file mode 100755
index 0043aad7cdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'type function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'types arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "array"/)
-      end
-    end
-    it 'types strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "string"/)
-      end
-    end
-    it 'types hashes'
-    it 'types integers'
-    it 'types floats'
-    it 'types booleans'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb
deleted file mode 100755
index 6db8d0cf96f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'union function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'unions arrays' do
-      pp = <<-EOS
-      $a = ["the","public"]
-      $b = ["art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = union($a,$b)
-      notice(inline_template('union is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/union is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
deleted file mode 100755
index bfadad19bf9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'unique function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'uniques arrays' do
-      pp = <<-EOS
-      $a = ["wallless", "wallless", "brrr", "goddessship"]
-      $o = unique($a)
-      notice(inline_template('unique is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/unique is \["wallless", "brrr", "goddessship"\]/)
-      end
-    end
-    it 'uniques strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = unique($a)
-      notice(inline_template('unique is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/unique is "wales prohytingcmbd"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
deleted file mode 100755
index 1c559f67ecb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'mysql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
deleted file mode 100755
index 3d2906d7254..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'upcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'upcases arrays' do
-      pp = <<-EOS
-      $a = ["wallless", "laparohysterosalpingooophorectomy", "brrr", "goddessship"]
-      $o = upcase($a)
-      notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is \["WALLLESS", "LAPAROHYSTEROSALPINGOOOPHORECTOMY", "BRRR", "GODDESSSHIP"\]/)
-      end
-    end
-    it 'upcases strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = upcase($a)
-      notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is "WALLLESS LAPAROHYSTEROSALPINGOOOPHORECTOMY BRRR GODDESSSHIP"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
deleted file mode 100755
index 7e30205e8dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'uriescape function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'uriescape strings' do
-      pp = <<-EOS
-      $a = ":/?#[]@!$&'()*+,;= \\\"{}"
-      $o = uriescape($a)
-      notice(inline_template('uriescape is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/uriescape is ":\/\?%23\[\]@!\$&'\(\)\*\+,;=%20%22%7B%7D"/)
-      end
-    end
-    it 'does nothing if a string is already safe'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
deleted file mode 100755
index 7082e848ef9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_absolute_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    %w{
-      C:/
-      C:\\\\
-      C:\\\\WINDOWS\\\\System32
-      C:/windows/system32
-      X:/foo/bar
-      X:\\\\foo\\\\bar
-      /var/tmp
-      /var/lib/puppet
-      /var/opt/../lib/puppet
-    }.each do |path|
-      it "validates a single argument #{path}" do
-        pp = <<-EOS
-        $one = '#{path}'
-        validate_absolute_path($one)
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles relative paths'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
deleted file mode 100755
index b53e98c273e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = ['a', 'b']
-      validate_array($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = ['a', 'b']
-      $two = [['c'], 'd']
-      validate_array($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-array' do
-      {
-        %{validate_array({'a' => 'hash' })} => "Hash",
-        %{validate_array('string')}         => "String",
-        %{validate_array(false)}            => "FalseClass",
-        %{validate_array(undef)}            => "String"
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
deleted file mode 100755
index aeec67ae1b9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_augeas function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'prep' do
-    it 'installs augeas for tests'
-  end
-  describe 'success' do
-    context 'valid inputs with no 3rd argument' do
-      {
-        'root:x:0:0:root:/root:/bin/bash\n'                        => 'Passwd.lns',
-        'proc /proc   proc    nodev,noexec,nosuid     0       0\n' => 'Fstab.lns'
-      }.each do |line,lens|
-        it "validates a single argument for #{lens}" do
-          pp = <<-EOS
-          $line = "#{line}"
-          $lens = "#{lens}"
-          validate_augeas($line, $lens)
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-    end
-    context 'valid inputs with 3rd and 4th arguments' do
-      it "validates a restricted value" do
-        line        = 'root:x:0:0:root:/root:/bin/barsh\n'
-        lens        = 'Passwd.lns'
-        restriction = '$file/*[shell="/bin/barsh"]'
-        pp = <<-EOS
-        $line        = "#{line}"
-        $lens        = "#{lens}"
-        $restriction = ['#{restriction}']
-        validate_augeas($line, $lens, $restriction, "my custom failure message")
-        EOS
-
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/my custom failure message/)
-      end
-    end
-    context 'invalid inputs' do
-      {
-        'root:x:0:0:root' => 'Passwd.lns',
-        '127.0.1.1'       => 'Hosts.lns'
-      }.each do |line,lens|
-        it "validates a single argument for #{lens}" do
-          pp = <<-EOS
-          $line = "#{line}"
-          $lens = "#{lens}"
-          validate_augeas($line, $lens)
-          EOS
-
-          apply_manifest(pp, :expect_failures => true)
-        end
-      end
-    end
-    context 'garbage inputs' do
-      it 'raises an error on invalid inputs'
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
deleted file mode 100755
index c837f089f29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = true
-      validate_bool($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = true
-      $two = false
-      validate_bool($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-bool' do
-      {
-        %{validate_bool('true')}  => "String",
-        %{validate_bool('false')} => "String",
-        %{validate_bool([true])}  => "Array",
-        %{validate_bool(undef)}   => "String",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
deleted file mode 100755
index 385676d14b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a true command' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'echo' #shell built-in
-      } else {
-        $two = '/bin/echo'
-      }
-      validate_cmd($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a fail command' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'C:/aoeu'
-      } else {
-        $two = '/bin/aoeu'
-      }
-      validate_cmd($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates a fail command with a custom error message' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'C:/aoeu'
-      } else {
-        $two = '/bin/aoeu'
-      }
-      validate_cmd($one,$two,"aoeu is dvorak)
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/aoeu is dvorak/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper argument types'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
deleted file mode 100755
index 52fb615bdf4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = { 'a' => 1 }
-      validate_hash($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = { 'a' => 1 }
-      $two = { 'b' => 2 }
-      validate_hash($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-hash' do
-      {
-        %{validate_hash('{ "not" => "hash" }')} => "String",
-        %{validate_hash('string')}              => "String",
-        %{validate_hash(["array"])}             => "Array",
-        %{validate_hash(undef)}                 => "String",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
deleted file mode 100755
index 64841c37163..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_ipv4_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = '1.2.3.4'
-      validate_ipv4_address($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = '1.2.3.4'
-      $two = '5.6.7.8'
-      validate_ipv4_address($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles ipv6 addresses'
-    it 'handles non-ipv4 strings'
-    it 'handles numbers'
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
deleted file mode 100755
index 6426d1a526a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_ipv6_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = '3ffe:0505:0002::'
-      validate_ipv6_address($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = '3ffe:0505:0002::'
-      $two = '3ffe:0505:0001::'
-      validate_ipv6_address($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles ipv6 addresses'
-    it 'handles non-ipv6 strings'
-    it 'handles numbers'
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
deleted file mode 100755
index 22f6d47d1d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_re function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a string' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = '^one$'
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an array' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = ['^one$', '^two']
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a failed array' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = ['^two$', '^three']
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates a failed array with a custom error message' do
-      pp = <<-EOS
-      $one = '3.4.3'
-      $two = '^2.7'
-      validate_re($one,$two,"The $puppetversion fact does not match 2.7")
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not match/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper argument types'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
deleted file mode 100755
index 1ab2bb986e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_slength function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single string max' do
-      pp = <<-EOS
-      $one = 'discombobulate'
-      $two = 17
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates multiple string maxes' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates min/max of  strings in array' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      $three = 3
-      validate_slength($one,$two,$three)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a single string max of incorrect length' do
-      pp = <<-EOS
-      $one = 'discombobulate'
-      $two = 1
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates multiple string maxes of incorrect length' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 3
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates multiple strings min/maxes of incorrect length' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      $three = 10
-      validate_slength($one,$two,$three)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper first argument type'
-    it 'handles non-strings in array of first argument'
-    it 'handles improper second argument type'
-    it 'handles improper third argument type'
-    it 'handles negative ranges'
-    it 'handles improper ranges'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
deleted file mode 100755
index 8956f48c908..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = 'string'
-      validate_string($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = 'string'
-      $two = 'also string'
-      validate_string($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-string' do
-      {
-        %{validate_string({ 'a' => 'hash' })} => "Hash",
-        %{validate_string(['array'])}         => "Array",
-        %{validate_string(false)}             => "FalseClass",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
deleted file mode 100755
index da63cf307a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'values_at function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns a specific value' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = 1
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b"\]/)
-    end
-    it 'returns a specific negative index value' do
-      pending("negative numbers don't work")
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = -1
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["e"\]/)
-    end
-    it 'returns a range of values' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = "1-3"
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b", "c", "d"\]/)
-    end
-    it 'returns a negative specific value and range of values' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = ["1-3",0]
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b", "c", "d", "a"\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $output = values_at($one)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
-    end
-    it 'handles non-indicies arguments' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = []
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/at least one positive index/)
-    end
-
-    it 'detects index ranges smaller than the start range'
-    it 'handles index ranges larger than array'
-    it 'handles non-integer indicies'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb
deleted file mode 100755
index 7ef956e0489..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns an array of values' do
-      pp = <<-EOS
-      $arg = {
-        'a' => 1,
-        'b' => 2,
-        'c' => 3,
-      }
-      $output = values($arg)
-      notice(inline_template('<%= @output.sort.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "2", "3"\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles non-hash arguments' do
-      pp = <<-EOS
-      $arg = "foo"
-      $output = values($arg)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires hash/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
deleted file mode 100755
index 0e924e8492f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-require 'puppet'
-
-describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'zips two arrays of numbers together' do
-      pp = <<-EOS
-      $one = [1,2,3,4]
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\], \["3", "7"\], \["4", "8"\]\]/)
-    end
-    it 'zips two arrays of numbers & bools together' do
-      pp = <<-EOS
-      $one = [1,2,"three",4]
-      $two = [true,true,false,false]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", true\], \["2", true\], \["three", false\], \["4", false\]\]/)
-    end
-    it 'zips two arrays of numbers together and flattens them' do
-      # XXX This only tests the argument `true`, even though the following are valid:
-      # 1 t y true yes
-      # 0 f n false no
-      # undef undefined
-      pp = <<-EOS
-      $one = [1,2,3,4]
-      $two = [5,6,7,8]
-      $output = zip($one,$two,true)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "5", "2", "6", "3", "7", "4", "8"\]/)
-    end
-    it 'handles unmatched length' do
-      # XXX Is this expected behavior?
-      pp = <<-EOS
-      $one = [1,2]
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\]\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments' do
-      pp = <<-EOS
-      $one = [1,2]
-      $output = zip($one)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
-    end
-    it 'handles improper argument types' do
-      pp = <<-EOS
-      $one = "a string"
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires array/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb
deleted file mode 100755
index 2d4455e417e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'puppet_spec/compiler'
-
-describe "anchorrefresh" do
-  include PuppetSpec::Compiler
-
-  let :transaction do
-    apply_compiled_manifest(<<-ANCHORCLASS)
-      class anchored {
-        anchor { 'anchored::begin': }
-        ~> anchor { 'anchored::end': }
-      }
-
-      class anchorrefresh {
-        notify { 'first': }
-        ~> class { 'anchored': }
-        ~> anchor { 'final': }
-      }
-
-      include anchorrefresh
-    ANCHORCLASS
-  end
-
-  it 'propagates events through the anchored class' do
-    resource = transaction.resource_status('Anchor[final]')
-
-    expect(resource.restarted).to eq(true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
deleted file mode 100644
index 1e34519b2af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
+++ /dev/null
@@ -1,8 +0,0 @@
-name: root
-password: *
-uid: 0
-gid: 0
-dir: /var/root
-shell: /bin/bash
-gecos: rawr Root
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb
deleted file mode 100755
index c0b42970c52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the abs function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("abs").should == "function_abs"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_abs([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert a negative number into a positive" do
-    result = scope.function_abs(["-34"])
-    result.should(eq(34))
-  end
-
-  it "should do nothing with a positive number" do
-    result = scope.function_abs(["5678"])
-    result.should(eq(5678))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb
deleted file mode 100755
index b266e84f4f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the any2array function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("any2array").should == "function_any2array"
-  end
-
-  it "should return an empty array if there is less than 1 argument" do
-    result = scope.function_any2array([])
-    result.should(eq([]))
-  end
-
-  it "should convert boolean true to [ true ] " do
-    result = scope.function_any2array([true])
-    result.should(eq([true]))
-  end
-
-  it "should convert one object to [object]" do
-    result = scope.function_any2array(['one'])
-    result.should(eq(['one']))
-  end
-
-  it "should convert multiple objects to [objects]" do
-    result = scope.function_any2array(['one', 'two'])
-    result.should(eq(['one', 'two']))
-  end
-
-  it "should return empty array it was called with" do
-    result = scope.function_any2array([[]])
-    result.should(eq([]))
-  end
-
-  it "should return one-member array it was called with" do
-    result = scope.function_any2array([['string']])
-    result.should(eq(['string']))
-  end
-
-  it "should return multi-member array it was called with" do
-    result = scope.function_any2array([['one', 'two']])
-    result.should(eq(['one', 'two']))
-  end
-
-  it "should return members of a hash it was called with" do
-    result = scope.function_any2array([{ 'key' => 'value' }])
-    result.should(eq(['key', 'value']))
-  end
-
-  it "should return an empty array if it was called with an empty hash" do
-    result = scope.function_any2array([{ }])
-    result.should(eq([]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb
deleted file mode 100755
index 5faa5e66c73..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the base64 function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("base64").should == "function_base64"
-  end
-
-  it "should raise a ParseError if there are other than 2 arguments" do
-    expect { scope.function_base64([]) }.to(raise_error(Puppet::ParseError))
-    expect { scope.function_base64(["asdf"]) }.to(raise_error(Puppet::ParseError))
-    expect { scope.function_base64(["asdf","moo","cow"]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if argument 1 isn't 'encode' or 'decode'" do
-    expect { scope.function_base64(["bees","astring"]) }.to(raise_error(Puppet::ParseError, /first argument must be one of/))
-  end
-
-  it "should raise a ParseError if argument 2 isn't a string" do
-    expect { scope.function_base64(["encode",["2"]]) }.to(raise_error(Puppet::ParseError, /second argument must be a string/))
-  end
-
-  it "should encode a encoded string" do
-    result = scope.function_base64(["encode",'thestring'])
-    result.should =~ /\AdGhlc3RyaW5n\n\Z/
-  end
-  it "should decode a base64 encoded string" do
-    result = scope.function_base64(["decode",'dGhlc3RyaW5n'])
-    result.should == 'thestring'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
deleted file mode 100755
index 518ac85ec5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the bool2num function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("bool2num").should == "function_bool2num"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_bool2num([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert true to 1" do
-    result = scope.function_bool2num([true])
-    result.should(eq(1))
-  end
-
-  it "should convert false to 0" do
-    result = scope.function_bool2num([false])
-    result.should(eq(0))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
deleted file mode 100755
index 69c9758f25b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the capitalize function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("capitalize").should == "function_capitalize"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_capitalize([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should capitalize the beginning of a string" do
-    result = scope.function_capitalize(["abc"])
-    result.should(eq("Abc"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb
deleted file mode 100755
index e425365fcb0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the chomp function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("chomp").should == "function_chomp"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_chomp([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should chomp the end of a string" do
-    result = scope.function_chomp(["abc\n"])
-    result.should(eq("abc"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb
deleted file mode 100755
index 9e466de4b69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the chop function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("chop").should == "function_chop"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_chop([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should chop the end of a string" do
-    result = scope.function_chop(["asdf\n"])
-    result.should(eq("asdf"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb
deleted file mode 100755
index 6e67620966b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the concat function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should raise a ParseError if the client does not provide two arguments" do
-    lambda { scope.function_concat([]) }.should(raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if the first parameter is not an array" do
-    lambda { scope.function_concat([1, []])}.should(raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to concat an array" do
-    result = scope.function_concat([['1','2','3'],['4','5','6']])
-    result.should(eq(['1','2','3','4','5','6']))
-  end
-
-  it "should be able to concat a primitive to an array" do
-    result = scope.function_concat([['1','2','3'],'4'])
-    result.should(eq(['1','2','3','4']))
-  end
-
-  it "should not accidentally flatten nested arrays" do
-    result = scope.function_concat([['1','2','3'],[['4','5'],'6']])
-    result.should(eq(['1','2','3',['4','5'],'6']))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb
deleted file mode 100755
index 2453815c26d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the count function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("count").should == "function_count"
-  end
-
-  it "should raise a ArgumentError if there is more than 2 arguments" do
-    lambda { scope.function_count(['foo', 'bar', 'baz']) }.should( raise_error(ArgumentError))
-  end
-
-  it "should be able to count arrays" do
-    scope.function_count([["1","2","3"]]).should(eq(3))
-  end
-
-  it "should be able to count matching elements in arrays" do
-    scope.function_count([["1", "2", "2"], "2"]).should(eq(2))
-  end
-
-  it "should not count nil or empty strings" do
-    scope.function_count([["foo","bar",nil,""]]).should(eq(2))
-  end
-
-  it 'does not count an undefined hash key or an out of bound array index (which are both :undef)' do
-    expect(scope.function_count([["foo",:undef,:undef]])).to eq(1)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
deleted file mode 100755
index f1347014cf2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:deep_merge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling deep_merge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = deep_merge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = deep_merge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling deep_merge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_deep_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_deep_merge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_deep_merge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to deep_merge two hashes' do
-      new_hash = scope.function_deep_merge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should deep_merge multiple hashes' do
-      hash = scope.function_deep_merge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_deep_merge([{},{},{}]).should == {}
-    end
-
-    it 'should deep_merge subhashes' do
-      hash = scope.function_deep_merge([{'one' => 1}, {'two' => 2, 'three' => { 'four' => 4 } }])
-      hash['one'].should == 1
-      hash['two'].should == 2
-      hash['three'].should == { 'four' => 4 }
-    end
-
-    it 'should append to subhashes' do
-      hash = scope.function_deep_merge([{'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } }])
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should append to subhashes 2' do
-      hash = scope.function_deep_merge([{'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, {'two' => 'dos', 'three' => { 'five' => 5 } }])
-      hash['one'].should == 1
-      hash['two'].should == 'dos'
-      hash['three'].should == { 'four' => 4, 'five' => 5 }
-    end
-
-    it 'should append to subhashes 3' do
-      hash = scope.function_deep_merge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }])
-      hash['key1'].should == { 'a' => 1, 'b' => 99 }
-      hash['key2'].should == { 'c' => 3 }
-    end
-
-    it 'should not change the original hashes' do
-      hash1 = {'one' => { 'two' => 2 } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => 2 } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should not change the original hashes 2' do
-      hash1 = {'one' => { 'two' => [1,2] } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => [1,2] } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => [1,2], 'three' => 3 }
-    end
-
-    it 'should not change the original hashes 3' do
-      hash1 = {'one' => { 'two' => [1,2, {'two' => 2} ] } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => [1,2, {'two' => 2}] } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => [1,2, {'two' => 2} ], 'three' => 3 }
-      hash['one']['two'].should == [1,2, {'two' => 2}]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
deleted file mode 100755
index 28dbab31192..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-require 'rspec-puppet'
-describe 'defined_with_params' do
-  describe 'when a resource is not specified' do
-    it { should run.with_params().and_raise_error(ArgumentError) }
-  end
-  describe 'when compared against a resource with no attributes' do
-    let :pre_condition do
-      'user { "dan": }'
-    end
-    it do
-      should run.with_params('User[dan]', {}).and_return(true)
-      should run.with_params('User[bob]', {}).and_return(false)
-      should run.with_params('User[dan]', {'foo' => 'bar'}).and_return(false)
-    end
-  end
-
-  describe 'when compared against a resource with attributes' do
-    let :pre_condition do
-      'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}'
-    end
-    it do
-      should run.with_params('User[dan]', {}).and_return(true)
-      should run.with_params('User[dan]', '').and_return(true)
-      should run.with_params('User[dan]', {'ensure' => 'present'}
-                            ).and_return(true)
-      should run.with_params('User[dan]',
-                             {'ensure' => 'present', 'managehome' => false}
-                            ).and_return(true)
-      should run.with_params('User[dan]',
-                             {'ensure' => 'absent', 'managehome' => false}
-                            ).and_return(false)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
deleted file mode 100755
index 593cf45929f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_at function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_at").should == "function_delete_at"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_delete_at([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should delete an item at specified location from an array" do
-    result = scope.function_delete_at([['a','b','c'],1])
-    result.should(eq(['a','c']))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a','b','c','d']
-    result = scope.function_delete_at([origin_array, 1])
-    origin_array.should(eq(['a','b','c','d']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb
deleted file mode 100755
index 1508a63e914..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete").should == "function_delete"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_delete([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are greater than 2 arguments" do
-    lambda { scope.function_delete([[], 'foo', 'bar']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a TypeError if a number is passed as the first argument" do
-    lambda { scope.function_delete([1, 'bar']) }.should( raise_error(TypeError))
-  end
-
-  it "should delete all instances of an element from an array" do
-    result = scope.function_delete([['a','b','c','b'],'b'])
-    result.should(eq(['a','c']))
-  end
-
-  it "should delete all instances of a substring from a string" do
-    result = scope.function_delete(['foobarbabarz','bar'])
-    result.should(eq('foobaz'))
-  end
-
-  it "should delete a key from a hash" do
-    result = scope.function_delete([{ 'a' => 1, 'b' => 2, 'c' => 3 },'b'])
-    result.should(eq({ 'a' => 1, 'c' => 3 }))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a','b','c','d']
-    result = scope.function_delete([origin_array, 'b'])
-    origin_array.should(eq(['a','b','c','d']))
-  end
-
-  it "should not change the origin string passed as argument" do
-    origin_string = 'foobarbabarz'
-    result = scope.function_delete([origin_string,'bar'])
-    origin_string.should(eq('foobarbabarz'))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
-    result = scope.function_delete([origin_hash, 'b'])
-    origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
deleted file mode 100755
index b341d888ae1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_undef_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_undef_values").should == "function_delete_undef_values"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_delete_undef_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if the argument is not Array nor Hash" do
-    lambda { scope.function_delete_undef_values(['']) }.should( raise_error(Puppet::ParseError))
-    lambda { scope.function_delete_undef_values([nil]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should delete all undef items from Array and only these" do
-    result = scope.function_delete_undef_values([['a',:undef,'c','undef']])
-    result.should(eq(['a','c','undef']))
-  end
-
-  it "should delete all undef items from Hash and only these" do
-    result = scope.function_delete_undef_values([{'a'=>'A','b'=>:undef,'c'=>'C','d'=>'undef'}])
-    result.should(eq({'a'=>'A','c'=>'C','d'=>'undef'}))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a',:undef,'c','undef']
-    result = scope.function_delete_undef_values([origin_array])
-    origin_array.should(eq(['a',:undef,'c','undef']))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => :undef, 'c' => 'undef' }
-    result = scope.function_delete_undef_values([origin_hash])
-    origin_hash.should(eq({ 'a' => 1, 'b' => :undef, 'c' => 'undef' }))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
deleted file mode 100755
index 8d7f2315d46..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_values").should == "function_delete_values"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_delete_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are greater than 2 arguments" do
-    lambda { scope.function_delete_values([[], 'foo', 'bar']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a TypeError if the argument is not a hash" do
-    lambda { scope.function_delete_values([1,'bar']) }.should( raise_error(TypeError))
-    lambda { scope.function_delete_values(['foo','bar']) }.should( raise_error(TypeError))
-    lambda { scope.function_delete_values([[],'bar']) }.should( raise_error(TypeError))
-  end
-
-  it "should delete all instances of a value from a hash" do
-    result = scope.function_delete_values([{ 'a'=>'A', 'b'=>'B', 'B'=>'C', 'd'=>'B' },'B'])
-    result.should(eq({ 'a'=>'A', 'B'=>'C' }))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
-    result = scope.function_delete_values([origin_hash, 2])
-    origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb
deleted file mode 100755
index 9feff091890..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the difference function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("difference").should == "function_difference"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_difference([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return the difference between two arrays" do
-    result = scope.function_difference([["a","b","c"],["b","c","d"]])
-    result.should(eq(["a"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb
deleted file mode 100755
index fb3b4feca77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the dirname function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("dirname").should == "function_dirname"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_dirname([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return dirname for an absolute path" do
-    result = scope.function_dirname(['/path/to/a/file.ext'])
-    result.should(eq('/path/to/a'))
-  end
-
-  it "should return dirname for a relative path" do
-    result = scope.function_dirname(['path/to/a/file.ext'])
-    result.should(eq('path/to/a'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb
deleted file mode 100755
index acef1f05d92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the downcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("downcase").should == "function_downcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_downcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should downcase a string" do
-    result = scope.function_downcase(["ASFD"])
-    result.should(eq("asfd"))
-  end
-
-  it "should do nothing to a string that is already downcase" do
-    result = scope.function_downcase(["asdf asdf"])
-    result.should(eq("asdf asdf"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb
deleted file mode 100755
index 77458752248..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the empty function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("empty").should == "function_empty"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_empty([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a true for an empty string" do
-    result = scope.function_empty([''])
-    result.should(eq(true))
-  end
-
-  it "should return a false for a non-empty string" do
-    result = scope.function_empty(['asdf'])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
deleted file mode 100755
index 436be10bc4e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'ensure_packages' do
-  include PuppetSpec::Compiler
-
-  before :each do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:ensure_packages)
-    Puppet::Parser::Functions.function(:ensure_resource)
-    Puppet::Parser::Functions.function(:defined_with_params)
-    Puppet::Parser::Functions.function(:create_resources)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  let :scope    do
-    if Puppet.version.to_f >= 3.0
-      Puppet::Parser::Scope.new(compiler)
-    else
-      newscope = Puppet::Parser::Scope.new
-      newscope.compiler = compiler
-      newscope.source   = Puppet::Resource::Type.new(:node, :localhost)
-      newscope
-    end
-  end
-
-  describe 'argument handling' do
-    it 'fails with no arguments' do
-      expect {
-        scope.function_ensure_packages([])
-      }.to raise_error(Puppet::ParseError, /0 for 1 or 2/)
-    end
-
-    it 'accepts an array of values' do
-      scope.function_ensure_packages([['foo']])
-    end
-
-    it 'accepts a single package name as a string' do
-      scope.function_ensure_packages(['foo'])
-    end
-  end
-
-  context 'given a catalog with puppet package => absent' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        ensure_packages(['facter'])
-        package { puppet: ensure => absent }
-      EOS
-      )
-    end
-
-    it 'has no effect on Package[puppet]' do
-      expect(catalog.resource(:package, 'puppet')['ensure']).to eq('absent')
-    end
-  end
-
-  context 'given a clean catalog' do
-    let :catalog do
-      compile_to_catalog('ensure_packages(["facter"])')
-    end
-
-    it 'declares package resources with ensure => present' do
-      expect(catalog.resource(:package, 'facter')['ensure']).to eq('present')
-    end
-  end
-
-  context 'given a clean catalog and specified defaults' do
-    let :catalog do
-      compile_to_catalog('ensure_packages(["facter"], {"provider" => "gem"})')
-    end
-
-    it 'declares package resources with ensure => present' do
-      expect(catalog.resource(:package, 'facter')['ensure']).to eq('present')
-      expect(catalog.resource(:package, 'facter')['provider']).to eq('gem')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
deleted file mode 100755
index 33bcac0d1f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'ensure_resource' do
-  include PuppetSpec::Compiler
-
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:ensure_packages)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  let :scope    do Puppet::Parser::Scope.new(compiler) end
-
-  describe 'when a type or title is not specified' do
-    it { expect { scope.function_ensure_resource([]) }.to raise_error }
-    it { expect { scope.function_ensure_resource(['type']) }.to raise_error }
-  end
-
-  describe 'when compared against a resource with no attributes' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { "dan": }
-        ensure_resource('user', 'dan', {})
-      EOS
-      )
-    end
-
-    it 'should contain the the ensured resources' do
-      expect(catalog.resource(:user, 'dan').to_s).to eq('User[dan]')
-    end
-  end
-
-  describe 'works when compared against a resource with non-conflicting attributes' do
-    [
-      "ensure_resource('User', 'dan', {})",
-      "ensure_resource('User', 'dan', '')",
-      "ensure_resource('User', 'dan', {'ensure' => 'present'})",
-      "ensure_resource('User', 'dan', {'ensure' => 'present', 'managehome' => false})"
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-        #{ensure_resource}
-      EOS
-
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
-    end
-  end
-
-  describe 'fails when compared against a resource with conflicting attributes' do
-    pp = <<-EOS
-      user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-      ensure_resource('User', 'dan', {'ensure' => 'absent', 'managehome' => false})
-    EOS
-
-    it { expect { compile_to_catalog(pp) }.to raise_error }
-  end
-
-  describe 'when an array of new resources are passed in' do
-    let :catalog do
-      compile_to_catalog("ensure_resource('User', ['dan', 'alex'], {})")
-    end
-
-    it 'should contain the ensured resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
-    end
-  end
-
-  describe 'when an array of existing resources is compared against existing resources' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {})
-    EOS
-
-    let :catalog do
-      compile_to_catalog(pp)
-    end
-
-    it 'should return the existing resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
-    end
-  end
-
-  describe 'works when compared against existing resources with attributes' do
-    [
-      "ensure_resource('User', ['dan', 'alex'], {})",
-      "ensure_resource('User', ['dan', 'alex'], '')",
-      "ensure_resource('User', ['dan', 'alex'], {'ensure' => 'present'})",
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { 'dan': ensure => present; 'alex': ensure => present }
-        #{ensure_resource}
-      EOS
-
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
-    end
-  end
-
-  describe 'fails when compared against existing resources with conflicting attributes' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {'ensure' => 'absent'})
-    EOS
-
-    it { expect { compile_to_catalog(pp) }.to raise_error }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb
deleted file mode 100755
index dba7a6bbdb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the flatten function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("flatten").should == "function_flatten"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_flatten([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 1 argument" do
-    lambda { scope.function_flatten([[], []]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should flatten a complex data structure" do
-    result = scope.function_flatten([["a","b",["c",["d","e"],"f","g"]]])
-    result.should(eq(["a","b","c","d","e","f","g"]))
-  end
-
-  it "should do nothing to a structure that is already flat" do
-    result = scope.function_flatten([["a","b","c","d"]])
-    result.should(eq(["a","b","c","d"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb
deleted file mode 100755
index dbc8c773585..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the floor function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("floor").should == "function_floor"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_floor([]) }.should( raise_error(Puppet::ParseError, /Wrong number of arguments/))
-  end
-
-  it "should should raise a ParseError if input isn't numeric (eg. String)" do
-    lambda { scope.function_floor(["foo"]) }.should( raise_error(Puppet::ParseError, /Wrong argument type/))
-  end
-
-  it "should should raise a ParseError if input isn't numeric (eg. Boolean)" do
-    lambda { scope.function_floor([true]) }.should( raise_error(Puppet::ParseError, /Wrong argument type/))
-  end
-
-  it "should return an integer when a numeric type is passed" do
-    result = scope.function_floor([12.4])
-    result.is_a?(Integer).should(eq(true))
-  end
-
-  it "should return the input when an integer is passed" do
-    result = scope.function_floor([7])
-    result.should(eq(7))
-  end
-
-  it "should return the largest integer less than or equal to the input" do
-    result = scope.function_floor([3.8])
-    result.should(eq(3))
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
deleted file mode 100755
index 2577723351a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the fqdn_rotate function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("fqdn_rotate").should == "function_fqdn_rotate"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_fqdn_rotate([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should rotate a string and the result should be the same size" do
-    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1")
-    result = scope.function_fqdn_rotate(["asdf"])
-    result.size.should(eq(4))
-  end
-
-  it "should rotate a string to give the same results for one host" do
-    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice
-    scope.function_fqdn_rotate(["abcdefg"]).should eql(scope.function_fqdn_rotate(["abcdefg"]))
-  end
-
-  it "should rotate a string to give different values on different hosts" do
-     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1")
-     val1 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
-     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.2")
-     val2 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
-     val1.should_not eql(val2)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
deleted file mode 100755
index 486bef6f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:get_module_path) do
-  Internals = PuppetlabsSpec::PuppetInternals
-  class StubModule
-    attr_reader :path
-    def initialize(path)
-      @path = path
-    end
-  end
-
-  def scope(environment = "production")
-    Internals.scope(:compiler => Internals.compiler(:node => Internals.node(:environment => environment)))
-  end
-
-  it 'should only allow one argument' do
-    expect { scope.function_get_module_path([]) }.to raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/)
-    expect { scope.function_get_module_path(['1','2','3']) }.to raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/)
-  end
-  it 'should raise an exception when the module cannot be found' do
-    expect { scope.function_get_module_path(['foo']) }.to raise_error(Puppet::ParseError, /Could not find module/)
-  end
-  describe 'when locating a module' do
-    let(:modulepath) { "/tmp/does_not_exist" }
-    let(:path_of_module_foo) { StubModule.new("/tmp/does_not_exist/foo") }
-
-    before(:each) { Puppet[:modulepath] = modulepath }
-
-    it 'should be able to find module paths from the modulepath setting' do
-      Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo)
-      scope.function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-    it 'should be able to find module paths when the modulepath is a list' do
-      Puppet[:modulepath] = modulepath + ":/tmp"
-      Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo)
-      scope.function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-    it 'should respect the environment' do
-      pending("Disabled on Puppet 2.6.x") if Puppet.version =~ /^2\.6\b/
-      Puppet.settings[:environment] = 'danstestenv'
-      Puppet::Module.expects(:find).with('foo', 'danstestenv').returns(path_of_module_foo)
-      scope('danstestenv').function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb
deleted file mode 100755
index bf024af0e5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'getparam' do
-  include PuppetSpec::Compiler
-
-  before :each do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:getparam)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  if Puppet.version.to_f >= 3.0
-    let :scope    do Puppet::Parser::Scope.new(compiler) end
-  else
-    let :scope    do
-      newscope = Puppet::Parser::Scope.new
-      newscope.compiler = compiler
-      newscope.source   = Puppet::Resource::Type.new(:node, :localhost)
-      newscope
-    end
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("getparam").should == "function_getparam"
-  end
-
-  describe 'when a resource is not specified' do
-    it { expect { scope.function_getparam([]) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]']) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]']) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]', {}]) }.to raise_error }
-    # This seems to be OK because we just check for a string.
-    it { expect { scope.function_getparam(['User[dan]', '']) }.to_not raise_error }
-  end
-
-  describe 'when compared against a resource with no params' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { "dan": }
-      EOS
-      )
-    end
-
-    it do
-      expect(scope.function_getparam(['User[dan]', 'shell'])).to eq('')
-    end
-  end
-
-  describe 'when compared against a resource with params' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { 'dan': ensure => present, shell => '/bin/sh', managehome => false}
-        $test = getparam(User[dan], 'shell')
-      EOS
-      )
-    end
-
-    it do
-      resource = Puppet::Parser::Resource.new(:user, 'dan', {:scope => scope})
-      resource.set_parameter('ensure', 'present')
-      resource.set_parameter('shell', '/bin/sh')
-      resource.set_parameter('managehome', false)
-      compiler.add_resource(scope, resource)
-
-      expect(scope.function_getparam(['User[dan]', 'shell'])).to eq('/bin/sh')
-      expect(scope.function_getparam(['User[dan]', ''])).to eq('')
-      expect(scope.function_getparam(['User[dan]', 'ensure'])).to eq('present')
-      # TODO: Expected this to be false, figure out why we're getting '' back.
-      expect(scope.function_getparam(['User[dan]', 'managehome'])).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb
deleted file mode 100755
index 5ff834ee71e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:getvar) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling getvar from puppet' do
-
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$foo = getvar()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when too many arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$foo = getvar("foo::bar", "baz")'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should lookup variables in other namespaces" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        class site::data { $foo = 'baz' }
-        include site::data
-        $foo = getvar("site::data::foo")
-        if $foo != 'baz' {
-          fail('getvar did not return what we expect')
-        }
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb
deleted file mode 100755
index a93b842537e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the grep function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("grep").should == "function_grep"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_grep([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should grep contents from an array" do
-    result = scope.function_grep([["aaabbb","bbbccc","dddeee"], "bbb"])
-    result.should(eq(["aaabbb","bbbccc"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
deleted file mode 100755
index c5264e4f309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_interface_with) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  # The subject of these examples is the method itself.
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_interface_with)
-    scope.method(function_name)
-  end
-
-  # We need to mock out the Facts so we can specify how we expect this function
-  # to behave on different platforms.
-  context "On Mac OS X Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with("interfaces").returns('lo0,gif0,stf0,en1,p2p0,fw0,en0,vmnet1,vmnet8,utun0')
-    end
-    it 'should have loopback (lo0)' do
-      subject.call(['lo0']).should be_true
-    end
-    it 'should not have loopback (lo)' do
-      subject.call(['lo']).should be_false
-    end
-  end
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with("interfaces").returns('eth0,lo')
-      scope.stubs(:lookupvar).with("ipaddress").returns('10.0.0.1')
-      scope.stubs(:lookupvar).with("ipaddress_lo").returns('127.0.0.1')
-      scope.stubs(:lookupvar).with("ipaddress_eth0").returns('10.0.0.1')
-      scope.stubs(:lookupvar).with('muppet').returns('kermit')
-      scope.stubs(:lookupvar).with('muppet_lo').returns('mspiggy')
-      scope.stubs(:lookupvar).with('muppet_eth0').returns('kermit')
-    end
-    it 'should have loopback (lo)' do
-      subject.call(['lo']).should be_true
-    end
-    it 'should not have loopback (lo0)' do
-      subject.call(['lo0']).should be_false
-    end
-    it 'should have ipaddress with 127.0.0.1' do
-      subject.call(['ipaddress', '127.0.0.1']).should be_true
-    end
-    it 'should have ipaddress with 10.0.0.1' do
-      subject.call(['ipaddress', '10.0.0.1']).should be_true
-    end
-    it 'should not have ipaddress with 10.0.0.2' do
-      subject.call(['ipaddress', '10.0.0.2']).should be_false
-    end
-    it 'should have muppet named kermit' do
-      subject.call(['muppet', 'kermit']).should be_true
-    end
-    it 'should have muppet named mspiggy' do
-      subject.call(['muppet', 'mspiggy']).should be_true
-    end
-    it 'should not have muppet named bigbird' do
-      subject.call(['muppet', 'bigbird']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
deleted file mode 100755
index 5a684608209..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_ip_address) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_ip_address)
-    scope.method(function_name)
-  end
-
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with('interfaces').returns('eth0,lo')
-      scope.stubs(:lookupvar).with('ipaddress').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_eth0').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_lo').returns('127.0.0.1')
-    end
-
-    it 'should have primary address (10.0.2.15)' do
-      subject.call(['10.0.2.15']).should be_true
-    end
-
-    it 'should have lookupback address (127.0.0.1)' do
-      subject.call(['127.0.0.1']).should be_true
-    end
-
-    it 'should not have other address' do
-      subject.call(['192.1681.1.1']).should be_false
-    end
-
-    it 'should not have "mspiggy" on an interface' do
-      subject.call(['mspiggy']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
deleted file mode 100755
index c3a289e3728..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_ip_network) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_ip_network)
-    scope.method(function_name)
-  end
-
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with('interfaces').returns('eth0,lo')
-      scope.stubs(:lookupvar).with('network').returns(:undefined)
-      scope.stubs(:lookupvar).with('network_eth0').returns('10.0.2.0')
-      scope.stubs(:lookupvar).with('network_lo').returns('127.0.0.1')
-    end
-
-    it 'should have primary network (10.0.2.0)' do
-      subject.call(['10.0.2.0']).should be_true
-    end
-
-    it 'should have loopback network (127.0.0.0)' do
-      subject.call(['127.0.0.1']).should be_true
-    end
-
-    it 'should not have other network' do
-      subject.call(['192.168.1.0']).should be_false
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb
deleted file mode 100755
index 490daeae7cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_key) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling has_key from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = has_key()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_key('foo')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should require the first value to be a Hash" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_key('foo', 'bar')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /expects the first argument to be a hash/)
-    end
-  end
-
-  describe 'when calling the function has_key from a scope instance' do
-    it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'one']).should be_true
-    end
-
-    it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'two']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb
deleted file mode 100755
index 7c91be9077f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the hash function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("hash").should == "function_hash"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_hash([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert an array to a hash" do
-    result = scope.function_hash([['a',1,'b',2,'c',3]])
-    result.should(eq({'a'=>1,'b'=>2,'c'=>3}))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb
deleted file mode 100755
index fd44f7fe3dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the intersection function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("intersection").should == "function_intersection"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_intersection([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return the intersection of two arrays" do
-    result = scope.function_intersection([["a","b","c"],["b","c","d"]])
-    result.should(eq(["b","c"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb
deleted file mode 100755
index e7f4bcd6df4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_array function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_array").should == "function_is_array"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_array([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed an array" do
-    result = scope.function_is_array([[1,2,3]])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed a hash" do
-    result = scope.function_is_array([{'a'=>1}])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a string" do
-    result = scope.function_is_array(["asdf"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
deleted file mode 100755
index c94e83a9d9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_bool").should == "function_is_bool"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed a TrueClass" do
-    result = scope.function_is_bool([true])
-    result.should(eq(true))
-  end
-
-  it "should return true if passed a FalseClass" do
-    result = scope.function_is_bool([false])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed the string 'true'" do
-    result = scope.function_is_bool(['true'])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed the string 'false'" do
-    result = scope.function_is_bool(['false'])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed an array" do
-    result = scope.function_is_bool([["a","b"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a hash" do
-    result = scope.function_is_bool([{"a" => "b"}])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
deleted file mode 100755
index f2ea76dac70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_domain_name function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_domain_name").should == "function_is_domain_name"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_domain_name([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a valid short domain name" do
-    result = scope.function_is_domain_name(["x.com"])
-    result.should(be_true)
-  end
-
-  it "should return true if the domain is ." do
-    result = scope.function_is_domain_name(["."])
-    result.should(be_true)
-  end
-
-  it "should return true if the domain is x.com." do
-    result = scope.function_is_domain_name(["x.com."])
-    result.should(be_true)
-  end
-
-  it "should return true if a valid domain name" do
-    result = scope.function_is_domain_name(["foo.bar.com"])
-    result.should(be_true)
-  end
-
-  it "should allow domain parts to start with numbers" do
-    result = scope.function_is_domain_name(["3foo.2bar.com"])
-    result.should(be_true)
-  end
-
-  it "should allow domain to end with a dot" do
-    result = scope.function_is_domain_name(["3foo.2bar.com."])
-    result.should(be_true)
-  end
-
-  it "should allow a single part domain" do
-    result = scope.function_is_domain_name(["orange"])
-    result.should(be_true)
-  end
-
-  it "should return false if domain parts start with hyphens" do
-    result = scope.function_is_domain_name(["-3foo.2bar.com"])
-    result.should(be_false)
-  end
-
-  it "should return true if domain contains hyphens" do
-    result = scope.function_is_domain_name(["3foo-bar.2bar-fuzz.com"])
-    result.should(be_true)
-  end
-
-  it "should return false if domain name contains spaces" do
-    result = scope.function_is_domain_name(["not valid"])
-    result.should(be_false)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb
deleted file mode 100755
index b7d73b04a25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_float function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_float").should == "function_is_float"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_float([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a float" do
-    result = scope.function_is_float(["0.12"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_float(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an integer" do
-    result = scope.function_is_float(["3"])
-    result.should(eq(false))
-  end
-  it "should return true if a float is created from an arithmetical operation" do
-    result = scope.function_is_float([3.2*2])
-    result.should(eq(true))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb
deleted file mode 100755
index d5669a75837..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_function_available function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_function_available").should == "function_is_function_available"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { @scope.function_is_function_available([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return false if a nonexistent function is passed" do
-    result = @scope.function_is_function_available(['jeff_mccunes_left_sock'])
-    result.should(eq(false))
-  end
-
-  it "should return true if an available function is passed" do
-    result = @scope.function_is_function_available(['require'])
-    result.should(eq(true))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
deleted file mode 100755
index bbebf39f9c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_hash function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_hash").should == "function_is_hash"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_hash([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed a hash" do
-    result = scope.function_is_hash([{"a"=>1,"b"=>2}])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed an array" do
-    result = scope.function_is_hash([["a","b"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a string" do
-    result = scope.function_is_hash(["asdf"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
deleted file mode 100755
index 24141cc7b7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_integer function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_integer").should == "function_is_integer"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_integer([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an integer" do
-    result = scope.function_is_integer(["3"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a negative integer" do
-    result = scope.function_is_integer(["-7"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a float" do
-    result = scope.function_is_integer(["3.2"])
-    result.should(eq(false))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_integer(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return true if an integer is created from an arithmetical operation" do
-    result = scope.function_is_integer([3*2])
-    result.should(eq(true))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_numeric([["asdf"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash" do
-    result = scope.function_is_numeric([{"asdf" => false}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a boolean" do
-    result = scope.function_is_numeric([true])
-    result.should(eq(false))
-  end
-
-  it "should return false if a whitespace is in the string" do
-    result = scope.function_is_numeric([" -1324"])
-    result.should(eq(false))
-  end
-
-  it "should return false if it is zero prefixed" do
-    result = scope.function_is_numeric(["0001234"])
-    result.should(eq(false))
-  end
-
-  it "should return false if it is wrapped inside an array" do
-    result = scope.function_is_numeric([[1234]])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
deleted file mode 100755
index c0debb3d43b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_ip_address function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_ip_address").should == "function_is_ip_address"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_ip_address([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an IPv4 address" do
-    result = scope.function_is_ip_address(["1.2.3.4"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a full IPv6 address" do
-    result = scope.function_is_ip_address(["fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a compressed IPv6 address" do
-    result = scope.function_is_ip_address(["fe00::1"])
-    result.should(eq(true))
-  end
-
-  it "should return false if not valid" do
-    result = scope.function_is_ip_address(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if IP octets out of range" do
-    result = scope.function_is_ip_address(["1.1.1.300"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
deleted file mode 100755
index ca9c5904767..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_mac_address function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_mac_address").should == "function_is_mac_address"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_mac_address([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a valid mac address" do
-    result = scope.function_is_mac_address(["00:a0:1f:12:7f:a0"])
-    result.should(eq(true))
-  end
-
-  it "should return false if octets are out of range" do
-    result = scope.function_is_mac_address(["00:a0:1f:12:7f:g0"])
-    result.should(eq(false))
-  end
-
-  it "should return false if not valid" do
-    result = scope.function_is_mac_address(["not valid"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
deleted file mode 100755
index 1df14978711..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_numeric function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_numeric").should == "function_is_numeric"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_is_numeric([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an integer" do
-    result = scope.function_is_numeric(["3"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a float" do
-    result = scope.function_is_numeric(["3.2"])
-    result.should(eq(true))
-  end
-
-  it "should return true if an integer is created from an arithmetical operation" do
-    result = scope.function_is_numeric([3*2])
-    result.should(eq(true))
-  end
-
-  it "should return true if a float is created from an arithmetical operation" do
-    result = scope.function_is_numeric([3.2*2])
-    result.should(eq(true))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_numeric(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_numeric([["asdf"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array of integers" do
-    result = scope.function_is_numeric([[1,2,3,4]])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash" do
-    result = scope.function_is_numeric([{"asdf" => false}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash with numbers in it" do
-    result = scope.function_is_numeric([{1 => 2}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a boolean" do
-    result = scope.function_is_numeric([true])
-    result.should(eq(false))
-  end
-
-  it "should return true if a negative float with exponent" do
-    result = scope.function_is_numeric(["-342.2315e-12"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a negative integer with whitespaces before/after the dash" do
-    result = scope.function_is_numeric([" -  751"])
-    result.should(eq(false))
-  end
-
-#  it "should return true if a hexadecimal" do
-#    result = scope.function_is_numeric(["0x52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a hexadecimal with uppercase 0X prefix" do
-#    result = scope.function_is_numeric(["0X52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return false if a hexadecimal without a prefix" do
-#    result = scope.function_is_numeric(["52F8c"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return true if a octal" do
-#    result = scope.function_is_numeric(["0751"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a negative hexadecimal" do
-#    result = scope.function_is_numeric(["-0x52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a negative octal" do
-#    result = scope.function_is_numeric(["-0751"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return false if a negative octal with whitespaces before/after the dash" do
-#    result = scope.function_is_numeric([" -  0751"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return false if a bad hexadecimal" do
-#    result = scope.function_is_numeric(["0x23d7g"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return false if a bad octal" do
-#    result = scope.function_is_numeric(["0287"])
-#    result.should(eq(false))
-#  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb
deleted file mode 100755
index 3756bea8b5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_string function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_string").should == "function_is_string"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_string([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a string" do
-    result = scope.function_is_string(["asdf"])
-    result.should(eq(true))
-  end
-
-  it "should return false if an integer" do
-    result = scope.function_is_string(["3"])
-    result.should(eq(false))
-  end
-
-  it "should return false if a float" do
-    result = scope.function_is_string(["3.23"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_string([["a","b","c"]])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
deleted file mode 100755
index a52fb719f27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the join_keys_to_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("join_keys_to_values").should == "function_join_keys_to_values"
-  end
-
-  it "should raise a ParseError if there are fewer than two arguments" do
-    lambda { scope.function_join_keys_to_values([{}]) }.should raise_error Puppet::ParseError
-  end
-
-  it "should raise a ParseError if there are greater than two arguments" do
-    lambda { scope.function_join_keys_to_values([{}, 'foo', 'bar']) }.should raise_error Puppet::ParseError
-  end
-
-  it "should raise a TypeError if the first argument is an array" do
-    lambda { scope.function_join_keys_to_values([[1,2], ',']) }.should raise_error TypeError
-  end
-
-  it "should raise a TypeError if the second argument is an array" do
-    lambda { scope.function_join_keys_to_values([{}, [1,2]]) }.should raise_error TypeError
-  end
-
-  it "should raise a TypeError if the second argument is a number" do
-    lambda { scope.function_join_keys_to_values([{}, 1]) }.should raise_error TypeError
-  end
-
-  it "should return an empty array given an empty hash" do
-    result = scope.function_join_keys_to_values([{}, ":"])
-    result.should == []
-  end
-
-  it "should join hash's keys to its values" do
-    result = scope.function_join_keys_to_values([{'a'=>1,2=>'foo',:b=>nil}, ":"])
-    result.should =~ ['a:1','2:foo','b:']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb
deleted file mode 100755
index aafa1a7f76e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the join function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("join").should == "function_join"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_join([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should join an array into a string" do
-    result = scope.function_join([["a","b","c"], ":"])
-    result.should(eq("a:b:c"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb
deleted file mode 100755
index fdd7a7073e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the keys function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("keys").should == "function_keys"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_keys([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return an array of keys when given a hash" do
-    result = scope.function_keys([{'a'=>1, 'b'=>2}])
-    # =~ performs 'array with same elements' (set) matching
-    # For more info see RSpec::Matchers::MatchArray
-    result.should =~ ['a','b']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
deleted file mode 100755
index fe163182671..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the loadyaml function" do
-  include PuppetlabsSpec::Files
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("loadyaml").should == "function_loadyaml"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_loadyaml([]) }.to raise_error(Puppet::ParseError)
-  end
-
-  it "should convert YAML file to a data structure" do
-    yaml_file = tmpfilename ('yamlfile')
-    File.open(yaml_file, 'w') do |fh|
-      fh.write("---\n aaa: 1\n bbb: 2\n ccc: 3\n ddd: 4\n")
-    end
-    result = scope.function_loadyaml([yaml_file])
-    result.should == {"aaa" => 1, "bbb" => 2, "ccc" => 3, "ddd" => 4 }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
deleted file mode 100755
index b280ae7ac1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the lstrip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("lstrip").should == "function_lstrip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_lstrip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should lstrip a string" do
-    result = scope.function_lstrip(["  asdf"])
-    result.should(eq('asdf'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb
deleted file mode 100755
index ff6f2b361c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the max function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("max").should == "function_max"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_max([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to compare strings" do
-    scope.function_max(["albatross","dog","horse"]).should(eq("horse"))
-  end
-
-  it "should be able to compare numbers" do
-    scope.function_max([6,8,4]).should(eq(8))
-  end
-
-  it "should be able to compare a number with a stringified number" do
-    scope.function_max([1,"2"]).should(eq("2"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb
deleted file mode 100755
index 6e9a023fa46..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the member function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("member").should == "function_member"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_member([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a member is in an array" do
-    result = scope.function_member([["a","b","c"], "a"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a member is not in an array" do
-    result = scope.function_member([["a","b","c"], "d"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb
deleted file mode 100755
index 15a5d94cf82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:merge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling merge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = merge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling merge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_merge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_merge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to merge two hashes' do
-      new_hash = scope.function_merge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should merge multiple hashes' do
-      hash = scope.function_merge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_merge([{},{},{}]).should == {}
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb
deleted file mode 100755
index 71d593ef091..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the min function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("min").should == "function_min"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_min([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to compare strings" do
-    scope.function_min(["albatross","dog","horse"]).should(eq("albatross"))
-  end
-
-  it "should be able to compare numbers" do
-    scope.function_min([6,8,4]).should(eq(4))
-  end
-
-  it "should be able to compare a number with a stringified number" do
-    scope.function_min([1,"2"]).should(eq(1))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
deleted file mode 100755
index b56196d3c6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the num2bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("num2bool").should == "function_num2bool"
-  end
-
-  it "should raise a ParseError if there are no arguments" do
-    lambda { scope.function_num2bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are more than 1 arguments" do
-    lambda { scope.function_num2bool(["foo","bar"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if passed something non-numeric" do
-    lambda { scope.function_num2bool(["xyzzy"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed string 1" do
-    result = scope.function_num2bool(["1"])
-    result.should(be_true)
-  end
-
-  it "should return true if passed string 1.5" do
-    result = scope.function_num2bool(["1.5"])
-    result.should(be_true)
-  end
-
-  it "should return true if passed number 1" do
-    result = scope.function_num2bool([1])
-    result.should(be_true)
-  end
-
-  it "should return false if passed string 0" do
-    result = scope.function_num2bool(["0"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed number 0" do
-    result = scope.function_num2bool([0])
-    result.should(be_false)
-  end
-
-  it "should return false if passed string -1" do
-    result = scope.function_num2bool(["-1"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed string -1.5" do
-    result = scope.function_num2bool(["-1.5"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed number -1" do
-    result = scope.function_num2bool([-1])
-    result.should(be_false)
-  end
-
-  it "should return false if passed float -1.5" do
-    result = scope.function_num2bool([-1.5])
-    result.should(be_false)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
deleted file mode 100755
index f179ac111a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the parsejson function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("parsejson").should == "function_parsejson"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_parsejson([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert JSON to a data structure" do
-    json = <<-EOS
-["aaa","bbb","ccc"]
-EOS
-    result = scope.function_parsejson([json])
-    result.should(eq(['aaa','bbb','ccc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
deleted file mode 100755
index 0c7aea8a5ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the parseyaml function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("parseyaml").should == "function_parseyaml"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_parseyaml([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert YAML to a data structure" do
-    yaml = <<-EOS
-- aaa
-- bbb
-- ccc
-EOS
-    result = scope.function_parseyaml([yaml])
-    result.should(eq(['aaa','bbb','ccc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
deleted file mode 100755
index c9235b53464..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the pick_default function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("pick_default").should == "function_pick_default"
-  end
-
-  it 'should return the correct value' do
-    scope.function_pick_default(['first', 'second']).should == 'first'
-  end
-
-  it 'should return the correct value if the first value is empty' do
-    scope.function_pick_default(['', 'second']).should == 'second'
-  end
-
-  it 'should skip empty string values' do
-    scope.function_pick_default(['', 'first']).should == 'first'
-  end
-
-  it 'should skip :undef values' do
-    scope.function_pick_default([:undef, 'first']).should == 'first'
-  end
-
-  it 'should skip :undefined values' do
-    scope.function_pick_default([:undefined, 'first']).should == 'first'
-  end
-
-  it 'should return the empty string if it is the last possibility' do
-    scope.function_pick_default([:undef, :undefined, '']).should == ''
-  end
-
-  it 'should return :undef if it is the last possibility' do
-    scope.function_pick_default(['', :undefined, :undef]).should == :undef
-  end
-
-  it 'should return :undefined if it is the last possibility' do
-    scope.function_pick_default([:undef, '', :undefined]).should == :undefined
-  end
-
-  it 'should return the empty string if it is the only possibility' do
-    scope.function_pick_default(['']).should == ''
-  end
-
-  it 'should return :undef if it is the only possibility' do
-    scope.function_pick_default([:undef]).should == :undef
-  end
-
-  it 'should return :undefined if it is the only possibility' do
-    scope.function_pick_default([:undefined]).should == :undefined
-  end
-
-  it 'should error if no values are passed' do
-    expect { scope.function_pick_default([]) }.to raise_error(Puppet::Error, /Must receive at least one argument./)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb
deleted file mode 100755
index f53fa800053..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the pick function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("pick").should == "function_pick"
-  end
-
-  it 'should return the correct value' do
-    scope.function_pick(['first', 'second']).should == 'first'
-  end
-
-  it 'should return the correct value if the first value is empty' do
-    scope.function_pick(['', 'second']).should == 'second'
-  end
-
-  it 'should remove empty string values' do
-    scope.function_pick(['', 'first']).should == 'first'
-  end
-
-  it 'should remove :undef values' do
-    scope.function_pick([:undef, 'first']).should == 'first'
-  end
-
-  it 'should remove :undefined values' do
-    scope.function_pick([:undefined, 'first']).should == 'first'
-  end
-
-  it 'should error if no values are passed' do
-    expect { scope.function_pick([]) }.to( raise_error(Puppet::ParseError, "pick(): must receive at least one non empty value"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb
deleted file mode 100755
index 6e8ddc58ee8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the prefix function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_prefix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
-  end
-
-  it "raises an error if the first argument is not an array" do
-    expect {
-      scope.function_prefix([Object.new])
-    }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
-  end
-
-
-  it "raises an error if the second argument is not a string" do
-    expect {
-      scope.function_prefix([['first', 'second'], 42])
-    }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
-  end
-
-  it "returns a prefixed array" do
-    result = scope.function_prefix([['a','b','c'], 'p'])
-    result.should(eq(['pa','pb','pc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb
deleted file mode 100755
index 0e1ad376f6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the range function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "exists" do
-    Puppet::Parser::Functions.function("range").should == "function_range"
-  end
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_range([]) }.to raise_error Puppet::ParseError, /Wrong number of arguments.*0 for 1/
-  end
-
-  describe 'with a letter range' do
-    it "returns a letter range" do
-      result = scope.function_range(["a","d"])
-      result.should eq ['a','b','c','d']
-    end
-
-    it "returns a letter range given a step of 1" do
-      result = scope.function_range(["a","d","1"])
-      result.should eq ['a','b','c','d']
-    end
-
-    it "returns a stepped letter range" do
-      result = scope.function_range(["a","d","2"])
-      result.should eq ['a','c']
-    end
-
-    it "returns a stepped letter range given a negative step" do
-      result = scope.function_range(["a","d","-2"])
-      result.should eq ['a','c']
-    end
-  end
-
-  describe 'with a number range' do
-    it "returns a number range" do
-      result = scope.function_range(["1","4"])
-      result.should eq [1,2,3,4]
-    end
-
-    it "returns a number range given a step of 1" do
-      result = scope.function_range(["1","4","1"])
-      result.should eq [1,2,3,4]
-    end
-
-    it "returns a stepped number range" do
-      result = scope.function_range(["1","4","2"])
-      result.should eq [1,3]
-    end
-
-    it "returns a stepped number range given a negative step" do
-      result = scope.function_range(["1","4","-2"])
-      result.should eq [1,3]
-    end
-  end
-
-  describe 'with a numeric-like string range' do
-    it "works with padded hostname like strings" do
-      expected = ("host01".."host10").to_a
-      scope.function_range(["host01","host10"]).should eq expected
-    end
-
-    it "coerces zero padded digits to integers" do
-      expected = (0..10).to_a
-      scope.function_range(["00", "10"]).should eq expected
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb
deleted file mode 100755
index f2cb7419352..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-
-describe "the reject function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("reject").should == "function_reject"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_reject([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should reject contents from an array" do
-    result = scope.function_reject([["1111", "aaabbb","bbbccc","dddeee"], "bbb"])
-    result.should(eq(["1111", "dddeee"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb
deleted file mode 100755
index 1b592065478..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the reverse function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("reverse").should == "function_reverse"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_reverse([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should reverse a string" do
-    result = scope.function_reverse(["asdfghijkl"])
-    result.should(eq('lkjihgfdsa'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
deleted file mode 100755
index d90de1d0609..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the rstrip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("rstrip").should == "function_rstrip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_rstrip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should rstrip a string" do
-    result = scope.function_rstrip(["asdf  "])
-    result.should(eq('asdf'))
-  end
-
-  it "should rstrip each element in an array" do
-    result = scope.function_rstrip([["a ","b ", "c "]])
-    result.should(eq(['a','b','c']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
deleted file mode 100755
index 93346d53700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the shuffle function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("shuffle").should == "function_shuffle"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_shuffle([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should shuffle a string and the result should be the same size" do
-    result = scope.function_shuffle(["asdf"])
-    result.size.should(eq(4))
-  end
-
-  it "should shuffle a string but the sorted contents should still be the same" do
-    result = scope.function_shuffle(["adfs"])
-    result.split("").sort.join("").should(eq("adfs"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb
deleted file mode 100755
index b1c435a3027..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the size function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("size").should == "function_size"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_size([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return the size of a string" do
-    result = scope.function_size(["asdf"])
-    result.should(eq(4))
-  end
-
-  it "should return the size of an array" do
-    result = scope.function_size([["a","b","c"]])
-    result.should(eq(3))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb
deleted file mode 100755
index 3187a5aecbc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the sort function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("sort").should == "function_sort"
-  end
-
-  it "should raise a ParseError if there is not 1 arguments" do
-    lambda { scope.function_sort(['','']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should sort an array" do
-    result = scope.function_sort([["a","c","b"]])
-    result.should(eq(['a','b','c']))
-  end
-
-  it "should sort a string" do
-    result = scope.function_sort(["acb"])
-    result.should(eq('abc'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
deleted file mode 100755
index 60e5a3028db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the squeeze function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("squeeze").should == "function_squeeze"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    lambda { scope.function_squeeze([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should squeeze a string" do
-    result = scope.function_squeeze(["aaabbbbcccc"])
-    result.should(eq('abc'))
-  end
-
-  it "should squeeze all elements in an array" do
-    result = scope.function_squeeze([["aaabbbbcccc","dddfff"]])
-    result.should(eq(['abc','df']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
deleted file mode 100755
index 73c09c72922..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the str2bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("str2bool").should == "function_str2bool"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_str2bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert string 'true' to true" do
-    result = scope.function_str2bool(["true"])
-    result.should(eq(true))
-  end
-
-  it "should convert string 'undef' to false" do
-    result = scope.function_str2bool(["undef"])
-    result.should(eq(false))
-  end
-
-  it "should return the boolean it was called with" do
-    result = scope.function_str2bool([true])
-    result.should(eq(true))
-    result = scope.function_str2bool([false])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
deleted file mode 100755
index df8fb8e905c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the str2saltedsha512 function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("str2saltedsha512").should == "function_str2saltedsha512"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    expect { scope.function_str2saltedsha512([]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError if there is more than 1 argument" do
-    expect { scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return a salted-sha512 password hash 136 characters in length" do
-    result = scope.function_str2saltedsha512(["password"])
-    result.length.should(eq(136))
-  end
-
-  it "should raise an error if you pass a non-string password" do
-    expect { scope.function_str2saltedsha512([1234]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should generate a valid password" do
-    # Allow the function to generate a password based on the string 'password'
-    password_hash = scope.function_str2saltedsha512(["password"])
-
-    # Separate the Salt and Password from the Password Hash
-    salt     = password_hash[0..7]
-    password = password_hash[8..-1]
-
-    # Convert the Salt and Password from Hex to Binary Data
-    str_salt     = Array(salt.lines).pack('H*')
-    str_password = Array(password.lines).pack('H*')
-
-    # Combine the Binary Salt with 'password' and compare the end result
-    saltedpass    = Digest::SHA512.digest(str_salt + 'password')
-    result        = (str_salt + saltedpass).unpack('H*')[0]
-    result.should == password_hash
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb
deleted file mode 100755
index df42b6f26bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the strftime function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("strftime").should == "function_strftime"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_strftime([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "using %s should be higher then when I wrote this test" do
-    result = scope.function_strftime(["%s"])
-    result.to_i.should(be > 1311953157)
-  end
-
-  it "using %s should be lower then 1.5 trillion" do
-    result = scope.function_strftime(["%s"])
-    result.to_i.should(be < 1500000000)
-  end
-
-  it "should return a date when given %Y-%m-%d" do
-    result = scope.function_strftime(["%Y-%m-%d"])
-    result.should =~ /^\d{4}-\d{2}-\d{2}$/
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb
deleted file mode 100755
index fccdd26067c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the strip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("strip").should == "function_strip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_strip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should strip a string" do
-    result = scope.function_strip([" ab cd "])
-    result.should(eq('ab cd'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb
deleted file mode 100755
index 89ba3b82309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the suffix function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_suffix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
-  end
-
-  it "raises an error if the first argument is not an array" do
-    expect {
-      scope.function_suffix([Object.new])
-    }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
-  end
-
-  it "raises an error if the second argument is not a string" do
-    expect {
-      scope.function_suffix([['first', 'second'], 42])
-    }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
-  end
-
-  it "returns a suffixed array" do
-    result = scope.function_suffix([['a','b','c'], 'p'])
-    result.should(eq(['ap','bp','cp']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
deleted file mode 100755
index 808b4158767..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the swapcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("swapcase").should == "function_swapcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_swapcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should swapcase a string" do
-    result = scope.function_swapcase(["aaBBccDD"])
-    result.should(eq('AAbbCCdd'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb
deleted file mode 100755
index e9fb76e6ac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the time function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("time").should == "function_time"
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    lambda { scope.function_time(['','']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a number" do
-    result = scope.function_time([])
-    result.should be_an(Integer)
-  end
-
-  it "should be higher then when I wrote this test" do
-    result = scope.function_time([])
-    result.should(be > 1311953157)
-  end
-
-  it "should be lower then 1.5 trillion" do
-    result = scope.function_time([])
-    result.should(be < 1500000000)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
deleted file mode 100755
index d1ea4c80cc2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the to_bytes function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("to_bytes").should == "function_to_bytes"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_to_bytes([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert kB to B" do
-    result = scope.function_to_bytes(["4 kB"])
-    result.should(eq(4096))
-  end
-
-  it "should work without B in unit" do
-    result = scope.function_to_bytes(["4 k"])
-    result.should(eq(4096))
-  end
-
-  it "should work without a space before unit" do
-    result = scope.function_to_bytes(["4k"])
-    result.should(eq(4096))
-  end
-
-  it "should work without a unit" do
-    result = scope.function_to_bytes(["5678"])
-    result.should(eq(5678))
-  end
-
-  it "should convert fractions" do
-    result = scope.function_to_bytes(["1.5 kB"])
-    result.should(eq(1536))
-  end
-
-  it "should convert scientific notation" do
-    result = scope.function_to_bytes(["1.5e2 B"])
-    result.should(eq(150))
-  end
-
-  it "should do nothing with a positive number" do
-    result = scope.function_to_bytes([5678])
-    result.should(eq(5678))
-  end
-
-  it "should should raise a ParseError if input isn't a number" do
-    lambda { scope.function_to_bytes(["foo"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should should raise a ParseError if prefix is unknown" do
-    lambda { scope.function_to_bytes(["5 uB"]) }.should( raise_error(Puppet::ParseError))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb
deleted file mode 100755
index 8fec88f2660..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the type function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("type").should == "function_type"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_type([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return string when given a string" do
-    result = scope.function_type(["aaabbbbcccc"])
-    result.should(eq('string'))
-  end
-
-  it "should return array when given an array" do
-    result = scope.function_type([["aaabbbbcccc","asdf"]])
-    result.should(eq('array'))
-  end
-
-  it "should return hash when given a hash" do
-    result = scope.function_type([{"a"=>1,"b"=>2}])
-    result.should(eq('hash'))
-  end
-
-  it "should return integer when given an integer" do
-    result = scope.function_type(["1"])
-    result.should(eq('integer'))
-  end
-
-  it "should return float when given a float" do
-    result = scope.function_type(["1.34"])
-    result.should(eq('float'))
-  end
-
-  it "should return boolean when given a boolean" do
-    result = scope.function_type([true])
-    result.should(eq('boolean'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb
deleted file mode 100755
index 0d282caa653..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the union function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("union").should == "function_union"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_union([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should join two arrays together" do
-    result = scope.function_union([["a","b","c"],["b","c","d"]])
-    result.should(eq(["a","b","c","d"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb
deleted file mode 100755
index 5d48d49b723..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the unique function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("unique").should == "function_unique"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_unique([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should remove duplicate elements in a string" do
-    result = scope.function_unique(["aabbc"])
-    result.should(eq('abc'))
-  end
-
-  it "should remove duplicate elements in an array" do
-    result = scope.function_unique([["a","a","b","b","c"]])
-    result.should(eq(['a','b','c']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb
deleted file mode 100755
index 5db55138a69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the upcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("upcase").should == "function_upcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_upcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should upcase a string" do
-    result = scope.function_upcase(["abc"])
-    result.should(eq('ABC'))
-  end
-
-  it "should do nothing if a string is already upcase" do
-    result = scope.function_upcase(["ABC"])
-    result.should(eq('ABC'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
deleted file mode 100755
index 7211c88783d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the uriescape function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("uriescape").should == "function_uriescape"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_uriescape([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should uriescape a string" do
-    result = scope.function_uriescape([":/?#[]@!$&'()*+,;= \"{}"])
-    result.should(eq(':/?%23[]@!$&\'()*+,;=%20%22%7B%7D'))
-  end
-
-  it "should do nothing if a string is already safe" do
-    result = scope.function_uriescape(["ABCdef"])
-    result.should(eq('ABCdef'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
deleted file mode 100755
index 342ae848257..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_absolute_path) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examples is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_absolute_path)
-    scope.method(function_name)
-  end
-
-  describe "Valid Paths" do
-    def self.valid_paths
-      %w{
-        C:/
-        C:\\
-        C:\\WINDOWS\\System32
-        C:/windows/system32
-        X:/foo/bar
-        X:\\foo\\bar
-        /var/tmp
-        /var/lib/puppet
-        /var/opt/../lib/puppet
-      }
-    end
-
-    context "Without Puppet::Util.absolute_path? (e.g. Puppet <= 2.6)" do
-      before :each do
-        # The intent here is to mock Puppet to behave like Puppet 2.6 does.
-        # Puppet 2.6 does not have the absolute_path? method.  This is only a
-        # convenience test, stdlib should be run with the Puppet 2.6.x in the
-        # $LOAD_PATH in addition to 2.7.x and master.
-        Puppet::Util.expects(:respond_to?).with(:absolute_path?).returns(false)
-      end
-      valid_paths.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should not fail" do
-          expect { subject.call [path] }.not_to raise_error
-        end
-      end
-    end
-
-    context "Puppet without mocking" do
-      valid_paths.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should not fail" do
-          expect { subject.call [path] }.not_to raise_error
-        end
-      end
-    end
-  end
-
-  describe 'Invalid paths' do
-    context 'Garbage inputs' do
-      [
-        nil,
-        [ nil ],
-        { 'foo' => 'bar' },
-        { },
-        '',
-      ].each do |path|
-        it "validate_absolute_path(#{path.inspect}) should fail" do
-          expect { subject.call [path] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    context 'Relative paths' do
-      %w{
-        relative1
-        .
-        ..
-        ./foo
-        ../foo
-        etc/puppetlabs/puppet
-        opt/puppet/bin
-      }.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should fail" do
-          expect { subject.call [path] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
deleted file mode 100755
index 4b31cfde42f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_array) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling validate_array from puppet' do
-
-    %w{ true false }.each do |the_string|
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_array('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_array(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-      end
-    end
-
-    it "should compile when multiple array arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = [ ]
-        $bar = [ 'one', 'two' ]
-        validate_array($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should not compile when an undef variable is passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_array($foo)
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
deleted file mode 100755
index c695ba2eb7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_augeas), :if => Puppet.features.augeas? do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examplres is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_augeas)
-    scope.method(function_name)
-  end
-
-  context 'Using Puppet::Parser::Scope.new' do
-
-    describe 'Garbage inputs' do
-      inputs = [
-        [ nil ],
-        [ [ nil ] ],
-        [ { 'foo' => 'bar' } ],
-        [ { } ],
-        [ '' ],
-        [ "one", "one", "MSG to User", "4th arg" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call [input] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    describe 'Valid inputs' do
-      inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns' ],
-        [ "proc /proc   proc    nodev,noexec,nosuid     0       0\n", 'Fstab.lns'],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should not fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-
-    describe "Valid inputs which should raise an exception without a message" do
-      # The intent here is to make sure valid inputs raise exceptions when they
-      # don't specify an error message to display.  This is the behvior in
-      # 2.2.x and prior.
-      inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns' ],
-        [ "127.0.1.1\n", 'Hosts.lns' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /validate_augeas.*?matched less than it should/
-        end
-      end
-    end
-
-    describe "Nicer Error Messages" do
-      # The intent here is to make sure the function returns the 3rd argument
-      # in the exception thrown
-      inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns', [], 'Failed to validate passwd content' ],
-        [ "127.0.1.1\n", 'Hosts.lns', [], 'Wrong hosts content' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /#{input[2]}/
-        end
-      end
-    end
-
-    describe "Passing simple unit tests" do
-      inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-
-    describe "Failing simple unit tests" do
-      inputs = [
-        [ "foobar:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/sh\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /testing path/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
deleted file mode 100755
index a352d3b550b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_bool) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling validate_bool from puppet' do
-
-    %w{ true false }.each do |the_string|
-
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_bool('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-      end
-
-      it "should compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_bool(#{the_string})"
-        scope.compiler.compile
-      end
-
-    end
-
-    it "should not compile when an arbitrary string is passed" do
-      Puppet[:code] = 'validate_bool("jeff and dan are awesome")'
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = 'validate_bool()'
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should compile when multiple boolean arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = true
-        $bar = false
-        validate_bool($foo, $bar, true, false)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when multiple boolean arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = true
-        $bar = false
-        validate_bool($foo, $bar, true, false, 'jeff')
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
deleted file mode 100755
index a6e68df2105..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-TESTEXE = File.exists?('/usr/bin/test') ? '/usr/bin/test' : '/bin/test'
-TOUCHEXE = File.exists?('/usr/bin/touch') ? '/usr/bin/touch' : '/bin/touch'
-
-describe Puppet::Parser::Functions.function(:validate_cmd) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:validate_cmd)
-    scope.method(function_name)
-  end
-
-  describe "with an explicit failure message" do
-    it "prints the failure message on error" do
-      expect {
-        subject.call ['', '/bin/false', 'failure message!']
-      }.to raise_error Puppet::ParseError, /failure message!/
-    end
-  end
-
-  describe "on validation failure" do
-    it "includes the command error output" do
-      expect {
-        subject.call ['', "#{TOUCHEXE} /cant/touch/this"]
-      }.to raise_error Puppet::ParseError, /(cannot touch|o such file or)/
-    end
-
-    it "includes the command return value" do
-      expect {
-        subject.call ['', '/cant/run/this']
-      }.to raise_error Puppet::ParseError, /returned 1\b/
-    end
-  end
-
-  describe "when performing actual validation" do
-    it "can positively validate file content" do
-      expect { subject.call ["non-empty", "#{TESTEXE} -s"] }.to_not raise_error
-    end
-
-    it "can negatively validate file content" do
-      expect {
-        subject.call ["", "#{TESTEXE} -s"]
-      }.to raise_error Puppet::ParseError, /failed to validate.*test -s/
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
deleted file mode 100755
index a0c35c2304f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_hash) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling validate_hash from puppet' do
-
-    %w{ true false }.each do |the_string|
-
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_hash('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_hash(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-      end
-
-    end
-
-    it "should compile when multiple hash arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = {}
-        $bar = { 'one' => 'two' }
-        validate_hash($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should not compile when an undef variable is passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_hash($foo)
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
deleted file mode 100755
index 45401a42327..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require "spec_helper"
-
-describe Puppet::Parser::Functions.function(:validate_ipv4_address) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe "when calling validate_ipv4_address from puppet" do
-    describe "when given IPv4 address strings" do
-      it "should compile with one argument" do
-        Puppet[:code] = "validate_ipv4_address('1.2.3.4')"
-        scope.compiler.compile
-      end
-
-      it "should compile with multiple arguments" do
-        Puppet[:code] = "validate_ipv4_address('1.2.3.4', '5.6.7.8')"
-        scope.compiler.compile
-      end
-    end
-
-    describe "when given an IPv6 address" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address('3ffe:505')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given other strings" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address('hello', 'world')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given numbers" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address(1, 2)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given booleans" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address(true, false)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = "validate_ipv4_address()"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
deleted file mode 100755
index a839d902c9e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require "spec_helper"
-
-describe Puppet::Parser::Functions.function(:validate_ipv6_address) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe "when calling validate_ipv6_address from puppet" do
-    describe "when given IPv6 address strings" do
-      it "should compile with one argument" do
-        Puppet[:code] = "validate_ipv6_address('3ffe:0505:0002::')"
-        scope.compiler.compile
-      end
-
-      it "should compile with multiple arguments" do
-        Puppet[:code] = "validate_ipv6_address('3ffe:0505:0002::', '3ffe:0505:0001::')"
-        scope.compiler.compile
-      end
-    end
-
-    describe "when given an ipv4 address" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address('1.2.3.4')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-      end
-    end
-
-    describe "when given other strings" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address('hello', 'world')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-      end
-    end
-
-    # 1.8.7 is EOL'd and also absolutely insane about ipv6
-    unless RUBY_VERSION == '1.8.7'
-      describe "when given numbers" do
-        it "should not compile" do
-          Puppet[:code] = "validate_ipv6_address(1, 2)"
-          expect {
-            scope.compiler.compile
-          }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-        end
-      end
-    end
-
-    describe "when given booleans" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address(true, false)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = "validate_ipv6_address()"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
deleted file mode 100755
index d29988bf006..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_re) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examplres is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_re)
-    scope.method(function_name)
-  end
-
-  context 'Using Puppet::Parser::Scope.new' do
-
-    describe 'Garbage inputs' do
-      inputs = [
-        [ nil ],
-        [ [ nil ] ],
-        [ { 'foo' => 'bar' } ],
-        [ { } ],
-        [ '' ],
-        [ "one", "one", "MSG to User", "4th arg" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call [input] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    describe 'Valid inputs' do
-      inputs = [
-        [ '/full/path/to/something', '^/full' ],
-        [ '/full/path/to/something', 'full' ],
-        [ '/full/path/to/something', ['full', 'absent'] ],
-        [ '/full/path/to/something', ['full', 'absent'], 'Message to the user' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should not fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-    describe "Valid inputs which should raise an exception without a message" do
-      # The intent here is to make sure valid inputs raise exceptions when they
-      # don't specify an error message to display.  This is the behvior in
-      # 2.2.x and prior.
-      inputs = [
-        [ "hello", [ "bye", "later", "adios" ] ],
-        [ "greetings", "salutations" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /validate_re.*?does not match/
-        end
-      end
-    end
-    describe "Nicer Error Messages" do
-      # The intent here is to make sure the function returns the 3rd argument
-      # in the exception thrown
-      inputs = [
-        [ "hello", [ "bye", "later", "adios" ], "MSG to User" ],
-        [ "greetings", "salutations", "Error, greetings does not match salutations" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /#{input[2]}/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
deleted file mode 100755
index 851835fa1e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the validate_slength function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("validate_slength").should == "function_validate_slength"
-  end
-
-  describe "validating the input argument types" do
-    it "raises an error if there are less than two arguments" do
-      expect { scope.function_validate_slength([]) }.to raise_error Puppet::ParseError, /Wrong number of arguments/
-    end
-
-    it "raises an error if there are more than three arguments" do
-      expect { scope.function_validate_slength(['input', 1, 2, 3]) }.to raise_error Puppet::ParseError, /Wrong number of arguments/
-    end
-
-    it "raises an error if the first argument is not a string" do
-      expect { scope.function_validate_slength([Object.new, 2, 1]) }.to raise_error Puppet::ParseError, /Expected first argument.*got .*Object/
-    end
-
-    it "raises an error if the second argument cannot be cast to an Integer" do
-      expect { scope.function_validate_slength(['input', Object.new]) }.to raise_error Puppet::ParseError, /Expected second argument.*got .*Object/
-    end
-
-    it "raises an error if the third argument cannot be cast to an Integer" do
-      expect { scope.function_validate_slength(['input', 1, Object.new]) }.to raise_error Puppet::ParseError, /Expected third argument.*got .*Object/
-    end
-
-    it "raises an error if the second argument is smaller than the third argument" do
-      expect { scope.function_validate_slength(['input', 1, 2]) }.to raise_error Puppet::ParseError, /Expected second argument to be larger than third argument/
-    end
-  end
-
-  describe "validating the input string length" do
-    describe "when the input is a string" do
-      it "fails validation if the string is larger than the max length" do
-        expect { scope.function_validate_slength(['input', 1]) }.to raise_error Puppet::ParseError, /Expected length .* between 0 and 1, was 5/
-      end
-
-      it "fails validation if the string is less than the min length" do
-        expect { scope.function_validate_slength(['input', 10, 6]) }.to raise_error Puppet::ParseError, /Expected length .* between 6 and 10, was 5/
-      end
-
-      it "doesn't raise an error if the string is under the max length" do
-        scope.function_validate_slength(['input', 10])
-      end
-
-      it "doesn't raise an error if the string is equal to the max length" do
-        scope.function_validate_slength(['input', 5])
-      end
-
-      it "doesn't raise an error if the string is equal to the min length" do
-        scope.function_validate_slength(['input', 10, 5])
-      end
-    end
-
-    describe "when the input is an array" do
-      it "fails validation if one of the array elements is not a string" do
-        expect { scope.function_validate_slength([["a", "b", Object.new], 2]) }.to raise_error Puppet::ParseError, /Expected element at array position 2 .*String, got .*Object/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
deleted file mode 100755
index 3b4fb3e1da1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_string) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling validate_string from puppet' do
-
-    %w{ foo bar baz }.each do |the_string|
-
-      it "should compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_string('#{the_string}')"
-        scope.compiler.compile
-      end
-
-      it "should compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_string(#{the_string})"
-        scope.compiler.compile
-      end
-
-    end
-
-    %w{ true false }.each do |the_string|
-      it "should compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_string('#{the_string}')"
-        scope.compiler.compile
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_string(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should compile when multiple string arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = ''
-        $bar = 'two'
-        validate_string($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when an explicitly undef variable is passed (NOTE THIS MAY NOT BE DESIRABLE)" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_string($foo)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when an undefined variable is passed (NOTE THIS MAY NOT BE DESIRABLE)" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        validate_string($foobarbazishouldnotexist)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb
deleted file mode 100755
index 08e95a567bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the values_at function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("values_at").should == "function_values_at"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_values_at([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if you try to use a range where stop is greater then start" do
-    lambda { scope.function_values_at([['a','b'],["3-1"]]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a value at from an array" do
-    result = scope.function_values_at([['a','b','c'],"1"])
-    result.should(eq(['b']))
-  end
-
-  it "should return a value at from an array when passed a range" do
-    result = scope.function_values_at([['a','b','c'],"0-1"])
-    result.should(eq(['a','b']))
-  end
-
-  it "should return chosen values from an array when passed number of indexes" do
-    result = scope.function_values_at([['a','b','c'],["0","2"]])
-    result.should(eq(['a','c']))
-  end
-
-  it "should return chosen values from an array when passed ranges and multiple indexes" do
-    result = scope.function_values_at([['a','b','c','d','e','f','g'],["0","2","4-5"]])
-    result.should(eq(['a','c','e','f']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb
deleted file mode 100755
index 14ae4176380..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("values").should == "function_values"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return values from a hash" do
-    result = scope.function_values([{'a'=>'1','b'=>'2','c'=>'3'}])
-    # =~ is the RSpec::Matchers::MatchArray matcher.
-    # A.K.A. "array with same elements" (multiset) matching
-    result.should =~ %w{ 1 2 3 }
-  end
-
-  it "should return a multiset" do
-    result = scope.function_values([{'a'=>'1','b'=>'3','c'=>'3'}])
-    result.should     =~ %w{ 1 3 3 }
-    result.should_not =~ %w{ 1 3 }
-  end
-
-  it "should raise a ParseError unless a Hash is provided" do
-    lambda { scope.function_values([['a','b','c']]) }.should( raise_error(Puppet::ParseError))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb
deleted file mode 100755
index f45ab17308d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the zip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_zip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to zip an array" do
-    result = scope.function_zip([['1','2','3'],['4','5','6']])
-    result.should(eq([["1", "4"], ["2", "5"], ["3", "6"]]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb
deleted file mode 100755
index 2f0ae4d7974..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Compiler
-  def compile_to_catalog(string, node = Puppet::Node.new('foonode'))
-    Puppet[:code] = string
-    Puppet::Parser::Compiler.compile(node)
-  end
-
-  def compile_to_ral(manifest)
-    catalog = compile_to_catalog(manifest)
-    ral = catalog.to_ral
-    ral.finalize
-    ral
-  end
-
-  def compile_to_relationship_graph(manifest, prioritizer = Puppet::Graph::SequentialPrioritizer.new)
-    ral = compile_to_ral(manifest)
-    graph = Puppet::Graph::RelationshipGraph.new(prioritizer)
-    graph.populate_from(ral)
-    graph
-  end
-
-  if Puppet.version.to_f >= 3.3
-    def apply_compiled_manifest(manifest, prioritizer = Puppet::Graph::SequentialPrioritizer.new)
-      transaction = Puppet::Transaction.new(compile_to_ral(manifest),
-                                          Puppet::Transaction::Report.new("apply"),
-                                          prioritizer)
-      transaction.evaluate
-      transaction.report.finalize_report
-
-      transaction
-    end
-  else
-    def apply_compiled_manifest(manifest)
-      transaction = Puppet::Transaction.new(compile_to_ral(manifest), Puppet::Transaction::Report.new("apply"))
-      transaction.evaluate
-      transaction.report.finalize_report
-
-      transaction
-    end
-  end
-
-  def order_resources_traversed_in(relationships)
-    order_seen = []
-    relationships.traverse { |resource| order_seen << resource.ref }
-    order_seen
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb
deleted file mode 100755
index f5c2341791b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# This just makes some nice things available at global scope, and for setup of
-# tests to use a real fake database, rather than a fake stubs-that-don't-work
-# version of the same.  Fun times.
-def sqlite?
-  if $sqlite.nil?
-    begin
-      require 'sqlite3'
-      $sqlite = true
-    rescue LoadError
-      $sqlite = false
-    end
-  end
-  $sqlite
-end
-
-def can_use_scratch_database?
-  sqlite? and Puppet.features.rails?
-end
-
-
-# This is expected to be called in your `before :each` block, and will get you
-# ready to roll with a serious database and all.  Cleanup is handled
-# automatically for you.  Nothing to do there.
-def setup_scratch_database
-  Puppet[:dbadapter] = 'sqlite3'
-  Puppet[:dblocation] = ':memory:'
-  Puppet[:railslog] = PuppetSpec::Files.tmpfile('storeconfigs.log')
-  Puppet::Rails.init
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb
deleted file mode 100755
index 71b38ffedfd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'fileutils'
-require 'tempfile'
-require 'tmpdir'
-require 'pathname'
-
-# A support module for testing files.
-module PuppetSpec::Files
-  def self.cleanup
-    $global_tempfiles ||= []
-    while path = $global_tempfiles.pop do
-      begin
-        Dir.unstub(:entries)
-        FileUtils.rm_rf path, :secure => true
-      rescue Errno::ENOENT
-        # nothing to do
-      end
-    end
-  end
-
-  def make_absolute(path) PuppetSpec::Files.make_absolute(path) end
-  def self.make_absolute(path)
-    path = File.expand_path(path)
-    path[0] = 'c' if Puppet.features.microsoft_windows?
-    path
-  end
-
-  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
-  def self.tmpfile(name, dir = nil)
-    # Generate a temporary file, just for the name...
-    source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
-    path = source.path
-    source.close!
-
-    record_tmp(File.expand_path(path))
-
-    path
-  end
-
-  def file_containing(name, contents) PuppetSpec::Files.file_containing(name, contents) end
-  def self.file_containing(name, contents)
-    file = tmpfile(name)
-    File.open(file, 'wb') { |f| f.write(contents) }
-    file
-  end
-
-  def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
-  def self.tmpdir(name)
-    dir = Dir.mktmpdir(name)
-
-    record_tmp(dir)
-
-    dir
-  end
-
-  def self.record_tmp(tmp)
-    # ...record it for cleanup,
-    $global_tempfiles ||= []
-    $global_tempfiles << tmp
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb
deleted file mode 100755
index 81e9775ff87..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Fixtures
-  def fixtures(*rest)
-    File.join(PuppetSpec::FIXTURE_DIR, *rest)
-  end
-  def my_fixture_dir
-    callers = caller
-    while line = callers.shift do
-      next unless found = line.match(%r{/spec/(.*)_spec\.rb:})
-      return fixtures(found[1])
-    end
-    fail "sorry, I couldn't work out your path from the caller stack!"
-  end
-  def my_fixture(name)
-    file = File.join(my_fixture_dir, name)
-    unless File.readable? file then
-      fail Puppet::DevError, "fixture '#{name}' for #{my_fixture_dir} is not readable"
-    end
-    return file
-  end
-  def my_fixtures(glob = '*', flags = 0)
-    files = Dir.glob(File.join(my_fixture_dir, glob), flags)
-    unless files.length > 0 then
-      fail Puppet::DevError, "fixture '#{glob}' for #{my_fixture_dir} had no files!"
-    end
-    block_given? and files.each do |file| yield file end
-    files
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb
deleted file mode 100755
index 093d77c8122..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'stringio'
-
-########################################################################
-# Backward compatibility for Jenkins outdated environment.
-module RSpec
-  module Matchers
-    module BlockAliases
-      alias_method :to,     :should      unless method_defined? :to
-      alias_method :to_not, :should_not  unless method_defined? :to_not
-      alias_method :not_to, :should_not  unless method_defined? :not_to
-    end
-  end
-end
-
-
-########################################################################
-# Custom matchers...
-RSpec::Matchers.define :have_matching_element do |expected|
-  match do |actual|
-    actual.any? { |item| item =~ expected }
-  end
-end
-
-
-RSpec::Matchers.define :exit_with do |expected|
-  actual = nil
-  match do |block|
-    begin
-      block.call
-    rescue SystemExit => e
-      actual = e.status
-    end
-    actual and actual == expected
-  end
-  failure_message_for_should do |block|
-    "expected exit with code #{expected} but " +
-      (actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
-  end
-  failure_message_for_should_not do |block|
-    "expected that exit would not be called with #{expected}"
-  end
-  description do
-    "expect exit with #{expected}"
-  end
-end
-
-class HavePrintedMatcher
-  attr_accessor :expected, :actual
-
-  def initialize(expected)
-    case expected
-    when String, Regexp
-      @expected = expected
-    else
-      @expected = expected.to_s
-    end
-  end
-
-  def matches?(block)
-    begin
-      $stderr = $stdout = StringIO.new
-      $stdout.set_encoding('UTF-8') if $stdout.respond_to?(:set_encoding)
-      block.call
-      $stdout.rewind
-      @actual = $stdout.read
-    ensure
-      $stdout = STDOUT
-      $stderr = STDERR
-    end
-
-    if @actual then
-      case @expected
-      when String
-        @actual.include? @expected
-      when Regexp
-        @expected.match @actual
-      end
-    else
-      false
-    end
-  end
-
-  def failure_message_for_should
-    if @actual.nil? then
-      "expected #{@expected.inspect}, but nothing was printed"
-    else
-      "expected #{@expected.inspect} to be printed; got:\n#{@actual}"
-    end
-  end
-
-  def failure_message_for_should_not
-    "expected #{@expected.inspect} to not be printed; got:\n#{@actual}"
-  end
-
-  def description
-    "expect #{@expected.inspect} to be printed"
-  end
-end
-
-def have_printed(what)
-  HavePrintedMatcher.new(what)
-end
-
-RSpec::Matchers.define :equal_attributes_of do |expected|
-  match do |actual|
-    actual.instance_variables.all? do |attr|
-      actual.instance_variable_get(attr) == expected.instance_variable_get(attr)
-    end
-  end
-end
-
-RSpec::Matchers.define :be_one_of do |*expected|
-  match do |actual|
-    expected.include? actual
-  end
-
-  failure_message_for_should do |actual|
-    "expected #{actual.inspect} to be one of #{expected.map(&:inspect).join(' or ')}"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb
deleted file mode 100755
index 910c6d94e43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Modules
-  class << self
-    def create(name, dir, options = {})
-      module_dir = File.join(dir, name)
-      FileUtils.mkdir_p(module_dir)
-
-      environment = options[:environment]
-
-      if metadata = options[:metadata]
-        metadata[:source]  ||= 'github'
-        metadata[:author]  ||= 'puppetlabs'
-        metadata[:version] ||= '9.9.9'
-        metadata[:license] ||= 'to kill'
-        metadata[:dependencies] ||= []
-
-        metadata[:name] = "#{metadata[:author]}/#{name}"
-
-        File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
-        end
-      end
-
-      Puppet::Module.new(name, module_dir, environment)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb
deleted file mode 100755
index e056a52b77d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Pops
-  extend RSpec::Matchers::DSL
-
-  # Checks if an Acceptor has a specific issue in its list of diagnostics
-  matcher :have_issue do |expected|
-    match do |actual|
-      actual.diagnostics.index { |i| i.issue == expected } != nil
-    end
-    failure_message_for_should do |actual|
-      "expected Acceptor[#{actual.diagnostics.collect { |i| i.issue.issue_code }.join(',')}] to contain issue #{expected.issue_code}"
-    end
-    failure_message_for_should_not do |actual|
-      "expected Acceptor[#{actual.diagnostics.collect { |i| i.issue.issue_code }.join(',')}] to not contain issue #{expected.issue_code}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb
deleted file mode 100755
index 3847ede1877..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-module PuppetSpec::Scope
-  # Initialize a new scope suitable for testing.
-  #
-  def create_test_scope_for_node(node_name)
-    node = Puppet::Node.new(node_name)
-    compiler = Puppet::Parser::Compiler.new(node)
-    scope = Puppet::Parser::Scope.new(compiler)
-    scope.source = Puppet::Resource::Type.new(:node, node_name)
-    scope.parent = compiler.topscope
-    scope
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb
deleted file mode 100755
index 8ddcb975fb4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Settings
-
-  # It would probably be preferable to refactor defaults.rb such that the real definitions of
-  #  these settings were available as a variable, which was then accessible for use during tests.
-  #  However, I'm not doing that yet because I don't want to introduce any additional moving parts
-  #  to this already very large changeset.
-  #  Would be nice to clean this up later.  --cprice 2012-03-20
-  TEST_APP_DEFAULT_DEFINITIONS = {
-    :name         => { :default => "test", :desc => "name" },
-    :logdir       => { :type => :directory, :default => "test", :desc => "logdir" },
-    :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },
-    :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
-    :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb
deleted file mode 100755
index b2683df0483..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# Support code for running stuff with warnings disabled.
-module Kernel
-  def with_verbose_disabled
-    verbose, $VERBOSE = $VERBOSE, nil
-    result = yield
-    $VERBOSE = verbose
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
deleted file mode 100755
index 505e240920b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'rspec'
-
-class Object
-  # This is necessary because the RAL has a 'should'
-  # method.
-  alias :must :should
-  alias :must_not :should_not
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
deleted file mode 100755
index 3ae59f978b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# Some monkey-patching to allow us to test private methods.
-class Class
-    def publicize_methods(*methods)
-        saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
-
-        self.class_eval { public(*saved_private_instance_methods) }
-        yield
-        self.class_eval { private(*saved_private_instance_methods) }
-    end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb
deleted file mode 100755
index 78925fdea3d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# So everyone else doesn't have to include this base constant.
-module PuppetSpec
-  FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
-end
-
-require 'puppet'
-require 'rspec-puppet'
-require 'simplecov'
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'puppet_spec/verbose'
-require 'puppet_spec/files'
-require 'puppet_spec/settings'
-require 'puppet_spec/fixtures'
-require 'puppet_spec/matchers'
-require 'puppet_spec/database'
-require 'monkey_patches/alias_should_to_must'
-require 'mocha/setup'
-
-
-SimpleCov.start do
-  add_filter "/spec/"
-end
-
-
-RSpec.configure do |config|
-  config.before :each do
-    # Ensure that we don't accidentally cache facts and environment between
-    # test cases.  This requires each example group to explicitly load the
-    # facts being exercised with something like
-    # Facter.collection.loader.load(:ipaddress)
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
deleted file mode 100755
index 8e56daa6830..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-    on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
-  else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'stdlib')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json
deleted file mode 100644
index 3cb5e70c964..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "result": {
-    "covered_percent": 100.0
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json
deleted file mode 100644
index bed049341c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "RSpec": {
-    "coverage": {
-    },
-    "timestamp": 1398200553
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css
deleted file mode 100644
index d86560434df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css
+++ /dev/null
@@ -1,799 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 0.9
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* reset.css */
-
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
-body {line-height:1.5;}
-table {border-collapse:separate;border-spacing:0;}
-caption, th, td {text-align:left;font-weight:normal;}
-table, td, th {vertical-align:middle;}
-blockquote:before, blockquote:after, q:before, q:after {content:"";}
-blockquote, q {quotes:"" "";}
-a img {border:none;}
-
-/* typography.css */
-html {font-size:100.01%;}
-body {font-size:82%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
-h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
-h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
-h2 {font-size:2em;margin-bottom:0.75em;}
-h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
-h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
-h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
-h6 {font-size:1em;font-weight:bold;}
-h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
-p {margin:0 0 1.5em;}
-p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
-p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
-a:focus, a:hover {color:#000;}
-a {color:#009;text-decoration:underline;}
-blockquote {margin:1.5em;color:#666;font-style:italic;}
-strong {font-weight:bold;}
-em, dfn {font-style:italic;}
-dfn {font-weight:bold;}
-sup, sub {line-height:0;}
-abbr, acronym {border-bottom:1px dotted #666;}
-address {margin:0 0 1.5em;font-style:italic;}
-del {color:#666;}
-pre {margin:1.5em 0;white-space:pre;}
-pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
-li ul, li ol {margin:0;}
-ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;}
-ul {list-style-type:disc;}
-ol {list-style-type:decimal;}
-dl {margin:0 0 1.5em 0;}
-dl dt {font-weight:bold;}
-dd {margin-left:1.5em;}
-table {margin-bottom:1.4em;width:100%;}
-th {font-weight:bold;}
-thead th {background:#c3d9ff;}
-th, td, caption {padding:4px 10px 4px 5px;}
-tr.even td {background:#efefef;}
-tfoot {font-style:italic;}
-caption {background:#eee;}
-.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
-.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
-.hide {display:none;}
-.quiet {color:#666;}
-.loud {color:#000;}
-.highlight {background:#ff0;}
-.added {background:#060;color:#fff;}
-.removed {background:#900;color:#fff;}
-.first {margin-left:0;padding-left:0;}
-.last {margin-right:0;padding-right:0;}
-.top {margin-top:0;padding-top:0;}
-.bottom {margin-bottom:0;padding-bottom:0;}
-
-/* forms.css */
-label {font-weight:bold;}
-fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
-legend {font-weight:bold;font-size:1.2em;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
-input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
-input.text, input.title {width:300px;padding:5px;}
-input.title {font-size:1.5em;}
-textarea {width:390px;height:250px;padding:5px;}
-input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline {line-height:3;}
-form.inline p {margin-bottom:0;}
-.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
-.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
-.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
-.error a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
-.clearfix, .container {display:block;}
-.clear {clear:both;}
-/*
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-*/
-
-
-pre code {
-}
-
-pre .comment,
-pre .template_comment,
-pre .diff .header,
-pre .javadoc {
-  color: #998;
-  font-style: italic
-}
-
-pre .keyword,
-pre .css .rule .keyword,
-pre .winutils,
-pre .javascript .title,
-pre .lisp .title {
-  color: #000;
-  font-weight: bold
-}
-
-pre .number,
-pre .hexcolor {
-  color: #458
-}
-
-
-pre .string,
-pre .tag .value,
-pre .phpdoc,
-pre .tex .formula {
-  color: #d14
-}
-
-pre .subst {
-  color: #712;
-}
-
-pre .constant,
-pre .title,
-pre .id {
-  color: #900;
-  font-weight: bold
-}
-
-pre .javascript .title,
-pre .lisp .title,
-pre .subst {
-  font-weight: normal
-}
-
-pre .class .title,
-pre .haskell .label,
-pre .tex .command {
-  color: #458;
-  font-weight: bold
-}
-
-pre .tag,
-pre .tag .title,
-pre .rules .property,
-pre .django .tag .keyword {
-  color: #000080;
-  font-weight: normal
-}
-
-pre .attribute,
-pre .variable,
-pre .instancevar,
-pre .lisp .body {
-  color: #008080
-}
-
-pre .regexp {
-  color: #009926
-}
-
-pre .class {
-  color: #458;
-  font-weight: bold
-}
-
-pre .symbol,
-pre .ruby .symbol .string,
-pre .ruby .symbol .keyword,
-pre .ruby .symbol .keymethods,
-pre .lisp .keyword,
-pre .tex .special,
-pre .input_number {
-  color: #990073
-}
-
-pre .builtin,
-pre .built_in,
-pre .lisp .title {
-  color: #0086b3
-}
-
-pre .preprocessor,
-pre .pi,
-pre .doctype,
-pre .shebang,
-pre .cdata {
-  color: #999;
-  font-weight: bold
-}
-
-pre .deletion {
-  background: #fdd
-}
-
-pre .addition {
-  background: #dfd
-}
-
-pre .diff .change {
-  background: #0086b3
-}
-
-pre .chunk {
-  color: #aaa
-}
-
-pre .tex .formula {
-  opacity: 0.5;
-}
-/*
- * jQuery UI CSS Framework @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
-/*
-    ColorBox Core Style:
-    The following CSS is consistent between example themes and should not be altered.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative;}
-#cboxLoadedContent{overflow:auto;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
-.cboxIframe{width:100%; height:100%; display:block; border:0;}
-#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
-
-/*
-    User Style:
-    Change the following styles to modify the appearance of ColorBox.  They are
-    ordered & tabbed in a way that represents the nesting of the generated HTML.
-*/
-#cboxOverlay{background:#000;}
-#colorbox{}
-    #cboxTopLeft{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat 0 0;}
-    #cboxTopCenter{height:14px; background:url(colorbox/border.png) repeat-x top left;}
-    #cboxTopRight{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat -36px 0;}
-    #cboxBottomLeft{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat 0 -32px;}
-    #cboxBottomCenter{height:43px; background:url(colorbox/border.png) repeat-x bottom left;}
-    #cboxBottomRight{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat -36px -32px;}
-    #cboxMiddleLeft{width:14px; background:url(colorbox/controls.png) repeat-y -175px 0;}
-    #cboxMiddleRight{width:14px; background:url(colorbox/controls.png) repeat-y -211px 0;}
-    #cboxContent{background:#fff; overflow:visible;}
-        .cboxIframe{background:#fff;}
-        #cboxError{padding:50px; border:1px solid #ccc;}
-        #cboxLoadedContent{margin-bottom:5px;}
-        #cboxLoadingOverlay{background:url(colorbox/loading_background.png) no-repeat center center;}
-        #cboxLoadingGraphic{background:url(colorbox/loading.gif) no-repeat center center;}
-        #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;}
-        #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;}
-
-        #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(colorbox/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;}
-        #cboxPrevious{left:0px; background-position: -51px -25px;}
-        #cboxPrevious:hover{background-position:-51px 0px;}
-        #cboxNext{left:27px; background-position:-75px -25px;}
-        #cboxNext:hover{background-position:-75px 0px;}
-        #cboxClose{right:0; background-position:-100px -25px;}
-        #cboxClose:hover{background-position:-100px 0px;}
-
-        .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;}
-        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;}
-        .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;}
-        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;}
-#loading {
-  position: fixed;
-  left: 40%;
-  top: 50%; }
-
-a {
-  color: #333333;
-  text-decoration: none; }
-  a:hover {
-    color: black;
-    text-decoration: underline; }
-
-body {
-  font-family: "Lucida Grande", Helvetica, "Helvetica Neue", Arial, sans-serif;
-  padding: 12px;
-  background-color: #333333; }
-
-h1, h2, h3, h4 {
-  color: #1c2324;
-  margin: 0;
-  padding: 0;
-  margin-bottom: 12px; }
-
-table {
-  width: 100%; }
-
-#content {
-  clear: left;
-  background-color: white;
-  border: 2px solid #dddddd;
-  border-top: 8px solid #dddddd;
-  padding: 18px;
-  -webkit-border-bottom-left-radius: 5px;
-  -webkit-border-bottom-right-radius: 5px;
-  -webkit-border-top-right-radius: 5px;
-  -moz-border-radius-bottomleft: 5px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topright: 5px;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  border-top-right-radius: 5px; }
-
-.dataTables_filter, .dataTables_info {
-  padding: 2px 6px; }
-
-abbr.timeago {
-  text-decoration: none;
-  border: none;
-  font-weight: bold; }
-
-.timestamp {
-  float: right;
-  color: #dddddd; }
-
-.group_tabs {
-  list-style: none;
-  float: left;
-  margin: 0;
-  padding: 0; }
-  .group_tabs li {
-    display: inline;
-    float: left; }
-    .group_tabs li a {
-      font-family: Helvetica, Arial, sans-serif;
-      display: block;
-      float: left;
-      text-decoration: none;
-      padding: 4px 8px;
-      background-color: #aaaaaa;
-      background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dddddd), to(#aaaaaa));
-      background: -moz-linear-gradient(#dddddd, #aaaaaa);
-      background: linear-gradient(#dddddd, #aaaaaa);
-      text-shadow: #e5e5e5 1px 1px 0px;
-      border-bottom: none;
-      color: #333333;
-      font-weight: bold;
-      margin-right: 8px;
-      border-top: 1px solid #efefef;
-      -webkit-border-top-left-radius: 2px;
-      -webkit-border-top-right-radius: 2px;
-      -moz-border-radius-topleft: 2px;
-      -moz-border-radius-topright: 2px;
-      border-top-left-radius: 2px;
-      border-top-right-radius: 2px; }
-      .group_tabs li a:hover {
-        background-color: #cccccc;
-        background: -webkit-gradient(linear, 0 0, 0 bottom, from(#eeeeee), to(#aaaaaa));
-        background: -moz-linear-gradient(#eeeeee, #aaaaaa);
-        background: linear-gradient(#eeeeee, #aaaaaa); }
-      .group_tabs li a:active {
-        padding-top: 5px;
-        padding-bottom: 3px; }
-    .group_tabs li.active a {
-      color: black;
-      text-shadow: white 1px 1px 0px;
-      background-color: #dddddd;
-      background: -webkit-gradient(linear, 0 0, 0 bottom, from(white), to(#dddddd));
-      background: -moz-linear-gradient(white, #dddddd);
-      background: linear-gradient(white, #dddddd); }
-
-.file_list {
-  margin-bottom: 18px; }
-
-a.src_link {
-  background: url("./magnify.png") no-repeat left 50%;
-  padding-left: 18px; }
-
-tr, td {
-  margin: 0;
-  padding: 0; }
-
-th {
-  white-space: nowrap; }
-  th.ui-state-default {
-    cursor: pointer; }
-  th span.ui-icon {
-    float: left; }
-
-td {
-  padding: 4px 8px; }
-  td.strong {
-    font-weight: bold; }
-
-.source_table h3, .source_table h4 {
-  padding: 0;
-  margin: 0;
-  margin-bottom: 4px; }
-.source_table .header {
-  padding: 10px; }
-.source_table pre {
-  margin: 0;
-  padding: 0;
-  white-space: normal;
-  color: black;
-  font-family: "Monaco", "Inconsolata", "Consolas", monospace; }
-.source_table code {
-  color: black;
-  font-family: "Monaco", "Inconsolata", "Consolas", monospace; }
-.source_table pre {
-  background-color: #333333; }
-  .source_table pre ol {
-    margin: 0px;
-    padding: 0px;
-    margin-left: 45px;
-    font-size: 12px;
-    color: white; }
-  .source_table pre li {
-    margin: 0px;
-    padding: 2px 6px;
-    border-left: 5px solid white; }
-    .source_table pre li code {
-      white-space: pre;
-      white-space: pre-wrap; }
-  .source_table pre .hits {
-    float: right;
-    margin-left: 10px;
-    padding: 2px 4px;
-    background-color: #444444;
-    background: -webkit-gradient(linear, 0 0, 0 bottom, from(#222222), to(#666666));
-    background: -moz-linear-gradient(#222222, #666666);
-    background: linear-gradient(#222222, #666666);
-    color: white;
-    font-family: Helvetica, "Helvetica Neue", Arial, sans-serif;
-    font-size: 10px;
-    font-weight: bold;
-    text-align: center;
-    border-radius: 6px; }
-
-#footer {
-  color: #dddddd;
-  font-size: 12px;
-  font-weight: bold;
-  margin-top: 12px;
-  text-align: right; }
-  #footer a {
-    color: #eeeeee;
-    text-decoration: underline; }
-    #footer a:hover {
-      color: white;
-      text-decoration: none; }
-
-.green {
-  color: #009900; }
-
-.red {
-  color: #990000; }
-
-.yellow {
-  color: #ddaa00; }
-
-.source_table .covered {
-  border-color: #009900; }
-.source_table .missed {
-  border-color: #990000; }
-.source_table .never {
-  border-color: black; }
-.source_table .skipped {
-  border-color: #ffcc00; }
-.source_table .covered:nth-child(odd) {
-  background-color: #cdf2cd; }
-.source_table .covered:nth-child(even) {
-  background-color: #dbf2db; }
-.source_table .missed:nth-child(odd) {
-  background-color: #f7c0c0; }
-.source_table .missed:nth-child(even) {
-  background-color: #f7cfcf; }
-.source_table .never:nth-child(odd) {
-  background-color: #efefef; }
-.source_table .never:nth-child(even) {
-  background-color: #f4f4f4; }
-.source_table .skipped:nth-child(odd) {
-  background-color: #fbf0c0; }
-.source_table .skipped:nth-child(even) {
-  background-color: #fbffcf; }
-
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js
deleted file mode 100644
index 5e06df5f31d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js
+++ /dev/null
@@ -1,1559 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Jun 30 14:16:56 2011 -0400
- */
-
-(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
-shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
-)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;")}function c(q,p,o){return RegExp(p,"m"+(q.cI?"i":"")+(o?"g":""))}function i(q){for(var o=0;o<q.childNodes.length;o++){var p=q.childNodes[o];if(p.nodeName=="CODE"){return p}if(!(p.nodeType==3&&p.nodeValue.match(/\s+/))){break}}}function g(s,r){var q="";for(var p=0;p<s.childNodes.length;p++){if(s.childNodes[p].nodeType==3){var o=s.childNodes[p].nodeValue;if(r){o=o.replace(/\n/g,"")}q+=o}else{if(s.childNodes[p].nodeName=="BR"){q+="\n"}else{q+=g(s.childNodes[p])}}}if(/MSIE [678]/.test(navigator.userAgent)){q=q.replace(/\r/g,"\n")}return q}function a(r){var p=r.className.split(/\s+/);p=p.concat(r.parentNode.className.split(/\s+/));for(var o=0;o<p.length;o++){var q=p[o].replace(/^language-/,"");if(d[q]||q=="no-highlight"){return q}}}function b(o){var p=[];(function(r,s){for(var q=0;q<r.childNodes.length;q++){if(r.childNodes[q].nodeType==3){s+=r.childNodes[q].nodeValue.length}else{if(r.childNodes[q].nodeName=="BR"){s+=1}else{p.push({event:"start",offset:s,node:r.childNodes[q]});s=arguments.callee(r.childNodes[q],s);p.push({event:"stop",offset:s,node:r.childNodes[q]})}}}return s})(o,0);return p}function k(x,y,w){var q=0;var v="";var s=[];function t(){if(x.length&&y.length){if(x[0].offset!=y[0].offset){return(x[0].offset<y[0].offset)?x:y}else{return y[0].event=="start"?x:y}}else{return x.length?x:y}}function r(B){var C="<"+B.nodeName.toLowerCase();for(var z=0;z<B.attributes.length;z++){var A=B.attributes[z];C+=" "+A.nodeName.toLowerCase();if(A.nodeValue!=undefined){C+='="'+l(A.nodeValue)+'"'}}return C+">"}while(x.length||y.length){var u=t().splice(0,1)[0];v+=l(w.substr(q,u.offset-q));q=u.offset;if(u.event=="start"){v+=r(u.node);s.push(u.node)}else{if(u.event=="stop"){var p=s.length;do{p--;var o=s[p];v+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);s.splice(p,1);while(p<s.length){v+=r(s[p]);p++}}}}v+=w.substr(q);return v}function f(I,C){function y(r,L){for(var K=0;K<L.c.length;K++){if(L.c[K].bR.test(r)){return L.c[K]}}}function v(K,r){if(B[K].e&&B[K].eR.test(r)){return 1}if(B[K].eW){var L=v(K-1,r);return L?L+1:0}return 0}function w(r,K){return K.iR&&K.iR.test(r)}function z(N,M){var L=[];for(var K=0;K<N.c.length;K++){L.push(N.c[K].b)}var r=B.length-1;do{if(B[r].e){L.push(B[r].e)}r--}while(B[r+1].eW);if(N.i){L.push(N.i)}return c(M,"("+L.join("|")+")",true)}function q(L,K){var M=B[B.length-1];if(!M.t){M.t=z(M,G)}M.t.lastIndex=K;var r=M.t.exec(L);if(r){return[L.substr(K,r.index-K),r[0],false]}else{return[L.substr(K),"",true]}}function o(N,r){var K=G.cI?r[0].toLowerCase():r[0];for(var M in N.kG){if(!N.kG.hasOwnProperty(M)){continue}var L=N.kG[M].hasOwnProperty(K);if(L){return[M,L]}}return false}function E(L,N){if(!N.k){return l(L)}var M="";var O=0;N.lR.lastIndex=0;var K=N.lR.exec(L);while(K){M+=l(L.substr(O,K.index-O));var r=o(N,K);if(r){s+=r[1];M+='<span class="'+r[0]+'">'+l(K[0])+"</span>"}else{M+=l(K[0])}O=N.lR.lastIndex;K=N.lR.exec(L)}M+=l(L.substr(O,L.length-O));return M}function J(r,L){if(L.sL&&d[L.sL]){var K=f(L.sL,r);s+=K.keyword_count;return K.value}else{return E(r,L)}}function H(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){p+=K;L.buffer=""}else{if(L.eB){p+=l(r)+K;L.buffer=""}else{p+=K;L.buffer=r}}B.push(L);A+=L.r}function D(N,K,P){var Q=B[B.length-1];if(P){p+=J(Q.buffer+N,Q);return false}var L=y(K,Q);if(L){p+=J(Q.buffer+N,Q);H(L,K);return L.rB}var r=v(B.length-1,K);if(r){var M=Q.cN?"</span>":"";if(Q.rE){p+=J(Q.buffer+N,Q)+M}else{if(Q.eE){p+=J(Q.buffer+N,Q)+M+l(K)}else{p+=J(Q.buffer+N+K,Q)+M}}while(r>1){M=B[B.length-2].cN?"</span>":"";p+=M;r--;B.length--}var O=B[B.length-1];B.length--;B[B.length-1].buffer="";if(O.starts){H(O.starts,"")}return Q.rE}if(w(K,Q)){throw"Illegal"}}var G=d[I];var B=[G.dM];var A=0;var s=0;var p="";try{var u=0;G.dM.buffer="";do{var x=q(C,u);var t=D(x[0],x[1],x[2]);u+=x[0].length;if(!t){u+=x[1].length}}while(!x[2]);if(B.length>1){throw"Illegal"}return{language:I,r:A,keyword_count:s,value:p}}catch(F){if(F=="Illegal"){return{language:null,r:0,keyword_count:0,value:l(C)}}else{throw F}}}function h(){function o(t,s,u){if(t.compiled){return}if(!u){t.bR=c(s,t.b?t.b:"\\B|\\b");if(!t.e&&!t.eW){t.e="\\B|\\b"}if(t.e){t.eR=c(s,t.e)}}if(t.i){t.iR=c(s,t.i)}if(t.r==undefined){t.r=1}if(t.k){t.lR=c(s,t.l||hljs.IR,true)}for(var r in t.k){if(!t.k.hasOwnProperty(r)){continue}if(t.k[r] instanceof Object){t.kG=t.k}else{t.kG={keyword:t.k}}break}if(!t.c){t.c=[]}t.compiled=true;for(var q=0;q<t.c.length;q++){o(t.c[q],s,false)}if(t.starts){o(t.starts,s,false)}}for(var p in d){if(!d.hasOwnProperty(p)){continue}o(d[p].dM,d[p],true)}}function e(){if(e.called){return}e.called=true;h()}function n(t,y,p){e();var A=g(t,p);var r=a(t);if(r=="no-highlight"){return}if(r){var w=f(r,A)}else{var w={language:"",keyword_count:0,r:0,value:l(A)};var x=w;for(var z in d){if(!d.hasOwnProperty(z)){continue}var u=f(z,A);if(u.keyword_count+u.r>x.keyword_count+x.r){x=u}if(u.keyword_count+u.r>w.keyword_count+w.r){x=w;w=u}}}var s=t.className;if(!s.match(w.language)){s=s?(s+" "+w.language):w.language}var o=b(t);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=k(o,b(q),A)}if(y){w.value=w.value.replace(/^((<[^>]+>|\t)+)/gm,function(B,E,D,C){return E.replace(/\t/g,y)})}if(p){w.value=w.value.replace(/\n/g,"<br>")}if(/MSIE [678]/.test(navigator.userAgent)&&t.tagName=="CODE"&&t.parentNode.tagName=="PRE"){var q=t.parentNode;var v=document.createElement("div");v.innerHTML="<pre><code>"+w.value+"</code></pre>";t=v.firstChild.firstChild;v.firstChild.cN=q.cN;q.parentNode.replaceChild(v.firstChild,q)}else{t.innerHTML=w.value}t.className=s;t.dataset={};t.dataset.result={language:w.language,kw:w.keyword_count,re:w.r};if(x&&x.language){t.dataset.second_best={language:x.language,kw:x.keyword_count,re:x.r}}}function j(){if(j.called){return}j.called=true;e();var q=document.getElementsByTagName("pre");for(var o=0;o<q.length;o++){var p=i(q[o]);if(p){n(p,hljs.tabReplace)}}}function m(){var o=arguments;var p=function(){j.apply(null,o)};if(window.addEventListener){window.addEventListener("DOMContentLoaded",p,false);window.addEventListener("load",p,false)}else{if(window.attachEvent){window.attachEvent("onload",p)}else{window.onload=p}}}var d={};this.LANGUAGES=d;this.initHighlightingOnLoad=m;this.highlightBlock=n;this.initHighlighting=j;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="\\b(0x[A-Za-z0-9]+|\\d+(\\.\\d+)?)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\.",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.inherit=function(o,r){var q={};for(var p in o){q[p]=o[p]}if(r){for(var p in r){q[p]=r[p]}}return q}}();hljs.LANGUAGES.ruby=function(){var g="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var a="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var n={keyword:{and:1,"false":1,then:1,defined:1,module:1,"in":1,"return":1,redo:1,"if":1,BEGIN:1,retry:1,end:1,"for":1,"true":1,self:1,when:1,next:1,until:1,"do":1,begin:1,unless:1,END:1,rescue:1,nil:1,"else":1,"break":1,undef:1,not:1,"super":1,"class":1,"case":1,require:1,yield:1,alias:1,"while":1,ensure:1,elsif:1,or:1,def:1},keymethods:{__id__:1,__send__:1,abort:1,abs:1,"all?":1,allocate:1,ancestors:1,"any?":1,arity:1,assoc:1,at:1,at_exit:1,autoload:1,"autoload?":1,"between?":1,binding:1,binmode:1,"block_given?":1,call:1,callcc:1,caller:1,capitalize:1,"capitalize!":1,casecmp:1,"catch":1,ceil:1,center:1,chomp:1,"chomp!":1,chop:1,"chop!":1,chr:1,"class":1,class_eval:1,"class_variable_defined?":1,class_variables:1,clear:1,clone:1,close:1,close_read:1,close_write:1,"closed?":1,coerce:1,collect:1,"collect!":1,compact:1,"compact!":1,concat:1,"const_defined?":1,const_get:1,const_missing:1,const_set:1,constants:1,count:1,crypt:1,"default":1,default_proc:1,"delete":1,"delete!":1,delete_at:1,delete_if:1,detect:1,display:1,div:1,divmod:1,downcase:1,"downcase!":1,downto:1,dump:1,dup:1,each:1,each_byte:1,each_index:1,each_key:1,each_line:1,each_pair:1,each_value:1,each_with_index:1,"empty?":1,entries:1,eof:1,"eof?":1,"eql?":1,"equal?":1,"eval":1,exec:1,exit:1,"exit!":1,extend:1,fail:1,fcntl:1,fetch:1,fileno:1,fill:1,find:1,find_all:1,first:1,flatten:1,"flatten!":1,floor:1,flush:1,for_fd:1,foreach:1,fork:1,format:1,freeze:1,"frozen?":1,fsync:1,getc:1,gets:1,global_variables:1,grep:1,gsub:1,"gsub!":1,"has_key?":1,"has_value?":1,hash:1,hex:1,id:1,include:1,"include?":1,included_modules:1,index:1,indexes:1,indices:1,induced_from:1,inject:1,insert:1,inspect:1,instance_eval:1,instance_method:1,instance_methods:1,"instance_of?":1,"instance_variable_defined?":1,instance_variable_get:1,instance_variable_set:1,instance_variables:1,"integer?":1,intern:1,invert:1,ioctl:1,"is_a?":1,isatty:1,"iterator?":1,join:1,"key?":1,keys:1,"kind_of?":1,lambda:1,last:1,length:1,lineno:1,ljust:1,load:1,local_variables:1,loop:1,lstrip:1,"lstrip!":1,map:1,"map!":1,match:1,max:1,"member?":1,merge:1,"merge!":1,method:1,"method_defined?":1,method_missing:1,methods:1,min:1,module_eval:1,modulo:1,name:1,nesting:1,"new":1,next:1,"next!":1,"nil?":1,nitems:1,"nonzero?":1,object_id:1,oct:1,open:1,pack:1,partition:1,pid:1,pipe:1,pop:1,popen:1,pos:1,prec:1,prec_f:1,prec_i:1,print:1,printf:1,private_class_method:1,private_instance_methods:1,"private_method_defined?":1,private_methods:1,proc:1,protected_instance_methods:1,"protected_method_defined?":1,protected_methods:1,public_class_method:1,public_instance_methods:1,"public_method_defined?":1,public_methods:1,push:1,putc:1,puts:1,quo:1,raise:1,rand:1,rassoc:1,read:1,read_nonblock:1,readchar:1,readline:1,readlines:1,readpartial:1,rehash:1,reject:1,"reject!":1,remainder:1,reopen:1,replace:1,require:1,"respond_to?":1,reverse:1,"reverse!":1,reverse_each:1,rewind:1,rindex:1,rjust:1,round:1,rstrip:1,"rstrip!":1,scan:1,seek:1,select:1,send:1,set_trace_func:1,shift:1,singleton_method_added:1,singleton_methods:1,size:1,sleep:1,slice:1,"slice!":1,sort:1,"sort!":1,sort_by:1,split:1,sprintf:1,squeeze:1,"squeeze!":1,srand:1,stat:1,step:1,store:1,strip:1,"strip!":1,sub:1,"sub!":1,succ:1,"succ!":1,sum:1,superclass:1,swapcase:1,"swapcase!":1,sync:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,taint:1,"tainted?":1,tell:1,test:1,"throw":1,times:1,to_a:1,to_ary:1,to_f:1,to_hash:1,to_i:1,to_int:1,to_io:1,to_proc:1,to_s:1,to_str:1,to_sym:1,tr:1,"tr!":1,tr_s:1,"tr_s!":1,trace_var:1,transpose:1,trap:1,truncate:1,"tty?":1,type:1,ungetc:1,uniq:1,"uniq!":1,unpack:1,unshift:1,untaint:1,untrace_var:1,upcase:1,"upcase!":1,update:1,upto:1,"value?":1,values:1,values_at:1,warn:1,write:1,write_nonblock:1,"zero?":1,zip:1}};var h={cN:"yardoctag",b:"@[A-Za-z]+"};var d={cN:"comment",b:"#",e:"$",c:[h]};var c={cN:"comment",b:"^\\=begin",e:"^\\=end",c:[h],r:10};var b={cN:"comment",b:"^__END__",e:"\\n$"};var u={cN:"subst",b:"#\\{",e:"}",l:g,k:n};var p=[hljs.BE,u];var s={cN:"string",b:"'",e:"'",c:p,r:0};var r={cN:"string",b:'"',e:'"',c:p,r:0};var q={cN:"string",b:"%[qw]?\\(",e:"\\)",c:p,r:10};var o={cN:"string",b:"%[qw]?\\[",e:"\\]",c:p,r:10};var m={cN:"string",b:"%[qw]?{",e:"}",c:p,r:10};var l={cN:"string",b:"%[qw]?<",e:">",c:p,r:10};var k={cN:"string",b:"%[qw]?/",e:"/",c:p,r:10};var j={cN:"string",b:"%[qw]?%",e:"%",c:p,r:10};var i={cN:"string",b:"%[qw]?-",e:"-",c:p,r:10};var t={cN:"string",b:"%[qw]?\\|",e:"\\|",c:p,r:10};var e={cN:"function",b:"\\bdef\\s+",e:" |$|;",l:g,k:n,c:[{cN:"title",b:a,l:g,k:n},{cN:"params",b:"\\(",e:"\\)",l:g,k:n},d,c,b]};var f={cN:"identifier",b:g,l:g,k:n,r:0};var v=[d,c,b,s,r,q,o,m,l,k,j,i,t,{cN:"class",b:"\\b(class|module)\\b",e:"$|;",k:{"class":1,module:1},c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+hljs.IR+"::)?"+hljs.IR}]},d,c,b]},e,{cN:"constant",b:"(::)?([A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[s,r,q,o,m,l,k,j,i,t,f],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},f,{b:"("+hljs.RSR+")\\s*",c:[d,c,b,{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[hljs.BE]}],r:0}];u.c=v;e.c[1].c=v;return{dM:{l:g,k:n,c:v}}}();
-// ColorBox v1.3.20.1 - jQuery lightbox plugin
-// (c) 2011 Jack Moore - jacklmoore.com
-// License: http://www.opensource.org/licenses/mit-license.php
-(function ($, document, window) {
-	var
-	// Default settings object.
-	// See http://jacklmoore.com/colorbox for details.
-	defaults = {
-		transition: "elastic",
-		speed: 300,
-		width: false,
-		initialWidth: "600",
-		innerWidth: false,
-		maxWidth: false,
-		height: false,
-		initialHeight: "450",
-		innerHeight: false,
-		maxHeight: false,
-		scalePhotos: true,
-		scrolling: true,
-		inline: false,
-		html: false,
-		iframe: false,
-		fastIframe: true,
-		photo: false,
-		href: false,
-		title: false,
-		rel: false,
-		opacity: 0.9,
-		preloading: true,
-
-		current: "image {current} of {total}",
-		previous: "previous",
-		next: "next",
-		close: "close",
-		xhrError: "This content failed to load.",
-		imgError: "This image failed to load.",
-
-		open: false,
-		returnFocus: true,
-		reposition: true,
-		loop: true,
-		slideshow: false,
-		slideshowAuto: true,
-		slideshowSpeed: 2500,
-		slideshowStart: "start slideshow",
-		slideshowStop: "stop slideshow",
-		onOpen: false,
-		onLoad: false,
-		onComplete: false,
-		onCleanup: false,
-		onClosed: false,
-		overlayClose: true,
-		escKey: true,
-		arrowKey: true,
-		top: false,
-		bottom: false,
-		left: false,
-		right: false,
-		fixed: false,
-		data: undefined
-	},
-	
-	// Abstracting the HTML and event identifiers for easy rebranding
-	colorbox = 'colorbox',
-	prefix = 'cbox',
-	boxElement = prefix + 'Element',
-	
-	// Events
-	event_open = prefix + '_open',
-	event_load = prefix + '_load',
-	event_complete = prefix + '_complete',
-	event_cleanup = prefix + '_cleanup',
-	event_closed = prefix + '_closed',
-	event_purge = prefix + '_purge',
-	
-	// Special Handling for IE
-	isIE = !$.support.opacity && !$.support.style, // IE7 & IE8
-	isIE6 = isIE && !window.XMLHttpRequest, // IE6
-	event_ie6 = prefix + '_IE6',
-
-	// Cached jQuery Object Variables
-	$overlay,
-	$box,
-	$wrap,
-	$content,
-	$topBorder,
-	$leftBorder,
-	$rightBorder,
-	$bottomBorder,
-	$related,
-	$window,
-	$loaded,
-	$loadingBay,
-	$loadingOverlay,
-	$title,
-	$current,
-	$slideshow,
-	$next,
-	$prev,
-	$close,
-	$groupControls,
-	
-	// Variables for cached values or use across multiple functions
-	settings,
-	interfaceHeight,
-	interfaceWidth,
-	loadedHeight,
-	loadedWidth,
-	element,
-	index,
-	photo,
-	open,
-	active,
-	closing,
-	loadingTimer,
-	publicMethod,
-	div = "div",
-	init;
-
-	// ****************
-	// HELPER FUNCTIONS
-	// ****************
-	
-	// Convience function for creating new jQuery objects
-	function $tag(tag, id, css) {
-		var element = document.createElement(tag);
-
-		if (id) {
-			element.id = prefix + id;
-		}
-
-		if (css) {
-			element.style.cssText = css;
-		}
-
-		return $(element);
-	}
-
-	// Determine the next and previous members in a group.
-	function getIndex(increment) {
-		var
-		max = $related.length,
-		newIndex = (index + increment) % max;
-		
-		return (newIndex < 0) ? max + newIndex : newIndex;
-	}
-
-	// Convert '%' and 'px' values to integers
-	function setSize(size, dimension) {
-		return Math.round((/%/.test(size) ? ((dimension === 'x' ? winWidth() : winHeight()) / 100) : 1) * parseInt(size, 10));
-	}
-	
-	// Checks an href to see if it is a photo.
-	// There is a force photo option (photo: true) for hrefs that cannot be matched by this regex.
-	function isImage(url) {
-		return settings.photo || /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(url);
-	}
-	
-	function winWidth() {
-		// $(window).width() is incorrect for some mobile browsers, but
-		// window.innerWidth is unsupported in IE8 and lower.
-		return window.innerWidth || $window.width();
-	}
-
-	function winHeight() {
-		return window.innerHeight || $window.height();
-	}
-
-	// Assigns function results to their respective properties
-	function makeSettings() {
-		var i,
-			data = $.data(element, colorbox);
-		
-		if (data == null) {
-			settings = $.extend({}, defaults);
-			if (console && console.log) {
-				console.log('Error: cboxElement missing settings object');
-			}
-		} else {
-			settings = $.extend({}, data);
-		}
-		
-		for (i in settings) {
-			if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
-				settings[i] = settings[i].call(element);
-			}
-		}
-		
-		settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow';
-		settings.href = settings.href || $(element).attr('href');
-		settings.title = settings.title || element.title;
-		
-		if (typeof settings.href === "string") {
-			settings.href = $.trim(settings.href);
-		}
-	}
-
-	function trigger(event, callback) {
-		$.event.trigger(event);
-		if (callback) {
-			callback.call(element);
-		}
-	}
-
-	// Slideshow functionality
-	function slideshow() {
-		var
-		timeOut,
-		className = prefix + "Slideshow_",
-		click = "click." + prefix,
-		start,
-		stop,
-		clear;
-		
-		if (settings.slideshow && $related[1]) {
-			start = function () {
-				$slideshow
-					.html(settings.slideshowStop)
-					.unbind(click)
-					.bind(event_complete, function () {
-						if (settings.loop || $related[index + 1]) {
-							timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-						}
-					})
-					.bind(event_load, function () {
-						clearTimeout(timeOut);
-					})
-					.one(click + ' ' + event_cleanup, stop);
-				$box.removeClass(className + "off").addClass(className + "on");
-				timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-			};
-			
-			stop = function () {
-				clearTimeout(timeOut);
-				$slideshow
-					.html(settings.slideshowStart)
-					.unbind([event_complete, event_load, event_cleanup, click].join(' '))
-					.one(click, function () {
-						publicMethod.next();
-						start();
-					});
-				$box.removeClass(className + "on").addClass(className + "off");
-			};
-			
-			if (settings.slideshowAuto) {
-				start();
-			} else {
-				stop();
-			}
-		} else {
-			$box.removeClass(className + "off " + className + "on");
-		}
-	}
-
-	function launch(target) {
-		if (!closing) {
-			
-			element = target;
-			
-			makeSettings();
-			
-			$related = $(element);
-			
-			index = 0;
-			
-			if (settings.rel !== 'nofollow') {
-				$related = $('.' + boxElement).filter(function () {
-					var data = $.data(this, colorbox),
-						relRelated;
-
-					if (data) {
-						relRelated =  $(this).data('rel') || data.rel || this.rel;
-					}
-					
-					return (relRelated === settings.rel);
-				});
-				index = $related.index(element);
-				
-				// Check direct calls to ColorBox.
-				if (index === -1) {
-					$related = $related.add(element);
-					index = $related.length - 1;
-				}
-			}
-			
-			if (!open) {
-				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
-				
-				$box.show();
-				
-				if (settings.returnFocus) {
-					$(element).blur().one(event_closed, function () {
-						$(this).focus();
-					});
-				}
-				
-				// +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5'
-				$overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show();
-				
-				// Opens inital empty ColorBox prior to content being loaded.
-				settings.w = setSize(settings.initialWidth, 'x');
-				settings.h = setSize(settings.initialHeight, 'y');
-				publicMethod.position();
-				
-				if (isIE6) {
-					$window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () {
-						$overlay.css({width: winWidth(), height: winHeight(), top: $window.scrollTop(), left: $window.scrollLeft()});
-					}).trigger('resize.' + event_ie6);
-				}
-				
-				trigger(event_open, settings.onOpen);
-				
-				$groupControls.add($title).hide();
-				
-				$close.html(settings.close).show();
-			}
-			
-			publicMethod.load(true);
-		}
-	}
-
-	// ColorBox's markup needs to be added to the DOM prior to being called
-	// so that the browser will go ahead and load the CSS background images.
-	function appendHTML() {
-		if (!$box && document.body) {
-			init = false;
-
-			$window = $(window);
-			$box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide();
-			$overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide();
-			$loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic"));
-			$wrap = $tag(div, "Wrapper");
-			$content = $tag(div, "Content").append(
-				$loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'),
-				$title = $tag(div, "Title"),
-				$current = $tag(div, "Current"),
-				$next = $tag(div, "Next"),
-				$prev = $tag(div, "Previous"),
-				$slideshow = $tag(div, "Slideshow").bind(event_open, slideshow),
-				$close = $tag(div, "Close")
-			);
-			
-			$wrap.append( // The 3x3 Grid that makes up ColorBox
-				$tag(div).append(
-					$tag(div, "TopLeft"),
-					$topBorder = $tag(div, "TopCenter"),
-					$tag(div, "TopRight")
-				),
-				$tag(div, false, 'clear:left').append(
-					$leftBorder = $tag(div, "MiddleLeft"),
-					$content,
-					$rightBorder = $tag(div, "MiddleRight")
-				),
-				$tag(div, false, 'clear:left').append(
-					$tag(div, "BottomLeft"),
-					$bottomBorder = $tag(div, "BottomCenter"),
-					$tag(div, "BottomRight")
-				)
-			).find('div div').css({'float': 'left'});
-			
-			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none');
-			
-			$groupControls = $next.add($prev).add($current).add($slideshow);
-
-			$(document.body).append($overlay, $box.append($wrap, $loadingBay));
-		}
-	}
-
-	// Add ColorBox's event bindings
-	function addBindings() {
-		if ($box) {
-			if (!init) {
-				init = true;
-
-				// Cache values needed for size calculations
-				interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6
-				interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width();
-				loadedHeight = $loaded.outerHeight(true);
-				loadedWidth = $loaded.outerWidth(true);
-				
-				// Setting padding to remove the need to do size conversions during the animation step.
-				$box.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth});
-
-				// Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly.
-				$next.click(function () {
-					publicMethod.next();
-				});
-				$prev.click(function () {
-					publicMethod.prev();
-				});
-				$close.click(function () {
-					publicMethod.close();
-				});
-				$overlay.click(function () {
-					if (settings.overlayClose) {
-						publicMethod.close();
-					}
-				});
-				
-				// Key Bindings
-				$(document).bind('keydown.' + prefix, function (e) {
-					var key = e.keyCode;
-					if (open && settings.escKey && key === 27) {
-						e.preventDefault();
-						publicMethod.close();
-					}
-					if (open && settings.arrowKey && $related[1]) {
-						if (key === 37) {
-							e.preventDefault();
-							$prev.click();
-						} else if (key === 39) {
-							e.preventDefault();
-							$next.click();
-						}
-					}
-				});
-
-				$('.' + boxElement, document).live('click', function (e) {
-					// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
-					// See: http://jacklmoore.com/notes/click-events/
-					if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey)) {
-						e.preventDefault();
-						launch(this);
-					}
-				});
-			}
-			return true;
-		}
-		return false;
-	}
-
-	// Don't do anything if ColorBox already exists.
-	if ($.colorbox) {
-		return;
-	}
-
-	// Append the HTML when the DOM loads
-	$(appendHTML);
-
-
-	// ****************
-	// PUBLIC FUNCTIONS
-	// Usage format: $.fn.colorbox.close();
-	// Usage from within an iframe: parent.$.fn.colorbox.close();
-	// ****************
-	
-	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
-		var $this = this;
-		
-		options = options || {};
-		
-		appendHTML();
-
-		if (addBindings()) {
-			if (!$this[0]) {
-				if ($this.selector) { // if a selector was given and it didn't match any elements, go ahead and exit.
-					return $this;
-				}
-				// if no selector was given (ie. $.colorbox()), create a temporary element to work with
-				$this = $('<a/>');
-				options.open = true; // assume an immediate open
-			}
-			
-			if (callback) {
-				options.onComplete = callback;
-			}
-			
-			$this.each(function () {
-				$.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
-			}).addClass(boxElement);
-			
-			if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
-				launch($this[0]);
-			}
-		}
-		
-		return $this;
-	};
-
-	publicMethod.position = function (speed, loadedCallback) {
-		var
-		css,
-		top = 0,
-		left = 0,
-		offset = $box.offset(),
-		scrollTop,
-		scrollLeft;
-		
-		$window.unbind('resize.' + prefix);
-
-		// remove the modal so that it doesn't influence the document width/height
-		$box.css({top: -9e4, left: -9e4});
-
-		scrollTop = $window.scrollTop();
-		scrollLeft = $window.scrollLeft();
-
-		if (settings.fixed && !isIE6) {
-			offset.top -= scrollTop;
-			offset.left -= scrollLeft;
-			$box.css({position: 'fixed'});
-		} else {
-			top = scrollTop;
-			left = scrollLeft;
-			$box.css({position: 'absolute'});
-		}
-
-		// keeps the top and left positions within the browser's viewport.
-		if (settings.right !== false) {
-			left += Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
-		} else if (settings.left !== false) {
-			left += setSize(settings.left, 'x');
-		} else {
-			left += Math.round(Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
-		}
-		
-		if (settings.bottom !== false) {
-			top += Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
-		} else if (settings.top !== false) {
-			top += setSize(settings.top, 'y');
-		} else {
-			top += Math.round(Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
-		}
-
-		$box.css({top: offset.top, left: offset.left});
-
-		// setting the speed to 0 to reduce the delay between same-sized content.
-		speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0;
-		
-		// this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly,
-		// but it has to be shrank down around the size of div#colorbox when it's done.  If not,
-		// it can invoke an obscure IE bug when using iframes.
-		$wrap[0].style.width = $wrap[0].style.height = "9999px";
-		
-		function modalDimensions(that) {
-			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width;
-			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height;
-		}
-
-		css = {width: settings.w + loadedWidth, height: settings.h + loadedHeight, top: top, left: left};
-		if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273)
-			$box.css(css);
-		}
-		$box.dequeue().animate(css, {
-			duration: speed,
-			complete: function () {
-				modalDimensions(this);
-				
-				active = false;
-				
-				// shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation.
-				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
-				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
-				
-				if (settings.reposition) {
-					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
-						$window.bind('resize.' + prefix, publicMethod.position);
-					}, 1);
-				}
-
-				if (loadedCallback) {
-					loadedCallback();
-				}
-			},
-			step: function () {
-				modalDimensions(this);
-			}
-		});
-	};
-
-	publicMethod.resize = function (options) {
-		if (open) {
-			options = options || {};
-			
-			if (options.width) {
-				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
-			}
-			if (options.innerWidth) {
-				settings.w = setSize(options.innerWidth, 'x');
-			}
-			$loaded.css({width: settings.w});
-			
-			if (options.height) {
-				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
-			}
-			if (options.innerHeight) {
-				settings.h = setSize(options.innerHeight, 'y');
-			}
-			if (!options.innerHeight && !options.height) {
-				$loaded.css({height: "auto"});
-				settings.h = $loaded.height();
-			}
-			$loaded.css({height: settings.h});
-			
-			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
-		}
-	};
-
-	publicMethod.prep = function (object) {
-		if (!open) {
-			return;
-		}
-		
-		var callback, speed = settings.transition === "none" ? 0 : settings.speed;
-		
-		$loaded.remove();
-		$loaded = $tag(div, 'LoadedContent').append(object);
-		
-		function getWidth() {
-			settings.w = settings.w || $loaded.width();
-			settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w;
-			return settings.w;
-		}
-		function getHeight() {
-			settings.h = settings.h || $loaded.height();
-			settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h;
-			return settings.h;
-		}
-		
-		$loaded.hide()
-		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
-		.css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
-		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
-		.prependTo($content);
-		
-		$loadingBay.hide();
-		
-		// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width.
-		//$(photo).css({'float': 'none', marginLeft: 'auto', marginRight: 'auto'});
-		
-		$(photo).css({'float': 'none'});
-		
-		// Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay.
-		if (isIE6) {
-			$('select').not($box.find('select')).filter(function () {
-				return this.style.visibility !== 'hidden';
-			}).css({'visibility': 'hidden'}).one(event_cleanup, function () {
-				this.style.visibility = 'inherit';
-			});
-		}
-		
-		callback = function () {
-			var preload,
-				i,
-				total = $related.length,
-				iframe,
-				frameBorder = 'frameBorder',
-				allowTransparency = 'allowTransparency',
-				complete,
-				src,
-				img,
-				data;
-			
-			if (!open) {
-				return;
-			}
-			
-			function removeFilter() {
-				if (isIE) {
-					$box[0].style.removeAttribute('filter');
-				}
-			}
-			
-			complete = function () {
-				clearTimeout(loadingTimer);
-				// Detaching forces Andriod stock browser to redraw the area underneat the loading overlay.  Hiding alone isn't enough.
-				$loadingOverlay.detach().hide();
-				trigger(event_complete, settings.onComplete);
-			};
-			
-			if (isIE) {
-				//This fadeIn helps the bicubic resampling to kick-in.
-				if (photo) {
-					$loaded.fadeIn(100);
-				}
-			}
-			
-			$title.html(settings.title).add($loaded).show();
-			
-			if (total > 1) { // handle grouping
-				if (typeof settings.current === "string") {
-					$current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
-				}
-				
-				$next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
-				$prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
-				
-				if (settings.slideshow) {
-					$slideshow.show();
-				}
-				
-				// Preloads images within a rel group
-				if (settings.preloading) {
-					preload = [
-						getIndex(-1),
-						getIndex(1)
-					];
-					while (i = $related[preload.pop()]) {
-						data = $.data(i, colorbox);
-						
-						if (data && data.href) {
-							src = data.href;
-							if ($.isFunction(src)) {
-								src = src.call(i);
-							}
-						} else {
-							src = i.href;
-						}
-
-						if (isImage(src)) {
-							img = new Image();
-							img.src = src;
-						}
-					}
-				}
-			} else {
-				$groupControls.hide();
-			}
-			
-			if (settings.iframe) {
-				iframe = $tag('iframe')[0];
-				
-				if (frameBorder in iframe) {
-					iframe[frameBorder] = 0;
-				}
-				
-				if (allowTransparency in iframe) {
-					iframe[allowTransparency] = "true";
-				}
-
-				if (!settings.scrolling) {
-					iframe.scrolling = "no";
-				}
-				
-				$(iframe)
-					.attr({
-						src: settings.href,
-						name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
-						'class': prefix + 'Iframe',
-						allowFullScreen : true, // allow HTML5 video to go fullscreen
-						webkitAllowFullScreen : true,
-						mozallowfullscreen : true
-					})
-					.one('load', complete)
-					.one(event_purge, function () {
-						iframe.src = "//about:blank";
-					})
-					.appendTo($loaded);
-				
-				if (settings.fastIframe) {
-					$(iframe).trigger('load');
-				}
-			} else {
-				complete();
-			}
-			
-			if (settings.transition === 'fade') {
-				$box.fadeTo(speed, 1, removeFilter);
-			} else {
-				removeFilter();
-			}
-		};
-		
-		if (settings.transition === 'fade') {
-			$box.fadeTo(speed, 0, function () {
-				publicMethod.position(0, callback);
-			});
-		} else {
-			publicMethod.position(speed, callback);
-		}
-	};
-
-	publicMethod.load = function (launched) {
-		var href, setResize, prep = publicMethod.prep;
-		
-		active = true;
-		
-		photo = false;
-		
-		element = $related[index];
-		
-		if (!launched) {
-			makeSettings();
-		}
-		
-		trigger(event_purge);
-		
-		trigger(event_load, settings.onLoad);
-		
-		settings.h = settings.height ?
-				setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
-				settings.innerHeight && setSize(settings.innerHeight, 'y');
-		
-		settings.w = settings.width ?
-				setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
-				settings.innerWidth && setSize(settings.innerWidth, 'x');
-		
-		// Sets the minimum dimensions for use in image scaling
-		settings.mw = settings.w;
-		settings.mh = settings.h;
-		
-		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
-		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
-		if (settings.maxWidth) {
-			settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
-			settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
-		}
-		if (settings.maxHeight) {
-			settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
-			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
-		}
-		
-		href = settings.href;
-		
-		loadingTimer = setTimeout(function () {
-			$loadingOverlay.show().appendTo($content);
-		}, 100);
-		
-		if (settings.inline) {
-			// Inserts an empty placeholder where inline content is being pulled from.
-			// An event is bound to put inline content back when ColorBox closes or loads new content.
-			$tag(div).hide().insertBefore($(href)[0]).one(event_purge, function () {
-				$(this).replaceWith($loaded.children());
-			});
-			prep($(href));
-		} else if (settings.iframe) {
-			// IFrame element won't be added to the DOM until it is ready to be displayed,
-			// to avoid problems with DOM-ready JS that might be trying to run in that iframe.
-			prep(" ");
-		} else if (settings.html) {
-			prep(settings.html);
-		} else if (isImage(href)) {
-			$(photo = new Image())
-			.addClass(prefix + 'Photo')
-			.error(function () {
-				settings.title = false;
-				prep($tag(div, 'Error').html(settings.imgError));
-			})
-			.load(function () {
-				var percent;
-				photo.onload = null; //stops animated gifs from firing the onload repeatedly.
-				
-				if (settings.scalePhotos) {
-					setResize = function () {
-						photo.height -= photo.height * percent;
-						photo.width -= photo.width * percent;
-					};
-					if (settings.mw && photo.width > settings.mw) {
-						percent = (photo.width - settings.mw) / photo.width;
-						setResize();
-					}
-					if (settings.mh && photo.height > settings.mh) {
-						percent = (photo.height - settings.mh) / photo.height;
-						setResize();
-					}
-				}
-				
-				if (settings.h) {
-					photo.style.marginTop = Math.max(settings.h - photo.height, 0) / 2 + 'px';
-				}
-				
-				if ($related[1] && (settings.loop || $related[index + 1])) {
-					photo.style.cursor = 'pointer';
-					photo.onclick = function () {
-						publicMethod.next();
-					};
-				}
-				
-				if (isIE) {
-					photo.style.msInterpolationMode = 'bicubic';
-				}
-				
-				setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise.
-					prep(photo);
-				}, 1);
-			});
-			
-			setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise.
-				photo.src = href;
-			}, 1);
-		} else if (href) {
-			$loadingBay.load(href, settings.data, function (data, status, xhr) {
-				prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
-			});
-		}
-	};
-		
-	// Navigates to the next page/image in a set.
-	publicMethod.next = function () {
-		if (!active && $related[1] && (settings.loop || $related[index + 1])) {
-			index = getIndex(1);
-			publicMethod.load();
-		}
-	};
-	
-	publicMethod.prev = function () {
-		if (!active && $related[1] && (settings.loop || index)) {
-			index = getIndex(-1);
-			publicMethod.load();
-		}
-	};
-
-	// Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close();
-	publicMethod.close = function () {
-		if (open && !closing) {
-			
-			closing = true;
-			
-			open = false;
-			
-			trigger(event_cleanup, settings.onCleanup);
-			
-			$window.unbind('.' + prefix + ' .' + event_ie6);
-			
-			$overlay.fadeTo(200, 0);
-			
-			$box.stop().fadeTo(300, 0, function () {
-			
-				$box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
-				
-				trigger(event_purge);
-				
-				$loaded.remove();
-				
-				setTimeout(function () {
-					closing = false;
-					trigger(event_closed, settings.onClosed);
-				}, 1);
-			});
-		}
-	};
-
-	// Removes changes ColorBox made to the document, but does not remove the plugin
-	// from jQuery.
-	publicMethod.remove = function () {
-		$([]).add($box).add($overlay).remove();
-		$box = null;
-		$('.' + boxElement)
-			.removeData(colorbox)
-			.removeClass(boxElement)
-			.die();
-	};
-
-	// A method for fetching the current element ColorBox is referencing.
-	// returns a jQuery object.
-	publicMethod.element = function () {
-		return $(element);
-	};
-
-	publicMethod.settings = defaults;
-
-}(jQuery, document, window));
-/*
- * File:        jquery.dataTables.min.js
- * Version:     1.7.0
- * Author:      Allan Jardine (www.sprymedia.co.uk)
- * Info:        www.datatables.net
- * 
- * Copyright 2008-2010 Allan Jardine, all rights reserved.
- *
- * This source file is free software, under either the GPL v2 license or a
- * BSD style license, as supplied with this software.
- * 
- * This source file 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 license files for details.
- */
-
-(function(j,Y,p){j.fn.dataTableSettings=[];var E=j.fn.dataTableSettings;j.fn.dataTableExt={};var m=j.fn.dataTableExt;m.sVersion="1.7.0";m.sErrMode="alert";m.iApiIndex=0;m.oApi={};m.afnFiltering=[];m.aoFeatures=[];m.ofnSearch={};m.afnSortData=[];m.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
-sPageButtonStaticDisabled:"paginate_button",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
-sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};m.oJUIClasses={sPagePrevEnabled:"fg-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-state-default ui-corner-left ui-state-disabled",
-sPageNextEnabled:"fg-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-state-default",sPageButtonActive:"fg-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",
-sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset fg-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",
-sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",
-sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};m.oPagination={two_button:{fnInit:function(g,l,q){var r,u,y;if(g.bJUI){r=p.createElement("a");u=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;u.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;r.appendChild(y)}else{r=p.createElement("div");u=p.createElement("div")}r.className=g.oClasses.sPagePrevDisabled;u.className=g.oClasses.sPageNextDisabled;r.title=g.oLanguage.oPaginate.sPrevious;
-u.title=g.oLanguage.oPaginate.sNext;l.appendChild(r);l.appendChild(u);j(r).click(function(){g.oApi._fnPageChange(g,"previous")&&q(g)});j(u).click(function(){g.oApi._fnPageChange(g,"next")&&q(g)});j(r).bind("selectstart",function(){return false});j(u).bind("selectstart",function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");r.setAttribute("id",g.sTableId+"_previous");u.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=
-g.aanFeatures.p,q=0,r=l.length;q<r;q++)if(l[q].childNodes.length!==0){l[q].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[q].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,q){var r=p.createElement("span"),u=p.createElement("span"),y=p.createElement("span"),C=p.createElement("span"),w=p.createElement("span");r.innerHTML=
-g.oLanguage.oPaginate.sFirst;u.innerHTML=g.oLanguage.oPaginate.sPrevious;C.innerHTML=g.oLanguage.oPaginate.sNext;w.innerHTML=g.oLanguage.oPaginate.sLast;var x=g.oClasses;r.className=x.sPageButton+" "+x.sPageFirst;u.className=x.sPageButton+" "+x.sPagePrevious;C.className=x.sPageButton+" "+x.sPageNext;w.className=x.sPageButton+" "+x.sPageLast;l.appendChild(r);l.appendChild(u);l.appendChild(y);l.appendChild(C);l.appendChild(w);j(r).click(function(){g.oApi._fnPageChange(g,"first")&&q(g)});j(u).click(function(){g.oApi._fnPageChange(g,
-"previous")&&q(g)});j(C).click(function(){g.oApi._fnPageChange(g,"next")&&q(g)});j(w).click(function(){g.oApi._fnPageChange(g,"last")&&q(g)});j("span",l).bind("mousedown",function(){return false}).bind("selectstart",function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");r.setAttribute("id",g.sTableId+"_first");u.setAttribute("id",g.sTableId+"_previous");C.setAttribute("id",g.sTableId+"_next");w.setAttribute("id",g.sTableId+"_last")}},
-fnUpdate:function(g,l){if(g.aanFeatures.p){var q=m.oPagination.iFullNumbersShowPages,r=Math.floor(q/2),u=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,C="",w,x=g.oClasses;if(u<q){r=1;w=u}else if(y<=r){r=1;w=q}else if(y>=u-r){r=u-q+1;w=u}else{r=y-Math.ceil(q/2)+1;w=r+q-1}for(q=r;q<=w;q++)C+=y!=q?'<span class="'+x.sPageButton+'">'+q+"</span>":'<span class="'+x.sPageButtonActive+'">'+q+"</span>";w=g.aanFeatures.p;var z,D=function(){g._iDisplayStart=
-(this.innerHTML*1-1)*g._iDisplayLength;l(g);return false},L=function(){return false};q=0;for(r=w.length;q<r;q++)if(w[q].childNodes.length!==0){z=w[q].childNodes[2];z.innerHTML=C;j("span",z).click(D).bind("mousedown",L).bind("selectstart",L);z=w[q].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];j(z).removeClass(x.sPageButton+" "+x.sPageButtonActive+" "+x.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+x.sPageButtonStaticDisabled;z[1].className+=" "+x.sPageButtonStaticDisabled}else{z[0].className+=
-" "+x.sPageButton;z[1].className+=" "+x.sPageButton}if(u===0||y==u||g._iDisplayLength==-1){z[2].className+=" "+x.sPageButtonStaticDisabled;z[3].className+=" "+x.sPageButtonStaticDisabled}else{z[2].className+=" "+x.sPageButton;z[3].className+=" "+x.sPageButton}}}}}};m.oSort={"string-asc":function(g,l){g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();
-l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l===
-"")l=Date.parse("01/01/1970 00:00:00");return l-g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};m.aTypes=[function(g){if(g.length===0)return"numeric";var l,q=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var r=1;r<g.length;r++){l=g.charAt(r);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(q)return null;q=true}}return"numeric"},function(g){var l=Date.parse(g);
-if(l!==null&&!isNaN(l)||g.length===0)return"date";return null},function(g){if(g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];m.fnVersionCheck=function(g){var l=function(w,x){for(;w.length<x;)w+="0";return w},q=m.sVersion.split(".");g=g.split(".");for(var r="",u="",y=0,C=g.length;y<C;y++){r+=l(q[y],3);u+=l(g[y],3)}return parseInt(r,10)>=parseInt(u,10)};m._oExternConfig={iNextUnique:0};j.fn.dataTable=function(g){function l(){this.fnRecordsTotal=function(){return this.oFeatures.bServerSide?
-this._iRecordsTotal:this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?this._iRecordsDisplay:this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iDisplayStart+this.aiDisplay.length):this._iDisplayEnd};this.sInstance=this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,
-bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,iBarWidth:0};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",
-sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"}};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];
-this.fnInitComplete=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.iDefaultSortIndex=0;this.bInitialised=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.sAjaxSource=null;this.bAjaxDataGet=true;this.fnServerData=function(a,b,c){j.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(){alert("DataTables warning: JSON data from server failed to load or be parsed. This is most likely to be caused by a JSON formatting error.")}})};
-this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=m.oStdClasses;this.bSorted=this.bFiltered=false;this.oInit=null}function q(a){return function(){var b=[B(this[m.iApiIndex])].concat(Array.prototype.slice.call(arguments));
-return m.oApi[a].apply(this,b)}}function r(a){if(a.bInitialised===false)setTimeout(function(){r(a)},200);else{na(a);z(a);if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();F(a);D(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide){K(a,true);a.fnServerData.call(a.oInstance,a.sAjaxSource,null,function(b){for(var c=0;c<b.aaData.length;c++)w(a,b.aaData[c]);a.iInitDisplayStart=a._iDisplayStart;if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();F(a);D(a)}K(a,false);
-typeof a.fnInitComplete=="function"&&a.fnInitComplete.call(a.oInstance,a,b)})}else{typeof a.fnInitComplete=="function"&&a.fnInitComplete.call(a.oInstance,a);a.oFeatures.bServerSide||K(a,false)}}}function u(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!=
-"undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");c&&r(a)}function y(a,b){a.aoColumns[a.aoColumns.length++]={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],sSortingClass:a.oClasses.sSortable,
-sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:a.aoColumns.length-1,sSortDataType:"std",nTh:b?b:p.createElement("th"),nTf:null};b=a.aoColumns.length-1;if(typeof a.aoPreSearchCols[b]=="undefined"||a.aoPreSearchCols[b]===null)a.aoPreSearchCols[b]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[b].bRegex=="undefined")a.aoPreSearchCols[b].bRegex=true;if(typeof a.aoPreSearchCols[b].bSmart==
-"undefined")a.aoPreSearchCols[b].bSmart=true}C(a,b,null)}function C(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"asSorting");n(b,c,"sSortDataType")}if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||
-j.inArray("asc",b.asSorting)==-1&&j.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(j.inArray("asc",b.asSorting)!=-1&&j.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(j.inArray("asc",b.asSorting)==-1&&j.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function w(a,b){if(b.length!=a.aoColumns.length&&
-a.iDrawError!=a.iDraw){J(a,0,"Added data does not match known number of columns");a.iDrawError=a.iDraw;return-1}b=b.slice();var c=a.aoData.length;a.aoData.push({nTr:p.createElement("tr"),_iId:a.iNextId++,_aData:b,_anHidden:[],_sRowStripe:""});for(var d,f,e=0;e<b.length;e++){d=p.createElement("td");if(b[e]===null)b[e]="";if(typeof b[e]!="string")b[e]+="";b[e]=j.trim(b[e]);if(typeof a.aoColumns[e].fnRender=="function"){f=a.aoColumns[e].fnRender({iDataRow:c,iDataColumn:e,aData:b,oSettings:a});d.innerHTML=
-f;if(a.aoColumns[e].bUseRendered)a.aoData[c]._aData[e]=f}else d.innerHTML=b[e];if(a.aoColumns[e].sClass!==null)d.className=a.aoColumns[e].sClass;if(a.aoColumns[e]._bAutoType&&a.aoColumns[e].sType!="string"){f=Z(a.aoData[c]._aData[e]);if(a.aoColumns[e].sType===null)a.aoColumns[e].sType=f;else if(a.aoColumns[e].sType!=f)a.aoColumns[e].sType="string"}if(a.aoColumns[e].bVisible)a.aoData[c].nTr.appendChild(d);else a.aoData[c]._anHidden[e]=d}a.aiDisplayMaster.push(c);return c}function x(a){var b,c,d,f,
-e,i,h,k;if(a.sAjaxSource===null){h=a.nTBody.childNodes;b=0;for(c=h.length;b<c;b++)if(h[b].nodeName.toUpperCase()=="TR"){i=a.aoData.length;a.aoData.push({nTr:h[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(i);k=a.aoData[i]._aData;i=h[b].childNodes;d=e=0;for(f=i.length;d<f;d++)if(i[d].nodeName.toUpperCase()=="TD"){k[e]=j.trim(i[d].innerHTML);e++}}}h=S(a);i=[];b=0;for(c=h.length;b<c;b++){d=0;for(f=h[b].childNodes.length;d<f;d++){e=h[b].childNodes[d];e.nodeName.toUpperCase()==
-"TD"&&i.push(e)}}i.length!=h.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+h.length*a.aoColumns.length+" and got "+i.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");h=0;for(d=a.aoColumns.length;h<d;h++){if(a.aoColumns[h].sTitle===null)a.aoColumns[h].sTitle=a.aoColumns[h].nTh.innerHTML;f=a.aoColumns[h]._bAutoType;e=typeof a.aoColumns[h].fnRender=="function";k=a.aoColumns[h].sClass!==
-null;var o=a.aoColumns[h].bVisible,t,s;if(f||e||k||!o){b=0;for(c=a.aoData.length;b<c;b++){t=i[b*d+h];if(f)if(a.aoColumns[h].sType!="string"){s=Z(a.aoData[b]._aData[h]);if(a.aoColumns[h].sType===null)a.aoColumns[h].sType=s;else if(a.aoColumns[h].sType!=s)a.aoColumns[h].sType="string"}if(e){s=a.aoColumns[h].fnRender({iDataRow:b,iDataColumn:h,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=s;if(a.aoColumns[h].bUseRendered)a.aoData[b]._aData[h]=s}if(k)t.className+=" "+a.aoColumns[h].sClass;if(!o){a.aoData[b]._anHidden[h]=
-t;t.parentNode.removeChild(t)}}}}}function z(a){var b,c,d,f=0;if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;if(a.aoColumns[b].bVisible){if(a.aoColumns[b].sWidth!==null)c.style.width=a.aoColumns[b].sWidth;if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}else{c.parentNode.removeChild(c);f++}}}else{f=p.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;
-if(a.aoColumns[b].bVisible){if(a.aoColumns[b].sClass!==null)c.className=a.aoColumns[b].sClass;if(a.aoColumns[b].sWidth!==null)c.style.width=a.aoColumns[b].sWidth;f.appendChild(c)}}j(a.nTHead).html("")[0].appendChild(f)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++)a.aoColumns[b].nTh.insertBefore(p.createElement("span"),a.aoColumns[b].nTh.firstChild)}if(a.oFeatures.bSort){for(b=0;b<a.aoColumns.length;b++)a.aoColumns[b].bSortable!==false?$(a,a.aoColumns[b].nTh,b):j(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);
-j("th",a.nTHead).mousedown(function(){this.onselectstart=function(){return false};return false})}if(a.nTFoot!==null){f=0;c=a.nTFoot.getElementsByTagName("th");b=0;for(d=c.length;b<d;b++)if(typeof a.aoColumns[b]!="undefined"){a.aoColumns[b].nTf=c[b-f];if(a.oClasses.sFooterTH!=="")a.aoColumns[b].nTf.className+=" "+a.oClasses.sFooterTH;if(!a.aoColumns[b].bVisible){c[b-f].parentNode.removeChild(c[b-f]);f++}}}}function D(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(typeof a.iInitDisplayStart!=
-"undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;F(a)}if(!(a.oFeatures.bServerSide&&!oa(a))){if(a.aiDisplay.length!==0){var i=a._iDisplayStart,h=a._iDisplayEnd;if(a.oFeatures.bServerSide){i=0;h=a.aoData.length}for(i=i;i<h;i++){var k=a.aoData[a.aiDisplay[i]],o=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=t){j(o).removeClass(k._sRowStripe).addClass(t);
-k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){o=a.fnRowCallback.call(a.oInstance,o,a.aoData[a.aiDisplay[i]]._aData,f,i);if(!o&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(o);f++;if(c!==0)for(k=0;k<c;k++)o==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=p.createElement("td");e.setAttribute("valign","top");e.colSpan=T(a);e.className=a.oClasses.sRowEmpty;
-e.innerHTML=typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0?a.oLanguage.sEmptyTable:a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));d[f].appendChild(e)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,j(">tr",a.nTHead)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback=="function"&&a.fnFooterCallback.call(a.oInstance,j(">tr",a.nTFoot)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=
-p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b]);b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}if(typeof a._bInitComplete=="undefined"){a._bInitComplete=true;a.nTableWrapper!=a.nTable.parentNode&&j(a.nTableWrapper).width()>j(a.nTable.parentNode).width()&&U(a)}b=0;for(c=a.aoDrawCallback.length;b<
-c;b++)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false}}function L(a){if(a.oFeatures.bSort)O(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)P(a,a.oPreviousSearch);else{F(a);D(a)}}function oa(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:aa(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==
-false?a._iDisplayLength:-1});if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(d=0;d<b;d++){c.push({name:"sSearch_"+d,value:a.aoPreSearchCols[d].sSearch});c.push({name:"bRegex_"+d,value:a.aoPreSearchCols[d].bRegex});c.push({name:"bSearchable_"+d,value:a.aoColumns[d].bSearchable})}}if(a.oFeatures.bSort!==false){var f=a.aaSortingFixed!==null?a.aaSortingFixed.length:0,e=a.aaSorting.length;c.push({name:"iSortingCols",
-value:f+e});for(d=0;d<f;d++){c.push({name:"iSortCol_"+d,value:a.aaSortingFixed[d][0]});c.push({name:"sSortDir_"+d,value:a.aaSortingFixed[d][1]})}for(d=0;d<e;d++){c.push({name:"iSortCol_"+(d+f),value:a.aaSorting[d][0]});c.push({name:"sSortDir_"+(d+f),value:a.aaSorting[d][1]})}for(d=0;d<b;d++)c.push({name:"bSortable_"+d,value:a.aoColumns[d].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(i){pa(a,i)});return false}else return true}function pa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*
-1<a.iDraw)return;else a.iDraw=b.sEcho*1;ba(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=aa(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=qa(a,b.sColumns);for(var f=0,e=b.aaData.length;f<e;f++)if(c){for(var i=[],h=0,k=a.aoColumns.length;h<k;h++)i.push(b.aaData[f][d[h]]);w(a,i)}else w(a,b.aaData[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;D(a);a.bAjaxDataGet=true;K(a,false)}function na(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,
-a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,i,h,k,o,t,s=0;s<d.length;s++){e=0;i=d[s];if(i=="<"){h=p.createElement("div");k=d[s+1];if(k=="'"||k=='"'){o="";for(t=2;d[s+t]!=k;){o+=d[s+t];t++}if(o=="H")o="fg-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(o=="F")o="fg-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";
-h.className=o;s+=t}c.appendChild(h);c=h}else if(i==">")c=c.parentNode;else if(i=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=ra(a);e=1}else if(i=="f"&&a.oFeatures.bFilter){f=sa(a);e=1}else if(i=="r"&&a.oFeatures.bProcessing){f=ta(a);e=1}else if(i=="t"){f=ua(a);e=1}else if(i=="i"&&a.oFeatures.bInfo){f=va(a);e=1}else if(i=="p"&&a.oFeatures.bPaginate){f=wa(a);e=1}else if(m.aoFeatures.length!==0){h=m.aoFeatures;k=0;for(o=h.length;k<o;k++)if(i==h[k].cFeature){if(f=h[k].fnInit(a))e=1;break}}if(e==
-1){if(typeof a.aanFeatures[i]!="object")a.aanFeatures[i]=[];a.aanFeatures[i].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function ua(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),i=p.createElement("div"),h=a.nTable.cloneNode(false),k=a.nTable.cloneNode(false),o=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===
-0?null:a.nTable.getElementsByTagName("tfoot")[0],s=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?m.oJUIClasses:m.oStdClasses;c.appendChild(d);e.appendChild(i);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(h);h.appendChild(o);if(t!==null){b.appendChild(e);i.appendChild(k);k.appendChild(t)}b.className=s.sScrollWrapper;c.className=s.sScrollHead;d.className=s.sScrollHeadInner;f.className=s.sScrollBody;e.className=s.sScrollFoot;i.className=s.sScrollFootInner;c.style.overflow="hidden";
-e.style.overflow="hidden";f.style.overflow="auto";c.style.border="0";e.style.border="0";d.style.width="150%";h.removeAttribute("id");h.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=j(">caption",a.nTable);i=0;for(k=d.length;i<k;i++)h.appendChild(d[i]);if(a.oScroll.sX!==""){c.style.width=v(a.oScroll.sX);f.style.width=v(a.oScroll.sX);if(t!==null)e.style.width=v(a.oScroll.sX);j(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==
-null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=v(a.oScroll.sY);a.aoDrawCallback.push({fn:xa,sName:"scrolling"});a.nScrollHead=c;a.nScrollFoot=e;return b}function xa(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,i,h,k,o,t,s,H=[];i=a.nTable.getElementsByTagName("thead");i.length>0&&a.nTable.removeChild(i[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}i=
-a.nTHead.cloneNode(true);a.nTable.insertBefore(i,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);a.nTable.insertBefore(k,a.nTable.childNodes[1])}var I=ca(i);f=0;for(e=I.length;f<e;f++){t=da(a,f);I[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&M(function(A){A.style.width=""},k.getElementsByTagName("tr"));f=j(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(j.browser.msie&&j.browser.version<=7)a.nTable.style.width=v(j(a.nTable).outerWidth()-
-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!=="")a.nTable.style.width=v(a.oScroll.sXInner);else if(f==j(d).width()&&j(d).height()<j(a.nTable).height()){a.nTable.style.width=v(f-a.oScroll.iBarWidth);if(j(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=v(f)}else a.nTable.style.width=v(f);f=j(a.nTable).outerWidth();e=a.nTHead.getElementsByTagName("tr");i=i.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth=
-"0";o.height=0;s=j(A).width();G.style.width=v(s);H.push(s)},i,e);if(a.nTFoot!==null){h=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth="0";s=j(A).width();G.style.width=v(s);H.push(s)},h,k)}M(function(A){A.innerHTML="";A.style.width=v(H.shift())},i);a.nTFoot!==null&&M(function(A){A.innerHTML="";A.style.width=v(H.shift())},h);if(j(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,
-1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");if(a.oScroll.sY==="")if(j.browser.msie&&
-j.browser.version<=7)d.style.height=v(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=v(a.oScroll.sY);h=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=v(j(a.nTable).height()+h)}c.style.width=v(j(a.nTable).outerWidth());b.style.width=v(j(a.nTable).outerWidth()+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];c=b.getElementsByTagName("table")[0];
-b.style.width=v(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=v(a.nTable.offsetWidth)}}function U(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function sa(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&b.setAttribute("id",a.sTableId+"_filter");b.className=a.oClasses.sFilter;b.innerHTML=a.oLanguage.sSearch+(a.oLanguage.sSearch===""?"":" ")+'<input type="text" />';
-var c=j("input",b);c.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));c.keyup(function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&j("input",d[f]).val(this.value);P(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});c.keypress(function(d){if(d.keyCode==13)return false});return b}function P(a,b,c){ya(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)za(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,
-a.aoPreSearchCols[b].bSmart);m.afnFiltering.length!==0&&Aa(a);a.bFiltered=true;a._iDisplayStart=0;F(a);D(a);Q(a,0)}function Aa(a){for(var b=m.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,i=a.aiDisplay.length;e<i;e++){var h=a.aiDisplay[e-f];if(!b[c](a,a.aoData[h]._aData,h)){a.aiDisplay.splice(e-f,1);f++}}}function za(a,b,c,d,f){if(b!==""){var e=0;b=fa(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ga(a.aoData[a.aiDisplay[d]]._aData[c],a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,
-1);e++}}}}function ya(a,b,c,d,f){var e=fa(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(m.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);Q(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var i=
-0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-i,1);i++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function Q(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);var c=p.createElement("div");b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:a.aiDisplay;for(var d=0,f=b.length;d<f;d++){a.asDataSearch[d]="";for(var e=0,i=a.aoColumns.length;e<i;e++)if(a.aoColumns[e].bSearchable)a.asDataSearch[d]+=ga(a.aoData[b[d]]._aData[e],
-a.aoColumns[e].sType)+"  ";if(a.asDataSearch[d].indexOf("&")!==-1){c.innerHTML=a.asDataSearch[d];a.asDataSearch[d]=c.textContent?c.textContent:c.innerText}}}function fa(a,b,c){if(c){a=b?a.split(" "):ha(a).split(" ");a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:ha(a);return new RegExp(a,"i")}}function ga(a,b){if(typeof m.ofnSearch[b]=="function")return m.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g,
-" ");return a}function O(a,b){var c=[],d=m.oSort,f=a.aoData,e,i,h,k;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){c=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(h=0;h<c.length;h++){e=c[h][0];i=N(a,e);k=a.aoColumns[e].sSortDataType;if(typeof m.afnSortData[k]!="undefined"){var o=m.afnSortData[k](a,e,i);i=0;for(k=f.length;i<k;i++)f[i]._aData[e]=o[i]}}if(Y.runtime){var t=[],s=c.length;for(h=0;h<s;h++){e=a.aoColumns[c[h][0]].iDataSort;
-t.push([e,a.aoColumns[e].sType+"-"+c[h][1]])}a.aiDisplayMaster.sort(function(H,I){for(var A,G=0;G<s;G++){A=d[t[G][1]](f[H]._aData[t[G][0]],f[I]._aData[t[G][0]]);if(A!==0)return A}return 0})}else{this.ClosureDataTables={fn:function(){},data:f,sort:m.oSort};k="this.ClosureDataTables.fn = function(a,b){var iTest, oSort=this.ClosureDataTables.sort, aoData=this.ClosureDataTables.data;";for(h=0;h<c.length-1;h++){e=a.aoColumns[c[h][0]].iDataSort;i=a.aoColumns[e].sType;k+="iTest = oSort['"+i+"-"+c[h][1]+
-"']( aoData[a]._aData["+e+"], aoData[b]._aData["+e+"] ); if ( iTest === 0 )"}if(c.length>0){e=a.aoColumns[c[c.length-1][0]].iDataSort;i=a.aoColumns[e].sType;k+="iTest = oSort['"+i+"-"+c[c.length-1][1]+"']( aoData[a]._aData["+e+"], aoData[b]._aData["+e+"] );if (iTest===0) return oSort['numeric-"+c[c.length-1][1]+"'](a, b); return iTest;}";eval(k);a.aiDisplayMaster.sort(this.ClosureDataTables.fn)}this.ClosureDataTables=undefined}}if(typeof b=="undefined"||b)W(a);a.bSorted=true;if(a.oFeatures.bFilter)P(a,
-a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;F(a);D(a)}}function $(a,b,c,d){j(b).click(function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var i,h;if(f.shiftKey){for(var k=false,o=0;o<a.aaSorting.length;o++)if(a.aaSorting[o][0]==c){k=true;i=a.aaSorting[o][0];h=a.aaSorting[o][2]+1;if(typeof a.aoColumns[i].asSorting[h]=="undefined")a.aaSorting.splice(o,1);else{a.aaSorting[o][1]=a.aoColumns[i].asSorting[h];a.aaSorting[o][2]=h}break}k===false&&a.aaSorting.push([c,
-a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){i=a.aaSorting[0][0];h=a.aaSorting[0][2]+1;if(typeof a.aoColumns[i].asSorting[h]=="undefined")h=0;a.aaSorting[0][1]=a.aoColumns[i].asSorting[h];a.aaSorting[0][2]=h}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}O(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function W(a){var b,
-c,d,f,e,i=a.aoColumns.length,h=a.oClasses;for(b=0;b<i;b++)a.aoColumns[b].bSortable&&j(a.aoColumns[b].nTh).removeClass(h.sSortAsc+" "+h.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?h.sSortAsc:h.sSortDesc;d=c;break}j(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=j("span",
-a.aoColumns[b].nTh);c.removeClass(h.sSortJUIAsc+" "+h.sSortJUIDesc+" "+h.sSortJUI+" "+h.sSortJUIAscAllowed+" "+h.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?h.sSortJUIAsc:h.sSortJUIDesc)}}else j(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=h.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=X(a);if(d.length>=i)for(b=0;b<i;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+
-e+"1","")}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+e+"2","")}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+e+"3","")}h=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/i;c<a;c++)d[i*c+k].className+=" "+e+h;h<3&&h++}}}function wa(a){var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;m.oPagination[a.sPaginationType].fnInit(a,
-b,function(c){F(c);D(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){m.oPagination[c.sPaginationType].fnUpdate(c,function(d){F(d);D(d)})},sName:"pagination"});return b}function Ba(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=
-a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function va(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Ca,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}
-function Ca(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=j(a.aanFeatures.i[0]),c=a.fnFormatNumber(a.fnRecordsTotal()),d=a.fnFormatNumber(a._iDisplayStart+1),f=a.fnFormatNumber(a.fnDisplayEnd()),e=a.fnFormatNumber(a.fnRecordsDisplay());if(a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal())b.html(a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix);else if(a.fnRecordsDisplay()===0)b.html(a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",c)+a.oLanguage.sInfoPostFix);
-else a.fnRecordsDisplay()==a.fnRecordsTotal()?b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+a.oLanguage.sInfoPostFix):b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix);a=a.aanFeatures.i;if(a.length>1){b=b.html();c=1;for(d=a.length;c<d;c++)j(a[c]).html(b)}}}function ra(a){var b='<select size="1" '+(a.sTableId===""?
-"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]=="object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+
-"_length");f.className=a.oClasses.sLength;f.innerHTML=a.oLanguage.sLengthMenu.replace("_MENU_",b);j('select option[value="'+a._iDisplayLength+'"]',f).attr("selected",true);j("select",f).change(function(){var e=j(this).val(),i=a.aanFeatures.l;c=0;for(d=i.length;c<d;c++)i[c]!=this.parentNode&&j("select",i[c]).val(e);a._iDisplayLength=parseInt(e,10);F(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==
--1)a._iDisplayStart=0;D(a)});return f}function ta(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r=="undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function da(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
-true&&c++;if(c==b)return d}return null}function N(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function R(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function T(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}
-function F(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Da(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=a;b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,i=j("th",a.nTHead);for(e=
-0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Da(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==null)a.aoColumns[e].sWidth=v(c);b++}}if(f==i.length&&b===0&&d==f){ia(a,a.nTable);for(e=0;e<a.aoColumns.length;e++){c=j(i[e]).width();if(c!==null)a.aoColumns[e].sWidth=v(c)}}else{b=a.nTable.cloneNode(false);e=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(a.nTHead.cloneNode(true));if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));
-M(function(h){h.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(e);e.appendChild(c);e=j("thead th",b);if(e.length===0)e=j("tbody tr:eq(0)>td",b);e.each(function(h){this.style.width="";h=da(a,h);if(h!==null&&a.aoColumns[h].sWidthOrig!=="")this.style.width=a.aoColumns[h].sWidthOrig});for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Ea(a,e);if(d!==null){d=d.cloneNode(true);c.appendChild(d)}}e=a.nTable.parentNode;e.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!=="")b.style.width=v(a.oScroll.sXInner);
-else if(a.oScroll.sX!==""){b.style.width="";if(j(b).width()<e.offsetWidth)b.style.width=v(e.offsetWidth)}else b.style.width=v(e.offsetWidth);b.style.visibility="hidden";ia(a,b);f=j("tbody tr:eq(0)>td",b);if(f.length===0)f=j("thead tr:eq(0)>th",b);for(e=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){d=j(f[c]).width();if(d!==null&&d>0)a.aoColumns[e].sWidth=v(d);c++}a.nTable.style.width=v(j(b).outerWidth());b.parentNode.removeChild(b)}}function ia(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==
-""){j(b).width();b.style.width=v(j(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=v(j(b).outerWidth())}function Ea(a,b,c){if(typeof c=="undefined"||c){c=Fa(a,b);b=N(a,b);if(c<0)return null;return a.aoData[c].nTr.getElementsByTagName("td")[b]}var d=-1,f,e;c=-1;var i=p.createElement("div");i.style.visibility="hidden";i.style.position="absolute";p.body.appendChild(i);f=0;for(e=a.aoData.length;f<e;f++){i.innerHTML=a.aoData[f]._aData[b];if(i.offsetWidth>d){d=i.offsetWidth;
-c=f}}p.body.removeChild(i);if(c>=0){b=N(a,b);if(a=a.aoData[c].nTr.getElementsByTagName("td")[b])return a}return null}function Fa(a,b){for(var c=0,d=-1,f=0;f<a.aoData.length;f++){var e=a.aoData[f]._aData[b];if(e.length>c){c=e.length;d=f}}return d}function v(a){if(a===null)return"0px";if(typeof a=="number")return a+"px";if(a.indexOf("em")!=-1||a.indexOf("%")!=-1||a.indexOf("ex")!=-1||a.indexOf("px")!=-1)return a;return a+"px"}function La(a,b){if(a.length!=b.length)return 1;for(var c=0;c<a.length;c++)if(a[c]!=
-b[c])return 2;return 0}function Z(a){for(var b=m.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function B(a){for(var b=0;b<E.length;b++)if(E[b].nTable==a)return E[b];return null}function V(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function S(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d].nTr);return b}function X(a){var b=S(a),c=[],d,f=[],e,i,h,k;e=0;for(i=b.length;e<i;e++){c=[];h=0;for(k=b[e].childNodes.length;h<
-k;h++){d=b[e].childNodes[h];d.nodeName.toUpperCase()=="TD"&&c.push(d)}h=d=0;for(k=a.aoColumns.length;h<k;h++)if(a.aoColumns[h].bVisible)f.push(c[h-d]);else{f.push(a.aoData[e]._anHidden[h]);d++}}return f}function ha(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ja(a,b){for(var c=-1,d=0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function qa(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<
-f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function aa(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(m.sErrMode=="alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ba(a){a.aoData.length=0;
-a.aiDisplayMaster.length=0;a.aiDisplay.length=0;F(a)}function Ga(a){if(a.oFeatures.bStateSave){var b,c="{";c+='"iCreate": '+(new Date).getTime()+",";c+='"iStart": '+a._iDisplayStart+",";c+='"iEnd": '+a._iDisplayEnd+",";c+='"iLength": '+a._iDisplayLength+",";c+='"sFilter": "'+a.oPreviousSearch.sSearch.replace('"','\\"')+'",';c+='"sFilterEsc": '+!a.oPreviousSearch.bRegex+",";c+='"aaSorting": [ ';for(b=0;b<a.aaSorting.length;b++)c+="["+a.aaSorting[b][0]+",'"+a.aaSorting[b][1]+"'],";c=c.substring(0,c.length-
-1);c+="],";c+='"aaSearchCols": [ ';for(b=0;b<a.aoPreSearchCols.length;b++)c+="['"+a.aoPreSearchCols[b].sSearch.replace("'","'")+"',"+!a.aoPreSearchCols[b].bRegex+"],";c=c.substring(0,c.length-1);c+="],";c+='"abVisCols": [ ';for(b=0;b<a.aoColumns.length;b++)c+=a.aoColumns[b].bVisible+",";c=c.substring(0,c.length-1);c+="]";c+="}";Ha(a.sCookiePrefix+a.sInstance,c,a.iCookieDuration,a.sCookiePrefix)}}function Ia(a,b){if(a.oFeatures.bStateSave){var c,d=ka(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=
-typeof JSON=="object"&&typeof JSON.parse=="function"?JSON.parse(d.replace(/'/g,'"')):eval("("+d+")")}catch(f){return}a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=c.sFilter;a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]={sSearch:c.aaSearchCols[d][0],
-bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Ha(a,b,c,d){var f=new Date;f.setTime(f.getTime()+c*1E3);c=Y.location.pathname.split("/");var e=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();b=e+"="+encodeURIComponent(b)+"; expires="+f.toGMTString()+"; path="+c.join("/")+"/";f="";a=9999999999999;var i;if((ka(e)!==null?p.cookie.length:b.length+
-p.cookie.length)+10>4096){e=p.cookie.split(";");for(var h=0,k=e.length;h<k;h++)if(e[h].indexOf(d)!=-1){var o=e[h].split("=");try{i=eval("("+decodeURIComponent(o[1])+")")}catch(t){continue}if(typeof i.iCreate!="undefined"&&i.iCreate<a){f=o[0];a=i.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+"/"}p.cookie=b}function ka(a){var b=Y.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<
-b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function ca(a){a=a.getElementsByTagName("tr");if(a.length==1)return a[0].getElementsByTagName("th");var b=[],c=[],d,f,e,i,h,k,o=function(G,Ma,la){for(;typeof G[Ma][la]!="undefined";)la++;return la},t=function(G){if(typeof b[G]=="undefined")b[G]=[]};d=0;for(i=a.length;d<i;d++){t(d);var s=0,H=[];f=0;for(h=a[d].childNodes.length;f<h;f++)if(a[d].childNodes[f].nodeName.toUpperCase()==
-"TD"||a[d].childNodes[f].nodeName.toUpperCase()=="TH")H.push(a[d].childNodes[f]);f=0;for(h=H.length;f<h;f++){var I=H[f].getAttribute("colspan")*1,A=H[f].getAttribute("rowspan")*1;if(!I||I===0||I===1){k=o(b,d,s);b[d][k]=H[f].nodeName.toUpperCase()=="TD"?4:H[f];if(A||A===0||A===1)for(e=1;e<A;e++){t(d+e);b[d+e][k]=2}s++}else{k=o(b,d,s);for(e=0;e<I;e++)b[d][k+e]=3;s+=I}}}d=0;for(i=b[0].length;d<i;d++){f=0;for(h=b.length;f<h;f++)typeof b[f][d]=="object"&&c.push(b[f][d])}return c}function Ja(){var a=p.createElement("p"),
-b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=c.clientWidth;p.body.removeChild(c);return b-a}function M(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,i=b[d].childNodes.length;e<i;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?
-a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}this.oApi={};this.fnDraw=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined"&&a===false){F(b);D(b)}else L(b)};this.fnFilter=function(a,b,c,d,f){var e=B(this[m.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){P(e,{sSearch:a,
-bRegex:c,bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)j("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;P(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return B(this[m.iApiIndex])};this.fnVersionCheck=m.fnVersionCheck;this.fnSort=function(a){var b=B(this[m.iApiIndex]);b.aaSorting=a;O(b)};this.fnSortListener=function(a,b,c){$(B(this[m.iApiIndex]),a,b,c)};this.fnAddData=
-function(a,b){if(a.length===0)return[];var c=[],d,f=B(this[m.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=w(f,a[e]);if(d==-1)return c;c.push(d)}else{d=w(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();Q(f,1);if(typeof b=="undefined"||b)L(f);return c};this.fnDeleteRow=function(a,b,c){var d=B(this[m.iApiIndex]);a=typeof a=="object"?R(d,a):a;var f=d.aoData.splice(a,1);ja(d.aiDisplayMaster,a);ja(d.aiDisplay,a);Q(d,1);typeof b=="function"&&b.call(this,d,f);
-if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){F(d);D(d)}return f};this.fnClearTable=function(a){var b=B(this[m.iApiIndex]);ba(b);if(typeof a=="undefined"||a)D(b)};this.fnOpen=function(a,b,c){var d=B(this[m.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=T(d);e.innerHTML=b;b=j("tr",d.nTBody);j.inArray(a,b)!=-1&&j(f).insertAfter(a);
-d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=B(this[m.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?R(b,a):a;return b.aoData[a]._aData}return V(b)};this.fnGetNodes=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined")return b.aoData[a].nTr;
-return S(b)};this.fnGetPosition=function(a){var b=B(this[m.iApiIndex]);if(a.nodeName.toUpperCase()=="TR")return R(b,a);else if(a.nodeName.toUpperCase()=="TD")for(var c=R(b,a.parentNode),d=0,f=0;f<b.aoColumns.length;f++)if(b.aoColumns[f].bVisible){if(b.aoData[c].nTr.getElementsByTagName("td")[f-d]==a)return[c,f-d,f]}else d++;return null};this.fnUpdate=function(a,b,c,d,f){var e=B(this[m.iApiIndex]),i=typeof b=="object"?R(e,b):b;if(typeof a!="object"){b=a;e.aoData[i]._aData[c]=b;if(e.aoColumns[c].fnRender!==
-null){b=e.aoColumns[c].fnRender({iDataRow:i,iDataColumn:c,aData:e.aoData[i]._aData,oSettings:e});if(e.aoColumns[c].bUseRendered)e.aoData[i]._aData[c]=b}c=N(e,c);if(c!==null)e.aoData[i].nTr.getElementsByTagName("td")[c].innerHTML=b}else{if(a.length!=e.aoColumns.length){J(e,0,"An array passed to fnUpdate must have the same number of columns as the table in question - in this case "+e.aoColumns.length);return 1}for(var h=0;h<a.length;h++){b=a[h];e.aoData[i]._aData[h]=b;if(e.aoColumns[h].fnRender!==null){b=
-e.aoColumns[h].fnRender({iDataRow:i,iDataColumn:h,aData:e.aoData[i]._aData,oSettings:e});if(e.aoColumns[h].bUseRendered)e.aoData[i]._aData[h]=b}c=N(e,h);if(c!==null)e.aoData[i].nTr.getElementsByTagName("td")[c].innerHTML=b}}if(typeof f=="undefined"||f){Q(e,1);U(e)}if(typeof d=="undefined"||d)L(e);return 0};this.fnSetColumnVis=function(a,b){var c=B(this[m.iApiIndex]),d,f;f=c.aoColumns.length;var e,i;if(c.aoColumns[a].bVisible!=b){e=j(">tr",c.nTHead)[0];var h=j(">tr",c.nTFoot)[0],k=[],o=[];for(d=0;d<
-f;d++){k.push(c.aoColumns[d].nTh);o.push(c.aoColumns[d].nTf)}if(b){for(d=b=0;d<a;d++)c.aoColumns[d].bVisible&&b++;if(b>=T(c)){e.appendChild(k[a]);h&&h.appendChild(o[a]);d=0;for(f=c.aoData.length;d<f;d++){e=c.aoData[d]._anHidden[a];c.aoData[d].nTr.appendChild(e)}}else{for(d=a;d<f;d++){i=N(c,d);if(i!==null)break}e.insertBefore(k[a],e.getElementsByTagName("th")[i]);h&&h.insertBefore(o[a],h.getElementsByTagName("th")[i]);X(c);d=0;for(f=c.aoData.length;d<f;d++){e=c.aoData[d]._anHidden[a];c.aoData[d].nTr.insertBefore(e,
-j(">td:eq("+i+")",c.aoData[d].nTr)[0])}}c.aoColumns[a].bVisible=true}else{e.removeChild(k[a]);h&&h.removeChild(o[a]);i=X(c);d=0;for(f=c.aoData.length;d<f;d++){e=i[d*c.aoColumns.length+a*1];c.aoData[d]._anHidden[a]=e;e.parentNode.removeChild(e)}c.aoColumns[a].bVisible=false}d=0;for(f=c.aoOpenRows.length;d<f;d++)c.aoOpenRows[d].nTr.colSpan=T(c);U(c);D(c)}};this.fnPageChange=function(a,b){var c=B(this[m.iApiIndex]);Ba(c,a);F(c);if(typeof b=="undefined"||b)D(c)};this.fnDestroy=function(){var a=B(this[m.iApiIndex]),
-b=a.nTableWrapper.parentNode,c=a.nTBody,d;a.nTable.parentNode.removeChild(a.nTable);j(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];W(a);j(S(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){j("th",a.nTHead).removeClass([m.oStdClasses.sSortable,m.oJUIClasses.sSortableAsc,m.oJUIClasses.sSortableDesc,m.oJUIClasses.sSortableNone].join(" "));j("th span",a.nTHead).remove()}else j("th",a.nTHead).removeClass([m.oStdClasses.sSortable,m.oStdClasses.sSortableAsc,m.oStdClasses.sSortableDesc,
-m.oStdClasses.sSortableNone].join(" "));b.appendChild(a.nTable);b=0;for(d=a.aoData.length;b<d;b++)c.appendChild(a.aoData[b].nTr);j(">tr:even",c).addClass(a.asDestoryStrips[0]);j(">tr:odd",c).addClass(a.asDestoryStrips[1]);b=0;for(d=E.length;b<d;b++)E[b]==a&&E.splice(b,1)};this.fnAdjustColumnSizing=function(a){U(B(this[m.iApiIndex]));if(typeof a=="undefined"||a)this.fnDraw(false)};for(var ma in m.oApi)if(ma)this[ma]=q(ma);this.oApi._fnExternApiFunc=q;this.oApi._fnInitalise=r;this.oApi._fnLanguageProcess=
-u;this.oApi._fnAddColumn=y;this.oApi._fnColumnOptions=C;this.oApi._fnAddData=w;this.oApi._fnGatherData=x;this.oApi._fnDrawHead=z;this.oApi._fnDraw=D;this.oApi._fnReDraw=L;this.oApi._fnAjaxUpdate=oa;this.oApi._fnAjaxUpdateDraw=pa;this.oApi._fnAddOptionsHtml=na;this.oApi._fnFeatureHtmlTable=ua;this.oApi._fnScrollDraw=xa;this.oApi._fnAjustColumnSizing=U;this.oApi._fnFeatureHtmlFilter=sa;this.oApi._fnFilterComplete=P;this.oApi._fnFilterCustom=Aa;this.oApi._fnFilterColumn=za;this.oApi._fnFilter=ya;this.oApi._fnBuildSearchArray=
-Q;this.oApi._fnFilterCreateSearch=fa;this.oApi._fnDataToSearch=ga;this.oApi._fnSort=O;this.oApi._fnSortAttachListener=$;this.oApi._fnSortingClasses=W;this.oApi._fnFeatureHtmlPaginate=wa;this.oApi._fnPageChange=Ba;this.oApi._fnFeatureHtmlInfo=va;this.oApi._fnUpdateInfo=Ca;this.oApi._fnFeatureHtmlLength=ra;this.oApi._fnFeatureHtmlProcessing=ta;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=da;this.oApi._fnColumnIndexToVisible=N;this.oApi._fnNodeToDataIndex=R;this.oApi._fnVisbleColumns=
-T;this.oApi._fnCalculateEnd=F;this.oApi._fnConvertToWidth=Da;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=ia;this.oApi._fnGetWidestNode=Ea;this.oApi._fnGetMaxLenString=Fa;this.oApi._fnStringToCss=v;this.oApi._fnArrayCmp=La;this.oApi._fnDetectType=Z;this.oApi._fnSettingsFromNode=B;this.oApi._fnGetDataMaster=V;this.oApi._fnGetTrNodes=S;this.oApi._fnGetTdNodes=X;this.oApi._fnEscapeRegex=ha;this.oApi._fnDeleteIndex=ja;this.oApi._fnReOrderIndex=qa;this.oApi._fnColumnOrdering=
-aa;this.oApi._fnLog=J;this.oApi._fnClearTable=ba;this.oApi._fnSaveState=Ga;this.oApi._fnLoadState=Ia;this.oApi._fnCreateCookie=Ha;this.oApi._fnReadCookie=ka;this.oApi._fnGetUniqueThs=ca;this.oApi._fnScrollBarWidth=Ja;this.oApi._fnApplyToChildren=M;this.oApi._fnMap=n;var Ka=this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=E.length;a<b;a++){if(E[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return E[a].oInstance;else if(typeof g.bDestroy!="undefined"&&
-g.bDestroy===true){E[a].oInstance.fnDestroy();break}else{J(E[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");return}if(E[a].sTableId!==""&&E[a].sTableId==this.getAttribute("id")){E.splice(a,
-1);break}}var e=new l;E.push(e);var i=false,h=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=m._oExternConfig.iNextUnique++;e.oInstance=Ka;e.nTable=this;e.oApi=Ka.oApi;if(typeof g!="undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,
-g,"bServerSide");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e,g,"asStripClasses");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");n(e,g,"sDom");
-n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses&&e.aoDrawCallback.push({fn:W,sName:"server_side_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=m.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==
-""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ja();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ia(e,g);e.aoDrawCallback.push({fn:Ga,sName:"state_save"})}if(typeof g.aaData!="undefined")h=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!=
-"undefined"&&g.oLanguage.sUrl!==""){e.oLanguage.sUrl=g.oLanguage.sUrl;j.getJSON(e.oLanguage.sUrl,null,function(o){u(e,o,true)});i=true}else u(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=j("tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(j(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
-e.oClasses.sStripOdd+" ";if(j(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(j(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(j(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}a=this.getElementsByTagName("thead");c=a.length===0?[]:ca(a[0]);d=typeof g.aoColumns!="undefined";a=0;for(b=d?g.aoColumns.length:c.length;a<b;a++){f=d?g.aoColumns[a]:null;
-var k=c?c[a]:null;if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(f===null)f={};f.bVisible=g.saved_aoColumns[a].bVisible}y(e,k)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){k=g.aoColumnDefs[a].aTargets;c=0;for(d=k.length;c<d;c++)if(typeof k[c]=="number"&&k[c]>=0){for(;e.aoColumns.length<=k[c];)y(e);C(e,k[c],g.aoColumnDefs[a])}else if(typeof k[c]=="number"&&k[c]<0)C(e,e.aoColumns.length+k[c],g.aoColumnDefs[a]);else if(typeof k[c]=="string"){b=
-0;for(f=e.aoColumns.length;b<f;b++)if(k[c]=="_all"||e.aoColumns[b].nTh.className.indexOf(k[c])!=-1)C(e,b,g.aoColumnDefs[a])}}if(typeof g.aoColumns!="undefined"){a=0;for(b=g.aoColumns.length;a<b;a++)C(e,a,g.aoColumns[a])}a=0;for(b=e.aaSorting.length;a<b;a++){f=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=f.asSorting[0];c=0;for(d=f.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==
-f.asSorting[c]){e.aaSorting[a][2]=c;break}}this.getElementsByTagName("thead").length===0&&this.appendChild(p.createElement("thead"));this.getElementsByTagName("tbody").length===0&&this.appendChild(p.createElement("tbody"));e.nTHead=this.getElementsByTagName("thead")[0];e.nTBody=this.getElementsByTagName("tbody")[0];if(this.getElementsByTagName("tfoot").length>0)e.nTFoot=this.getElementsByTagName("tfoot")[0];if(h)for(a=0;a<g.aaData.length;a++)w(e,g.aaData[a]);else x(e);e.aiDisplay=e.aiDisplayMaster.slice();
-e.oFeatures.bAutoWidth&&ea(e);e.bInitialised=true;i===false&&r(e)})}})(jQuery,window,document);
-
-jQuery.fn.dataTableExt.oSort['percent-asc']  = function(a,b) {
-	var x = (a == "-") ? 0 : a.replace( /%/, "" );
-	var y = (b == "-") ? 0 : b.replace( /%/, "" );
-	x = parseFloat( x );
-	y = parseFloat( y );
-	return ((x < y) ? -1 : ((x > y) ?  1 : 0));
-};
-
-jQuery.fn.dataTableExt.oSort['percent-desc'] = function(a,b) {
-	var x = (a == "-") ? 0 : a.replace( /%/, "" );
-	var y = (b == "-") ? 0 : b.replace( /%/, "" );
-	x = parseFloat( x );
-	y = parseFloat( y );
-	return ((x < y) ?  1 : ((x > y) ? -1 : 0));
-};
-/*
- * timeago: a jQuery plugin, version: 0.9 (2010-06-21)
- * @requires jQuery v1.2.3 or later
- *
- * Timeago is a jQuery plugin that makes it easy to support automatically
- * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
- *
- * For usage and examples, visit:
- * http://timeago.yarp.com/
- *
- * Licensed under the MIT:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * Copyright (c) 2008-2010, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
- */
-
-(function($) {
-  $.timeago = function(timestamp) {
-    if (timestamp instanceof Date) return inWords(timestamp);
-    else if (typeof timestamp == "string") return inWords($.timeago.parse(timestamp));
-    else return inWords($.timeago.datetime(timestamp));
-  };
-  var $t = $.timeago;
-
-  $.extend($.timeago, {
-    settings: {
-      refreshMillis: 60000,
-      allowFuture: false,
-      strings: {
-        prefixAgo: null,
-        prefixFromNow: null,
-        suffixAgo: "ago",
-        suffixFromNow: "from now",
-        seconds: "less than a minute",
-        minute: "about a minute",
-        minutes: "%d minutes",
-        hour: "about an hour",
-        hours: "about %d hours",
-        day: "a day",
-        days: "%d days",
-        month: "about a month",
-        months: "%d months",
-        year: "about a year",
-        years: "%d years",
-        numbers: []
-      }
-    },
-    inWords: function(distanceMillis) {
-      var $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
-      if (this.settings.allowFuture) {
-        if (distanceMillis < 0) {
-          prefix = $l.prefixFromNow;
-          suffix = $l.suffixFromNow;
-        }
-        distanceMillis = Math.abs(distanceMillis);
-      }
-
-      var seconds = distanceMillis / 1000;
-      var minutes = seconds / 60;
-      var hours = minutes / 60;
-      var days = hours / 24;
-      var years = days / 365;
-
-      function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
-        return string.replace(/%d/i, value);
-      }
-
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
-        seconds < 90 && substitute($l.minute, 1) ||
-        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
-        minutes < 90 && substitute($l.hour, 1) ||
-        hours < 24 && substitute($l.hours, Math.round(hours)) ||
-        hours < 48 && substitute($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.floor(days)) ||
-        days < 60 && substitute($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
-        years < 2 && substitute($l.year, 1) ||
-        substitute($l.years, Math.floor(years));
-
-      return $.trim([prefix, words, suffix].join(" "));
-    },
-    parse: function(iso8601) {
-      var s = $.trim(iso8601);
-      s = s.replace(/\.\d\d\d/,""); // remove milliseconds
-      s = s.replace(/-/,"/").replace(/-/,"/");
-      s = s.replace(/T/," ").replace(/Z/," UTC");
-      s = s.replace(/([\+-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
-      return new Date(s);
-    },
-    datetime: function(elem) {
-      // jQuery's `is()` doesn't play well with HTML5 in IE
-      var isTime = $(elem).get(0).tagName.toLowerCase() == "time"; // $(elem).is("time");
-      var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
-      return $t.parse(iso8601);
-    }
-  });
-
-  $.fn.timeago = function() {
-    var self = this;
-    self.each(refresh);
-
-    var $s = $t.settings;
-    if ($s.refreshMillis > 0) {
-      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
-    }
-    return self;
-  };
-
-  function refresh() {
-    var data = prepareData(this);
-    if (!isNaN(data.datetime)) {
-      $(this).text(inWords(data.datetime));
-    }
-    return this;
-  }
-
-  function prepareData(element) {
-    element = $(element);
-    if (!element.data("timeago")) {
-      element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
-      if (text.length > 0) element.attr("title", text);
-    }
-    return element.data("timeago");
-  }
-
-  function inWords(date) {
-    return $t.inWords(distance(date));
-  }
-
-  function distance(date) {
-    return (new Date().getTime() - date.getTime());
-  }
-
-  // fix for IE6 suckage
-  document.createElement("abbr");
-  document.createElement("time");
-})(jQuery);
-// JQuery URL Parser
-// Written by Mark Perkins, mark@allmarkedup.com
-// License: http://unlicense.org/ (i.e. do what you want with it!)
-
-jQuery.url = function()
-{
-	var segments = {};
-	
-	var parsed = {};
-	
-	/**
-    * Options object. Only the URI and strictMode values can be changed via the setters below.
-    */
-  	var options = {
-	
-		url : window.location, // default URI is the page in which the script is running
-		
-		strictMode: false, // 'loose' parsing by default
-	
-		key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], // keys available to query 
-		
-		q: {
-			name: "queryKey",
-			parser: /(?:^|&)([^&=]*)=?([^&]*)/g
-		},
-		
-		parser: {
-			strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,  //less intuitive, more accurate to the specs
-			loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/ // more intuitive, fails on relative paths and deviates from specs
-		}
-		
-	};
-	
-    /**
-     * Deals with the parsing of the URI according to the regex above.
- 	 * Written by Steven Levithan - see credits at top.
-     */		
-	var parseUri = function()
-	{
-		str = decodeURI( options.url );
-		
-		var m = options.parser[ options.strictMode ? "strict" : "loose" ].exec( str );
-		var uri = {};
-		var i = 14;
-
-		while ( i-- ) {
-			uri[ options.key[i] ] = m[i] || "";
-		}
-
-		uri[ options.q.name ] = {};
-		uri[ options.key[12] ].replace( options.q.parser, function ( $0, $1, $2 ) {
-			if ($1) {
-				uri[options.q.name][$1] = $2;
-			}
-		});
-
-		return uri;
-	};
-
-    /**
-     * Returns the value of the passed in key from the parsed URI.
-  	 * 
-	 * @param string key The key whose value is required
-     */		
-	var key = function( key )
-	{
-		if ( ! parsed.length )
-		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
-		} 
-		if ( key == "base" )
-		{
-			if ( parsed.port !== null && parsed.port !== "" )
-			{
-				return parsed.protocol+"://"+parsed.host+":"+parsed.port+"/";	
-			}
-			else
-			{
-				return parsed.protocol+"://"+parsed.host+"/";
-			}
-		}
-	
-		return ( parsed[key] === "" ) ? null : parsed[key];
-	};
-	
-	/**
-     * Returns the value of the required query string parameter.
-  	 * 
-	 * @param string item The parameter whose value is required
-     */		
-	var param = function( item )
-	{
-		if ( ! parsed.length )
-		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
-		}
-		return ( parsed.queryKey[item] === null ) ? null : parsed.queryKey[item];
-	};
-
-    /**
-     * 'Constructor' (not really!) function.
-     *  Called whenever the URI changes to kick off re-parsing of the URI and splitting it up into segments. 
-     */	
-	var setUp = function()
-	{
-		parsed = parseUri();
-		
-		getSegments();	
-	};
-	
-    /**
-     * Splits up the body of the URI into segments (i.e. sections delimited by '/')
-     */
-	var getSegments = function()
-	{
-		var p = parsed.path;
-		segments = []; // clear out segments array
-		segments = parsed.path.length == 1 ? {} : ( p.charAt( p.length - 1 ) == "/" ? p.substring( 1, p.length - 1 ) : path = p.substring( 1 ) ).split("/");
-	};
-	
-	return {
-		
-	    /**
-	     * Sets the parsing mode - either strict or loose. Set to loose by default.
-	     *
-	     * @param string mode The mode to set the parser to. Anything apart from a value of 'strict' will set it to loose!
-	     */
-		setMode : function( mode )
-		{
-			strictMode = mode == "strict" ? true : false;
-			return this;
-		},
-		
-		/**
-	     * Sets URI to parse if you don't want to to parse the current page's URI.
-		 * Calling the function with no value for newUri resets it to the current page's URI.
-	     *
-	     * @param string newUri The URI to parse.
-	     */		
-		setUrl : function( newUri )
-		{
-			options.url = newUri === undefined ? window.location : newUri;
-			setUp();
-			return this;
-		},		
-		
-		/**
-	     * Returns the value of the specified URI segment. Segments are numbered from 1 to the number of segments.
-		 * For example the URI http://test.com/about/company/ segment(1) would return 'about'.
-		 *
-		 * If no integer is passed into the function it returns the number of segments in the URI.
-	     *
-	     * @param int pos The position of the segment to return. Can be empty.
-	     */	
-		segment : function( pos )
-		{
-			if ( ! parsed.length )
-			{
-				setUp(); // if the URI has not been parsed yet then do this first...	
-			} 
-			if ( pos === undefined )
-			{
-				return segments.length;
-			}
-			return ( segments[pos] === "" || segments[pos] === undefined ) ? null : segments[pos];
-		},
-		
-		attr : key, // provides public access to private 'key' function - see above
-		
-		param : param // provides public access to private 'param' function - see above
-		
-	};
-	
-}();
-
-
-
-
-$(document).ready(function() {
-  // Configuration for fancy sortable tables for source file groups
-  $('.file_list').dataTable({
-    "aaSorting": [[ 1, "asc" ]],
-    "bPaginate": false,
-    "bJQueryUI": true,
-    "aoColumns": [
-      null,
-      { "sType": "percent" },
-      null,
-      null,
-      null,
-      null,
-      null
-    ]
-  });
-
-  // Syntax highlight all files up front - deactivated
-  // $('.source_table pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
-
-  // Syntax highlight source files on first toggle of the file view popup
-  $("a.src_link").click(function() {
-    // Get the source file element that corresponds to the clicked element
-    var source_table = $($(this).attr('href'));
-
-    // If not highlighted yet, do it!
-    if (!source_table.hasClass('highlighted')) {
-      source_table.find('pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
-      source_table.addClass('highlighted');
-    };
-  });
-
-  var prev_anchor;
-  var curr_anchor;
-
-  // Set-up of popup for source file views
-  $("a.src_link").colorbox({
-    transition: "none",
-    inline: true,
-    opacity: 1,
-    width: "95%",
-    height: "95%",
-    onLoad: function() {
-      if (prev_anchor) {
-        prev_anchor = jQuery.url.attr('anchor');
-      }
-      curr_anchor = this.href.split('#')[1];
-      window.location.hash = curr_anchor;
-    },
-    onCleanup: function() {
-      if (prev_anchor) {
-        $('a[href="#'+prev_anchor+'"]').click();
-        curr_anchor = prev_anchor;
-      } else {
-        $('.group_tabs a:first').click();
-        prev_anchor = curr_anchor;
-        curr_anchor = "#_AllFiles";
-      }
-      window.location.hash = curr_anchor;
-    }
-  });
-
-  // Hide src files and file list container after load
-  $('.source_files').hide();
-  $('.file_list_container').hide();
-
-  // Add tabs based upon existing file_list_containers
-  $('.file_list_container h2').each(function(){
-    var container_id = $(this).parent().attr('id');
-    var group_name = $(this).find('.group_name').first().html();
-    var covered_percent = $(this).find('.covered_percent').first().html();
-
-    $('.group_tabs').append('<li><a href="#' + container_id + '">' + group_name + ' ('+ covered_percent +')</a></li>');
-  });
-
-  $('.group_tabs a').each( function() {
-    $(this).addClass($(this).attr('href').replace('#', ''));
-  });
-
-  // Make sure tabs don't get ugly focus borders when active
-  $('.group_tabs a').live('focus', function() { $(this).blur(); });
-
-  var favicon_path = $('link[rel="shortcut icon"]').attr('href');
-  $('.group_tabs a').live('click', function(){
-    if (!$(this).parent().hasClass('active')) {
-      $('.group_tabs a').parent().removeClass('active');
-      $(this).parent().addClass('active');
-      $('.file_list_container').hide();
-      $(".file_list_container" + $(this).attr('href')).show();
-      window.location.href = window.location.href.split('#')[0] + $(this).attr('href').replace('#', '#_');
-
-      // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
-      // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file?
-      $('link[rel="shortcut icon"]').remove();
-      $('head').append('<link rel="shortcut icon" type="image/png" href="'+ favicon_path +'" />');
-    };
-    return false;
-  });
-
-  if (jQuery.url.attr('anchor')) {
-    var anchor = jQuery.url.attr('anchor')
-    if (anchor.length == 40) {
-      $('a.src_link[href=#' + anchor + ']').click();
-    } else {
-      $('.group_tabs a.'+anchor.replace('_', '')).click();
-    }
-  } else {
-    $('.group_tabs a:first').click();
-  };
-
-  $("abbr.timeago").timeago();
-  $('#loading').fadeOut();
-  $('#wrapper').show();
-});
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png
deleted file mode 100644
index bc04508aae37b87025042bf57efcfe197288ca50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmeAS@N?&q;$mQ6;Pv!y2?ElLK<v%I3?$n)WH$mS;{cx!*Px&vcXxMxe}6|uM{jTM
zfPeriE31Trgs!eGV`Jk>mo7y`MFj>1e){yOv$OO6|NqaPJ}oa<Uk=o+?djqeQW3ZG
zU@LEfg8;*Zc{X{!{ZI3>TuC~X=%G91_vFjZer9f;HRZykg1r(Q%$LHyxPJ#~WAJqK
Kb6Mw<&;$Sw0X-f7

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png
deleted file mode 100644
index 57fe953b7e59ff70b15797d2ce74577a5c518891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2032
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
O0000<MNUMnLSTY@_vO_9

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif
deleted file mode 100644
index b4695d811d4f84ed693eff7b5e6b4d61a3e8c48d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9427
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
BHE;j`

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png
deleted file mode 100644
index 2d8598bf8cb75f2ef7dafa6942714b95a8ad61c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 165
zcmeAS@N?&q;$mQ6;Pv!y2?Ej@Ak4xHB<n6LjRR6b0X`wF|6u?q0AadcH<=IQu$Bb*
z1;1|)U^qX?d(Ks$fSsp{V@O5Z+slfK3<?6y7ZpE92st!$J1_~nj%PhD#!wh<w^vbW
y{;2~?wp<Y9U-gL1cYZ?BBH6Wbx7#-DJ;VBI1Dn)dtp+2YNerH@elF{r5}E+D3Oz9Z

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png
deleted file mode 100644
index 7cf67ed199323e38b5e9072060881648f3e9a270..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1008
zcmbVL&u-H&7|%2fp-E^v0w*iGaG;5uu1T9MOiP`yie*%7C3>8jxNWp0&K!@XJ96U*
z5HGP8-~dPV3cLg_zyZ5$28U@#L`pu}`Tc(1AAjG+?&<5z=bM_QJ?R|dp0wNQeY`He
zFKSzTX`YE-DEe$HW`tAiFlHkPIw_gZ9wqVo@|Nyv+WI&d48<@!aU+%*L}83F%_UpY
z_7BROMCVk15uGHNr~mx&RR>Az>F*jL4D&XfCdb#D_ODL|(e-)MiuHq6V83*wKuQGx
zWqOenZt3X@U01Hvv8jUvM4Ws2GN@tL1#QMDXc({-K^p=a8K}PNIL=F8K?F@`naHXk
z$E{l~gkbgP(i@M*ZVw-=e94`sPld=`)11v_#;k5IJ~2_N)lwRkRg;KXG0y}kYgw^V
zDPUSeJjq4EGN2U6h+PR!mys@0Nb@kf6V8fNp=8O-lH?{bpqZvBuLZggJ^Ck%d(p*U
zo>Q|&3wFgLc^~7QiY#mQup<SO(YSAUA}@tpU>04aG!q@{>GF>eC$S4r6C&j7LdSx3
z6CodAKY-0$r|Dqagh8coAJ=c%b!_<owi|7P0(fXUjdsJf>exR*4ysq&PF4t#MYQsp
zNWUvCevs?7IVFPe0b>_c2Xv=Quwu$`(C#-tNTMWDdv!g_Y%%4@dm0~cmV!ln-Q*ts
z(E3;2OK$u>H8W)}rfQDAnx#6D9jKOftuHrs!$UJUF<g$uMtJ*4j@6^?$so`^s|lN5
n{<@K7tAh^*<&V+X(~a*M_@=FGYioPH|3*PN!70A+&p!MH>lH02

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png
deleted file mode 100644
index 1460b78d1208ab13395cf1a0e15f4b9a2ffb933c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1008
zcmbVLO>Wab7<E-Zs1meGV1Y*Nh6S-_oW@Q}OjUal8c~-hi9{qeo!FDcYV0xNDRHu7
z#}Qa@11`V<mT(0Qz?K^z#z|aQL`A}qJwJZ$egE&er_XjC>?n$Ir*n*Za@{N5+uQQ{
zsIuFa%YD%riar~Q8R1kp3fYK)PE5{ekCJfy`WtO3%Jw)K48_ntu>%%sq`+u-oJzK$
zG!OHX1Q%3*5j~F*NB#NfvkIcnQD4@4=%*f?M8^wG`-{^-u(${sp?dffG;>=D#8eQF
z$I~RUb4Ok3+Hzl9>nd16#D$}-oErLF;4w}?O@oyHnh=;sL)8PzvK|8iBB(<{M@9u%
zcGa*U1nWnY)_6F!d$_%}B~Okz5hAs9eKwnEv#Q4UxsDo*MxkLC6^W>1^F)xml4Sd(
z0;XBOqf|sJ0fizNu}k5o($iH4aq9b5!b!GHluVhPlT=3<)Z@5_Yl+T8kN$CEBRU(*
zQ>yo9#x8jv>oMLh$uf7>8!CX(8~X*1WKqZzv*0qOiRfTQm4CD_3T=q$5FzUTS_U-h
z2)PKmEm%LW>K4Xz*eW$PaoxIE#fE2Kv*sbxf=8xR^J=D1#cmr}s9JJ6NhU}V(9&)s
z?XJ1#TCVMJN(AEr#-?QlbSF%(Y{F9D^=rT<L6j8dqCBf;G3C)48n!u$!7{&gw81_!
z{uTF%8~#tubm@#<G{;}fQeMdpEVfszFArD4LlZeMT#m-8hd*w}vAWeg8MNLnC+x%B
nUs!H-JNRgje;=LQyZKcCUzDvqW$TISJ})qx)+zqzp1u7IjA<+p

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png
deleted file mode 100644
index e7d18257f1152631f76febc99080268b875315ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1008
zcmbVL&u-H&7|%3;U=rH60VgZFa99&NU7I#EOii4zie*%7C3>8jxNEc~4vt5&9l7xu
z969g;9N-AAfW$NK3fOHkI7~w#Qu5i(@Av!u`1{`XPhM<2+0r!aLGK6;q}@^Py-oRj
zTH78<^H>C9F=SJ*Ae?I5m`y0?rR0nbD2XrMe5V~v+ngq&u^5NPPQ+4!D2!32xnyfv
z=b+3<bWR1B(6c0S^<SUA=pcz*{dFURVeZpea&*P%@akj~U7bhmSU-3UI;A58QYr{2
z(|J}nrK>M>9l2J=rVf@6aqjA?pvGYz_>5D~Fkmf$O$eIEK=pmww)cPq5j3G?BCCdM
zr*1hAg7u?IZ#<ql1AMslC3mhq6C!s^bFo+$i@L%1nTgu%w$iYynncu!%S@26mKD2|
z0;Wa8lUyV$14@xh*oAO)8R;s8G!MgT;jCB}N|wwlNp2zonrW)?TA~Xvpnt-+5nYTf
zb7~G~!7g|t?_;`Kk!9^}ccg$a8s`;H<fV`~X3<4TGttAYF8>&D5<3vJAVT&&v@O_d
zA><+K1+cYmw``1CFsL+c;`%K+fI;BlX2VA)fZe9u@Ec95j=e)<qk6^dWrZMFL@U3E
z^t<MEZ{<2Zr$jJ5Vr*V@K!3&rD`qSQ{;&Z;5+#}1tLs^1iz!du()f_G6fEoOBschn
z*1z&zapV7~nJI%YRdf8+EY*?hK()MXeYv?F9-7IC;c_(UANC%~vAWwo9tA%?stH4V
mbYGh79`26HACuEZcfM)htG2PDZ9Mb5mkQDgPVgu1^xbdZiYvqb

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif
deleted file mode 100644
index 3596a61f3af951db38aeb149eecb37e7142d5c46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png
deleted file mode 100644
index 2a5079f4c4c7c7c56c2e9cf0ae0d6b2d20571810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1300
zcmeAS@N?&q;$mQ6;Pv!y2?EkQK+Mm<1|%;$)bj*Vk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81-`y;gY$}^0R;>){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T
zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsddm|7SZ
z8k(CJm>U_GSr{5x7`T|YIvQFUIlG#fni(6y%)qAC)ZE<B*v-k@(Zt-u(9p%r(a_P@
z(b3S%$<^4^$-u-3rq?sCxFj(zITdDaCeU7}UNgLUt(=Qe6HD@oLh|!-U@0IVBfliS
zI3vG6!8zDe!8b8EGY`ZEMGwTcE~!PCWvMA{Mftf3;PAD|#9}{Te?#=9U<)%~DB%q=
zeV}9XL5Tw?vA~3YDG<bjCw(9Xo_SL9fH|fJm^GB&zud{d!077f;uunKt7Xzbua*Fj
zw)a;RFL*B6s+;5>(8-|{wKeOaaKsm`y)D1=E-KAW6uYFBb#ak^GsmKd*Di@P-TESL
zIsJ&*uZM>pf8F0+{C~AbfB?%TjjqKu=hY*pt-Uns^{(RMh4XT6&vOgh(vT79VYEE6
zO6d5<wg{#B-_z$kk8Mr7@%F+B<Jr$2u*EcZ7jWCXkgg1A7VJIvm3arVRk1(s!MO9v
zCZ@(yHaDJ8e%5OD#b&Of=eK#2%>PYt%Pe^Nq4?kyk!fB&UYZ=ei;^FU-C)l?z+|1U
z`Sq8_f>KX?E-qYV$$vo7f^~O7&aAZ9X-`9PFHBZhxF)#7Q1`S{c<9z7iMEVcZd-D-
zU+=nB=pX;#+%D!-(r>!co(lF?zMTC2d8}~#Yr#E*xlM-?*PJf7yIS+;$$IIygOh)0
p@4E7W$C)jP{dvOdxP7b=3`;cX-pyftkOC^GJYD@<);T3K0RXJA$o>ET

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 68aa3f48d064597e6c046229364a0022b72a9ed4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 179
zcmeAS@N?&q;$mQ6;Pv!y2?Ej@K%BzC1|+|v6jcGKYEKu(kc`H+=L{JSC<rhZ9@sz0
zJW{3P#05Ta)|<wk*T`GPv)>a5VGVT*4G^U+C4P7h^U=A<t2BYmVDNPHb6Mw<&;$TY
CXD|K$

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index 2b49a7ae745816e166a0ae4ca56917465c539643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?&q;$mQ6;Pv!y2?Ej@K%BzC1|+|v6jcGKN>3NZkc`H+=L{JSC<riY4EjG$
zo|DJ?zyysGvu6I3`*xpi4o6ti)CAQCPU=$9S=}s0G>xwN0Ug2M>FVdQ&MBb@0BuY+
AumAu6

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 4b38ff2d7f6bedb954db4f2a9894694856a92378..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@>^)r^Lo9mVo;Tz=V8GyXasBuG
zIoB^GOgD30P`qG=4NL43tA2?EQ$9sc`lxomNutS7f>U_jl2r5CIsXH_em-G4I!Ayl
TF!F>J&?p8^S3j3^P6<r_R$VC8

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 5c0c93f1e9f7fa1fc87ea7b84cfef3c066fc91a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@3_M*NLo9mVo>t^zP!KtM;qCqZ
zXSBsQyIRidS+dCMkVlZ_)99S+23!C52cI;S+9WVO*}^OB@mOgKP%ne0tDnm{r-UW|
D;%*_|

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index 43d3253fc7e112981a0915b284dd1407f0e138f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 110
zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@%sgEjLo9leD?U9rS+B;%#?}^?
zG(|$SP50y5+vXbG6DJBbCnO~~r77;X(b4$*jE13CkI)SchU3YccNYA72sDm?!PC{x
JWt~$(699GrBWC~r

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 8265061241d2e4faae5e88b4142d6f806e947733..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@Og&v3Lo9mVo;KuSP!M1~xcATh
z)s+WAZ$)r4ZS|OyIQ!@~0SAtU(YvZcL*JINJ51^`Z}}i2+{(oH@rKKEH=qFwp00i_
I>zopr0Eu-Yod5s;

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index c6270881b87016e62aed1f999f883dadcb57c046..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 118
zcmeAS@N?&q;$mQ6;Pv!y2?ElLKs14a4amxm;JOW@>^xl@Lo9mVo;T!bFko=LIRDQ7
zZA}WSk5xLHuRERm^h5G+t(>8QW@`Mg*2xK;7B6%gRg-`C8qB}+ihJo4P5urgey)AI
S9X>#l7(8A5T-G@yGywqfL?*-l

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index 67e0eb9b4d19963b9e32310da2aa6c2184ee4868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?&q;$mQ6;Pv!y2?ElLK%BzC1|;2eq7s0Vj;D)bh{V+7iZ3rN)~m6xv9&3>
y{Q3W1-fKbO#g6*_{{;0<A2`4u>YU7L&BQQ$g_V|b=OKTfJ_b)$KbLh*2~7Y1$sOSU

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png
deleted file mode 100644
index 192e2b852572af305e320edf30cdadf068f7d179..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 88442a01937a5ba6700857a86795401818e5d435..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png
deleted file mode 100644
index 327cc6d46141e7d087f3886f8da43a062bb40530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4367
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=Q+eU0002DrG>dY008`Z
z1+21x|5~Euh26hy$=2H8tob?f|D7Z4eRTS7;iw>c)Fprj>;wy&ZTrJ)br}ag<ZZMV
z|5q-Ap^%xy1*vPtHSJa7bP{l#_xgr<PMS-!HAPmuFG+n<`A+cwFSo)00i_qYKQFBI
zn#nt7>=X6m?%ffK0|0<G&eGh}A@t>vORD=+10ST%qI@p)sak|5{hHP3I~z~E?vMLa
z=BT|H4YC~HA|Lrfuq^&22*lYsxv3owD`Sw{vawW$0pQv5{@z|9SiqKkEiUgBfEWn*
z;aH8mdrTk;cqyzUR+E<neD;GT#-d3{ZB>XeFBHUiAG_pxG+l1x$NP*$z**XUaHs%*
zT~QZ@JwKbQ&sNyZkpol8<WhDth}yKhMgGZc7Fxrvybf12k_(S7ftm{tKSE<+OW;>h
z5^oVqK-Y!Zwy72HNaI8cpgp!BT9|lhIRf$Q$-mV0G_G0r_4vcCAV06moKS!OS6T2=
zaA{r`*o?Vwy+p16i$FS1#yp!X#x#D-x=)mxV(MiaD~xucTKJ>Q&ldM6+YbU>U@N(y
z7QBwf@bVLr{8V7vD}&+n@2eflqq8!v)|gb_I>&^k^y6-qc21A~ht9Lede}Ft6Sn^z
zp03M_*i0AOWKXnrhc-zd6`!5VnHHEj<B`DVDjy~lR;x}U9dJm`)`MX_cb3Eee@!=>
z7mw4iO@RjJGiHrsLA75Z<5sgO`{Im|j=R7WL~BGbhi*;f*Y3A>gQEzF(H&xT!bvxf
zIO>MBz@*Xgt3N_AaqdUIbfuim2#6yuNI%I-Ydn)sUd+Tg{Ha<2>9<BR^|JrdAb;1|
z!@BRfom_8_ssZd>g?(?z%{MBPY8=38k@+?+;{=d%95yI5zOn57gFbea((RI`KOY|~
zLD#SQAn8PVU~6Hv)24u>H#nJ;tO!heKU;VX(T{v)QoCxTN#-wL^9#0ql4Wp5N^WEp
zsW<o`c2k%m)(Q+oi}fFXjfdM?5XifTv7)(sek(Z45$nSz$loR7_FASQopV<n<`pB3
zR0lptl+(biUcRyU1IBe;7}|Rp2$e<Wp$ncOu)#5J9fGXh@JW!PC=y-Co!1ITySfq%
zt?h~OKkn1FLJ3v)^uFGIAl{#*yEsFX>2?zYsa$T=k%VN{kwvrkavdGcNgF4tuaT@t
zVKIYu9yWErR9xW~ixq{ydtSpI&*t;k#4>Rl2rfstJqIl_r>!mEQ=t1RwWLTBB;xz+
zjWM$srvM5=UI97MWD0U_wyd9Rx}b`Q$C{bloZWDSIC8A@2c&kC7O~w`9B~P<?4{o*
z7v111#7y^eiTVzXzxL(&cuD&qyNp56&^EL`8`ez!*5Qts=FgLvsbPolW=<$YxXV3h
zdo2Vk>6ZRUJs$!KA$?5whnCd!7c;#ew}h8ucNy}k5@Ti50qK_$ch2=zfFA6^gW<9=
z&@6+eL&kf7T>18*S_j@ke}ks?Y&aBKT^;+SMh`SvV!+Z%kJG3gXJpV*U}$5j02W*4
z&kUg&SC+<!#T&sXTJjlFHiArtn2U9l3+lC)CYBeg06S^zc{bV_wn1GSMSKVSMa2Lr
z_#_II+A>#-vD>VBzYf)YhTzbd>9kC@hdZ#$PN8;{z%V%~_7|`}NHSq3Q)wFY);;>%
zU%C&>ZvBkCx69;(i1GTMq>~CAeRNXBc2xPAI!xipTiH%)Ka~f2z`78T3TUzM1l2Y<
zq5S-O9L<fh;h{FW)Yuk`HG<)5_J}+AxS_!2GwbV|rJu>Do9fBgm7NXKo<<^_XaE&x
zhfMT{seaG#HQutUOWm?!vDu5jCdvnbfzi%El<S5FmW4CYo<W5=CwU3GI(=#oZ~y_w
zm6onTU>Ugmj!1t}3yCp%j6Gw95E=ajxoCl7_Y^3O#fxl)0l0vetoSKoLf_Yb(Bid3
z(!poAUu5`>ff<3?lP+j5>s}jNog4s4Il$ipm095$@Jtb%paO`r_+~iaiI!yi`6!8k
zy2BYhbXs~mF{g7EOtYf&!6VrRo*A<;+olTZs%_*5#G_UEMihvn!PHkNsR&e}=@%Z(
z(S`v?ctYwAvH*Ldd}sqxb3)U^-u|@rNuSdlH*fPyn(`w9^_x5RS6QX-S=Q3D?dEg<
z86k140HUF;PG~7x#nSGc{O)_mUlU*g6y~1f?h--uP*0_-X`3zZkBCS4x)RAi1vG&T
z@Dm94jgG}G``M^vec?V0YJ@tR7g`oz7qyl)*zD04OYI@Kpy`v+a8QleQ|xzn?3Y~Q
znq}n>7Ki$_WxtCO0Q?&%O<oHUL>zNGi0k$GhvmT=T91Ax*!XV*fE5TQY%9JNmcJHK
z`5Z2x8f1AzK_T*%gwOZGf2Z82=iQyPb^8Htc-D2)dc&pNplz#&T;@okcO7YtnBkZo
zw5M0tH#<^iAB|>y|F)Mi*nlD)$4oKI*e}nCiexLU2N-Vp_u?GG0)|-wOqG?}NyKUx
zIQ$M+Z`52ix0anX^F{8)x2v|f=qmd1QpxOtn4v#`*xv(DaK*gvy^CJtTkVm-jcfw~
z`*!V8ZgI+(d=&@$0Cyc2%gkuDkM7=Ga^k!xqoR!GLOu4{#H02ESnl3zKNrN4V2DyN
zP{S+`Q=Eb(p37lNIty;R{G01RT70VV(o7UV;Vi+GQq9!;1fh*+W%#cb22z2_czf0<
zG}&hGDI@<B-xgRlRA)>==Mzr6_SAxG!4hlh+o8i5O7<0tsq}dIh}7zH=CuP7uab)<
zZzEdDufwq5{Y+kmSPrWEi|^Hl8J!XRycoUgo+faXF<~n6IHhY>IDskH(4P8T3n)*t
zQ&5OzouQ4Jy!4vv9B+KCa=a)Y;^1B*>Is}u*HXn>Ft4+(#5MV)6J3S^{!UK8s<&}Y
z%~U=rU_tEeFZLAm9PL*<PoJLU$;>F-q$~Ne*Pjr=n{3yu9r(0rTVUOX#RqoKD;O9N
zv7K4@=};a0LS$_VB8g+Bm(u<GuWIex0=c^HjeS`O-qzneyrqKry5)L~AspX8Qly#V
z9N-W4Re30#WNRJ_*xEWjU~kvkRyVmhvNn$|bRnq(s+DpxZZ9bmVQ%VP@b9chq8~wD
zUsQw&*V6P`>xWTi%~zrfA2_qit8VUrW^y!uaXI)-znxCrRZ08beB|gTh{g@V#B`rm
zTb#I$AC)_AKtHHYJUzEtQ;f$I4ry$w;L{xI5i9b7>wr0>Qt`~*MOVlXqj15!j8{{z
z@8Xrg*Y_r*z1L}r3&XV|eQ9_JFOJB7TOcZH>pYb^skZ`#HdCuls3jdf5LEYE*qu+c
z_a%p7;yGwa`4h7&kL6|2(4yg(1bf{xf|9`Ia?x~Cmev!2!HpepZf)rRiWpnq)iCXr
z-$wV`Zuv%AF6!f>*0(Cv#R~ldAzr2s(#+t)R~%@5o4g?<IxvI%MzwMN(8cgS?86Kd
z9hPp<-+g9I9_neG7sC&~Jox%(5&ZG}=+J6Ih3&XU^vOiH-`gWYJ(DWpNg@pO1PVJ)
z4&9<Hj7g}sfIsR@rs|ysY-6P>>F4II?X}^kaa~Fz68yEzpT0i!V+FfjU6)b=4@UWh
z@4j1D0?!8q0x77~Ex(hKXa%-<UQLFEA-MZ6r?@DvXywfeW{pjq4?K_TDVqv>s6Y6z
z)Mg6rxC}98GO=#D_#wA6QNRQ7=}i|(lW5i!bM?EoR`w21g#@PIN3;RIIuF7Y^j4<|
zw%C&Mjgd3Kx|%@#MLvS<WZ=<s7Z9f#Qw-KJ>R#kGDuwzTyh14BK3O?Jo{NrDOvj{-
zQL!ZI4yom)97<ZWN(Y*%$aHE7I3X)5dsB^TjkfR(Z!NqrIx$#3VN3?MuEgS9s`oZ{
zbSKsGMFR2lpRNY>XswW;w>3Kr_7z|QWrC2`@T{wccm5>heu~IIo)X@nu<s0yq210X
zrj;4VyVG#KloJC3Mv|5BWS^Jo#acV;_g*GQnc<)MmbG1y6Y>$;rBY<`@&vznX8=gx
zECHsG=S!Mq2mEIL<VvY<DyjEyc!cD6s*8d7?kjB>H^IYRM%u0Nr#d9$xU2)N$g6iU
z64(?IzYyc*UBaiFS3}b|Zoivg$hi2{j4K555C5uopBI#LKZ5YUz;qGt^^Eq9_>g>T
zNSS@Kw5#lPty2pxjEk%oTDm=wtl=-;0Ow!Wy&~SoS$5dPmfJHRK7H43>GOS8O9s#>
zX}3qgy|j<1aob6Vd{}2C$?&X~`P(;HS!%r98S7S0!XwrbL4OvwDHLqKZu;8>Yk(#P
z8?fQ+XF-~sC)t8E<Ag!jhy%^W_r8$9_$v`Q*F*z)t5e7xlv9Vg6A@k?)(ScX$g~25
z*0H^+<NNTN)thc&Dy|58uv2t-Br2t5(3{nopooV1Y8>-fKY|w5c=I|XVb%VYwg*Vd
z+Xi0$$caUG^n~Dy2tHKozw5u3x)bOTA~_c=xF4SO!-u9gw=RXTsR~OIh^qXy!9`_y
zQ-B=8xvMKCPM66Bs+8y)K%Aq33Ve?ff{k{>A72r_&}dH^zvePqS}9z5x~ODmJp2qq
z0emp3HWLqT&L{OE=Wt=%44u}>$>5F5L$1_PwBu9;Gz11@RD4U4-98AnMcQR?ql`~z
z934cwcJ@_DV>|;a0>!TEq~u1q;j}}o2_f94g<b8)1}StSzoZ|n3m!pirJYisWoLzx
zkjCcLPoyYqiP=l`wo{UYlX~4NTf1S=D)^kCe?+X4`2H^T*?_QJrE>KoxjBI2-!Svr
zf5SV&vtFXv8pY0+Z@g~{o|D_z07~xzUq*VncP={mycn5W56R<lc5IuIj@(TkGX%}Q
zd`&_*qUPpdhhYgK1bsjro#)l$1ZDBQp~1^?jW1_0CTFFT|GvMoHV9_fOw?ZL!kxpH
z8mHPJRZ@Cc{qwZ8+Z;FJ%rWv@N#l1|<hJaVKb+6kXZWUJm6$xu0AS(JWv&Yi(yNcN
zpjp1+*<e*0B$Hor=A)pU;?g?dmjDiCkng_L^j0)0WGjO*1Z6p`JI>BTrG(fM<_=N1
zM9XzXn1a<8NfS(66Xf)%MDLmIA8n~s%B8hS$lE03z00Rky%Xvd<3}p`MgId|J+3pg
zFM^kG1Rh<Nlmq-^A!cS`7)u`Kus@GB{o21p${#cLI0tL|V4Quh*Md3Ez(&kKr?*>>
z|A^7Qa`d&`biM_miG#m<Ot@Kyegt09=6F6F%nsVw{dke#`w86G_MtzD27D0Kf+_SC
z+zSaeB<gPoK40;Xwmr2I(0%3p(b5_&*r?!5bxmXi-E|!7({`{(W(}vezr!Fw<ijZ{
n*pk<YwcBSq_et&V9h1KKKnZEXVB5bxeSqazlzEjII_CcX#LpoS

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png
deleted file mode 100644
index c71c1446075e8e38afe77e0815d97de744351466..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 30c8c0d35b864b9643efefcd6896fb39a48cec78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html
deleted file mode 100644
index 3416ca7e30a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>Code coverage for Facter</title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <script src='./assets/0.8.0/application.js' type='text/javascript'></script>    
-    <link href='./assets/0.8.0/application.css' media='screen, projection, print' rel='stylesheet' type='text/css'>
-    <link rel="shortcut icon" type="image/png" href="./assets/0.8.0/favicon_green.png" />
-    <link rel="icon" type="image/png" href="./assets/0.8.0/favicon.png" />
-  </head>
-  
-  <body>
-    <div id="loading">
-      <img src="./assets/0.8.0/loading.gif" alt="loading"/>
-    </div>
-    <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2014-04-22T23:02:33+02:00">2014-04-22T23:02:33+02:00</abbr></div>
-      <ul class="group_tabs"></ul>
-
-      <div id="content">
-        <div class="file_list_container" id="AllFiles">
-  <h2>
-    <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="green">100.0%</span></span>
-     covered at
-     <span class="covered_strength">
-       <span class="red">
-         0.0
-       </span>
-    </span> hits/line)
-  </h2>
-  <a name="AllFiles"></a>
-  <div>
-    <b>0</b> files in total.
-    <b>0.0</b> relevant lines. 
-    <span class="green"><b>0.0</b> lines covered</span> and
-    <span class="red"><b>0.0</b> lines missed </span>
-  </div>
-  <table class="file_list">
-    <thead>
-      <tr>
-        <th>File</th>
-        <th>% covered</th>
-        <th>Lines</th>
-        <th>Relevant Lines</th>
-        <th>Lines covered</th>
-        <th>Lines missed</th>
-        <th>Avg. Hits / Line</th>
-      </tr>
-    </thead>
-    <tbody>
-      
-    </tbody>
-  </table>
-</div>
-
-
-        
-      </div>
-    
-      <div id="footer">
-        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.8.2 
-        and simplecov-html v0.8.0<br/>
-        using RSpec
-      </div>
-    
-      <div class="source_files">
-      
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
deleted file mode 100755
index 2fb72b29efb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/facter_dot_d'
-
-describe Facter::Util::DotD do
-
-  context 'returns a simple fact' do
-    before :each do
-      Facter.stubs(:version).returns('1.6.1')
-      subject.stubs(:entries).returns(['/etc/facter/facts.d/fake_fact.txt'])
-      File.stubs(:readlines).with('/etc/facter/facts.d/fake_fact.txt').returns(['fake_fact=fake fact'])
-      subject.create
-    end
-
-    it 'should return successfully' do
-      Facter.fact(:fake_fact).value.should == 'fake fact'
-    end
-  end
-
-  context 'returns a fact with equals signs' do
-    before :each do
-      Facter.stubs(:version).returns('1.6.1')
-      subject.stubs(:entries).returns(['/etc/facter/facts.d/foo.txt'])
-      File.stubs(:readlines).with('/etc/facter/facts.d/foo.txt').returns(['foo=1+1=2'])
-      subject.create
-    end
-
-    it 'should return successfully' do
-      Facter.fact(:foo).value.should == '1+1=2'
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
deleted file mode 100755
index 931c6d4b0a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-describe "PE Version specs" do
-  before :each do
-    # Explicitly load the pe_version.rb file which contains generated facts
-    # that cannot be automatically loaded.  Puppet 2.x implements
-    # Facter.collection.load while Facter 1.x markes Facter.collection.load as
-    # a private method.
-    if Facter.collection.respond_to? :load
-      Facter.collection.load(:pe_version)
-    else
-      Facter.collection.loader.load(:pe_version)
-    end
-  end
-
-  context "If PE is installed" do
-    %w{ 2.6.1 2.10.300 }.each do |version|
-      puppetversion = "2.7.19 (Puppet Enterprise #{version})"
-      context "puppetversion => #{puppetversion}" do
-        before :each do
-          Facter.fact(:puppetversion).stubs(:value).returns(puppetversion)
-        end
-
-        (major,minor,patch) = version.split(".")
-
-        it "Should return true" do
-          Facter.fact(:is_pe).value.should == true
-        end
-
-        it "Should have a version of #{version}" do
-          Facter.fact(:pe_version).value.should == version
-        end
-
-        it "Should have a major version of #{major}" do
-          Facter.fact(:pe_major_version).value.should == major
-        end
-
-        it "Should have a minor version of #{minor}" do
-          Facter.fact(:pe_minor_version).value.should == minor
-        end
-
-        it "Should have a patch version of #{patch}" do
-          Facter.fact(:pe_patch_version).value.should == patch
-        end
-      end
-    end
-  end
-
-  context "When PE is not installed" do
-    before :each do
-      Facter.fact(:puppetversion).stubs(:value).returns("2.7.19")
-    end
-
-    it "is_pe is false" do
-      Facter.fact(:is_pe).value.should == false
-    end
-
-    it "pe_version is nil" do
-      Facter.fact(:pe_version).value.should be_nil
-    end
-
-    it "pe_major_version is nil" do
-      Facter.fact(:pe_major_version).value.should be_nil
-    end
-
-    it "pe_minor_version is nil" do
-      Facter.fact(:pe_minor_version).value.should be_nil
-    end
-
-    it "Should have a patch version" do
-      Facter.fact(:pe_patch_version).value.should be_nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
deleted file mode 100755
index 73eb3eada8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/root_home'
-
-describe Facter::Util::RootHome do
-  context "solaris" do
-    let(:root_ent) { "root:x:0:0:Super-User:/:/sbin/sh" }
-    let(:expected_root_home) { "/" }
-
-    it "should return /" do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent)
-      Facter::Util::RootHome.get_root_home.should == expected_root_home
-    end
-  end
-  context "linux" do
-    let(:root_ent) { "root:x:0:0:root:/root:/bin/bash" }
-    let(:expected_root_home) { "/root" }
-
-    it "should return /root" do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent)
-      Facter::Util::RootHome.get_root_home.should == expected_root_home
-    end
-  end
-  context "windows" do
-    before :each do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(nil)
-    end
-    it "should be nil on windows" do
-      Facter::Util::RootHome.get_root_home.should be_nil
-    end
-  end
-end
-
-describe 'root_home', :type => :fact do
-  before { Facter.clear }
-  after { Facter.clear }
-
-  context "macosx" do
-    before do
-      Facter.fact(:kernel).stubs(:value).returns("Darwin")
-      Facter.fact(:osfamily).stubs(:value).returns("Darwin")
-    end
-    let(:expected_root_home) { "/var/root" }
-    sample_dscacheutil = File.read(fixtures('dscacheutil','root'))
-
-    it "should return /var/root" do
-      Facter::Util::Resolution.stubs(:exec).with("dscacheutil -q user -a name root").returns(sample_dscacheutil)
-      Facter.fact(:root_home).value.should == expected_root_home
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
deleted file mode 100755
index e77779bae14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/util/puppet_settings'
-
-describe Facter::Util::PuppetSettings do
-
-  describe "#with_puppet" do
-    context "Without Puppet loaded" do
-      before(:each) do
-        Module.expects(:const_get).with("Puppet").raises(NameError)
-      end
-
-      it 'should be nil' do
-        subject.with_puppet { Puppet[:vardir] }.should be_nil
-      end
-      it 'should not yield to the block' do
-        Puppet.expects(:[]).never
-        subject.with_puppet { Puppet[:vardir] }.should be_nil
-      end
-    end
-    context "With Puppet loaded" do
-      module Puppet; end
-      let(:vardir) { "/var/lib/puppet" }
-
-      before :each do
-        Puppet.expects(:[]).with(:vardir).returns vardir
-      end
-      it 'should yield to the block' do
-        subject.with_puppet { Puppet[:vardir] }
-      end
-      it 'should return the nodes vardir' do
-        subject.with_puppet { Puppet[:vardir] }.should eq vardir
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
deleted file mode 100755
index a016b685c35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'tempfile'
-provider_class = Puppet::Type.type(:file_line).provider(:ruby)
-describe provider_class do
-  context "when adding" do
-    let :tmpfile do
-      tmp = Tempfile.new('tmp')
-      path = tmp.path
-      tmp.close!
-      path
-    end
-    let :resource do
-      Puppet::Type::File_line.new(
-        {:name => 'foo', :path => tmpfile, :line => 'foo'}
-      )
-    end
-    let :provider do
-      provider_class.new(resource)
-    end
-
-    it 'should detect if the line exists in the file' do
-      File.open(tmpfile, 'w') do |fh|
-        fh.write('foo')
-      end
-      provider.exists?.should be_true
-    end
-    it 'should detect if the line does not exist in the file' do
-      File.open(tmpfile, 'w') do |fh|
-        fh.write('foo1')
-      end
-      provider.exists?.should be_nil
-    end
-    it 'should append to an existing file when creating' do
-      provider.create
-      File.read(tmpfile).chomp.should == 'foo'
-    end
-  end
-
-  context "when matching" do
-    before :each do
-      # TODO: these should be ported over to use the PuppetLabs spec_helper
-      #  file fixtures once the following pull request has been merged:
-      # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files
-      tmp = Tempfile.new('tmp')
-      @tmpfile = tmp.path
-      tmp.close!
-      @resource = Puppet::Type::File_line.new(
-          {
-           :name => 'foo',
-           :path => @tmpfile,
-           :line => 'foo = bar',
-           :match => '^foo\s*=.*$',
-          }
-      )
-      @provider = provider_class.new(@resource)
-    end
-
-    describe 'using match' do
-      it 'should raise an error if more than one line matches, and should not have modified the file' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
-        end
-        @provider.exists?.should be_nil
-        expect { @provider.create }.to raise_error(Puppet::Error, /More than one line.*matches/)
-        File.read(@tmpfile).should eql("foo1\nfoo=blah\nfoo2\nfoo=baz")
-      end
-
-      it 'should replace all lines that matches' do
-        @resource = Puppet::Type::File_line.new(
-          {
-            :name => 'foo',
-            :path => @tmpfile,
-            :line => 'foo = bar',
-            :match => '^foo\s*=.*$',
-            :multiple => true
-          }
-        )
-        @provider = provider_class.new(@resource)
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2\nfoo = bar")
-      end
-
-      it 'should raise an error with invalid values' do
-        expect {
-          @resource = Puppet::Type::File_line.new(
-            {
-              :name => 'foo',
-              :path => @tmpfile,
-              :line => 'foo = bar',
-              :match => '^foo\s*=.*$',
-              :multiple => 'asgadga'
-            }
-          )
-        }.to raise_error(Puppet::Error, /Invalid value "asgadga"\. Valid values are true, false\./)
-      end
-
-      it 'should replace a line that matches' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2")
-      end
-      it 'should add a new line if no lines match' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo2")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).should eql("foo1\nfoo2\nfoo = bar\n")
-      end
-      it 'should do nothing if the exact line already exists' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo = bar\nfoo2")
-        end
-        @provider.exists?.should be_true
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2")
-      end
-    end
-
-    describe 'using after' do
-      let :resource do
-        Puppet::Type::File_line.new(
-          {
-            :name  => 'foo',
-            :path  => @tmpfile,
-            :line  => 'inserted = line',
-            :after => '^foo1',
-          }
-        )
-      end
-
-      let :provider do
-        provider_class.new(resource)
-      end
-
-      context 'with one line matching the after expression' do
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz")
-          end
-        end
-
-        it 'inserts the specified line after the line matching the "after" expression' do
-          provider.create
-          File.read(@tmpfile).chomp.should eql("foo1\ninserted = line\nfoo = blah\nfoo2\nfoo = baz")
-        end
-      end
-
-      context 'with two lines matching the after expression' do
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write("foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz")
-          end
-        end
-
-        it 'errors out stating "One or no line must match the pattern"' do
-          expect { provider.create }.to raise_error(Puppet::Error, /One or no line must match the pattern/)
-        end
-      end
-
-      context 'with no lines matching the after expression' do
-        let :content do
-          "foo3\nfoo = blah\nfoo2\nfoo = baz\n"
-        end
-
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write(content)
-          end
-        end
-
-        it 'appends the specified line to the file' do
-          provider.create
-          File.read(@tmpfile).should eq(content << resource[:line] << "\n")
-        end
-      end
-    end
-  end
-
-  context "when removing" do
-    before :each do
-      # TODO: these should be ported over to use the PuppetLabs spec_helper
-      #  file fixtures once the following pull request has been merged:
-      # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files
-      tmp = Tempfile.new('tmp')
-      @tmpfile = tmp.path
-      tmp.close!
-      @resource = Puppet::Type::File_line.new(
-        {:name => 'foo', :path => @tmpfile, :line => 'foo', :ensure => 'absent' }
-      )
-      @provider = provider_class.new(@resource)
-    end
-    it 'should remove the line if it exists' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2")
-    end
-
-    it 'should remove the line without touching the last new line' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2\n")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2\n")
-    end
-
-    it 'should remove any occurence of the line' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2\nfoo\nfoo")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2\n")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
deleted file mode 100755
index f92065f79ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-
-anchor = Puppet::Type.type(:anchor).new(:name => "ntp::begin")
-
-describe anchor do
-  it "should stringify normally" do
-    anchor.to_s.should == "Anchor[ntp::begin]"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
deleted file mode 100755
index ab5b81bb96b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'tempfile'
-describe Puppet::Type.type(:file_line) do
-  let :file_line do
-    Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
-  end
-  it 'should accept a line and path' do
-    file_line[:line] = 'my_line'
-    file_line[:line].should == 'my_line'
-    file_line[:path] = '/my/path'
-    file_line[:path].should == '/my/path'
-  end
-  it 'should accept a match regex' do
-    file_line[:match] = '^foo.*$'
-    file_line[:match].should == '^foo.*$'
-  end
-  it 'should not accept a match regex that does not match the specified line' do
-    expect {
-      Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => '/my/path',
-          :line   => 'foo=bar',
-          :match  => '^bar=blah$'
-    )}.to raise_error(Puppet::Error, /the value must be a regex that matches/)
-  end
-  it 'should accept a match regex that does match the specified line' do
-    expect {
-      Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => '/my/path',
-          :line   => 'foo=bar',
-          :match  => '^\s*foo=.*$'
-      )}.not_to raise_error
-  end
-  it 'should accept posix filenames' do
-    file_line[:path] = '/tmp/path'
-    file_line[:path].should == '/tmp/path'
-  end
-  it 'should not accept unqualified path' do
-    expect { file_line[:path] = 'file' }.to raise_error(Puppet::Error, /File paths must be fully qualified/)
-  end
-  it 'should require that a line is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => '/tmp/file') }.to raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-  it 'should require that a file is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.to raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-  it 'should default to ensure => present' do
-    file_line[:ensure].should eq :present
-  end
-
-  it "should autorequire the file it manages" do
-    catalog = Puppet::Resource::Catalog.new
-    file = Puppet::Type.type(:file).new(:name => "/tmp/path")
-    catalog.add_resource file
-    catalog.add_resource file_line
-
-    relationship = file_line.autorequire.find do |rel|
-      (rel.source.to_s == "File[/tmp/path]") and (rel.target.to_s == file_line.to_s)
-    end
-    relationship.should be_a Puppet::Relationship
-  end
-
-  it "should not autorequire the file it manages if it is not managed" do
-    catalog = Puppet::Resource::Catalog.new
-    catalog.add_resource file_line
-    file_line.autorequire.should be_empty
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp
deleted file mode 100644
index eea693e15ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a simple smoke test
-# of the file_line resource type.
-file { '/tmp/dansfile':
-  ensure => present
-}->
-file_line { 'dans_line':
-  line => 'dan is awesome',
-  path => '/tmp/dansfile',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp
deleted file mode 100644
index e1f1353cdd9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-include stdlib
-info('has_interface_with(\'lo\'):', has_interface_with('lo'))
-info('has_interface_with(\'loX\'):', has_interface_with('loX'))
-info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1'))
-info('has_interface_with(\'ipaddress\', \'127.0.0.100\'):', has_interface_with('ipaddress', '127.0.0.100'))
-info('has_interface_with(\'network\', \'127.0.0.0\'):', has_interface_with('network', '127.0.0.0'))
-info('has_interface_with(\'network\', \'128.0.0.0\'):', has_interface_with('network', '128.0.0.0'))
-info('has_interface_with(\'netmask\', \'255.0.0.0\'):', has_interface_with('netmask', '255.0.0.0'))
-info('has_interface_with(\'netmask\', \'256.0.0.0\'):', has_interface_with('netmask', '256.0.0.0'))
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp
deleted file mode 100644
index 8429a885539..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-include stdlib
-info('has_ip_address(\'192.168.1.256\'):', has_ip_address('192.168.1.256'))
-info('has_ip_address(\'127.0.0.1\'):', has_ip_address('127.0.0.1'))
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp
deleted file mode 100644
index a15d8c011b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include stdlib
-info('has_ip_network(\'127.0.0.0\'):', has_ip_network('127.0.0.0'))
-info('has_ip_network(\'128.0.0.0\'):', has_ip_network('128.0.0.0'))
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp
deleted file mode 100644
index 9675d8374b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include stdlib
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
deleted file mode 100644
index 3f18ef2fca2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fixtures:
-  repositories:
-    'stdlib':
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
-      ref: '4.1.0'
-    'concat':
-      repo: 'git://github.com/puppetlabs/puppetlabs-concat'
-      ref: '1.0.1'
-  symlinks:
-    supervisord: "#{source_dir}"
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml
deleted file mode 100644
index c9a6e5a3e24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
deleted file mode 100644
index bc96a165e59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake test"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.6.0"
-matrix:
-  exclude:
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 3.1.0"
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 3.2.0"
-notifications:
-  email: false
-
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
deleted file mode 100644
index ea933f5dbcb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
+++ /dev/null
@@ -1,119 +0,0 @@
-2014-07-02 - v0.4.1
-
-Fixes:
-
-- Fixed status code error on supervisord::supervisorctl commands, thanks to @jtreminio for the PR.
-
-2014-06-20 - v0.4.0
-
-Fixes:
-
-- Removed root as group and replaced with uid 0 to enhance system
-compatibility
-
-Enhancements:
-
-- Made package provider a user definable param see supervisord::package_provider and README for details of how to change this.
-- All define types can now be automatically pulled in from hiera see example https://github.com/ajcrowe/puppet-supervisord#configure-a-program
-- You can now override the default include path of $config_include/*.conf with your own array using $config_dirs. Bear in mind this would need to include whatever you set $config_include to be, with *.conf on the end.
-
-Many thanks for the PRs from @jasperla, @mvantellingen for the bug report on the service name and @hasc for the enhancement ideas.
-
-2014-06-06 - v0.3.3
-
-Fixes:
-
-- Fixed typo in stopwaitsec param, should have been stopwaitsecs, thanks to @rchrd2
-
-2014-05-03 - v0.3.2
-
-Changes:
-
-- Added supervisord::executable_ctl variable for supervisorctl binary path, thanks to @bpgoldsb
-
-2014-04-22 - v0.3.1
-
-Fixes:
-
-- Fixed typo in unix_socket_group param, thanks to @dig412
-
-2014-03-11 - v0.3.0
-
-Fixes:
-
-- Fixed typo in fcgi config
-- Fixed typo in supervisord config with minfds and minprocs, thanks to @peefourtee
-- Typo in README fixed thanks to @hopkinsth
-- Removed refreshonly from pip_install exec resource
-- Number of syntax fixes thanks to `puppet lint`
-
-Important Changes:
-
-- Lots of input validation has been added **PLEASE** check your config works before upgrading!
-- Changed init_extras naming to defaults and cleaned things up.
-- Starting and stopping apps is now done with supervisorctl commands to avoid service restarts
-
-Other Changes:
-
-- CSV functions now order things consistently
-- Included description for classes and functions
-- Expanded spec testing built with Travis CI
-- Added beaker acceptance tests
-- Added greater validation of various parameters
-- Added coverage reporting for resources
-
-To-Do:
-
-- Add support for additional OS families such as Solaris.
-
-
-2013-10-31 - v0.2.3
-
-Fixes:
-
-- Fixed large bug on debian wheezy where /var/run is changed from a symlink to a 
-  directory causing all pids to be inaccessible breaking lots of services
-
-
-2013-10-30 - v0.2.2
-
-Fixes:
-
-- Fixed syntax error in README examples and tests
-
-2013-10-16 - v0.2.1
-
-Fixes:
-
-- Fixed user params in templates
-- Added missing environment support in main supervisord.conf
-
-
-2013-10-15 - v0.2.0
-
-Feature complete release
-
-- Added Eventlistener template and function
-- Added FGCI-Program template and function
-- More consistent log naming and fixed missing new lines
-
-
-2013-10-15 - v0.1.1
-
-Fixes:
-
-- Missing '=' in template tags when using certain parameters
-- Added log file default to program define to avoid /tmp being used when not specified
-- Fixed logic when not using environment variables in program
-
-
-2013-10-15 - v0.1.0
-
-Summary:
-
-Completed basic module functionality for
-
-- Install with pip
-- Configure programs
-- Configure groups
-- Install init scripts for RedHat and Debian families 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
deleted file mode 100644
index ba9a19d533a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake'
-  gem 'puppet-lint'
-  gem 'puppet-syntax'
-  gem 'puppetlabs_spec_helper'
-  gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git' , :ref => 'c44381a240ec420d4ffda7bffc55ee4d9c08d682'
-  gem 'rspec', '2.14.1'
-end
-
-group :development do
-  gem 'travis'
-  gem 'travis-lint'
-  gem 'beaker'
-  gem 'beaker-rspec'
-  gem 'pry'
-  gem 'guard-rake'
-end
-
-
-if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion
-else
-  gem 'puppet', '~> 3.4.0'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
deleted file mode 100644
index 80d47f22679..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'ajcrowe-supervisord'
-version '0.4.1'
-source 'git@github.com/ajcrowe/puppet-supervisord.git'
-author 'Alex Crowe'
-license 'Apache License, Version 2.0'
-summary 'supervisord class and functions'
-description 'supervisord class and functions'
-project_page 'https://github.com/ajcrowe/puppet-supervisord'
-
-dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0'
-dependency 'puppetlabs/stdlib', '>= 4.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
deleted file mode 100644
index b454cd9307a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Puppet Supervisord
-
-[![Build Status](https://travis-ci.org/ajcrowe/puppet-supervisord.png?branch=master)](https://travis-ci.org/ajcrowe/puppet-supervisord)
-
-Puppet module to manage the [supervisord](http://supervisord.org/) process control system.
-
-Functions available to configure
-
-* [programs](http://supervisord.org/configuration.html#program-x-section-settings)
-* [groups](http://supervisord.org/configuration.html#group-x-section-settings)
-* [fcgi-programs](http://supervisord.org/configuration.html#fcgi-program-x-section-settings)
-* [eventlisteners](http://supervisord.org/configuration.html#eventlistener-x-section-settings)
-
-## Examples
-
-### Configuring supervisord with defaults
-
-Install supervisord with pip and install an init script if available
-
-```ruby
-include supervisord
-```
-
-### Install supervisord and pip
-
-Install supervisord and install pip if not available.
-
-```ruby
-class supervisord {
-  $install_pip  => true,
-}
-```
-
-This will download [setuptool](https://bitbucket.org/pypa/setuptools) and install pip with easy_install.
-
-You can pass a specific url with `$setuptools_url = 'url'`
-
-### Install without pip
-
-If you want to use your system package manager you can specify that with `supervisord::package_provider`.
-
-You'll also likely need to adjust the `supervisord::service_name` to match that installed by the system package. If you're using Debian or Redhat OS families you'll also want to disable the init scripts with `supervisord::install_init = false`.
-
-Note: Only Debian and RedHat families have an init script currently.
-
-### Configure a program
-
-```ruby
-supervisord::program { 'myprogram':
-  command     => 'command --args',
-  priority    => '100',
-  environment => {
-    'HOME'   => '/home/myuser',
-    'PATH'   => '/bin:/sbin:/usr/bin:/usr/sbin',
-    'SECRET' => 'mysecret'
-  }
-}
-```
-
-You may also specify a variable for a hiera lookup to retreive your environment hash. This allows you to reuse existing environment variable hashes.
-
-```ruby
-supervisord::program { 'myprogram':
-  command  => 'command --args',
-  priority => '100',
-  env_var  => 'my_common_envs'
-}
-```
-
-Or you can fully define your programs in hiera:
-
-```yaml
-supervisord::programs:
-  'myprogram':
-    command: 'command --args'
-    autostart: yes
-    autorestart: 'true'
-    environment:
-      HOME: '/home/myuser'
-      PATH: '/bin:/sbin:/usr/bin:/usr/sbin'
-      SECRET: 'mysecret'
-```
-
-### Configure a group
-
-```ruby
-supervisord::group { 'mygroup':
-  priority => 100,
-  programs  => ['program1', 'program2', 'program3']
-}
-```
-
-### Configure an eventlistener
-
-```ruby
-supervisord::eventlistener { 'mylistener':
-  command  => 'command --args',
-  events   => ['PROCESS_STATE', 'PROCESS_STATE_START']
-  priority => '100',
-  env_var  => 'my_common_envs'
-}
-```
-
-### Run supervisorctl Commands
-
-Should you need to run a sequence of command with `supervisorctl` you can use the define type `supervisord::supervisorctl`
-
-```ruby
-supervisord::supervisorctl { 'restart_myapp':
-  command => 'restart',
-  process => 'myapp'
-}
-```
-
-You can also issue a command without specifying a process.
-
-### Development
-
-If you have suggestions or improvements please file an issue or pull request, i'll try and sort them as quickly as possble.
-
-If you submit a pull please try and include tests for the new functionality/fix. The module is tested with [Travis-CI](https://travis-ci.org/ajcrowe/puppet-supervisord).
-
-
-### Credits
-
-* Debian init script sourced from the system package.
-* RedHat/Centos init script sourced from https://github.com/Supervisor/initscripts
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
deleted file mode 100644
index cd592af48f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
-
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_quoted_booleans')
-PuppetLint.configuration.send('disable_autoloader_layout')
-
-exclude_paths = [
-  "pkg/**/*",
-  "vendor/**/*",
-  "spec/**/*",
-]
-PuppetLint.configuration.ignore_paths = exclude_paths
-PuppetSyntax.exclude_paths = exclude_paths
-
-desc "Acceptance Tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
-desc "Test Suite"
-task :test => [
-  :lint,
-  :syntax,
-  :spec
-]
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
deleted file mode 100644
index 6d34d5d5474..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Converts the array to a csv string
-#
-# $array = [ 'string1', 'string2', 'string3' ]
-#
-# becomes:
-#
-# $string = "string1,string2,string3"
-#
-module Puppet::Parser::Functions
-  newfunction(:array2csv, :type => :rvalue, :doc => <<-'EOS'
-    Returns a sorted csv formatted string from an array in the form
-    VALUE1,VALUE2,VALUE3
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "array2csv(): Wrong number of arguments " +
-      "given (#{args.size} of 1)") if args.size < 1
-
-    array = args[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'array2csv(): Requires an Array')
-    end
-
-    sorted_array = array.sort
-    result = ''
-
-    sorted_array.each {|value|
-      result += "#{value},"
-    }
-
-    return result.chop!
-    
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
deleted file mode 100644
index 5371328f2ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Converts the hash to a csv string
-#
-# $hash = {
-#   HOME   => '/home/user',
-#   ENV1   => 'env1',
-#   SECRET => 'secret'	
-# }
-#
-# becomes:
-#
-# $string = "HOME='/home/user',ENV1='env1',SECRET='secret'"
-#
-module Puppet::Parser::Functions
-  newfunction(:hash2csv, :type => :rvalue, :doc => <<-'EOS'
-    Returns a csv formatted string from an hash in the form
-    KEY=VALUE,KEY2=VALUE2,KEY3=VALUE3 ordered by key
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "hash2csv(): Wrong number of arguments " +
-      "given (#{args.size} of 1)") if args.size < 1
-
-    hash = args[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'hash2csv(): Requires an Hash')
-    end
-
-    sorted_hash = hash.sort
-    result = ''
-
-    sorted_hash.each {|key, value|
-      result += "#{key}='#{value}',"
-    }
-
-    return result.chop!
-
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
deleted file mode 100644
index 93713729e8b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Class: supervisord::config
-#
-# Configuration class for supervisor init and conf directories
-#
-class supervisord::config inherits supervisord {
-
-  file { $supervisord::config_include:
-    ensure => directory,
-    owner  => 'root',
-    mode   => '0755'
-  }
-
-  file { $supervisord::log_path:
-    ensure => directory,
-    owner  => 'root',
-    mode   => '0755'
-  }
-
-  if $supervisord::run_path != '/var/run' {
-    file { $supervisord::run_path:
-      ensure => directory,
-      owner  => 'root',
-      mode   => '0755'
-    }
-  }
-
-  if $supervisord::install_init {
-    file { '/etc/init.d/supervisord':
-      ensure  => present,
-      owner   => 'root',
-      mode    => '0755',
-      content => template("supervisord/init/${::osfamily}/init.erb")
-    }
-
-    if $supervisord::init_defaults {
-      file { $supervisord::init_defaults:
-        ensure  => present,
-        owner   => 'root',
-        mode    => '0755',
-        content => template("supervisord/init/${::osfamily}/defaults.erb")
-      }
-    }
-  }
-
-  concat { $supervisord::config_file:
-    owner => 'root',
-    group => '0',
-    mode  => '0755'
-  }
-
-  if $supervisord::unix_socket {
-    concat::fragment { 'supervisord_unix':
-      target  => $supervisord::config_file,
-      content => template('supervisord/supervisord_unix.erb'),
-      order   => 01
-    }
-  }
-
-  if $supervisord::inet_server {
-    concat::fragment { 'supervisord_inet':
-      target  => $supervisord::config_file,
-      content => template('supervisord/supervisord_inet.erb'),
-      order   => 01
-    }
-  }
-
-  concat::fragment { 'supervisord_main':
-    target  => $supervisord::config_file,
-    content => template('supervisord/supervisord_main.erb'),
-    order   => 02
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
deleted file mode 100644
index fd52d6e4da4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
+++ /dev/null
@@ -1,118 +0,0 @@
-# Define: supervisord::eventlistener
-#
-# This define creates an eventlistener configuration file
-#
-# Documentation on parameters available at:
-# http://supervisord.org/configuration.html#eventlistener-x-section-settings
-#
-define supervisord::eventlistener(
-  $command,
-  $ensure                  = present,
-  $ensure_process          = 'running',
-  $buffer_size             = 10,
-  $events                  = undef,
-  $result_handler          = undef,
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsecs            = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "eventlistener_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "eventlistener_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  # parameter validation
-  validate_string($command)
-  validate_re($ensure_process, ['running', 'stopped', 'removed'])
-  validate_re($buffer_size, '^\d+')
-  if $events { validate_array($events) }
-  if $result_handler { validate_string($result_handler) }
-  if $numprocs { validate_re($numprocs, '^\d+')}
-  if $numprocs_start { validate_re($numprocs_start, '^\d+')}
-  if $priority { validate_re($priority, '^\d+') }
-  if $autostart { validate_bool($autostart) }
-  if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) }
-  if $startsecs { validate_re($startsecs, '^\d+')}
-  if $startretries { validate_re($startretries, '^\d+')}
-  if $exitcodes { validate_string($exitcodes)}
-  if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) }
-  if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')}
-  if $stopasgroup { validate_bool($stopasgroup) }
-  if $killasgroup { validate_bool($killasgroup) }
-  if $user { validate_string($user) }
-  if $redirect_stderr { validate_bool($redirect_stderr) }
-  validate_string($stdout_logfile)
-  if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) }
-  if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')}
-  if $stdout_events_enabled { validate_bool($stdout_events_enabled) }
-  validate_string($stderr_logfile)
-  if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) }
-  if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')}
-  if $stderr_events_enabled { validate_bool($stderr_events_enabled) }
-  if $directory { validate_absolute_path($directory) }
-  if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') }
-
-  # convert environment data into a csv
-  if $env_var {
-    $env_hash = hiera_hash($env_var)
-    validate_hash($env_hash)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    validate_hash($environment)
-    $env_string = hash2csv($environment)
-  }
-
-  if $events {
-    $events_string = array2csv($events)
-  }
-
-  $conf = "${supervisord::config_include}/eventlistener_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/eventlistener.erb'),
-    notify  => Class['supervisord::reload']
-  }
-
-  case $ensure_process {
-    'stopped': {
-      supervisord::supervisorctl { "stop_${name}":
-        command => 'stop',
-        process => $name
-      }
-    }
-    'removed': {
-      supervisord::supervisorctl { "remove_${name}":
-        command => 'remove',
-        process => $name
-      }
-    }
-    default: { }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
deleted file mode 100644
index 633b024917e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Define: supervisord::fcgi_program
-#
-# This define creates an eventlistener configuration file
-#
-# Documentation on parameters available at:
-# http://supervisord.org/configuration.html#fcgi-program-x-section-settings
-#
-define supervisord::fcgi_program(
-  $command,
-  $socket,
-  $ensure                  = present,
-  $ensure_process          = 'running',
-  $socket_owner            = undef,
-  $socket_mode             = undef,
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsecs            = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "fcgi-program_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_capture_maxbytes = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "fcgi-program_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_capture_maxbytes = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  # parameter validation
-  validate_string($command)
-  validate_re($ensure_process, ['running', 'stopped', 'removed'])
-  validate_re($socket, ['^tcp:\/\/.*:\d+$', '^unix:\/\/\/'])
-  if $process_name { validate_string($process_name) }
-  if $numprocs { validate_re($numprocs, '^\d+')}
-  if $numprocs_start { validate_re($numprocs_start, '^\d+')}
-  if $priority { validate_re($priority, '^\d+') }
-  if $autostart { validate_bool($autostart) }
-  if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) }
-  if $startsecs { validate_re($startsecs, '^\d+')}
-  if $startretries { validate_re($startretries, '^\d+')}
-  if $exitcodes { validate_string($exitcodes)}
-  if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) }
-  if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')}
-  if $stopasgroup { validate_bool($stopasgroup) }
-  if $killasgroup { validate_bool($killasgroup) }
-  if $user { validate_string($user) }
-  if $redirect_stderr { validate_bool($redirect_stderr) }
-  validate_string($stdout_logfile)
-  if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) }
-  if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')}
-  if $stdout_capture_maxbytes { validate_string($stdout_capture_maxbytes) }
-  if $stdout_events_enabled { validate_bool($stdout_events_enabled) }
-  validate_string($stderr_logfile)
-  if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) }
-  if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')}
-  if $stderr_capture_maxbytes { validate_string($stderr_capture_maxbytes) }
-  if $stderr_events_enabled { validate_bool($stderr_events_enabled) }
-  if $directory { validate_absolute_path($directory) }
-  if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') }
-
-  # convert environment data into a csv
-  if $env_var {
-    $env_hash = hiera_hash($env_var)
-    validate_hash($env_hash)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    validate_hash($environment)
-    $env_string = hash2csv($environment)
-  }
-
-  $conf = "${supervisord::config_include}/fcgi-program_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/fcgi_program.erb'),
-    notify  => Class['supervisord::reload']
-  }
-
-  case $ensure_process {
-    'stopped': {
-      supervisord::supervisorctl { "stop_${name}":
-        command => 'stop',
-        process => $name
-      }
-    }
-    'removed': {
-      supervisord::supervisorctl { "remove_${name}":
-        command => 'remove',
-        process => $name
-      }
-    }
-    default: { }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
deleted file mode 100644
index 45cb29cf290..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Define: supervisord::group
-#
-# This define creates an group configuration file
-#
-# Documentation on parameters available at:
-# http://supervisord.org/configuration.html#group-x-section-settings
-#
-define supervisord::group (
-  $programs,
-  $ensure   = present,
-  $priority = undef
-) {
-
-  include supervisord
-
-  # parameter validation
-  validate_array($programs)
-  if $priority { validate_re($priority, '^\d+', "invalid priority value of: ${priority}") }
-
-  $progstring = array2csv($programs)
-  $conf = "${supervisord::config_include}/group_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/group.erb'),
-    notify  => Class['supervisord::reload']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
deleted file mode 100644
index fa396da578d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
+++ /dev/null
@@ -1,130 +0,0 @@
-# Class: supervisord
-#
-# This class installs supervisord via pip
-#
-class supervisord(
-  $package_ensure       = $supervisord::params::package_ensure,
-  $package_name         = $supervisord::params::package_name,
-  $package_provider     = $supervisord::params::package_provider,
-  $service_ensure       = $supervisord::params::service_ensure,
-  $service_name         = $supervisord::params::service_name,
-  $install_init         = $supervisord::params::install_init,
-  $install_pip          = false,
-  $init_defaults        = $supervisord::params::init_defaults,
-  $setuptools_url       = $supervisord::params::setuptools_url,
-  $executable_path      = $supervisord::params::executable_path,
-  $executable           = $supervisord::params::executable,
-  $executable_ctl       = $supervisord::params::executable_ctl,
-
-  $log_path             = $supervisord::params::log_path,
-  $log_file             = $supervisord::params::log_file,
-  $log_level            = $supervisord::params::log_level,
-  $logfile_maxbytes     = $supervisord::params::logfile_maxbytes,
-  $logfile_backups      = $supervisord::params::logfile_backups,
-
-  $run_path             = $supervisord::params::run_path,
-  $pid_file             = $supervisord::params::pid_file,
-  $nodaemon             = $supervisord::params::nodaemon,
-  $minfds               = $supervisord::params::minfds,
-  $minprocs             = $supervisord::params::minprocs,
-  $config_include       = $supervisord::params::config_include,
-  $config_file          = $supervisord::params::config_file,
-  $config_dirs          = undef,
-  $umask                = $supervisord::params::umask,
-
-  $unix_socket          = $supervisord::params::unix_socket,
-  $unix_socket_file     = $supervisord::params::unix_socket_file,
-  $unix_socket_mode     = $supervisord::params::unix_socket_mode,
-  $unix_socket_owner    = $supervisord::params::unix_socket_owner,
-  $unix_socket_group    = $supervisord::params::unix_socket_group,
-
-  $inet_server          = $supervisord::params::inet_server,
-  $inet_server_hostname = $supervisord::params::inet_server_hostname,
-  $inet_server_port     = $supervisord::params::inet_server_port,
-
-  $unix_auth            = false,
-  $unix_username        = undef,
-  $unix_password        = undef,
-
-  $inet_auth            = false,
-  $inet_username        = undef,
-  $inet_password        = undef,
-
-  $user                 = undef,
-  $identifier           = undef,
-  $childlogdir          = undef,
-  $environment          = undef,
-  $env_var              = undef,
-  $directory            = undef,
-  $strip_ansi           = false,
-  $nocleanup            = false,
-
-  $eventlisteners       = {},
-  $fcgi_programs        = {},
-  $groups               = {},
-  $programs             = {}
-
-) inherits supervisord::params {
-
-  validate_bool($install_pip)
-  validate_bool($install_init)
-  validate_bool($nodaemon)
-  validate_bool($unix_auth)
-  validate_bool($inet_auth)
-  validate_bool($strip_ansi)
-  validate_bool($nocleanup)
-
-  validate_hash($eventlisteners)
-  validate_hash($fcgi_programs)
-  validate_hash($groups)
-  validate_hash($programs)
-
-  validate_absolute_path($config_include)
-  validate_absolute_path($log_path)
-  validate_absolute_path($run_path)
-  if $childlogdir { validate_absolute_path($childlogdir) }
-  if $directory { validate_absolute_path($directory) }
-
-  $log_levels = ['^critical$', '^error$', '^warn$', '^info$', '^debug$', '^trace$', '^blather$']
-  validate_re($log_level, $log_levels, "invalid log_level: ${log_level}")
-  validate_re($umask, '^0[0-7][0-7]$', "invalid umask: ${umask}.")
-  validate_re($unix_socket_mode, '^[0-7][0-7][0-7][0-7]$', "invalid unix_socket_mode: ${unix_socket_mode}")
-
-  if ! is_integer($logfile_backups) { fail("invalid logfile_backups: ${logfile_backups}.")}
-  if ! is_integer($minfds) { fail("invalid minfds: ${minfds}.")}
-  if ! is_integer($minprocs) { fail("invalid minprocs: ${minprocs}.")}
-  if ! is_integer($inet_server_port) { fail("invalid inet_server_port: ${inet_server_port}.")}
-
-  if $env_var {
-    validate_hash($env_var)
-    $env_hash = hiera($env_var)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    validate_hash($environment)
-    $env_string = hash2csv($environment)
-  }
-
-  if $config_dirs {
-    validate_array($config_dirs)
-    $config_include_string = join($config_dirs, " ")
-  }
-  else {
-    $config_include_string = "${config_include}/*.conf"
-  }
-
-  create_resources('supervisord::eventlistener', $eventlisteners)
-  create_resources('supervisord::fcgi_program', $fcgi_programs)
-  create_resources('supervisord::group', $groups)
-  create_resources('supervisord::program', $programs)
-
-  if $install_pip {
-    include supervisord::pip
-    Class['supervisord::pip'] -> Class['supervisord::install']
-  }
-
-  include supervisord::install, supervisord::config, supervisord::service, supervisord::reload
-
-  Class['supervisord::install'] -> Class['supervisord::config'] ~> Class['supervisord::service']
-  Class['supervisord::reload'] -> Supervisord::Supervisorctl <| |>
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
deleted file mode 100644
index 387c77f5cba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Class supervisord::install
-#
-# Installs supervisor package (defaults to using pip)
-#
-class supervisord::install inherits supervisord {
-  package { $supervisord::package_name:
-    ensure   => $supervisord::package_ensure,
-    provider => $supervisord::package_provider
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
deleted file mode 100644
index 47a21852e01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Class: supervisord::params
-#
-# Default parameters for supervisord
-#
-class supervisord::params {
-  case $::osfamily {
-    'RedHat': {
-      $init_defaults     = '/etc/sysconfig/supervisord'
-      $unix_socket_group = 'nobody'
-      $install_init      = true
-      $executable_path   = '/usr/bin'
-    }
-    'Debian': {
-      $init_defaults     = '/etc/default/supervisor'
-      $unix_socket_group = 'nogroup'
-      $install_init      = true
-      $executable_path   = '/usr/local/bin'
-    }
-    default:  {
-      $init_defaults     = false
-      $unix_socket_group = 'nogroup'
-      $install_init      = false
-      $executable_path   = '/usr/local/bin'
-    }
-  }
-
-  # default supervisord params
-  $package_ensure       = 'installed'
-  $package_provider     = 'pip'
-  $service_ensure       = 'running'
-  $service_name         = 'supervisord'
-  $package_name         = 'supervisor'
-  $executable           = "${$executable_path}/supervisord"
-  $executable_ctl       = "${executable_path}/supervisorctl"
-
-  $run_path             = '/var/run'
-  $pid_file             = 'supervisord.pid'
-  $log_path             = '/var/log/supervisor'
-  $log_file             = 'supervisord.log'
-  $logfile_maxbytes     = '50MB'
-  $logfile_backups      = '10'
-  $log_level            = 'info'
-  $nodaemon             = false
-  $minfds               = '1024'
-  $minprocs             = '200'
-  $umask                = '022'
-  $config_include       = '/etc/supervisor.d'
-  $config_file          = '/etc/supervisord.conf'
-  $setuptools_url       = 'https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py'
-
-  $unix_socket          = true
-  $unix_socket_file     = 'supervisor.sock'
-  $unix_socket_mode     = '0700'
-  $unix_socket_owner    = 'nobody'
-
-  $inet_server          = false
-  $inet_server_hostname = '127.0.0.1'
-  $inet_server_port     = '9001'
-  $inet_auth            = false
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
deleted file mode 100644
index dcf57223498..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Class: supervisord::pip
-#
-# Optional class to install setuptool and pip
-#
-class supervisord::pip inherits supervisord {
-
-  Exec {
-    path => '/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin'
-  }
-
-  exec { 'install_setuptools':
-    command => "curl ${supervisord::setuptools_url} | python",
-    cwd     => '/tmp',
-    unless  => 'which easy_install',
-    before  => Exec['install_pip']
-  }
-
-  exec { 'install_pip':
-    command     => 'easy_install pip',
-    unless      => 'which pip'
-  }
-
-  if $::osfamily == 'RedHat' {
-    exec { 'pip_provider_name_fix':
-      command     => 'alternatives --install /usr/bin/pip-python pip-python /usr/bin/pip 1',
-      subscribe   => Exec['install_pip'],
-      unless      => 'which pip-python'
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
deleted file mode 100644
index 617a68ab208..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
+++ /dev/null
@@ -1,113 +0,0 @@
-# Define: supervisord::program
-#
-# This define creates an program configuration file
-#
-# Documentation on parameters available at:
-# http://supervisord.org/configuration.html#program-x-section-settings
-#
-define supervisord::program(
-  $command,
-  $ensure                  = present,
-  $ensure_process          = 'running',
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsecs            = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "program_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_capture_maxbytes = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "program_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_capture_maxbytes = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  # parameter validation
-  validate_string($command)
-  validate_re($ensure_process, ['running', 'stopped', 'removed'])
-  if $process_name { validate_string($process_name) }
-  if $numprocs { validate_re($numprocs, '^\d+')}
-  if $numprocs_start { validate_re($numprocs_start, '^\d+')}
-  if $priority { validate_re($priority, '^\d+') }
-  if $autostart { validate_bool($autostart) }
-  if $autorestart { validate_re($autorestart, ['true', 'false', 'unexpected']) }
-  if $startsecs { validate_re($startsecs, '^\d+')}
-  if $startretries { validate_re($startretries, '^\d+')}
-  if $exitcodes { validate_string($exitcodes)}
-  if $stopsignal { validate_re($stopsignal, ['TERM', 'HUP', 'INT', 'QUIT', 'KILL', 'USR1', 'USR2']) }
-  if $stopwaitsecs { validate_re($stopwaitsecs, '^\d+')}
-  if $stopasgroup { validate_bool($stopasgroup) }
-  if $killasgroup { validate_bool($killasgroup) }
-  if $user { validate_string($user) }
-  if $redirect_stderr { validate_bool($redirect_stderr) }
-  validate_string($stdout_logfile)
-  if $stdout_logfile_maxbytes { validate_string($stdout_logfile_maxbytes) }
-  if $stdout_logfile_backups { validate_re($stdout_logfile_backups, '^\d+')}
-  if $stdout_capture_maxbytes { validate_string($stdout_capture_maxbytes) }
-  if $stdout_events_enabled { validate_bool($stdout_events_enabled) }
-  validate_string($stderr_logfile)
-  if $stderr_logfile_maxbytes { validate_string($stderr_logfile_maxbytes) }
-  if $stderr_logfile_backups { validate_re($stderr_logfile_backups, '^\d+')}
-  if $stderr_capture_maxbytes { validate_string($stderr_capture_maxbytes) }
-  if $stderr_events_enabled { validate_bool($stderr_events_enabled) }
-  if $directory { validate_absolute_path($directory) }
-  if $umask { validate_re($umask, '^[0-7][0-7][0-7]$') }
-
-  # convert environment data into a csv
-  if $env_var {
-    $env_hash = hiera_hash($env_var)
-    validate_hash($env_hash)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    validate_hash($environment)
-    $env_string = hash2csv($environment)
-  }
-
-  $conf = "${supervisord::config_include}/program_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/program.erb'),
-    notify  => Class['supervisord::reload']
-  }
-
-  case $ensure_process {
-    'stopped': {
-      supervisord::supervisorctl { "stop_${name}":
-        command => 'stop',
-        process => $name
-      }
-    }
-    'removed': {
-      supervisord::supervisorctl { "remove_${name}":
-        command => 'remove',
-        process => $name
-      }
-    }
-    default: { }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp
deleted file mode 100644
index 79eca3d7e0f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# Class: supervisord::reload
-#
-# Class to reread and update supervisord with supervisorctl
-#
-class supervisord::reload inherits supervisord {
-
-  $supervisorctl = $::supervisord::executable_ctl
-
-  exec { 'supervisorctl_reread':
-    command     => "${supervisorctl} reread",
-    refreshonly => true,
-    require     => Service[$supervisord::service_name],
-  }
-  exec { 'supervisorctl_update':
-    command     => "${supervisorctl} update",
-    refreshonly => true,
-    require     => Service[$supervisord::service_name],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
deleted file mode 100644
index f02a0d0a081..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Class: supervisord::service
-#
-# Class for the supervisord service
-#
-class supervisord::service inherits supervisord  {
-  service { $supervisord::service_name:
-    ensure     => $supervisord::service_ensure,
-    enable     => true,
-    hasrestart => true,
-    hasstatus  => true
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp
deleted file mode 100644
index 473d301185b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Define: supervisord:supervisorctl
-#
-# This define executes command with the supervisorctl tool
-#
-define supervisord::supervisorctl(
-  $command,
-  $process       = undef,
-  $refreshonly   = false
-) {
-
-  validate_string($command)
-  validate_string($process)
-
-  $supervisorctl = $::supervisord::executable_ctl
-
-  if $process {
-    $cmd = join([$supervisorctl, $command, $process], ' ')
-  }
-  else {
-    $cmd = join([$supervisorctl, $command])
-  }
-
-  exec { "supervisorctl_command_${name}":
-    command     => $cmd,
-    refreshonly => $refreshonly
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml
deleted file mode 100644
index f8d4013a31b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-i386:
-    roles:
-      - master
-    platform: el-6-i386
-    box : centos-65-i386-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-i386-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 7535c104afb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml
deleted file mode 100644
index d1233aa83d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-73-i386:
-    roles:
-      - master
-    platform: debian-7-i386
-    box : debian-73-i386-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index 5b87870a909..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 5b87870a909..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb
deleted file mode 100644
index 47d052a4eec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'supervisord install' do
-
-  context 'default parameters with pip and init install' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'supervisord': install_pip  => true, install_init => true}
-      EOS
-
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
-    end
-
-    describe service('supervisord') do
-      it { should be_enabled }
-      it { should be_running }
-      it 'should restart successfully' do
-        cmd="service supervisord restart"
-        expect(shell(cmd).exit_code).to_not eq(1)
-      end
-    end
-  end
-end
-
-describe 'supervisord::program' do
-  context 'create a program config' do
-    it 'should install a program file' do
-
-      pp = <<-EOS
-        include supervisord
-        supervisord::program { 'test': 
-          command => 'echo', 
-          priority => '100', 
-          environment => { 
-            'HOME' => '/root',
-            'PATH' => '/bin',
-          }
-        }
-      EOS
-
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
-    end
-
-    it 'should contain the correct values' do
-      cmd='grep command=echo /etc/supervisor.d/program_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd='grep priority=100 /etc/supervisor.d/program_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd='grep "environment=" /etc/supervisor.d/program_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-    end
-  end
-end 
-
-describe 'supervisord::fcgi-program' do
-  context 'create fcgi-program config' do
-    it 'should install a fcgi-program file' do
-
-      pp = <<-EOS
-        include supervisord
-        supervisord::fcgi_program { 'test':
-          socket  => 'tcp://localhost:1000',
-          command => 'echo',
-          priority => '100',
-          environment => {
-            'HOME' => '/root',
-            'PATH' => '/bin',
-          }
-        }
-      EOS
-
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
-    end
-
-    it 'should contain the correct values' do
-      cmd='grep socket=tcp://localhost:1000 /etc/supervisor.d/fcgi-program_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd="grep command=echo /etc/supervisor.d/fcgi-program_test.conf"
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd="grep priority=100 /etc/supervisor.d/fcgi-program_test.conf"
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd='grep "environment=" /etc/supervisor.d/fcgi-program_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-    end
-  end
-end
-
-describe 'supervisord::group' do
-  context 'create group config' do
-    it 'should install a group config' do
-
-      pp = <<-EOS
-        include supervisord
-        supervisord::group { 'test':
-          programs => ['test'],
-          priority => '100',
-        }
-      EOS
-
-      expect(apply_manifest(pp).exit_code).to_not eq(1)
-      expect(apply_manifest(pp).exit_code).to eq(0)
-    end
-
-    it 'should contain the correct values' do
-      cmd='grep "programs=test" /etc/supervisor.d/group_test.conf'
-      expect(shell(cmd).exit_code).to eq(0)
-      cmd="grep priority=100 /etc/supervisor.d/group_test.conf"
-      expect(shell(cmd).exit_code).to eq(0)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
deleted file mode 100644
index b845920f6fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
+++ /dev/null
@@ -1,299 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord' do
-
-  concatdir = '/var/lib/puppet/concat'
-  let(:facts) {{ :concat_basedir => concatdir }}
-
-  it { should contain_class('supervisord') }
-  it { should contain_class('supervisord::install') }
-  it { should contain_class('supervisord::config') }
-  it { should contain_class('supervisord::service') }
-  it { should contain_class('supervisord::params') }
-  it { should contain_class('supervisord::reload') }
-  it { should contain_package('supervisor') }
-
-  describe '#service_name' do
-    context 'default' do
-      it { should contain_service('supervisord') }
-    end
-
-    context 'specified' do
-      let(:params) {{ :service_name => 'myservicename' }}
-      it { should contain_service('myservicename') }
-    end
-  end
-
-  describe '#install_pip' do
-    context 'default' do
-      it { should_not contain_class('supervisord::pip') }
-    end
-
-    context 'true' do
-      let(:params) {{ :install_pip => true }}
-      it { should contain_class('supervisord::pip') }
-      it { should contain_exec('install_setuptools') }
-      it { should contain_exec('install_pip') }
-    end
-
-    context 'true and RedHat' do
-      let(:params) {{ :install_pip => true }}
-      let(:facts) {{ :osfamily => 'RedHat', :concat_basedir => concatdir }}
-      it { should contain_exec('pip_provider_name_fix') }
-    end
-  end
-
-  describe '#env_var' do
-    context 'default' do
-      it { should contain_class('supervisord').without_env_hash }
-      it { should contain_class('supervisord').without_env_string }
-    end
-  end
-
-  describe '#environment' do
-    context 'default' do
-      it { should contain_class('supervisord').without_env_string }
-    end
-    context 'is specified' do
-      let(:params) {{ :environment => { 'key1' => 'value1', 'key2' => 'value2' } }}
-      it { should contain_concat__fragment('supervisord_main')\
-        .with_content(/environment=key1='value1',key2='value2'/) }
-    end
-  end
-
-  describe '#install_init' do
-    context 'default' do
-      it { should_not contain_file('/etc/init.d/supervisord') }
-    end
-
-    context 'false' do 
-      it { should_not contain_file('/etc/init.d/supervisord') }
-    end
-
-    describe 'on supported OS' do
-      context 'with Debian' do
-        let(:facts) {{ :osfamily => 'Debian', :concat_basedir => concatdir }}
-        it { should contain_file('/etc/init.d/supervisord') }
-        it { should contain_file('/etc/default/supervisor') }
-      end
-
-      context 'with RedHat' do
-        let(:facts) {{ :osfamily => 'RedHat', :concat_basedir => concatdir }}
-        it { should contain_file('/etc/init.d/supervisord') }
-        it { should contain_file('/etc/sysconfig/supervisord') }
-      end
-    end
-  end
-      
-  describe '#unix_socket' do
-    context 'default' do
-      it { should contain_concat__fragment('supervisord_unix')}
-    end
-    context 'false' do
-      let(:params) {{ :unix_socket => false }}
-      it { should_not contain_concat__fragment('supervisord_unix')}
-    end
-  end
-
-  describe '#inet_server' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_inet')}
-    end
-    context 'true' do
-      let(:params) {{ :inet_server => true }}
-      it { should contain_concat__fragment('supervisord_inet')}
-    end
-  end
-
-  describe '#run_path' do
-    context 'default' do
-      it { should_not contain_file('/var/run') }
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/pidfile=\/var\/run\/supervisord.pid$/) }
-    end
-    context 'is specified' do
-      let(:params) {{ :run_path => '/opt/supervisord/run' }}
-      it { should contain_file('/opt/supervisord/run') }
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/pidfile=\/opt\/supervisord\/run\/supervisord.pid$/) }
-    end
-  end
-
-  describe '#log_path' do
-    context 'default' do
-      it { should contain_file('/var/log/supervisor') }
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/logfile=\/var\/log\/supervisor\/supervisord.log$/) }
-    end
-    context 'is specified' do
-      let(:params) {{ :log_path => '/opt/supervisord/logs' }}
-      it { should contain_file('/opt/supervisord/logs')}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/logfile=\/opt\/supervisord\/logs\/supervisord.log$/) }
-    end
-  end
-
-  describe '#config_include' do
-    context 'default' do
-      it { should contain_file('/etc/supervisor.d') }
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/files=\/etc\/supervisor.d\/\*.conf$/) }
-    end
-    context 'is specified' do
-      let(:params) {{ :config_include => '/opt/supervisord/conf.d' }}
-      it { should contain_file('/opt/supervisord/conf.d') }
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/files=\/opt\/supervisord\/conf.d\/\*.conf$/) }
-    end
-  end
-
-  describe '#config_dirs' do
-    context 'is specified' do
-      let(:params) {{ :config_dirs => ['/etc/supervisor.d/*.conf', '/opt/supervisor.d/*', '/usr/share/supervisor.d/*.config'] }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/files=\/etc\/supervisor.d\/\*.conf \/opt\/supervisor.d\/\* \/usr\/share\/supervisor.d\/\*.config$/) }
-    end
-  end
-
-  describe '#config_file' do
-    context 'default' do
-      it { should contain_file('/etc/supervisord.conf') }
-    end
-    context 'is specified' do
-      let(:params) {{ :config_file => '/opt/supervisord/supervisor.conf' }}
-      it { should contain_file('/opt/supervisord/supervisor.conf') }
-    end
-  end
-
-  describe '#nodaemon' do
-    context 'default' do
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/nodaemon=false$/) }
-    end
-    context 'true' do
-      let(:params) {{ :nodaemon => true }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/nodaemon=true$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :nodaemon => 'invalid' }}
-      it { expect { raise_error(Puppet::Error, /is not a boolean/) }}
-    end
-  end
-
-  describe '#minfds' do
-    context 'default' do
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/minfds=1024$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :minfds => 2048 }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/minfds=2048$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :minfds => 'string' }}
-      it { expect { raise_error(Puppet::Error, /invalid minfds/) }}
-    end
-  end
-
-  describe '#minprocs' do
-    context 'default' do
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/minprocs=200$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :minprocs => 300 }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/minprocs=300$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :minfds => 'string' }}
-      it { expect { raise_error(Puppet::Error, /invalid minprocs/) }}
-    end
-  end
-
-  describe '#strip_ansi' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/strip_ansi$/) }
-    end
-    context 'true' do
-      let(:params) {{ :strip_ansi => true }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/strip_ansi=true$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :strip_ansi => 'string' }}
-      it { expect { raise_error(Puppet::Error, /is not a boolean/) }}
-    end
-  end
-
-  describe '#user' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/user$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :user => 'myuser' }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/user=myuser$/) }
-    end
-  end
-
-  describe '#identifier' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/identifier$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :identifier => 'myidentifier' }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/identifier=myidentifier$/) }
-    end
-  end
-
-  describe '#directory' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/directory$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :directory => '/opt/supervisord' }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/directory=\/opt\/supervisord$/) }
-    end
-  end
-
-  describe '#nocleanup' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/nocleanup$/) }
-    end
-    context 'true' do
-      let(:params) {{ :nocleanup => true }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/nocleanup=true$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :nocleanup => 'string' }}
-      it { expect { raise_error(Puppet::Error, /is not a boolean/) }}
-    end
-  end
-
-  describe '#childlogdir' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_main') \
-        .with_content(/childlogdir$/) }
-    end
-    context 'specified' do
-      let(:params) {{ :childlogdir => '/opt/supervisord/logdir' }}
-      it { should contain_concat__fragment('supervisord_main') \
-        .with_content(/childlogdir=\/opt\/supervisord\/logdir$/) }
-    end
-    context 'invalid' do
-      let(:params) {{ :childlogdir => 'not_a_path' }}
-      it { expect { raise_error(Puppet::Error, /is not an absolute path/) }}
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
deleted file mode 100644
index 1083b8a3230..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::eventlistener', :type => :define do
-  let(:title) {'foo'}
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-  let(:default_params) do 
-    {
-      :command                 => 'bar',
-      :process_name            => '%(process_num)s',
-      :events                  => ['PROCESS_STATE', 'PROCESS_STATE_STARTING'],
-      :buffer_size             => 10,
-      :numprocs                => '1',
-      :numprocs_start          => '0',
-      :priority                => '999',
-      :autostart               => true,
-      :autorestart             => 'unexpected',
-      :startsecs               => '1',
-      :startretries            => '3',
-      :exitcodes               => '0,2',
-      :stopsignal              => 'TERM',
-      :stopwaitsecs            => '10',
-      :stopasgroup             => true,
-      :killasgroup             => true,
-      :user                    => 'baz',
-      :redirect_stderr         => true,
-      :stdout_logfile          => 'eventlistener_foo.log',
-      :stdout_logfile_maxbytes => '50MB',
-      :stdout_logfile_backups  => '10',
-      :stdout_events_enabled   => true,
-      :stderr_logfile          => 'eventlistener_foo.error',
-      :stderr_logfile_maxbytes => '50MB',
-      :stderr_logfile_backups  => '10',
-      :stderr_events_enabled   => true,
-      :environment             => { 'env1' => 'value1', 'env2' => 'value2' },
-      :directory               => '/opt/supervisord/chroot',
-      :umask                   => '022',
-      :serverurl               => 'AUTO'
-    }
-  end
-
-  context 'default' do
-    let(:params) { default_params }
-
-    it { should contain_supervisord__eventlistener('foo') }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/\[eventlistener:foo\]/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/command=bar/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/process_name=\%\(process_num\)s/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/events=PROCESS_STATE,PROCESS_STATE_STARTING/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/buffer_size=10/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/numprocs=1/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/numprocs_start=0/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/priority=999/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/autostart=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/startsecs=1/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/startretries=3/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/exitcodes=0,2/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopsignal=TERM/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopwaitsecs=10/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stopasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/killasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/user=baz/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/redirect_stderr=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/eventlistener_foo.log/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stdout_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/eventlistener_foo.error/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/stderr_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/environment=env1='value1',env2='value2'/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/umask=022/) }
-    it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/serverurl=AUTO/) }
-  end
-
-  context 'ensure_process_stopped' do
-    let(:params) { default_params.merge({ :ensure_process => 'stopped' }) }
-    it { should contain_supervisord__supervisorctl('stop_foo') }
-  end
-
-  context 'ensure_process_removed' do
-    let(:params) { default_params.merge({ :ensure_process => 'removed' }) }
-    it { should contain_supervisord__supervisorctl('remove_foo') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
deleted file mode 100644
index e01311be70d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::fcgi_program', :type => :define do
-  let(:title) {'foo'}
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-  let(:default_params) do
-    {
-      :command                 => 'bar',
-      :socket                  => 'tcp://localhost:1000',
-      :process_name            => '%(process_num)s',
-      :numprocs                => '1',
-      :numprocs_start          => '0',
-      :priority                => '999',
-      :autostart               => true,
-      :autorestart             => 'unexpected',
-      :startsecs               => '1',
-      :startretries            => '3',
-      :exitcodes               => '0,2',
-      :stopsignal              => 'TERM',
-      :stopwaitsecs            => '10',
-      :stopasgroup             => true,
-      :killasgroup             => true,
-      :user                    => 'baz',
-      :redirect_stderr         => true,
-      :stdout_logfile          => 'fcgi-program_foo.log',
-      :stdout_logfile_maxbytes => '50MB',
-      :stdout_logfile_backups  => '10',
-      :stdout_capture_maxbytes => '0',
-      :stdout_events_enabled   => true,
-      :stderr_logfile          => 'fcgi-program_foo.error',
-      :stderr_logfile_maxbytes => '50MB',
-      :stderr_logfile_backups  => '10',
-      :stderr_capture_maxbytes => '0',
-      :stderr_events_enabled   => true,
-      :environment             => { 'env1' => 'value1', 'env2' => 'value2' },
-      :directory               => '/opt/supervisord/chroot',
-      :umask                   => '022',
-      :serverurl               => 'AUTO'
-    }
-  end
-
-  context 'default' do
-    let(:params) { default_params }
-
-    it { should contain_supervisord__fcgi_program('foo') }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/\[fcgi-program:foo\]/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/socket=tcp:\/\/localhost:1000/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/command=bar/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/process_name=\%\(process_num\)s/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/numprocs=1/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/numprocs_start=0/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/priority=999/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/autostart=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/startsecs=1/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/startretries=3/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/exitcodes=0,2/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopsignal=TERM/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopwaitsecs=10/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stopasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/killasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/user=baz/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/redirect_stderr=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/fcgi-program_foo.log/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_capture_maxbytes=0/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/fcgi-program_foo.error/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_capture_maxbytes=0/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/environment=env1='value1',env2='value2'/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/umask=022/) }
-    it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/serverurl=AUTO/) }
-  end
-
-  context 'ensure_process_stopped' do
-    let(:params) { default_params.merge({ :ensure_process => 'stopped' }) }
-    it { should contain_supervisord__supervisorctl('stop_foo') }
-  end
-
-  context 'ensure_process_removed' do
-    let(:params) { default_params.merge({ :ensure_process => 'removed' }) }
-    it { should contain_supervisord__supervisorctl('remove_foo') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb
deleted file mode 100644
index ba8d70196ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::group', :type => :define do
-  let(:title) {'foo'}
-  let(:params) {{ :programs => ['bar', 'baz'] }}
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__group('foo').with_program }
-  it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) }
-
-  describe '#priority' do
-    it 'should default to undef' do
-      should_not contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority/)
-      should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/)
-    end
-    context '100' do
-      let(:params) {{ :priority => '100', :programs => ['bar', 'baz'] }}
-      it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority=100/) }
-      it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
deleted file mode 100644
index e32c24ab2d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::program', :type => :define do
-  let(:title) {'foo'}
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-  let(:default_params) do 
-    {
-      :command                 => 'bar',
-      :process_name            => '%(process_num)s',
-      :numprocs                => '1',
-      :numprocs_start          => '0',
-      :priority                => '999',
-      :autostart               => true,
-      :autorestart             => 'unexpected',
-      :startsecs               => '1',
-      :startretries            => '3',
-      :exitcodes               => '0,2',
-      :stopsignal              => 'TERM',
-      :stopwaitsecs            => '10',
-      :stopasgroup             => true,
-      :killasgroup             => true,
-      :user                    => 'baz',
-      :redirect_stderr         => true,
-      :stdout_logfile          => 'program_foo.log',
-      :stdout_logfile_maxbytes => '50MB',
-      :stdout_logfile_backups  => '10',
-      :stdout_capture_maxbytes => '0',
-      :stdout_events_enabled   => true,
-      :stderr_logfile          => 'program_foo.error',
-      :stderr_logfile_maxbytes => '50MB',
-      :stderr_logfile_backups  => '10',
-      :stderr_capture_maxbytes => '0',
-      :stderr_events_enabled   => true,
-      :environment             => { 'env1' => 'value1', 'env2' => 'value2' },
-      :directory               => '/opt/supervisord/chroot',
-      :umask                   => '022',
-      :serverurl               => 'AUTO'
-    }
-  end
-
-  context 'default' do
-    let(:params) { default_params }
-
-    it { should contain_supervisord__program('foo') }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/\[program:foo\]/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/command=bar/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/process_name=\%\(process_num\)s/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/numprocs=1/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/numprocs_start=0/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/priority=999/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/autostart=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/startsecs=1/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/startretries=3/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/exitcodes=0,2/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopsignal=TERM/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopwaitsecs=10/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stopasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/killasgroup=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/user=baz/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/redirect_stderr=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/program_foo.log/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_capture_maxbytes=0/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/program_foo.error/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile_maxbytes=50MB/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile_backups=10/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_capture_maxbytes=0/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_events_enabled=true/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/environment=env1='value1',env2='value2'/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/directory=\/opt\/supervisord\/chroot/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/umask=022/) }
-    it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/serverurl=AUTO/) }
-  end
-
-  context 'ensure_process_stopped' do
-    let(:params) { default_params.merge({ :ensure_process => 'stopped' }) }
-    it { should contain_supervisord__supervisorctl('stop_foo') }
-  end
-
-  context 'ensure_process_removed' do
-    let(:params) { default_params.merge({ :ensure_process => 'removed' }) }
-    it { should contain_supervisord__supervisorctl('remove_foo') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb
deleted file mode 100644
index 33cfd75efe9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::supervisorctl', :type => :define do
-  let(:title) {'command_foo'}
-  let(:default_params) {{ 
-    :command => 'command',
-    :process => 'foo'
-  }}
-  let(:params) { default_params }
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__supervisorctl('command_foo') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb
deleted file mode 100644
index dd8dffa07ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe 'array2csv' do
-  it { should run.with_params(['value1']).and_return('value1') }
-  it { should run.with_params(['value1', 'value2', 'value3']).and_return('value1,value2,value3') }
-  it { should run.with_params('foo').and_raise_error(Puppet::ParseError) }
-  it { should run.with_params().and_raise_error(Puppet::ParseError) }
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb
deleted file mode 100644
index 68f04a6445a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe 'hash2csv' do
-  it { should run.with_params({'key1' => 'value1'}).and_return("key1='value1'") }
-  it { should run.with_params({'key1' => 'value1', 'key2' => 'value2'}).and_return("key1='value1',key2='value2'") }
-  it { should run.with_params('foo').and_raise_error(Puppet::ParseError) }
-  it { should run.with_params().and_raise_error(Puppet::ParseError) }
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
deleted file mode 100644
index 745ad4a5493..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-  c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-end
-
-at_exit { RSpec::Puppet::Coverage.report! }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb
deleted file mode 100644
index dcae2850d27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'beaker-rspec'
-
-hosts.each do |host|
-  # Install Puppet
-  install_puppet
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module
-    puppet_module_install(:source => proj_root, :module_name => 'supervisord')
-    hosts.each do |host|
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
deleted file mode 100644
index 9875c8ef5b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
+++ /dev/null
@@ -1,88 +0,0 @@
-[eventlistener:<%= @name %>]
-command=<%= @command %>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @events_string -%>
-events=<%= @events_string %>
-<% end -%>
-<% if @buffer_size -%>
-buffer_size=<%= @buffer_size %>
-<% end -%>
-<% if @result_handler -%>
-result_handler=<%= @result_handler %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsecs -%>
-stopwaitsecs=<%= @stopwaitsecs %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
deleted file mode 100644
index 98a7fb1cb32..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
+++ /dev/null
@@ -1,96 +0,0 @@
-[fcgi-program:<%= @name %>]
-command=<%= @command %>
-socket=<%= @socket %>
-<% if @socket_owner -%>
-socket_owner=<%= @socket_owner %>
-<% end -%>
-<% if @socket_mode -%>
-socket_mode=<%= @socket_mode %>
-<% end -%>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsecs -%>
-stopwaitsecs=<%= @stopwaitsecs %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-<% if @stdout_logfile -%>
-stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %>
-<% end -%>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_capture_maxbytes -%>
-stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-<% if @stderr_logfile -%>
-stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %>
-<% end -%>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_capture_maxbytes -%>
-stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb
deleted file mode 100644
index 478a02e4504..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-[group:<%= @name %>]
-programs=<%= @progstring %>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
deleted file mode 100644
index 78002c87ca6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-[program:<%= @name %>]
-command=<%= @command %>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsecs -%>
-stopwaitsecs=<%= @stopwaitsecs %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-<% if @stdout_logfile -%>
-stdout_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stdout_logfile %>
-<% end -%>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_capture_maxbytes -%>
-stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-<% if @stderr_logfile -%>
-stderr_logfile=<%= scope.lookupvar('supervisord::log_path') %>/<%= @stderr_logfile %>
-<% end -%>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_capture_maxbytes -%>
-stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb
deleted file mode 100644
index 232f5356da3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for supervisor initscript
-# sourced by /etc/init.d/supervisor
-# installed at /etc/default/supervisor by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c <%= @config_file %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb
deleted file mode 100644
index f8bdb5ff854..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb
+++ /dev/null
@@ -1,137 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          supervisor
-# Required-Start:    $remote_fs $network $named
-# Required-Stop:     $remote_fs $network $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start/stop supervisor
-# Description:       Start/stop supervisor daemon and its configured
-#                    subprocesses.
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=<%= @executable %>
-NAME=supervisord
-DESC=supervisor
-
-# Tests if executable exists
-if [ ! -x $DAEMON ] ; then
-    echo "Executable not found ${DAEMON}"
-    exit 1
-fi
-
-LOGDIR=<%= @log_path %>
-PIDFILE=<%= @run_path %>/<%= @pid_file %>
-DODTIME=5                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include supervisor defaults if available
-if [ -f <%= @init_defaults %> ] ; then
-        . <%= @init_defaults %>
-fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $DESC (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-    if [ -e $PIDFILE ]; then
-        echo "$DESC already running with pid: `cat $PIDFILE`"
-        exit 0
-    fi
-    echo -n "Starting $DESC: "
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- $DAEMON_OPTS
-    test -f $PIDFILE || sleep 1
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-    ;;
-    stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
-        echo "$NAME."
-    ;;
-    force-stop)
-        echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-    ;;
-    restart)
-        echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        start-stop-daemon --start --quiet --pidfile \
-            $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
-        echo "$NAME."
-    ;;
-    status)
-        echo -n "$DESC is "
-        if running ;  then
-            echo "running"
-        else
-            echo "not running."
-            exit 1
-        fi
-    ;;
-    *)
-        N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|restart|status|force-stop}" >&2
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb
deleted file mode 100644
index 0d7862d0233..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# this is sourced by the supervisord init script
-# written by jkoppe
-
-set -a 
-
-# should probably put both of these options as runtime arguments 
-OPTIONS="-c <%= @config_file %>"
-PIDFILE=<%= @run_path %><%= @pid_file %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb
deleted file mode 100644
index 617f3eed93b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#
-# supervisord   This scripts turns supervisord on
-#
-# Author:       Mike McGrath <mmcgrath@redhat.com> (based off yumupdatesd)
-#               Jason Koppe <jkoppe@indeed.com> adjusted to read sysconfig,
-#                   use supervisord tools to start/stop, conditionally wait
-#                   for child processes to shutdown, and startup later
-#
-# chkconfig:    345 83 04
-#
-# description:  supervisor is a process control utility.  It has a web based
-#               xmlrpc interface as well as a few other nifty features.
-# processname:  supervisord
-# config: <%= @config_file %>
-# pidfile: <%= @run_path %>/<%= @pid_file %>
-#
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-# source system settings
-[ -e <%= @init_defaults %> ] && . <%= @init_defaults %>
-
-RETVAL=0
-DAEMON=<%= @executable %>
-CTL=<%= @executable_ctl %>
-DESC=supervisord
-PIDFILE=<%= @run_path %>/<%= @pid_file %>
-
-# Tests if executable exists
-if [ ! -x $DAEMON ] ; then
-    echo "Executable not found ${DAEMON}"
-    exit 1
-fi
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-start() {
-    echo -n "Starting $DESC: "
-    if [ -e $PIDFILE ]; then 
-        echo "ALREADY STARTED"
-        return 1
-    else
-        # start supervisord with options from sysconfig (stuff like -c)
-        daemon $DAEMON $OPTIONS
-        # only create the subsyslock if we created the PIDFILE
-        [ -e $PIDFILE ] && touch /var/lock/subsys/supervisord
-        return 0
-    fi
-}
-
-stop() {
-    echo -n "Stopping supervisord: "
-    killproc -p $PIDFILE $DESC 
-    # always remove the subsys.  we might have waited a while, but just remove it at this point.
-    rm -f /var/lock/subsys/supervisord
-    return 0
-}
-
-restart() {
-        stop
-        start
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart|force-reload)
-        restart
-        ;;
-    reload)
-        $CTL $OPTIONS reload
-        RETVAL=$?
-        ;;
-    condrestart)
-        [ -f /var/lock/subsys/supervisord ] && restart
-        RETVAL=$?
-        ;;
-    status)
-        echo -n "supervisord is "
-        if running ;  then
-            echo "running"
-        else
-            echo "not running."
-            exit 1
-    fi
-    ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb
deleted file mode 100644
index 9f04cb24779..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-[inet_http_server]
-port=<%= @inet_server_hostname %>:<%= @inet_server_port %>
-<% if @inet_auth -%>
-username=<%= @inet_username %>
-password=<%= @inet_password %>
-<% end -%>
-
-[supervisorctl]
-serverurl=http://<%= @inet_hostname%>:<%= @inet_server_port %>
-<% if @inet_auth -%>
-username=<%= @inet_username %>
-password=<%= @inet_password %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
deleted file mode 100644
index 8ab8fee51df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-[supervisord]
-logfile=<%= @log_path %>/<%= @log_file %>
-pidfile=<%= @run_path %>/<%= @pid_file %>
-nodaemon=<%= @nodaemon %>
-minfds=<%= @minfds %>
-minprocs=<%= @minprocs %>
-umask=<%= @umask %>
-<% if @strip_ansi -%>
-strip_ansi=<%= @strip_ansi %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @identifier -%>
-identifier=<%= @identifier %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @nocleanup -%>
-nocleanup=true
-<% end -%>
-<% if @childlogdir -%>
-childlogdir=<%= @childlogdir %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[include]
-files=<%= @config_include_string %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
deleted file mode 100644
index 39e85199916..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-[unix_http_server]
-file=<%= @run_path %>/<%= @unix_socket_file %>
-chmod=<%= @unix_socket_mode %>
-chown=<%= @unix_socket_owner %>:<%= @unix_socket_group %>
-<% if @unix_auth -%>
-username=<%= @unix_socket_username %>
-password=<%= @unix_socket_password %>
-<% end -%>
-
-[supervisorctl]
-serverurl=unix://<%= @run_path %>/<%= @unix_socket_file %>
-<% if @unix_auth -%>
-username=<%= @unix_username %>
-password=<%= @unix_password %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp
deleted file mode 100644
index 3d340460dfb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-supervisord::group { 'mygroup':
-  priority => 100,
-  program  => ['program1', 'program2', 'program3']
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp
deleted file mode 100644
index 48bc1f47987..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class { 'supervisord':
-  install_pip  => true,
-  install_init => true,
-  nocleanup    => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
deleted file mode 100644
index 0d45ebe1b3d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-supervisord::program { 'myprogram':
-  command                 => 'command --args',
-  process_name            => '%(process_num)s',
-  numprocs                => '1',
-  numprocs_start          => '0',
-  priority                => '999',
-  autostart               => true,
-  autorestart             => 'unexpected',
-  startsecs               => '1',
-  startretries            => '3',
-  exitcodes               => '0,2',
-  stopsignal              => 'TERM',
-  stopwaitsecs            => '10',
-  stopasgroup             => false,
-  killasgroup             => false,
-  redirect_stderr         => false,
-  stdout_logfile          => 'program_foo.log',
-  stdout_logfile_maxbytes => '50MB',
-  stdout_logfile_backups  => '10',
-  stdout_capture_maxbytes => '0',
-  stdout_events_enabled   => false,
-  stderr_logfile          => 'program_foo.error',
-  stderr_logfile_maxbytes => '50MB',
-  stderr_logfile_backups  => '10',
-  stderr_capture_maxbytes => '0',
-  stderr_events_enabled   => false,
-  environment             => {
-    'HOME'   => '/home/myuser',
-    'PATH'   => '/bin:/sbin:/usr/bin:/usr/sbin',
-    'SECRET' => 'mysecret'
-  },
-  directory               => undef,
-  umask                   => '022',
-  serverurl               => 'AUTO'
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog
deleted file mode 100644
index a91a0e2cf48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2014-01-20 - 0.3.0
-* Add optional comment inside the sysctl.d file.
-* Use sysctl -p with the created/modified file instead of sysctl -w (#3).
-* Fix purge and set its default to false (#7, tehmaspc).
-
-2013-10-02 - 0.2.0
-* Add optional prefix to the sysctl.d file name, to force ordering.
-
-2013-06-25 - 0.1.1
-* Make purge optional, still enabled by default.
-* Add rspec tests (Justin Lambert).
-* Minor fix for values with spaces (needs more changes to be robust).
-
-2013-03-06 - 0.1.0
-* Update README to markdown.
-* Change to recommended 2 space indent.
-
-2012-12-18 - 0.0.3
-* Add feature to update existing values in /etc/sysctl.conf.
-* Apply setting on each run if needed (hakamadare).
-* Make sure $ensure => absent still works with the above change.
-
-2012-09-19 - 0.0.2
-* Fix deprecation warnings.
-* Fix README markup.
-
-2012-07-19 - 0.0.1
-* Initial module release.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile
deleted file mode 100644
index d4c141f5a3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper', '>= 0.4.0'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE
deleted file mode 100644
index 49a6e5c4010..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright (C) 2011-2013 Matthias Saou
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile
deleted file mode 100644
index 2d9f13ff73a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'thias-sysctl'
-version '0.3.0'
-source 'git://github.com/thias/puppet-sysctl'
-author 'Matthias Saou'
-license 'Apache 2.0'
-summary 'Sysctl module'
-description "Manage sysctl variable values."
-project_page 'https://github.com/thias/puppet-sysctl'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md
deleted file mode 100644
index 554bcfa0f14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# puppet-sysctl
-
-## Overview
-
-Manage sysctl variable values. All changes are immediately applied, as well as
-configured to become persistent. Tested on Red Hat Enterprise Linux 6.
-
- * `sysctl` : Definition to manage sysctl variables by setting a value.
- * `sysctl::base`: Base class (included from the definition).
-
-For persistence to work, your Operating System needs to support looking for
-sysctl configuration inside `/etc/sysctl.d/`.
-
-You may optionally enable purging of the `/etc/sysctl.d/` directory, so that
-all files which are not (or no longer) managed by this module will be removed.
-
-Beware that for the purge to work, you need to either have at least one
-sysctl definition call left for the node, or include `sysctl::base` manually.
-
-You may also force a value to `ensure => absent`, which will always work.
-
-For the few original settings in the main `/etc/sysct.conf` file, the value is
-also replaced so that running `sysctl -p` doesn't revert any change made by
-puppet.
-
-## Examples
-
-Enable IP forwarding globally :
-```puppet
-sysctl { 'net.ipv4.ip_forward': value => '1' }
-```
-
-Set a value for maximum number of connections per UNIX socket :
-```puppet
-sysctl { 'net.core.somaxconn': value => '65536' }
-```
-
-Make sure we don't have any explicit value set for swappiness, typically
-because it was set at some point but no longer needs to be. The original
-value for existing nodes won't be reset until the next reboot :
-```puppet
-sysctl { 'vm.swappiness': ensure => absent }
-```
-
-If the order in which the files get applied is important, you can set it by
-using a file name prefix, which could also be set globally from `site.pp` :
-```puppet
-Sysctl { prefix => '60' }
-```
-
-To enable purging of settings, you can use hiera to set the `sysctl::base`
-`$purge` parameter :
-```yaml
----
-# sysctl
-sysctl::base::purge: true
-```
- 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile
deleted file mode 100644
index 184b9b5915e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send("disable_autoloader_layout")
-PuppetLint.configuration.send("disable_quoted_booleans")
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp
deleted file mode 100644
index f7a95131467..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Class: sysctl::base
-#
-# Common part for the sysctl definition. Not meant to be used on its own.
-#
-class sysctl::base (
-  $purge = false,
-) {
-
-  if $purge {
-    $recurse = true
-  } else {
-    $recurse = false
-  }
-
-  file { '/etc/sysctl.d':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    # Magic hidden here
-    purge   => $purge,
-    recurse => $recurse,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp
deleted file mode 100644
index 379e69136c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Define: sysctl
-#
-# Manage sysctl variable values.
-#
-# Parameters:
-#  $value:
-#    The value for the sysctl parameter. Mandatory, unless $ensure is 'absent'.
-#  $prefix:
-#    Optional prefix for the sysctl.d file to be created. Default: none.
-#  $ensure:
-#    Whether the variable's value should be 'present' or 'absent'.
-#    Defaults to 'present'.
-#
-# Sample Usage :
-#  sysctl { 'net.ipv6.bindv6only': value => '1' }
-#
-define sysctl (
-  $value   = undef,
-  $prefix  = undef,
-  $comment = undef,
-  $ensure  = undef,
-) {
-
-  include sysctl::base
-
-  # If we have a prefix, then add the dash to it
-  if $prefix {
-    $sysctl_d_file = "${prefix}-${title}.conf"
-  } else {
-    $sysctl_d_file = "${title}.conf"
-  }
-
-  # The permanent change
-  file { "/etc/sysctl.d/${sysctl_d_file}":
-    ensure  => $ensure,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => template("${module_name}/sysctl.d-file.erb"),
-    notify  => [
-      Exec["sysctl-${title}"],
-      Exec["update-sysctl.conf-${title}"],
-    ],
-  }
-
-  if $ensure != 'absent' {
-
-    # The immediate change + re-check on each run "just in case"
-    exec { "sysctl-${title}":
-      command     => "/sbin/sysctl -p /etc/sysctl.d/${sysctl_d_file}",
-      refreshonly => true,
-      require     => File["/etc/sysctl.d/${sysctl_d_file}"],
-    }
-
-    # For the few original values from the main file
-    exec { "update-sysctl.conf-${title}":
-      command     => "sed -i -e 's/^${title} *=.*/${title} = ${value}/' /etc/sysctl.conf",
-      path        => [ '/usr/sbin', '/sbin', '/usr/bin', '/bin' ],
-      refreshonly => true,
-      onlyif      => "grep -E '^${title} *=' /etc/sysctl.conf",
-    }
-
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json
deleted file mode 100644
index 237befce806..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "project_page": "https://github.com/thias/puppet-sysctl",
-  "version": "0.3.0",
-  "license": "Apache 2.0",
-  "description": "Manage sysctl variable values.",
-  "dependencies": [
-
-  ],
-  "types": [
-
-  ],
-  "name": "thias-sysctl",
-  "author": "Matthias Saou",
-  "summary": "Sysctl module",
-  "source": "git://github.com/thias/puppet-sysctl",
-  "checksums": {
-    "tests/init.pp": "e70e5327b9840b44699bb7fae71d47cd",
-    "spec/spec_helper.rb": "3ea886dd135e120afa31e0aab12e85b0",
-    "ChangeLog": "ed8052eb5cb46b92eaa03b882c11779e",
-    "LICENSE": "99219472697a01561e7630d63aaecdc1",
-    "Modulefile": "3b8a6a0dfff841a31118a5f46fde59da",
-    "spec/defines/sysctl_init_spec.rb": "21d524df70961750cb22f6b83349093e",
-    "manifests/init.pp": "0f7dd893b08ebbbec8994d14eca6701b",
-    "README.md": "ed4837849a1c4790b7178cd99824a204",
-    "spec/classes/sysctl_base_spec.rb": "6241cf3e290871c00b1bb3bbd5490108",
-    "templates/sysctl.d-file.erb": "0212783df32c499b3e9e343993f608da",
-    "manifests/base.pp": "9508015ce74b5ce1420ad8c8ebc7d3af",
-    "tests/base.pp": "1ba89838432dbc94339097327c19ae3d",
-    "Gemfile": "3ad486d60d90bfe4395b368b95481e01",
-    "Rakefile": "ab253b919e7093c2a5eb7adf0e39ffbc"
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb
deleted file mode 100644
index a1d47a21e77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe 'sysctl::base', :type => :class do
-
-  it { should create_class('sysctl::base') }
-  it { should contain_file('/etc/sysctl.d') }
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb
deleted file mode 100644
index 1f8db67cce0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'sysctl', :type => :define do
-  let(:title) { 'net.ipv4.ip_forward'}
-
-  context 'present' do
-    let(:params) { { :value => '1' } }
-
-    it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with(
-      :content  => "net.ipv4.ip_forward = 1\n",
-      :ensure   => nil
-    ) }
-
-    it { should contain_exec('sysctl-net.ipv4.ip_forward') }
-    it { should contain_exec('update-sysctl.conf-net.ipv4.ip_forward')}
-  end
-
-  context 'absent' do
-    let(:params) { { :ensure  => 'absent' } }
-
-    it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with_ensure('absent') }
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb
deleted file mode 100644
index 843721435a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if @comment -%>
-<% @comment.each do |line| -%>
-# <%= line %>
-<% end -%>
-<% end -%>
-<%= @title %> = <%= @value %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp
deleted file mode 100644
index a4868712ef7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp
+++ /dev/null
@@ -1 +0,0 @@
-include sysctl::base
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp
deleted file mode 100644
index 402615bb798..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-sysctl { 'net.ipv4.ip_forward': value => '1' }
-sysctl { 'net.core.somaxconn': value => '65536' }
-sysctl { 'vm.swappiness': ensure => absent }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml
deleted file mode 100644
index 1c5e71b98df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
-      kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
-      IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG
deleted file mode 100644
index 8142f5d6e45..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG
+++ /dev/null
@@ -1,41 +0,0 @@
-2013-11-13 - Version 0.2.0
-
-Summary:
-
-This release mainly focuses on a number of bugfixes, which should
-significantly improve the reliability of Git and SVN.  Thanks to
-our many contributors for all of these fixes!
-
-Features:
-- Git:
- - Add autorequire for Package['git']
-- HG:
- - Allow user and identity properties.
-- Bzr:
- - "ensure => latest" support.
-- SVN:
- - Added configuration parameter.
- - Add support for master svn repositories.
-- CVS:
- - Allow for setting the CVS_RSH environment variable.
-
-Fixes:
-- Handle Puppet::Util[::Execution].withenv for 2.x and 3.x properly.
-- Change path_empty? to not do full directory listing.
-- Overhaul spec tests to work with rspec2.
-- Git:
- - Improve Git SSH usage documentation.
- - Add ssh session timeouts to prevent network issues from blocking runs.
- - Fix git provider checkout of a remote ref on an existing repo.
- - Allow unlimited submodules (thanks to --recursive).
- - Use git checkout --force instead of short -f everywhere.
- - Update git provider to handle checking out into an existing (empty) dir.
-- SVN:
- - Handle force property. for svn.
- - Adds support for changing upstream repo url.
- - Check that the URL of the WC matches the URL from the manifest.
- - Changed from using "update" to "switch".
- - Handle revision update without source switch.
- - Fix svn provider to look for '^Revision:' instead of '^Last Changed Rev:'.
-- CVS:
- - Documented the "module" attribute.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile
deleted file mode 100644
index 5def8292208..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile
+++ /dev/null
@@ -1,22 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE
deleted file mode 100644
index 2ee80c8ec84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2010-2012 Puppet Labs Inc.
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-This program and entire repository is free software; you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License as published by the Free Software
-Foundation; either version 2 of the License, or any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile
deleted file mode 100644
index d2bbe929598..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile
+++ /dev/null
@@ -1,4 +0,0 @@
-name 'puppetlabs/vcsrepo'
-version '0.2.0'
-summary 'Manage repositories from various version control systems'
-description 'Manage repositories from various version control systems'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown
deleted file mode 100644
index cc257e9fdf6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
-Using vcsrepo with Bazaar
-=========================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => bzr
-    }
-
-To branch from an existing repository
--------------------------------------
-
-Provide the `source` location:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => bzr,
-        source   => 'lp:myproj'
-    }
-
-For a specific revision, use `revision` with a valid revisionspec
-(see `bzr help revisionspec` for more information on formatting a revision):
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => bzr,
-        source   => 'lp:myproj',
-        revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-    }
-
-For sources that use SSH (eg, `bzr+ssh://...`, `sftp://...`)
-------------------------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/bzr/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown
deleted file mode 100644
index 3bdd59da4f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown
+++ /dev/null
@@ -1,66 +0,0 @@
-Using vcsrepo with CVS
-======================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure => present,
-      provider => cvs
-    }
-
-To checkout/update from a repository
-------------------------------------
-
-To get the current mainline:
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        source => ":pserver:anonymous@example.com:/sources/myproj"
-    }
-    
-To get a specific module on the current mainline:
-
-    vcsrepo {"/vagrant/lockss-daemon-source":
-        ensure   => present,
-        provider => cvs,
-        source   => ":pserver:anonymous@lockss.cvs.sourceforge.net:/cvsroot/lockss",
-        module   => "lockss-daemon",
-    }
-
-
-You can use the `compression` parameter (it works like CVS `-z`):
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        compression => 3,
-        source => ":pserver:anonymous@example.com:/sources/myproj"
-    }
-
-For a specific tag, use `revision`:
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        compression => 3,
-        source => ":pserver:anonymous@example.com:/sources/myproj",
-        revision => "SOMETAG"
-    }
-
-For sources that use SSH
-------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/cvs/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown
deleted file mode 100644
index 846bdcc2944..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown
+++ /dev/null
@@ -1,95 +0,0 @@
-Using vcsrepo with Git
-======================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure => present,
-      provider => git
-    }
-
-If you're defining this for a central/"official" repository, you'll
-probably want to make it a "bare" repository.  Do this by setting
-`ensure` to `bare` instead of `present`:
-
-    vcsrepo { "/path/to/repo":
-        ensure => bare,
-        provider => git
-    }
-
-To clone/pull a repository
-----------------------------
-
-To get the current [master] HEAD:
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => "git://example.com/repo.git"
-    }
-
-For a specific revision or branch (can be a commit SHA, tag or branch name):
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31'
-    }
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '1.1.2rc1'
-    }
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => 'development'
-    }
-
-Check out as a user:
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31',
-        user => 'someUser'
-    }
-
-Keep the repository at the latest revision (note: this will always overwrite local changes to the repository):
-
-    vcsrepo { "/path/to/repo":
-        ensure => latest,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => 'master',
-    }
-
-For sources that use SSH (eg, `username@server:...`)
-----------------------------------------------------
-
-If your SSH key is associated with a user, simply fill the `user` parameter to use his keys.
-
-Example:
-
-    user => 'toto'  # will use toto's $HOME/.ssh setup
-
-
-Otherwise, manage your SSH keys with Puppet and use `require` in your `vcsrepo` to ensure they are present.
-For more information, see the `require` metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/git/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown
deleted file mode 100644
index 55ceef4acce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown
+++ /dev/null
@@ -1,73 +0,0 @@
-Using vcsrepo with Mercurial
-============================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => hg
-    }
-
-To clone/pull & update a repository
------------------------------------
-
-To get the default branch tip:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo"
-    }
-
-For a specific changeset, use `revision`:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        revision => '21ea4598c962'
-    }
-
-You can also set `revision` to a tag:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        revision => '1.1.2'
-    }
-
-Check out as a user:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        user     => 'user'
-    }
-
-Specify an SSH identity key:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "ssh://hg@hg.example.com/myrepo",
-        identity => "/home/user/.ssh/id_dsa,
-    }
-
-For sources that use SSH (eg, `ssh://...`)
-------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/hg/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown
deleted file mode 100644
index f374094c1dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown
+++ /dev/null
@@ -1,62 +0,0 @@
-Using vcsrepo with Subversion
-=============================
-
-To create a blank repository
-----------------------------
-
-To create a blank repository suitable for use as a central repository,
-define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => svn
-    }
-
-To checkout from a repository
------------------------------
-
-Provide a `source` qualified to the branch/tag you want:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => svn,
-        source   => "svn://svnrepo/hello/branches/foo"
-    }
-
-You can provide a specific `revision`:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => svn,
-        source   => "svn://svnrepo/hello/branches/foo",
-        revision => '1234'
-    }
-
-
-Using a specified Subversion configuration directory 
------------------------------
-
-Provide a `configuration` parameter which should be a directory path on the local system where your svn configuration
-files are.  Typically, it is /path/to/.subversion:
-
-    vcsrepo { "/path/to/repo":
-        ensure        => present,
-        provider      => svn,
-        source        => "svn://svnrepo/hello/branches/foo",
-        configuration => "/path/to/.subversion"
-    }
-
-
-For sources that use SSH (eg, `svn+ssh://...`)
-----------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/svn/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown
deleted file mode 100644
index 848725630a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown
+++ /dev/null
@@ -1,32 +0,0 @@
-vcsrepo
-=======
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo)
-
-Purpose
--------
-
-This provides a single type, `vcsrepo`.
-
-This type can be used to describe:
-
-* A working copy checked out from a (remote or local) source, at an
-  arbitrary revision
-* A "blank" working copy not associated with a source (when it makes
-  sense for the VCS being used)
-* A "blank" central repository (when the distinction makes sense for the VCS
-  being used)
-
-Supported Version Control Systems
----------------------------------
-
-This module supports a wide range of VCS types, each represented by a
-separate provider.
-
-For information on how to use this module with a specific VCS, see
-`README.<VCS>.markdown`.
-
-License
--------
-
-See LICENSE.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp
deleted file mode 100644
index 0ed0705ee8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-vcsrepo { '/tmp/vcstest-bzr-branch':
-  ensure   => present,
-  provider => bzr,
-  source   => 'lp:do',
-  revision => '1312',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp
deleted file mode 100644
index 1129dd7d059..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-bzr-init':
-  ensure   => present,
-  provider => bzr,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp
deleted file mode 100644
index 155742e34d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-vcsrepo { '/tmp/vcstest-cvs-repo':
-  ensure   => present,
-  provider => cvs,
-}
-
-vcsrepo { '/tmp/vcstest-cvs-workspace-local':
-  ensure   => present,
-  provider => cvs,
-  source   => '/tmp/vcstest-cvs-repo',
-  require  => Vcsrepo['/tmp/vcstest-cvs-repo'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp
deleted file mode 100644
index eb9665a92e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-cvs-workspace-remote':
-  ensure   => present,
-  provider => cvs,
-  source   => ':pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp
deleted file mode 100644
index 4166f6e6963..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-bare':
-  ensure   => bare,
-  provider => git,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp
deleted file mode 100644
index b29a4fdbef5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-clone':
-  ensure   => present,
-  provider => git,
-  source   => 'git://github.com/bruce/rtex.git',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp
deleted file mode 100644
index e3352eb7c77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-wc':
-  ensure   => present,
-  provider => git,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp
deleted file mode 100644
index be2d955de53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-vcsrepo { '/tmp/vcstest-hg-clone':
-  ensure   => present,
-  provider => hg,
-  source   => 'http://hg.basho.com/riak',
-  revision => 'riak-0.5.3',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp
deleted file mode 100644
index a8908040490..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-hg-init':
-  ensure   => present,
-  provider => hg,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp
deleted file mode 100644
index f9fc2730f5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-svn-checkout':
-  ensure   => present,
-  provider => svn,
-  source   => 'http://svn.edgewall.org/repos/babel/trunk',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp
deleted file mode 100644
index de7c390f9f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-svn-server':
-  ensure   => present,
-  provider => svn,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb
deleted file mode 100644
index 8793e632cb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'tmpdir'
-require 'digest/md5'
-require 'fileutils'
-
-# Abstract
-class Puppet::Provider::Vcsrepo < Puppet::Provider
-
-  private
-
-  def set_ownership
-    owner = @resource.value(:owner) || nil
-    group = @resource.value(:group) || nil
-    FileUtils.chown_R(owner, group, @resource.value(:path))
-  end
-
-  def path_exists?
-    File.directory?(@resource.value(:path))
-  end
-
-  def path_empty?
-    # Path is empty if the only entries are '.' and '..'
-    d = Dir.new(@resource.value(:path))
-    d.read # should return '.'
-    d.read # should return '..'
-    d.read.nil?
-  end
-
-  # Note: We don't rely on Dir.chdir's behavior of automatically returning the
-  # value of the last statement -- for easier stubbing.
-  def at_path(&block) #:nodoc:
-    value = nil
-    Dir.chdir(@resource.value(:path)) do
-      value = yield
-    end
-    value
-  end
-
-  def tempdir
-    @tempdir ||= File.join(Dir.tmpdir, 'vcsrepo-' + Digest::MD5.hexdigest(@resource.value(:path)))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb
deleted file mode 100644
index 6688ce87b22..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:bzr, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Bazaar repositories"
-
-  optional_commands   :bzr => 'bzr'
-  has_features :reference_tracking
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:revision))
-    end
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.bzr'))
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def revision
-    at_path do
-      current_revid = bzr('version-info')[/^revision-id:\s+(\S+)/, 1]
-      desired = @resource.value(:revision)
-      begin
-        desired_revid = bzr('revision-info', desired).strip.split(/\s+/).last
-      rescue Puppet::ExecutionFailure
-        # Possible revid available during update (but definitely not current)
-        desired_revid = nil
-      end
-      if current_revid == desired_revid
-        desired
-      else
-        current_revid
-      end
-    end
-  end
-
-  def revision=(desired)
-    at_path do
-      begin
-        bzr('update', '-r', desired)
-      rescue Puppet::ExecutionFailure
-        bzr('update', '-r', desired, ':parent')
-      end
-    end
-  end
-
-  def latest
-    at_path do
-      bzr('version-info', ':parent')[/^revision-id:\s+(\S+)/, 1]
-    end
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  private
-
-  def create_repository(path)
-    bzr('init', path)
-  end
-
-  def clone_repository(revision)
-    args = ['branch']
-    if revision
-      args.push('-r', revision)
-    end
-    args.push(@resource.value(:source),
-              @resource.value(:path))
-    bzr(*args)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb
deleted file mode 100644
index 206e73295e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports CVS repositories/workspaces"
-
-  optional_commands   :cvs => 'cvs'
-  has_features :gzip_compression, :reference_tracking, :modules, :cvs_rsh
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      checkout_repository
-    end
-    update_owner
-  end
-
-  def exists?
-    if @resource.value(:source)
-      directory = File.join(@resource.value(:path), 'CVS')
-    else
-      directory = File.join(@resource.value(:path), 'CVSROOT')
-    end
-    File.directory?(directory)
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), 'CVS'))
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    debug "Checking for updates because 'ensure => latest'"
-    at_path do
-      # We cannot use -P to prune empty dirs, otherwise
-      # CVS would report those as "missing", regardless
-      # if they have contents or updates.
-      is_current = (runcvs('-nq', 'update', '-d').strip == "")
-      if (!is_current) then debug "There are updates available on the checkout's current branch/tag." end
-      return is_current
-    end
-  end
-
-  def latest
-    # CVS does not have a conecpt like commit-IDs or change
-    # sets, so we can only have the current branch name (or the
-    # requested one, if that differs) as the "latest" revision.
-    should = @resource.value(:revision)
-    current = self.revision
-    return should != current ? should : current
-  end
-
-  def revision
-    if !@rev
-      if File.exist?(tag_file)
-        contents = File.read(tag_file).strip
-        # Note: Doesn't differentiate between N and T entries
-        @rev = contents[1..-1]
-      else
-        @rev = 'HEAD'
-      end
-      debug "Checkout is on branch/tag '#{@rev}'"
-    end
-    return @rev
-  end
-
-  def revision=(desired)
-    at_path do
-      runcvs('update', '-dr', desired, '.')
-      update_owner
-      @rev = desired
-    end
-  end
-
-  private
-
-  def tag_file
-    File.join(@resource.value(:path), 'CVS', 'Tag')
-  end
-
-  def checkout_repository
-    dirname, basename = File.split(@resource.value(:path))
-    Dir.chdir(dirname) do
-      args = ['-d', @resource.value(:source)]
-      if @resource.value(:compression)
-        args.push('-z', @resource.value(:compression))
-      end
-      args.push('checkout')
-      if @resource.value(:revision)
-        args.push('-r', @resource.value(:revision))
-      end
-      args.push('-d', basename, module_name)
-      runcvs(*args)
-    end
-  end
-
-  # When the source:
-  # * Starts with ':' (eg, :pserver:...)
-  def module_name
-    if (m = @resource.value(:module))
-      m
-    elsif (source = @resource.value(:source))
-      source[0, 1] == ':' ? File.basename(source) : '.'
-    end
-  end
-
-  def create_repository(path)
-    runcvs('-d', path, 'init')
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-
-  def runcvs(*args)
-    if @resource.value(:cvs_rsh)
-      debug "Using CVS_RSH = " + @resource.value(:cvs_rsh)
-      e = { :CVS_RSH => @resource.value(:cvs_rsh) }
-    else
-      e = {}
-    end
-
-    # The location of withenv changed from Puppet 2.x to 3.x
-    withenv = Puppet::Util.method(:withenv) if Puppet::Util.respond_to?(:withenv)
-    withenv = Puppet::Util::Execution.method(:withenv) if Puppet::Util::Execution.respond_to?(:withenv)
-    fail("Cannot set custom environment #{e}") if e && !withenv
-
-    withenv.call e do
-      Puppet.debug cvs *args
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb
deleted file mode 100644
index f7b4e54b897..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:dummy, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Dummy default provider"
-
-  defaultfor :vcsrepo => :dummy
-
-  def working_copy_exists?
-    providers = @resource.class.providers.map{|x| x.to_s}.sort.reject{|x| x == "dummy"}.join(", ") rescue "none"
-    raise("vcsrepo resource must have a provider, available: #{providers}")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb
deleted file mode 100644
index 47e84d29ec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb
+++ /dev/null
@@ -1,323 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Git repositories"
-
-  ##TODO modify the commands below so that the su - is included
-  optional_commands :git => 'git',
-                    :su  => 'su'
-  has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user
-
-  def create
-    if !@resource.value(:source)
-      init_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:source), @resource.value(:path))
-      if @resource.value(:revision)
-        if @resource.value(:ensure) == :bare
-          notice "Ignoring revision for bare repository"
-        else
-          checkout
-        end
-      end
-      if @resource.value(:ensure) != :bare
-        update_submodules
-      end
-    end
-    update_owner_and_excludes
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  def latest
-    branch = on_branch?
-    if branch == 'master'
-      return get_revision("#{@resource.value(:remote)}/HEAD")
-    elsif branch == '(no branch)'
-      return get_revision('HEAD')
-    else
-      return get_revision("#{@resource.value(:remote)}/%s" % branch)
-    end
-  end
-
-  def revision
-    update_references
-    current = at_path { git_with_identity('rev-parse', 'HEAD').chomp }
-    return current unless @resource.value(:revision)
-
-    if tag_revision?(@resource.value(:revision))
-      canonical = at_path { git_with_identity('show', @resource.value(:revision)).scan(/^commit (.*)/).to_s }
-    else
-      # if it's not a tag, look for it as a local ref
-      canonical = at_path { git_with_identity('rev-parse', '--revs-only', @resource.value(:revision)).chomp }
-      if canonical.empty?
-        # git rev-parse executed properly but didn't find the ref;
-        # look for it in the remote
-        remote_ref = at_path { git_with_identity('ls-remote', '--heads', '--tags', @resource.value(:remote), @resource.value(:revision)).chomp }
-        if remote_ref.empty?
-          fail("#{@resource.value(:revision)} is not a local or remote ref")
-        end
-
-        # $ git ls-remote --heads --tags origin feature/cvs
-        # 7d4244b35e72904e30130cad6d2258f901c16f1a	refs/heads/feature/cvs
-        canonical = remote_ref.split.first
-      end
-    end
-
-    if current == canonical
-      @resource.value(:revision)
-    else
-      current
-    end
-  end
-
-  def revision=(desired)
-    checkout(desired)
-    if local_branch_revision?(desired)
-      # reset instead of pull to avoid merge conflicts. assuming remote is
-      # authoritative.
-      # might be worthwhile to have an allow_local_changes param to decide
-      # whether to reset or pull when we're ensuring latest.
-      at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") }
-    end
-    if @resource.value(:ensure) != :bare
-      update_submodules
-    end
-    update_owner_and_excludes
-  end
-
-  def bare_exists?
-    bare_git_config_exists? && !working_copy_exists?
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.git'))
-  end
-
-  def exists?
-    working_copy_exists? || bare_exists?
-  end
-
-  def update_remote_origin_url
-    current = git_with_identity('config', 'remote.origin.url')
-    unless @resource.value(:source).nil?
-      if current.nil? or current.strip != @resource.value(:source)
-        git_with_identity('config', 'remote.origin.url', @resource.value(:source))
-      end
-    end
-  end
-
-  def update_references
-    at_path do
-      update_remote_origin_url
-      git_with_identity('fetch', @resource.value(:remote))
-      git_with_identity('fetch', '--tags', @resource.value(:remote))
-      update_owner_and_excludes
-    end
-  end
-
-  private
-
-  def bare_git_config_exists?
-    File.exist?(File.join(@resource.value(:path), 'config'))
-  end
-
-  def clone_repository(source, path)
-    check_force
-    args = ['clone']
-    if @resource.value(:ensure) == :bare
-      args << '--bare'
-    end
-    if !File.exist?(File.join(@resource.value(:path), '.git'))
-      args.push(source, path)
-      Dir.chdir("/") do
-        git_with_identity(*args)
-      end
-    else
-      notice "Repo has already been cloned"
-    end
-  end
-
-  def check_force
-    if path_exists? and not path_empty?
-      if @resource.value(:force)
-        notice "Removing %s to replace with vcsrepo." % @resource.value(:path)
-        destroy
-      else
-        raise Puppet::Error, "Could not create repository (non-repository at path)"
-      end
-    end
-  end
-
-  def init_repository(path)
-    check_force
-    if @resource.value(:ensure) == :bare && working_copy_exists?
-      convert_working_copy_to_bare
-    elsif @resource.value(:ensure) == :present && bare_exists?
-      convert_bare_to_working_copy
-    else
-      # normal init
-      FileUtils.mkdir(@resource.value(:path))
-      FileUtils.chown(@resource.value(:user), nil, @resource.value(:path)) if @resource.value(:user)
-      args = ['init']
-      if @resource.value(:ensure) == :bare
-        args << '--bare'
-      end
-      at_path do
-        git_with_identity(*args)
-      end
-    end
-  end
-
-  # Convert working copy to bare
-  #
-  # Moves:
-  #   <path>/.git
-  # to:
-  #   <path>/
-  def convert_working_copy_to_bare
-    notice "Converting working copy repository to bare repository"
-    FileUtils.mv(File.join(@resource.value(:path), '.git'), tempdir)
-    FileUtils.rm_rf(@resource.value(:path))
-    FileUtils.mv(tempdir, @resource.value(:path))
-  end
-
-  # Convert bare to working copy
-  #
-  # Moves:
-  #   <path>/
-  # to:
-  #   <path>/.git
-  def convert_bare_to_working_copy
-    notice "Converting bare repository to working copy repository"
-    FileUtils.mv(@resource.value(:path), tempdir)
-    FileUtils.mkdir(@resource.value(:path))
-    FileUtils.mv(tempdir, File.join(@resource.value(:path), '.git'))
-    if commits_in?(File.join(@resource.value(:path), '.git'))
-      reset('HEAD')
-      git_with_identity('checkout', '--force')
-      update_owner_and_excludes
-    end
-  end
-
-  def commits_in?(dot_git)
-    Dir.glob(File.join(dot_git, 'objects/info/*'), File::FNM_DOTMATCH) do |e|
-      return true unless %w(. ..).include?(File::basename(e))
-    end
-    false
-  end
-
-  def checkout(revision = @resource.value(:revision))
-    if !local_branch_revision? && remote_branch_revision?
-      at_path { git_with_identity('checkout', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") }
-    else
-      at_path { git_with_identity('checkout', '--force', revision) }
-    end
-  end
-
-  def reset(desired)
-    at_path do
-      git_with_identity('reset', '--hard', desired)
-    end
-  end
-
-  def update_submodules
-    at_path do
-      git_with_identity('submodule', 'update', '--init', '--recursive')
-    end
-  end
-
-  def remote_branch_revision?(revision = @resource.value(:revision))
-    # git < 1.6 returns '#{@resource.value(:remote)}/#{revision}'
-    # git 1.6+ returns 'remotes/#{@resource.value(:remote)}/#{revision}'
-    branch = at_path { branches.grep /(remotes\/)?#{@resource.value(:remote)}\/#{revision}/ }
-    branch unless branch.empty?
-  end
-
-  def local_branch_revision?(revision = @resource.value(:revision))
-    at_path { branches.include?(revision) }
-  end
-
-  def tag_revision?(revision = @resource.value(:revision))
-    at_path { tags.include?(revision) }
-  end
-
-  def branches
-    at_path { git_with_identity('branch', '-a') }.gsub('*', ' ').split(/\n/).map { |line| line.strip }
-  end
-
-  def on_branch?
-    at_path { git_with_identity('branch', '-a') }.split(/\n/).grep(/\*/).first.to_s.gsub('*', '').strip
-  end
-
-  def tags
-    at_path { git_with_identity('tag', '-l') }.split(/\n/).map { |line| line.strip }
-  end
-
-  def set_excludes
-    at_path { open('.git/info/exclude', 'w') { |f| @resource.value(:excludes).each { |ex| f.write(ex + "\n") }}}
-  end
-
-  def get_revision(rev)
-    if !working_copy_exists?
-      create
-    end
-    at_path do
-      update_remote_origin_url
-      git_with_identity('fetch', @resource.value(:remote))
-      git_with_identity('fetch', '--tags', @resource.value(:remote))
-    end
-    current = at_path { git_with_identity('rev-parse', rev).strip }
-    if @resource.value(:revision)
-      if local_branch_revision?
-        canonical = at_path { git_with_identity('rev-parse', @resource.value(:revision)).strip }
-      elsif remote_branch_revision?
-        canonical = at_path { git_with_identity('rev-parse', "#{@resource.value(:remote)}/" + @resource.value(:revision)).strip }
-      end
-      current = @resource.value(:revision) if current == canonical
-    end
-    update_owner_and_excludes
-    return current
-  end
-
-  def update_owner_and_excludes
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-    if @resource.value(:excludes)
-      set_excludes
-    end
-  end
-
-  def git_with_identity(*args)
-    if @resource.value(:identity)
-      Tempfile.open('git-helper') do |f|
-        f.puts '#!/bin/sh'
-        f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*"
-        f.close
-
-        FileUtils.chmod(0755, f.path)
-        env_save = ENV['GIT_SSH']
-        ENV['GIT_SSH'] = f.path
-
-        ret = git(*args)
-
-        ENV['GIT_SSH'] = env_save
-
-        return ret
-      end
-    elsif @resource.value(:user)
-      su(@resource.value(:user), '-c', "git #{args.join(' ')}" )
-    else
-      git(*args)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb
deleted file mode 100644
index 4886b7a1f8e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Mercurial repositories"
-
-  optional_commands :hg => 'hg',
-                    :su => 'su'
-  has_features :reference_tracking, :ssh_identity, :user
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:revision))
-    end
-    update_owner
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.hg'))
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  def latest
-    at_path do
-      begin
-        hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
-      rescue Puppet::ExecutionFailure
-        # If there are no new changesets, return the current nodeid
-        self.revision
-      end
-    end
-  end
-
-  def revision
-    at_path do
-      current = hg_wrapper('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
-      desired = @resource.value(:revision)
-      if desired
-        # Return the tag name if it maps to the current nodeid
-        mapped = hg_wrapper('tags')[/^#{Regexp.quote(desired)}\s+\d+:(\S+)/m, 1]
-        if current == mapped
-          desired
-        else
-          current
-        end
-      else
-        current
-      end
-    end
-  end
-
-  def revision=(desired)
-    at_path do
-      begin
-        hg_wrapper('pull')
-      rescue
-      end
-      begin
-        hg_wrapper('merge')
-      rescue Puppet::ExecutionFailure
-        # If there's nothing to merge, just skip
-      end
-      hg_wrapper('update', '--clean', '-r', desired)
-    end
-    update_owner
-  end
-
-  private
-
-  def create_repository(path)
-    hg_wrapper('init', path)
-  end
-
-  def clone_repository(revision)
-    args = ['clone']
-    if revision
-      args.push('-u', revision)
-    end
-    args.push(@resource.value(:source),
-              @resource.value(:path))
-    hg_wrapper(*args)
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-
-  def hg_wrapper(*args)
-    if @resource.value(:identity)
-      args += ["--ssh", "ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -i #{@resource.value(:identity)}"]
-    end
-    if @resource.value(:user)
-      args.map! { |a| if a =~ /\s/ then "'#{a}'" else a end }  # Adds quotes to arguments with whitespaces.
-      su(@resource.value(:user), '-c', "hg #{args.join(' ')}")
-    else
-      hg(*args)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb
deleted file mode 100644
index e0d5b2164e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Subversion repositories"
-
-  optional_commands :svn      => 'svn',
-                    :svnadmin => 'svnadmin',
-                    :svnlook  => 'svnlook'
-
-  has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      checkout_repository(@resource.value(:source),
-                          @resource.value(:path),
-                          @resource.value(:revision))
-    end
-    update_owner
-  end
-
-  def working_copy_exists?
-    if File.directory?(@resource.value(:path))
-      # :path is an svn checkout
-      return true if File.directory?(File.join(@resource.value(:path), '.svn'))
-      # :path is an svn server
-      return true if svnlook('uuid', @resource.value(:path))
-    end
-    false
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      (self.revision >= self.latest) and (@resource.value(:source) == self.sourceurl)
-    end
-  end
-
-  def buildargs
-    args = ['--non-interactive']
-    if @resource.value(:basic_auth_username) && @resource.value(:basic_auth_password)
-      args.push('--username', @resource.value(:basic_auth_username))
-      args.push('--password', @resource.value(:basic_auth_password))
-      args.push('--no-auth-cache')
-    end
-
-    if @resource.value(:force)
-      args.push('--force')
-    end
-
-    if @resource.value(:configuration)
-      args.push('--config-dir', @resource.value(:configuration))
-    end
-
-    args
-  end
-
-  def latest
-    args = buildargs.push('info', '-r', 'HEAD')
-    at_path do
-      svn(*args)[/^Revision:\s+(\d+)/m, 1]
-    end
-  end
-
-  def sourceurl
-    args = buildargs.push('info')
-    at_path do
-      svn(*args)[/^URL:\s+(\S+)/m, 1]
-    end
-  end
-
-  def revision
-    args = buildargs.push('info')
-    at_path do
-      svn(*args)[/^Revision:\s+(\d+)/m, 1]
-    end
-  end
-
-  def revision=(desired)
-    args = if @resource.value(:source)
-             buildargs.push('switch', '-r', desired, @resource.value(:source))
-           else
-             buildargs.push('update', '-r', desired)
-           end
-    at_path do
-      svn(*args)
-    end
-    update_owner
-  end
-
-  private
-
-  def checkout_repository(source, path, revision)
-    args = buildargs.push('checkout')
-    if revision
-      args.push('-r', revision)
-    end
-    args.push(source, path)
-    svn(*args)
-  end
-
-  def create_repository(path)
-    args = ['create']
-    if @resource.value(:fstype)
-      args.push('--fs-type', @resource.value(:fstype))
-    end
-    args << path
-    svnadmin(*args)
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb
deleted file mode 100644
index ad90cedd833..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-require 'pathname'
-
-Puppet::Type.newtype(:vcsrepo) do
-  desc "A local version control repository"
-
-  feature :gzip_compression,
-          "The provider supports explicit GZip compression levels"
-  feature :basic_auth,
-          "The provider supports HTTP Basic Authentication"
-  feature :bare_repositories,
-          "The provider differentiates between bare repositories
-          and those with working copies",
-          :methods => [:bare_exists?, :working_copy_exists?]
-
-  feature :filesystem_types,
-          "The provider supports different filesystem types"
-
-  feature :reference_tracking,
-          "The provider supports tracking revision references that can change
-           over time (eg, some VCS tags and branch names)"
-
-  feature :ssh_identity,
-          "The provider supports a configurable SSH identity file"
-
-  feature :user,
-          "The provider can run as a different user"
-
-  feature :modules,
-          "The repository contains modules that can be chosen of"
-
-  feature :multiple_remotes,
-          "The repository tracks multiple remote repositories"
-
-  feature :configuration,
-          "The configuration directory to use"
-
-  feature :cvs_rsh,
-          "The provider understands the CVS_RSH environment variable"
-
-  ensurable do
-    attr_accessor :latest
-
-    def insync?(is)
-      @should ||= []
-
-      case should
-      when :present
-        return true unless [:absent, :purged, :held].include?(is)
-      when :latest
-        if is == :latest
-          return true
-        else
-          return false
-        end
-      when :bare
-        return is == :bare
-      end
-    end
-
-    newvalue :present do
-      notice "Creating repository from present"
-      provider.create
-    end
-
-    newvalue :bare, :required_features => [:bare_repositories] do
-      if !provider.exists?
-        provider.create
-      end
-    end
-
-    newvalue :absent do
-      provider.destroy
-    end
-
-    newvalue :latest, :required_features => [:reference_tracking] do
-      if provider.exists?
-        if provider.respond_to?(:update_references)
-          provider.update_references
-        end
-        if provider.respond_to?(:latest?)
-            reference = provider.latest || provider.revision
-        else
-          reference = resource.value(:revision) || provider.revision
-        end
-        notice "Updating to latest '#{reference}' revision"
-        provider.revision = reference
-      else
-        notice "Creating repository from latest"
-        provider.create
-      end
-    end
-
-    def retrieve
-      prov = @resource.provider
-      if prov
-        if prov.working_copy_exists?
-          (@should.include?(:latest) && prov.latest?) ? :latest : :present
-        elsif prov.class.feature?(:bare_repositories) and prov.bare_exists?
-          :bare
-        else
-          :absent
-        end
-      else
-        raise Puppet::Error, "Could not find provider"
-      end
-    end
-
-  end
-
-  newparam :path do
-    desc "Absolute path to repository"
-    isnamevar
-    validate do |value|
-      path = Pathname.new(value)
-      unless path.absolute?
-        raise ArgumentError, "Path must be absolute: #{path}"
-      end
-    end
-  end
-
-  newparam :source do
-    desc "The source URI for the repository"
-  end
-
-  newparam :fstype, :required_features => [:filesystem_types] do
-    desc "Filesystem type"
-  end
-
-  newproperty :revision do
-    desc "The revision of the repository"
-    newvalue(/^\S+$/)
-  end
-
-  newparam :owner do
-    desc "The user/uid that owns the repository files"
-  end
-
-  newparam :group do
-    desc "The group/gid that owns the repository files"
-  end
-
-  newparam :user do
-    desc "The user to run for repository operations"
-  end
-
-  newparam :excludes do
-    desc "Files to be excluded from the repository"
-  end
-
-  newparam :force do
-    desc "Force repository creation, destroying any files on the path in the process."
-    newvalues(:true, :false)
-    defaultto false
-  end
-
-  newparam :compression, :required_features => [:gzip_compression] do
-    desc "Compression level"
-    validate do |amount|
-      unless Integer(amount).between?(0, 6)
-        raise ArgumentError, "Unsupported compression level: #{amount} (expected 0-6)"
-      end
-    end
-  end
-
-  newparam :basic_auth_username, :required_features => [:basic_auth] do
-    desc "HTTP Basic Auth username"
-  end
-
-  newparam :basic_auth_password, :required_features => [:basic_auth] do
-    desc "HTTP Basic Auth password"
-  end
-
-  newparam :identity, :required_features => [:ssh_identity] do
-    desc "SSH identity file"
-  end
-
-  newparam :module, :required_features => [:modules] do
-    desc "The repository module to manage"
-  end
-
-  newparam :remote, :required_features => [:multiple_remotes] do
-    desc "The remote repository to track"
-    defaultto "origin"
-  end
-
-  newparam :configuration, :required_features => [:configuration]  do
-    desc "The configuration directory to use"
-  end
-
-  newparam :cvs_rsh, :required_features => [:cvs_rsh] do
-    desc "The value to be used for the CVS_RSH environment variable."
-  end
-
-  autorequire(:package) do
-    ['git', 'git-core']
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt
deleted file mode 100644
index 88a56a1c80f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-revision-id: menesis@pov.lt-20100309191856-4wmfqzc803fj300x
-date: 2010-03-09 21:18:56 +0200
-build-date: 2010-03-14 00:42:43 -0800
-revno: 2634
-branch-nick: mytest
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt
deleted file mode 100644
index 2c99829d48f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-  feature/foo
-  feature/bar
-  feature/baz
-  feature/quux
-  only/local
-* master
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt
deleted file mode 100644
index 72d5e2009c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-  feature/foo
-* feature/bar
-  feature/baz
-  feature/quux
-  only/local
-  master
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt
deleted file mode 100644
index 7207c37929b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-  feature/foo
-  feature/bar
-  feature/baz
-  feature/quux
-  only/local
-  master
-* (no branch)  
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt
deleted file mode 100644
index 46173df499d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-changeset:   3:34e6012c783a
-parent:      2:21ea4598c962
-parent:      1:9d0ff0028458
-user:        Test User <test.user@example.com>
-date:        Fri Aug 07 13:13:02 2009 -0400
-summary:     merge
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt
deleted file mode 100644
index 53792e5ac8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tip                             1019:bca3f20b249b
-0.9.1                           1017:76ce7cca95d8
-0.9                             1001:dbaa6f4ec585
-0.8                              839:65b66ac0fc83
-0.7.1                            702:e1357f00129f
-0.7                              561:7b2af3b4c968
-0.6.3                            486:e38077f4e4aa
-0.6.2                            405:07bb099b7b10
-0.6.1                            389:93750f3fbbe2
-0.6                              369:34e6012c783a
-0.5.3                            321:5ffa6ae7e699
-0.5.2                            318:fdc2c2e4cebe
-0.5.1                            315:33a5ea0cbe7a
-0.5                              313:47490716f4c9
-0.4                              240:47fa3a14cc63
-0.3.1                            132:bc231db18e1c
-0.3                              130:661615e510dd
-0.2                               81:f98d13b442f6
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt
deleted file mode 100644
index d2a975b238f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Path: .
-URL: http://example.com/svn/trunk
-Repository Root: http://example.com/svn
-Repository UUID: 75246ace-e253-0410-96dd-a7613ca8dc81
-Revision: 4
-Node Kind: directory
-Schedule: normal
-Last Changed Author: jon
-Last Changed Rev: 3
-Last Changed Date: 2008-08-07 11:34:25 -0700 (Thu, 07 Aug 2008)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb
deleted file mode 100644
index acfae0cb8cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'simplecov'
-require 'support/filesystem_helpers'
-require 'support/fixture_helpers'
-
-SimpleCov.start do
-    add_filter "/spec/"
-end
-
-RSpec.configure do |c|
-  c.include FilesystemHelpers
-  c.include FixtureHelpers
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb
deleted file mode 100644
index 15e2ca750a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module FilesystemHelpers
-
-  def expects_chdir(path = resource.value(:path))
-    Dir.expects(:chdir).with(path).at_least_once.yields
-  end
-
-  def expects_mkdir(path = resource.value(:path))
-    Dir.expects(:mkdir).with(path).at_least_once
-  end
-
-  def expects_rm_rf(path = resource.value(:path))
-    FileUtils.expects(:rm_rf).with(path)
-  end
-
-  def expects_directory?(returns = true, path = resource.value(:path))
-    File.expects(:directory?).with(path).returns(returns)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb
deleted file mode 100644
index 8a0e0a0b4cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module FixtureHelpers
-
-  def fixture(name, ext = '.txt')
-    File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name.to_s + ext))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
deleted file mode 100644
index 488ddc0f90a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:bzr_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :bzr,
-    :revision => '2634',
-    :source   => 'lp:do',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('bzr').returns('/usr/bin/bzr')
-  end
-
-  describe 'creating' do
-    context 'with defaults' do
-      it "should execute 'bzr clone -r' with the revision" do
-        provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without revision' do
-      it "should just execute 'bzr clone' without a revision" do
-        resource.delete(:revision)
-        provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without source' do
-      it "should execute 'bzr init'" do
-        resource.delete(:source)
-        provider.expects(:bzr).with('init', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      File.expects(:directory?).with(File.join(resource.value(:path), '.bzr')).returns(true)
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      expects_chdir
-      provider.expects(:bzr).with('version-info').returns(File.read(fixtures('bzr_version_info.txt')))
-      @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-    end
-
-    context "when given a non-revid as the resource revision" do
-      context "when its revid is not different than the current revid" do
-        it "should return the ref" do
-          resource[:revision] = '2634'
-          provider.expects(:bzr).with('revision-info', '2634').returns("2634 menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-      context "when its revid is different than the current revid" do
-        it "should return the current revid" do
-          resource[:revision] = '2636'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n")
-          provider.revision.should == @current_revid
-        end
-      end
-    end
-
-    context "when given a revid as the resource revision" do
-      context "when it is the same as the current revid" do
-        it "should return it" do
-          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-      context "when it is not the same as the current revid" do
-        it "should return the current revid" do
-          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n")
-          provider.revision.should == @current_revid
-        end
-      end
-
-    end
-  end
-
-  describe "setting the revision property" do
-    it "should use 'bzr update -r' with the revision" do
-      Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-      provider.expects(:bzr).with('update', '-r', 'somerev')
-      provider.revision = 'somerev'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
deleted file mode 100644
index efa4b33b36a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:cvs_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :cvs,
-    :revision => '2634',
-    :source   => 'lp:do',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('cvs').returns('/usr/bin/cvs')
-  end
-
-  describe 'creating' do
-    context "with a source" do
-      it "should execute 'cvs checkout'" do
-        resource[:source] = ':ext:source@example.com:/foo/bar'
-        resource[:revision] = 'an-unimportant-value'
-        expects_chdir('/tmp')
-        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-r', 'an-unimportant-value', '-d', 'test', 'bar')
-        provider.create
-      end
-
-      it "should just execute 'cvs checkout' without a revision" do
-        resource[:source] = ':ext:source@example.com:/foo/bar'
-        resource.delete(:revision)
-        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-        provider.create
-      end
-
-      context "with a compression" do
-        it "should just execute 'cvs checkout' without a revision" do
-          resource[:source] = ':ext:source@example.com:/foo/bar'
-          resource[:compression] = '3'
-          resource.delete(:revision)
-          provider.expects(:cvs).with('-d', resource.value(:source), '-z', '3', 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-          provider.create
-        end
-      end
-    end
-
-    context "when a source is not given" do
-      it "should execute 'cvs init'" do
-        resource.delete(:source)
-        provider.expects(:cvs).with('-d', resource.value(:path), 'init')
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the CVS directory with source" do
-      resource[:source] = ':ext:source@example.com:/foo/bar'
-      File.expects(:directory?).with(File.join(resource.value(:path), 'CVS'))
-      provider.exists?
-    end
-
-    it "should check for the CVSROOT directory without source" do
-      resource.delete(:source)
-      File.expects(:directory?).with(File.join(resource.value(:path), 'CVSROOT'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      @tag_file = File.join(resource.value(:path), 'CVS', 'Tag')
-    end
-
-    context "when CVS/Tag exists" do
-      before do
-        @tag = 'TAG'
-        File.expects(:exist?).with(@tag_file).returns(true)
-      end
-      it "should read CVS/Tag" do
-        File.expects(:read).with(@tag_file).returns("T#{@tag}")
-        provider.revision.should == @tag
-      end
-    end
-
-    context "when CVS/Tag does not exist" do
-      before do
-        File.expects(:exist?).with(@tag_file).returns(false)
-      end
-      it "assumes HEAD" do
-        provider.revision.should == 'HEAD'
-      end
-    end
-  end
-
-  describe "when setting the revision property" do
-    before do
-      @tag = 'SOMETAG'
-    end
-
-    it "should use 'cvs update -dr'" do
-      expects_chdir
-      provider.expects(:cvs).with('update', '-dr', @tag, '.')
-      provider.revision = @tag
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb
deleted file mode 100644
index 15fee535654..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ /dev/null
@@ -1,369 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:git_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :git,
-    :revision => '2634',
-    :source   => 'git@repo',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
-  end
-
-  context 'creating' do
-    context "with a revision that is a remote branch" do
-      it "should execute 'git clone' and 'git checkout -b'" do
-        resource[:revision] = 'only/remote'
-        Dir.expects(:chdir).with('/').at_least_once.yields
-        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.create
-      end
-    end
-
-    context "with a revision that is not a remote branch" do
-      it "should execute 'git clone' and 'git reset --hard'" do
-        resource[:revision] = 'a-commit-or-tag'
-        Dir.expects(:chdir).with('/').at_least_once.yields
-        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.create
-      end
-
-      it "should execute 'git clone' and submodule commands" do
-        resource.delete(:revision)
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.create
-      end
-    end
-
-    context "with an ensure of bare" do
-      context "with revision" do
-        it "should just execute 'git clone --bare'" do
-          resource[:ensure] = :bare
-          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-          provider.create
-        end
-      end
-      context "without revision" do
-        it "should just execute 'git clone --bare'" do
-          resource[:ensure] = :bare
-          resource.delete(:revision)
-          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-          provider.create
-        end
-      end
-    end
-
-    context "when a source is not given" do
-      context "when the path does not exist" do
-        it "should execute 'git init'" do
-          resource[:ensure] = :present
-          resource.delete(:source)
-          expects_mkdir
-          expects_chdir
-          expects_directory?(false)
-
-          provider.expects(:bare_exists?).returns(false)
-          provider.expects(:git).with('init')
-          provider.create
-        end
-      end
-
-      context "when the path is a bare repository" do
-        it "should convert it to a working copy" do
-          resource[:ensure] = :present
-          resource.delete(:source)
-          provider.expects(:bare_exists?).returns(true)
-          provider.expects(:convert_bare_to_working_copy)
-          provider.create
-        end
-      end
-
-      context "when the path is not empty and not a repository" do
-        it "should raise an exception" do
-          provider.expects(:path_exists?).returns(true)
-          provider.expects(:path_empty?).returns(false)
-          proc { provider.create }.should raise_error(Puppet::Error)
-        end
-      end
-    end
-
-    context "when the path does not exist" do
-      it "should execute 'git init --bare'" do
-        resource[:ensure] = :bare
-        resource.delete(:source)
-        expects_chdir
-        expects_mkdir
-        expects_directory?(false)
-        provider.expects(:working_copy_exists?).returns(false)
-        provider.expects(:git).with('init', '--bare')
-        provider.create
-      end
-    end
-
-    context "when the path is a working copy repository" do
-      it "should convert it to a bare repository" do
-        resource[:ensure] = :bare
-        resource.delete(:source)
-        provider.expects(:working_copy_exists?).returns(true)
-        provider.expects(:convert_working_copy_to_bare)
-        provider.create
-      end
-    end
-
-    context "when the path is not empty and not a repository" do
-      it "should raise an exception" do
-        expects_directory?(true)
-        provider.expects(:path_empty?).returns(false)
-        proc { provider.create }.should raise_error(Puppet::Error)
-      end
-    end
-  end
-
-
-  context 'destroying' do
-    it "it should remove the directory" do
-      #expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  context "checking the revision property" do
-    before do
-      expects_chdir('/tmp/test')
-      resource[:revision] = 'currentsha'
-      resource.delete(:source)
-      provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-    end
-
-    context "when its SHA is not different than the current SHA" do
-      it "should return the ref" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == resource.value(:revision)
-      end
-    end
-
-    context "when its SHA is different than the current SHA" do
-      it "should return the current SHA" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == 'currentsha'
-      end
-    end
-
-    context "when its a ref to a remote head" do
-      it "should return the revision" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
-        provider.revision.should == 'currentsha'
-      end
-    end
-
-    context "when its a ref to non existant remote head" do
-      it "should fail" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
-        expect { provider.revision }.to raise_error(Puppet::Error, /not a local or remote ref$/)
-      end
-    end
-
-    context "when the source is modified" do
-      it "should update the origin url" do
-        resource[:source] = 'git://git@foo.com/bar.git'
-        provider.expects(:git).with('config', 'remote.origin.url').returns('old')
-        provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == resource.value(:revision)
-      end
-    end
-  end
-
-  context "setting the revision property" do
-    before do
-      expects_chdir
-    end
-    context "when it's an existing local branch" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'feature/foo'
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
-        provider.revision = resource.value(:revision)
-      end
-    end
-    context "when it's a remote branch" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'only/remote'
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
-        provider.revision = resource.value(:revision)
-      end
-    end
-    context "when it's a commit or tag" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'a-commit-or-tag'
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('submodule', 'update', '--init', '--recursive')
-        provider.revision = resource.value(:revision)
-      end
-    end
-  end
-
-  context "updating references" do
-    it "should use 'git fetch --tags'" do
-      resource.delete(:source)
-      expects_chdir
-      provider.expects(:git).with('config', 'remote.origin.url').returns('')
-      provider.expects(:git).with('fetch', 'origin')
-      provider.expects(:git).with('fetch', '--tags', 'origin')
-      provider.update_references
-    end
-  end
-
-  context "checking if revision" do
-    before do
-      expects_chdir
-      provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-    end
-    context "is a local branch" do
-      context "when it's listed in 'git branch -a'" do
-        it "should return true" do
-          resource[:revision] = 'feature/foo'
-          provider.should be_local_branch_revision
-        end
-      end
-      context "when it's not listed in 'git branch -a'" do
-        it "should return false" do
-          resource[:revision] = 'feature/notexist'
-          provider.should_not be_local_branch_revision
-        end
-      end
-    end
-    context "is a remote branch" do
-      context "when it's listed in 'git branch -a' with an 'origin/' prefix" do
-        it "should return true" do
-          resource[:revision] = 'only/remote'
-          provider.should be_remote_branch_revision
-        end
-      end
-      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" do
-        it "should return false" do
-          resource[:revision] = 'only/local'
-          provider.should_not be_remote_branch_revision
-        end
-      end
-    end
-  end
-
-  describe 'latest?' do
-    before do
-      expects_chdir('/tmp/test')
-    end
-    context 'when true' do
-      it do
-        provider.expects(:revision).returns('testrev')
-        provider.expects(:latest).returns('testrev')
-        provider.latest?.should be_true
-      end
-    end
-    context 'when false' do
-      it do
-        provider.expects(:revision).returns('master')
-        provider.expects(:latest).returns('testrev')
-        provider.latest?.should be_false
-      end
-    end
-  end
-
-  describe 'latest' do
-    before do
-      provider.expects(:get_revision).returns('master')
-      expects_chdir
-    end
-    context 'on master' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.latest.should == 'master'
-      end
-    end
-    context 'no branch' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_none))
-        provider.latest.should == 'master'
-      end
-    end
-    context 'feature/bar' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_feature_bar))
-        provider.latest.should == 'master'
-      end
-    end
-  end
-
-  describe 'convert_working_copy_to_bare' do
-    it do
-      FileUtils.expects(:mv).returns(true)
-      FileUtils.expects(:rm_rf).returns(true)
-      FileUtils.expects(:mv).returns(true)
-
-      provider.instance_eval { convert_working_copy_to_bare }
-    end
-  end
-
-  describe 'convert_bare_to_working_copy' do
-    it do
-      FileUtils.expects(:mv).returns(true)
-      FileUtils.expects(:mkdir).returns(true)
-      FileUtils.expects(:mv).returns(true)
-      provider.expects(:commits_in?).returns(true)
-      # If you forget to stub these out you lose 3 hours of rspec work.
-      provider.expects(:reset).with('HEAD').returns(true)
-      provider.expects(:git_with_identity).returns(true)
-      provider.expects(:update_owner_and_excludes).returns(true)
-
-      provider.instance_eval { convert_bare_to_working_copy }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
deleted file mode 100644
index 7fd53486a74..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:hg) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :hg,
-    :path     => '/tmp/vcsrepo',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('hg').returns('/usr/bin/hg')
-  end
-
-  describe 'creating' do
-    context 'with source and revision' do
-      it "should execute 'hg clone -u' with the revision" do
-        resource[:source] = 'something'
-        resource[:revision] = '1'
-        provider.expects(:hg).with('clone', '-u',
-          resource.value(:revision),
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without revision' do
-      it "should just execute 'hg clone' without a revision" do
-        resource[:source] = 'something'
-        provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context "when a source is not given" do
-      it "should execute 'hg init'" do
-        provider.expects(:hg).with('init', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      expects_directory?(true, File.join(resource.value(:path), '.hg'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      expects_chdir
-    end
-
-    context "when given a non-SHA as the resource revision" do
-      before do
-        provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
-        provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-      end
-
-      context "when its SHA is not different than the current SHA" do
-        it "should return the ref" do
-          resource[:revision] = '0.6'
-          provider.revision.should == '0.6'
-        end
-      end
-
-      context "when its SHA is different than the current SHA" do
-        it "should return the current SHA" do
-          resource[:revision] = '0.5.3'
-          provider.revision.should == '34e6012c783a'
-        end
-      end
-    end
-    context "when given a SHA as the resource revision" do
-      before do
-        provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
-      end
-
-      context "when it is the same as the current SHA", :resource => {:revision => '34e6012c783a'} do
-        it "should return it" do
-          resource[:revision] = '34e6012c783a'
-          provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-
-      context "when it is not the same as the current SHA", :resource => {:revision => 'not-the-same'} do
-        it "should return the current SHA" do
-          resource[:revision] = 'not-the-same'
-          provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-          provider.revision.should == '34e6012c783a'
-        end
-      end
-    end
-  end
-
-  describe "setting the revision property" do
-    before do
-      @revision = '6aa99e9b3ab1'
-    end
-    it "should use 'hg update ---clean -r'" do
-      expects_chdir
-      provider.expects(:hg).with('pull')
-      provider.expects(:hg).with('merge')
-      provider.expects(:hg).with('update', '--clean', '-r', @revision)
-      provider.revision = @revision
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
deleted file mode 100644
index f44e314a56f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:svn) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :svn,
-    :path     => '/tmp/vcsrepo',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
-  end
-
-  describe 'creating' do
-    context 'with source and revision' do
-      it "should execute 'svn checkout' with a revision" do
-        resource[:source] = 'exists'
-        resource[:revision] = '1'
-        provider.expects(:svn).with('--non-interactive', 'checkout', '-r',
-          resource.value(:revision),
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-    context 'with source' do
-      it "should just execute 'svn checkout' without a revision" do
-        resource[:source] = 'exists'
-        provider.expects(:svn).with('--non-interactive', 'checkout',
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'with fstype' do
-      it "should execute 'svnadmin create' with an '--fs-type' option" do
-        resource[:fstype] = 'ext4'
-        provider.expects(:svnadmin).with('create', '--fs-type',
-                                          resource.value(:fstype),
-                                          resource.value(:path))
-        provider.create
-      end
-    end
-    context 'without fstype' do
-      it "should execute 'svnadmin create' without an '--fs-type' option" do
-        provider.expects(:svnadmin).with('create', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      expects_directory?(true, resource.value(:path))
-      expects_directory?(true, File.join(resource.value(:path), '.svn'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      provider.expects(:svn).with('--non-interactive', 'info').returns(fixture(:svn_info))
-    end
-    it "should use 'svn info'" do
-      expects_chdir
-      provider.revision.should == '4' # From 'Revision', not 'Last Changed Rev'
-    end
-  end
-
-  describe "setting the revision property" do
-    before do
-      @revision = '30'
-    end
-    it "should use 'svn update'" do
-      expects_chdir
-      provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision)
-      provider.revision = @revision
-    end
-  end
-
-  describe "setting the revision property and repo source" do
-    before do
-      @revision = '30'
-    end
-    it "should use 'svn switch'" do
-      resource[:source] = 'an-unimportant-value'
-      expects_chdir
-      provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value')
-      provider.revision = @revision
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown
deleted file mode 100644
index 1ee19ac840f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Resource Type Specs
-===================
-
-Define specs for your resource types in this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml
deleted file mode 100644
index bb90cc14880..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fixtures:
-  repositories:
-    "puppi": "git://github.com/example42/puppi.git"
-    "monitor": "git://github.com/example42/puppet-monitor.git"
-    "firewall": "git://github.com/example42/puppet-firewall.git"
-    "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat": "git://github.com/example42/puppet-concat.git"
-  symlinks:
-    "yum": "#{source_dir}"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile
deleted file mode 100644
index 49ea04a4918..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'rspec-puppet', '0.1.6'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project
deleted file mode 100644
index 13cd06f922b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>yum</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile
deleted file mode 100644
index 69820b86e02..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'example42-yum'
-version '2.1.9'
-author  'Alessandro Franceschi'
-license 'Apache2'
-project_page 'http://www.example42.com'
-source  'https://github.com/example42/puppet-yum'
-summary 'Puppet module for nagios'
-description 'This module installs and manages yum and yum repositories'
-dependency 'example42/puppi', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md
deleted file mode 100644
index cb254401bf1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Puppet module: yum
-
-This is a Puppet module that manages Yum repositories for Centos RedHat and Scientific Linux
-
-Made by Alessandro Franceschi / Lab42
-
-Inspired by the Yum Immerda module: https://git.puppet.immerda.ch
-
-Official site: http://www.example42.com
-
-Official git repository: http://github.com/example42/puppet-yum
-
-Released under the terms of Apache 2 License.
-
-This module requires functions provided by the Example42 Puppi module.
-
-## USAGE 
-
-* Just leave the default options: Automatic detection of Operating System (RedHat, Centos, Scientific supported) Epel repo installation, keeping of local yum files, automatic updates disabled.
-
-        class { 'yum':
-        }
-
-* Enable automatic updates via cron (updatesd is supported only on 5)
-
-        class { 'yum':
-          update => 'cron',
-        }
-
-
-* Purge local /etc/yum.repos.d/ and enforce its contents only via a custom source
-
-        class { 'yum':
-          source_repo_dir => 'puppet:///modules/example42/yum/conf/',
-          clean_repos     => true,
-        }
-
-* Enable EPEL and PuppetLabs repos
-
-        class { 'yum':
-          extrarepo => [ 'epel' , 'puppetlabs' ],
-        }
-
-
-* Do not include any extra repo (By default EPEL is added)
-
-        class { 'yum':
-          extrarepo => '' ,
-        }
-
-* Automatically copy in /etc/pki/rpm-gpg  all the rpm-gpg keys known by the yum module (this was the "old" and intrusive behaviour, now each rpm-gpg key may be individually provided by the yum::manages_repos' gpgkey_source parameter)
-
-        class { 'yum':
-          install_all_keys => true ,
-        }
-
-* Include a selected extra repo
-
-        include yum::repo::puppetlabs
-
-
-## USAGE - Overrides and Customizations
-* Enable auditing without without making changes on existing yum configuration files
-
-        class { 'yum':
-          audit_only => true
-        }
-
-
-* Use custom sources for main config file
-
-        class { 'yum':
-          source => [ "puppet:///modules/lab42/yum/yum.conf-${hostname}" , "puppet:///modules/lab42/yum/yum.conf" ],
-        }
-
-
-* Use custom source directory for the whole configuration dir
-
-        class { 'yum':
-          source_dir       => 'puppet:///modules/lab42/yum/conf/',
-          source_dir_purge => false, # Set to true to purge any existing file not present in $source_dir
-        }
-
-* Use custom template for main config file. Note that template and source arguments are alternative.
-
-        class { 'yum':
-          template => 'example42/yum/yum.conf.erb',
-        }
-
-* Automatically include a custom subclass
-
-        class { 'yum':
-          my_class => 'yum::example42',
-        }
-
-
-## USAGE - Example42 extensions management
-* Activate puppi (recommended, but disabled by default)
-
-        class { 'yum':
-          puppi    => true,
-        }
-
-* Activate puppi and use a custom puppi_helper template (to be provided separately with a puppi::helper define ) to customize the output of puppi commands
-
-        class { 'yum':
-          puppi        => true,
-          puppi_helper => 'myhelper',
-        }
-
-
-## OPERATING SYSTEMS SUPPORT
-
-REDHAT 6 - Full
-
-REDHAT 5 - Full
-
-REDHAT 4 - Partial
-
-CENTOS 6 - Full
-
-CENTOS 5 - Full
-
-CENTOS 4 - Partial
-
-SCIENTIFIC 6 - Full
-
-SCIENTIFIC 5 - Full
-
-AMAZON LINUX 3 (Sigh) - Partial
-
-[![Build Status](https://travis-ci.org/example42/puppet-yum.png?branch=master)](https://travis-ci.org/example42/puppet-yum)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile
deleted file mode 100644
index f0d1465cdc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 8722c21cbd6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson
deleted file mode 100644
index c71c5047541..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD/9sIMRBADp28M+gDNgYJ/UMW1Tem0W/D17FAZRVRI8Ht68QcZsq6uS1k3L
-HPX7rLG3iKrKj4crvEE+CY/3L182NZ6bRJt61rQLrtSbMFIMvt7L6dG6BYYw0i8P
-SqyVC6uPb2W8wi1RtNdQk0pSeDSQh8wCsDDo8WYHkdRztoKWHvd3hAN7NwCgzRVU
-QS3Uw6McILxO9cUBgJEhBj8D/38TomjexWRUp+rzs6aouqHoZyslSCUe4aLeJvSQ
-Whi1j4E0sgWMJ2L/Ta6FXNM2Of3Ze6delf8eVPZ2N78yELh+LV7DZr5Cy+zDtSWY
-WnyWGSqHVEqf0UarpC8XVcJ1jJu3sHfaBf94tnKJI/uipxbD8oU4ixoLvANFR1fp
-YfKdBACm+C8Rk2NpXeAtXIyN9UgJPpj9H5IXxnrdYJa0ce72qrrniM0dhGHz9+9H
-5d8rVJYTNEW6kDhj79vnFLq86o0n8VIpv/0g38FO+FCi4yVJ49qA2+D7unysBVTm
-ZXo3LRMiBJfeh39ONEIg+CWVD6sXo7FTwVKpawJpeO6Lp8nrlbQ6VHJveSBEYXdz
-b24gKFNwaWt5IEhhaXIgSGF3YWlpYW4gU2hpcnRzKSA8ZGF3c29uQGZuYWwuZ292
-PohZBBMRAgAZBQI//bCDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDaatAIgv0XsoJ2
-AJ9KdOcfYSVAjoUwwrQjARa6xWP/NQCcCJKfBYUVZDiWsiZjVm1EOGcNCSS5AQ0E
-P/2whBAEAJYHI18UVqIrZPX3C3FvzXf7MzNs31UPA1iCgp3f02w6nh/XZs8Y0CNB
-ig9rCR/e2O8O4Fnl56Z+N+a9H7jPmF8sOhacvqNaS7yAJ+9pHj0op6Az/X69dWnS
-AdaFXPB1Tc6ryfNtbs0CB0tWRbjlB4BTd/1PEerLNUNGoLOpFWeXAAMFA/0UD2ku
-vIRoQwAjNf1/swcIQe44DNNQYY+GSzi0tXVhytiJquziPk/la2elinl4N1KERrO8
-fgdrHtZl4X7n3nv5GGdwVjQfcZJfzFcGIlzqJOcLHAlVSVEpAJAlkykbx8BDtfod
-JbODs9NfU+VwmwrTwyVdpbOEHb9ktdeuabIXMIhGBBgRAgAGBQI//bCEAAoJENpq
-0AiC/Rey1JoAnjJ1qsi4gbkb+srAgH2UCBRcM0uQAKCGiibCE9G5udph5YplnHhL
-ZpAqxA==
-=3u8+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta
deleted file mode 100644
index 7b40671a4c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta
+++ /dev/null
@@ -1,61 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT
-kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A
-BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo
-gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P
-xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D
-FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7
-Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i
-QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm
-G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt
-0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR
-fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB
-tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv
-bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT
-ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy
-6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ
-OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6
-0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc
-MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u
-QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE
-Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6
-DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0
-B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH
-V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT
-CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ==
-=21pb
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG
-package.  Questions about this key should be sent to security@redhat.com.
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp
-Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd
-LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi
-UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe
-II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW
-QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz
-+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1
-VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI
-mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg
-SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX
-BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4
-F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF
-AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q
-0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc
-RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI
-JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR
-xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU
-ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5
-WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI
-RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL
-yACfb68fBd2pWEzLKsOk9imIobHHpzE=
-=gpIn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
deleted file mode 100644
index 3818b2c926f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
+++ /dev/null
@@ -1,37 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped prior to November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.0 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8
-HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM
-GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV
-EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS
-ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP
-lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW
-XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb
-E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES
-PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg
-SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID
-FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB
-XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U
-lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+
-5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3
-Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI
-hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+
-JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9
-E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK
-ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8
-BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5
-4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY
-FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk
-OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h
-VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==
-=3AHZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
deleted file mode 100644
index 09aded8bec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
+++ /dev/null
@@ -1,24 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i
-4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB
-ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0
-rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL
-DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD
-h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0
-EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF
-N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF
-gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg
-SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf
-BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD
-TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo=
-=mhzo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
deleted file mode 100644
index 0f875c0e207..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/
-9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP
-qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj
-UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX
-OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt
-pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6
-Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/
-ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle
-xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg
-SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F
-AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB
-+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ==
-=t0np
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release
deleted file mode 100644
index 47c6be6700b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release
+++ /dev/null
@@ -1,62 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2009, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
-pub  4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) <security@redhat.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
-0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
-0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c
-u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh
-XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H
-5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW
-9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj
-/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1
-PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY
-HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF
-buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB
-tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0
-LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC
-2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf
-C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5
-un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E
-0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE
-IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh
-8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL
-Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki
-JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25
-OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
-dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
-=zbHE
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is a supporting (auxiliary) key for
-Red Hat products shipped after November 2006 and for all updates to
-those products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT
-VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A
-UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C
-yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu
-MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg
-Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z
-z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2
-eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq
-SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg
-SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC
-AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg
-ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX
-=d/bm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl
deleted file mode 100644
index 70b6bd17ef3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG
-Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS
-/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De
-fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp
-3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj
-56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ
-lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c
-2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX
-nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8
-c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/
-IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf
-AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V
-fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5
-zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ
-U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg
-Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh
-g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X
-NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH
-mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2
-q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt
-Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV
-QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS
-LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q
-gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32
-VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw==
-=eL9H
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3
deleted file mode 100644
index 5d16185468e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXatkRBADSVLhSFxxebo3H16HGjvOg+tSAuppoqrmg9WrC2ly6I41BHXng
-n2H0t07nAemb35XSRfb6j4vNIiNoXGFzcjTMP5/cwn24hvilXyA0zX59hhD0ut4c
-VGksNhUKnYkVI/+0+EjJ3RnCouVvVx8p2eCIDhjIueDjuLp3mVBLYh7OEwCgmQrO
-ysS+xHHcYfUX4jsghfzge10EAIuMAXGWmMLRUJ6PCjrAKVVGT4FxH53UyPjXGXga
-SYR4A4aFq9eoDPLRo/nRB/isT0/NfcBbp4wdzYUxz8pmMOWGLFjg7DBBvOj84q+0
-ZFibybxFJAtjaZcKw+feCb6R2tJPOfJr6+noOeAZ9MFYZ7z5NG5vezGB1rLu/c5k
-vb5LA/9wI8pz7jCMOPBE4LGO9C1tbvKfrFHEfsgn5zsF/+YABCrbHrc2eN2NESpv
-84jLHvrssKaPjJVHL1JlRRfO2myT37hLa/D3pUrAcs/CqWGeddKkhJE7c816EO6d
-FZU5/7Utill9x3tLu8ZS+WXkH5sr/garxim5P3Sm3K1/ZXZaEbRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDMp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2rZ
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQAYjOtesQYlrupwCfR65pEGRf
-air4Nzf+ZP5Q2i8doscAnAhod/cVNjPA9Lo4UOEAJ5kWZ4CXiEYEEBECAAYFAkpX
-pTwACgkQsLQYPxkqfX2m9QCfUzSI3MVchLk00M2c67Xj7ghvNaMAn3TybHcAHpGu
-pJ8qBwisCX6mPMSqiEYEEBECAAYFAkpXqW4ACgkQ2mrQCIL9F7LGjwCfWBc67ftN
-jTGxL+ilnrYyZhupKd8AoKoSkHG61pxk+Ja58aSvsGRWAdv9uQINBEpXat0QCADG
-G22g1V5t8xoxjA5sgDw+ow3QonkA8p+EEr1+xjZyJTsMMiRioz88WH54xcbLBoCM
-ltgK3gSYpywEoB76yzFS/woLSjBdCLEMwX6Dj/y1U67ykoDoop31LIW8a4geYJpW
-0a83Np00noLidNi7xhuExvp3BxHPpM9mVvqfDOkFcuiexaAU9uF6cgVov8eE95l9
-jWcNn1oLnqo2mq2pqJFk0Qkq612Nj2TWOdcrJlksIqEG+H6Jn434u+leGgyR6RnW
-Ty4OS4JnwRYXeAfLh2wCCFPWVL6eQTfRjkWmjWlvKIgz8YX+vTx7SfYsfhPRKkgs
-ZS0VyRkUSV8EkkRlaRw3AAQLB/9YOgCeW673SBZJUITb1TM4bxT2bk03ORpfqPzu
-NBfb4Szm1lsJvlOgEfwZZR2UcQeCqm+WtSSx/Ajce/LA/Q+MYW0X/Vcy1pEYYhs1
-9YRZ/1Q7+JR2Q/hCMBvtMf3XN+1sEjHwPJpskq0qBng6SofE+V7FOELswfSk6j+b
-2d4G4WEyuiaj6FD5tvrWFmcWgBnhpGG+Rx2n1UT1lqk+r81H4iZB6MoIkicR1gyx
-i6mfqJnKMFSWeeXddx7kr6xclDungGlTF/dnk5K73CRm5XBxxYsUYS1Kz8tF6MbB
-d/FYJjYlQWx2eAh1xoimlnBgX8BNsmzjbvOtcLtZOUTT95F2iEkEGBECAAkFAkpX
-at0CGwwACgkQAYjOtesQYlqHcACfQqTUZxtuSjHWeM2yODl4Cb6kMqkAnjgBLM1s
-uix25Q+HkPygJyHv7nEI
-=eJoE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4
deleted file mode 100644
index 14f3096678e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa1QRBACRt4l3x+38VrBV58HhPrz8iOKDhMVzBODGetPzqmIX0bLz7nz/
-ZYmEPsY0Nhnp77e3cU4YRSUKOM96BZwo8DsJz9sT14b3IozNEo2R7JZNp22RrvU4
-gRXjgQmg5N83tnU03KK/IxrbjdO29Go3vGBWM4tWxUoGLG9kQGhYtZL0MwCgn13c
-xYt5JRtxLdfNM/Kxbg4FDTsD/31hBoeMetdNHjuMq+I3SMgnAATkgQ1TZHj8lCV3
-y0qM0zAfVRuPSTVodlJuMjOUKkERAAWqzXiNkgKtIgREBORmz6d9q/bangLr9ygL
-fz/4vTxtfdmXxG8Ru/zVF9Ulu1GuLZKlP1PZosZsMQfbByWVOybg38qdyeC93EGd
-qmrBBACQeehjanXRjgEROKXkpe2A6w31m0iu2sT42TUvq5neSXjrFTXN8YPd0SpK
-8IiCZHkAh3YBCRogfT7T+uWQsrwICCAf00pEAuP9c6BUeepbjQZPK2fqD16lhRn8
-A1TjdngDto45/2T8eIUafh8ONheRuA1Lnb3gV92fUSkQDppw57RbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDQp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2tU
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ8VzxvJUFci5eswCffepTdZlb
-60FSFxWfLGXdr6NLVY0Anj2ILigIHnOQ/Tb0fX4Wok2rObm1iEYEEBECAAYFAkpX
-pPwACgkQsLQYPxkqfX27WgCfccR97sqL4klabdAmAkQ0TSXZ+AgAn0FUCu92L9xP
-i9td6W7lPh0zdnudiEYEEBECAAYFAkpXqXsACgkQ2mrQCIL9F7LzywCdGT6FQ4ZT
-swwxZA63MrLn7ZdN/r4AoLvfdudahfiuiZQtGTYvoR3gzw70uQINBEpXa10QCACr
-GeMNUJTtApiwStqIKXGj5BahvI2muQPOF0yr5fqpOwA1SnucTQmwEVtBHRhR+J3V
-iOQ8igyMUxOe0F6JCOAbZIx0G5iVs51+wT1LYD2bQkUoObIToGut9r6NlI2selcP
-lqx2ckziGVOSU77/7MoGo5GNbWJaNHWCNh6zrA+5hKY46va7hkm0WFFvlZ+U8OCB
-aI8BnwB7JZCNdrBgL37oX1qm53BboDaE4aY/73gIvCd3M5bjuqbe666zvQo8xdbL
-wiSe8LrHHa7EHxWNFYxv91H56FIP7sbnbiSYKZiOMahnc2hBAa0CAsWhWKDSnqt4
-IN6VOMvqooFllvRXLVgnAAQLCACMm7NhtX0k5AAz3dsXREiQ5hpCS0+djxHTOyAf
-aYjB9FTV2WfWQ9G/KTowpQm4nu6IHzFtHWn8mt7/wnxnSIPeykjgAeuzXd/mSBM6
-/FobeXZsb7a6vDZNP4gSGzMAv7xl4QdBWGxQMRED7Lvg1rU70Dh/X2WvRu3a0MBy
-xHdTBmpIUIQJ0VV6ikGXvu7DS2skvL7lZxKTHPr0zho6rf9De7GJ6FGCAKfdmgjQ
-Gm1i9/pH05UQ4+FD/JyNwEX/CPf8qb6PgtwoJeJ+SPnWZlayYBEB03sK1fD/RIfF
-TbRoJz8YRBniC0AwLlUj3n6IdVGrcK8vy2MvVHF//cXLmCroiEgEGBECAAkFAkpX
-a10CGwwACgkQ8VzxvJUFci4ylgCY4OS+SEAqiiqz1VBCKq5PxNpzXgCffwtqFgV9
-aFtaKnBEuQRBQ5uz+mA=
-=G01V
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5
deleted file mode 100644
index 1e1c594ae7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa6URBADLDs4W73NK1DOZq0mWfmMwv27uaAS4RZuJJWj6eTmF2YcAdVPr
-rsfvBB1GrN5YluqGCN0CBSULtmoxE8AVB/2kGgIZmD7x10+dMXn0cYJrQuTjtf1z
-xos1cmdzK7Or0p5dQbuxvlpEseFATGimggBeunwSt5qMpXqN9/1dqksK0wCgi/Tu
-JyR3Wsg0NqZrUbr5vEiqHoMEALmYht9n6lCt4j6oYZGZ1DlTwjaAjeJe9qdDlbx7
-fNsfFwV1fqMFc2Bop7UJXfTytVXzDwISsn5YLK2ty1kSuA/7PCt7OkrbchBwm/y0
-5KiGjnC0D+6qdApnwJClWFsu6VqquRiplAJ+6bMw/z+VXVnJztMx09tQ/M9idN//
-mJYHA/9989JcHDi0hPlCCYHGs9Bw70H9TvzanKwq5GRlSbEDz9LrrJopJuz788Xu
-xg0WXVlduwrEqU2wlq8lY2m6UlkfIya/fs6NkDCJE3bHSMjfovpL6cUFCKedKsas
-ODOio6i3ZEcWXz3w4Dv43Mb/z1m8Fe5e6Z0jw5OwEQeWLIHHjbRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDUp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2ul
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQKHfjrROgotzliQCfdmgSNeDY
-fkako6w5P1RgYg+gnoAAnjdtRp8wrrlT7lD1fyZelaX+5GOxiEYEEBECAAYFAkpX
-pFMACgkQsLQYPxkqfX1tUACdEsZdXFXMG2nhU4Eema+NQ7dPT3EAn2xH8ARaCHLo
-xg/knc9G04Wd0Q6NiEYEEBECAAYFAkpXqYgACgkQ2mrQCIL9F7Ji0gCbBQ6cYMbI
-Dd9B+cYFXDrSDqUmkXMAoJAv8rAPO4IfRsVd++gt28/G293TuQINBEpXa6gQCAC3
-VnB5gncnFQSjlu0YXhMQzOlXZ1/UVT262emIACbECDTUoy9U1J4VEecZimIe/BId
-uEEBY76i5pmvEV5iWzP3UbCCCUQmpMlFk2LV1jci30/2uTSVXL3yicfrOs74W3rG
-4DxN3cHbttEAZJgH0nKAg48APWsKOgrlgzPk63/vzcuymSnXWTiYksslXQ+NYOoV
-2Oux9y65K1PjEZoftjorrtcx4E6P0LO5hoowFucfo3VEYpzCjeLogjMmS5Af5GyI
-+/5QSQLQ+m0vzppwE8mIt1jsHtEy/0XIdOZTIA10e/I4AvxVoRHbdVY1LjtrkXKN
-CGTyaydBe3a4MDoUQWTzAAMGCACW8tORZd0boInktcNWS/szBgAllwPVhFUF4hk7
-pp1rPsiW3h36ARvhvdtNlHHgFPExU4fSinnpMUL0ajx4jEXGg6178WHMFvLUw6ww
-Ts1rXaHHagLwemG9iQ1++lLewSkqlKOjVvdV03WOHBwt5GTNe7KCuuM2ko27wSVY
-YpbP4A5jEhMkQuWsXPpNu+Oj5uS8XzrIR9McHK0lD9vU2cUUM7OauRo4obygodOa
-cwmd0NnRyYf5aPMn4AI795/eWuFK1WYz1Fe7uX7PNcrc2oGEUuqADFNfwtN2HN1V
-4dDBHUiPiPydrSml2l4T2NOLI2wVaXIfKdM/6R4agf7lruJliEkEGBECAAkFAkpX
-a6gCGwwACgkQKHfjrROgotzpAwCfbLfWIHyWyaWdBRRTixIRs/LFkzYAn3eVy9pL
-omk16gZFWxiB8lelViC1
-=ta+t
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6
deleted file mode 100644
index 70e93822bc9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa+QRBADFJtkQOdBsPIElO4SQnri0o6+d1uaaIkclI3uu88Pmy7LkBO4L
-y8U7jKS1y4m6I49hpqALM43wq8tm7BYWObd+xlol2mZEgbrxHoFugqfEKAOKxLut
-CkCC0wFOK3psQQMSNLokPHYLP6MJL84VsS+molGpUE7EtZZMRaHXyHiU+wCgg5dF
-3TD3rYn2PXkiAFlHs6/OficEAK0zmzEdzNfdfWwipf4AQrAEaBO9If7eo5zj6RX9
-bajg0IRgTxpwq6dP+bnnoEtm/v0vZeAGe8zscCX8xIPtDqu7+QbMe89SSdKJXHog
-/cC/vOS1+s5TKX2ervZ7pAauyve1xO53eVxsg6oDtTwIqvlQbmi6Vs2I3lplhJj9
-sZZ1A/4oNeWoZlBnxr/0eyHDktW89x0wt0R+jJVksnHJxyg7D+MLmaDZR0Fjg8Wt
-EhW8Q5WS0rkk39VaFoA3oR9nfEzAJgymSqNjTEwLsPaqvq6Q5zE+nouYP46cMbcW
-PKmST+QZCRMfznam667eKk0+opBIhDy57M2Kerx4EZyMy/0l4LRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDYp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2vk
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQkV114Jsf01BepACeO7UR33C6
-g4HfHvLVq8zf1SU99y4An1ZOfgrW5iVCEwDc+bWiUu6sbujIiEYEEBECAAYFAkpX
-pBIACgkQsLQYPxkqfX0yCACfap7Y7XpjuSr2DXL+ohDbAM+xdOIAnRjegnSEBqHa
-Hpi8a7gS69H2hz51iEYEEBECAAYFAkpXqZUACgkQ2mrQCIL9F7IHlgCgr/SqepQ/
-8aXpbQqtwXQho6kDEHIAnRbtNiBRZl4B+fbh6ZsdOr6QHIiOuQINBEpXa+oQCACw
-50+Jv6VEVrAL+rRoptmBmHbg8XhNfOPn349GYCtZ9TebCtmU82MEWYF4Eo5vk1JM
-P29EBTKfYHBYsD231HavQa4EXVcjYm38i43c0P0sVvO1t5x2EDncthd+Sx3P/36k
-mr9pjCA9PFR3zLUA3YxqeipgrfU2NhDh4yvxgHogYjn1Gdqf0TWo2lqYnLjAMbZ0
-y7Mk5G6SfZcSRrZvjZgvXUlmynJXMY766LjyrfasuS4fd2LWFovXOakBb5lR7Z/O
-ec1U8CEypQ2iC9ww+Tg0tq+oIJ8g27pJrYsfoCf6HVhsxFOzxf8pjNTilWIB4lMk
-ok5+QnQwDVOykeXFDoKXAAMFB/9w1l+PFODmKJFCPqkYj2+0a+rT+76hDVaPJC8E
-xcsGf5uJQpOdgqgqMgT1kczMX4CbJ/OIqJVnuFGxoBh2tblwtHvGTwepSTn/yUyd
-SbCKmgMr8WafSZUxcRFPql4U2yBvAvdkTCTl+OHv3CrAZxDTV15FoHyPRm/2XU2f
-75Y3EutNLrh3TB5aXEveTe1LP+eYDtYTa/nW6A3WqOKWN7wpMBQ9H65mgN9au+g2
-Euh4DtV/myhnyILMYfCPvUAO68MZ4INC/koV0R78HBI4HHVE0Im338fQeS4g30eL
-+IPoYGAkRQsZ8pi5JnVdqUK9DuNA+NuEhZmYycC6RCxUaKFmiEkEGBECAAkFAkpX
-a+oCGwwACgkQkV114Jsf01C04QCdGkNIVHih/YkT79eykpQ8dUUfGkUAnjV0pyzz
-5XK12rKD3j1Z+SNr+Lqs
-=EcEL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder
deleted file mode 100644
index d7c13725067..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder for git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 8722c21cbd6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org
deleted file mode 100644
index fe0c0822752..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEm+/6QRBAC5mbtqOFSQ0FkTLIMdIoqxtraIeUqwbPp3IBYQ/u/EREjyEf1D
-qFyBEXII0dD8JDT85vRZ81jhB7nFWa0VbUfY0xfghkbnokiNBVNpiQcvszw3UYDF
-aLAaOC8Z98vmlsQaBBTQG6704ZXLr7FJyG3GP5WE6egXIQQbrMcdmCoRBwCg/dwC
-HLWjuemoDc5SX7hKHbB4zZ8D/jP+oMbqz+bDn8OZ2UuaGdxr+mHW8tzTdPjnEU8e
-hUt1ws8eBqn/gMfKvUBa8xFSILe8Ty99u+VjFbcRsdf0H6dRre9AdDVUz5oxzoPw
-gamA8mhPQvFh3wt9smtRUh5IoM2LiM1s5pGMLuYuvSnVUPArEnSfW6K5I6v7OarU
-3WfrBACDEGGcaWKjfdkRtmKIQrzu6AnldVC1ISLVAoqxHnKNFTk1BgO0PSZDpfJI
-x8fMCnGlusoL6F5+LYEk4K4B0zvlj1ur3JocjxpuBLccl94JTo/+I9ZbS8ptUqLw
-LBUkgIQJzzIH4G5NZsQ3FpzSWGRFVa7etqTv9BfUMUmJxhEoobQ/ZWxyZXBvLm9y
-ZyAoUlBNIFNpZ25pbmcgS2V5IGZvciBlbHJlcG8ub3JnKSA8c2VjdXJlQGVscmVw
-by5vcmc+iGAEExECACAFAkm+/6QCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAwm8MFuq2uUlgWAKCGWOpyodbzxS7Xy/0X9m9qVnHq+ACfUHrQzYAtFRpT07Sg
-giosE+mvAKu5Ag0ESb7/pxAIALgT0q0HhwugE717a7N+gAtCbFu8pCXOZcrAnJpG
-cMA9VWmsODZStPTxXYM2ggCMSzUnNis8pPZOPIP5C+t2IYtVjLshM4C9UiY7u5ET
-jErWCxWmF+2QLO50K56E4qxj0wufZt9P+Ih0USUM5L2oyrQG51uj/2v3Qq3igc8Z
-NTtmEOfis3losusQbAfZtTBmNQ0570kkhMxiyavgAUxLenXHYrkDJFuL7XdBCmna
-kykTn2dzU81rIDZ+QPxII4V/eZ5xGiRY/EDUIAysEV2m0NNZgWi/twUnZICm7zYp
-VRviJrBnFTvNEPMhiGRnJgQp/Krv4WIHQ67N8lQg3q5RJX8AAwUH/0UBjBgbsuWR
-dB+ZYWjKPBy+bJY/6HefPUuLrt3QDNINMW8kY7VzWRMWyGc4IlPJDW0nwOn/vT5H
-Dgc3YmA3tm7cKj5wpFijzff61Db8eq+CUKGscKxDBGzHq6oirM5U7DQLmipCs5Eb
-efwHIjE3aOUSnoQmniEnBWI2hm/rftmY9oJSi8xgns4wAokDPiMcucADtbV3fznx
-ppuowtBi8bcGB1vJZjTySQcSKWv+IVp5ej06uZ9501BEm6HxUZkuAGPecP65kcQu
-5bg7B7LQeI5AWyujqvfuWgAF34xhl9QU/sDWxM3wUog+bw7y8pyWCqnJhp70yx8o
-SqzhFygT62eISQQYEQIACQUCSb7/pwIbDAAKCRAwm8MFuq2uUq8PAKC1+E2pSwiS
-oHXkKYPYDwApsP1mVACfRe1YnggLYQtG9LMeweVQQC77rK8=
-=qyRr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta
deleted file mode 100644
index 7b40671a4c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta
+++ /dev/null
@@ -1,61 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT
-kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A
-BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo
-gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P
-xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D
-FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7
-Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i
-QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm
-G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt
-0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR
-fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB
-tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv
-bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT
-ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy
-6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ
-OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6
-0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc
-MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u
-QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE
-Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6
-DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0
-B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH
-V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT
-CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ==
-=21pb
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG
-package.  Questions about this key should be sent to security@redhat.com.
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp
-Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd
-LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi
-UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe
-II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW
-QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz
-+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1
-VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI
-mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg
-SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX
-BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4
-F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF
-AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q
-0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc
-RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI
-JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR
-xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU
-ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5
-WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI
-RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL
-yACfb68fBd2pWEzLKsOk9imIobHHpzE=
-=gpIn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
deleted file mode 100644
index 3818b2c926f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
+++ /dev/null
@@ -1,37 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped prior to November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.0 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8
-HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM
-GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV
-EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS
-ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP
-lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW
-XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb
-E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES
-PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg
-SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID
-FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB
-XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U
-lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+
-5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3
-Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI
-hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+
-JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9
-E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK
-ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8
-BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5
-4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY
-FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk
-OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h
-VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==
-=3AHZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
deleted file mode 100644
index 09aded8bec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
+++ /dev/null
@@ -1,24 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i
-4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB
-ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0
-rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL
-DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD
-h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0
-EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF
-N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF
-gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg
-SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf
-BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD
-TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo=
-=mhzo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
deleted file mode 100644
index 0f875c0e207..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/
-9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP
-qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj
-UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX
-OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt
-pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6
-Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/
-ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle
-xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg
-SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F
-AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB
-+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ==
-=t0np
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release
deleted file mode 100644
index 47c6be6700b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release
+++ /dev/null
@@ -1,62 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2009, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
-pub  4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) <security@redhat.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
-0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
-0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c
-u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh
-XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H
-5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW
-9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj
-/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1
-PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY
-HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF
-buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB
-tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0
-LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC
-2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf
-C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5
-un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E
-0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE
-IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh
-8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL
-Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki
-JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25
-OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
-dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
-=zbHE
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is a supporting (auxiliary) key for
-Red Hat products shipped after November 2006 and for all updates to
-those products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT
-VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A
-UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C
-yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu
-MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg
-Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z
-z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2
-eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq
-SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg
-SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC
-AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg
-ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX
-=d/bm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl
deleted file mode 100644
index 70b6bd17ef3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG
-Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS
-/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De
-fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp
-3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj
-56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ
-lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c
-2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX
-nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8
-c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/
-IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf
-AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V
-fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5
-zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ
-U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg
-Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh
-g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X
-NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH
-mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2
-q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt
-Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV
-QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS
-LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q
-gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32
-VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw==
-=eL9H
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf
deleted file mode 100644
index 39181c9d6e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# File Managed by Puppet
-[main]
-# how often to check for new updates (in seconds)
-run_interval = 3600
-# how often to allow checking on request (in seconds)
-updaterefresh = 600
-
-# how to send notifications (valid: dbus, email, syslog)
-emit_via = dbus
-# should we listen via dbus to give out update information/check for
-# new updates 
-dbus_listener = yes
-
-# automatically install updates
-do_update = yes
-# automatically download updates
-do_download = no
-# automatically download deps of updates
-do_download_deps = no
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp
deleted file mode 100644
index 5b404a0b183..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp
+++ /dev/null
@@ -1,47 +0,0 @@
-# = Class yum::cron
-#
-#
-class yum::cron {
-
-  $manage_update_package = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  $manage_update_service_ensure = $yum::bool_update_disable ? {
-    true    => stopped,
-    default => running,
-  }
-
-  $manage_update_service_enable = $yum::bool_update_disable ? {
-    true    => false,
-    default => true,
-  }
-
-  $manage_update_file = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  package { 'yum-cron':
-    ensure => $manage_update_package,
-  }
-
-  service { 'yum-cron':
-    ensure     => $manage_update_service_ensure,
-    name       => $yum::service,
-    enable     => $manage_update_service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-    require    => Package['yum-cron'],
-  }
-
-  file { 'yum-cron':
-    ensure   => $manage_update_file,
-    path     => '/etc/sysconfig/yum-cron',
-    content  => template($yum::update_template),
-    require  => Package['yum-cron'],
-    notify   => Service['yum-cron'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp
deleted file mode 100644
index 5d2a072d058..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# = Class: yum::defaults
-#
-# This class manages default yum repositories for RedHat based distros:
-# RHEL, Centos, Scientific Linux
-#
-class yum::defaults ( ) inherits yum::params {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  if $yum::extrarepo =~ /epel/ { include yum::repo::epel }
-  if $yum::extrarepo =~ /rpmforge/ { include yum::repo::rpmforge }
-  if $yum::extrarepo =~ /jpackage5/ { include yum::repo::jpackage5 }
-  if $yum::extrarepo =~ /jpackage6/ { include yum::repo::jpackage6 }
-  if $yum::extrarepo =~ /remi/ { include yum::repo::remi }
-  if $yum::extrarepo =~ /remi_php55/ { include yum::repo::remi_php55 }
-  if $yum::extrarepo =~ /tmz/ and $osver[0] != '4' { include yum::repo::tmz }
-  if $yum::extrarepo =~ /webtatic/ { include yum::repo::webtatic }
-  if $yum::extrarepo =~ /puppetlabs/ and $osver[0] != '4' { include yum::repo::puppetlabs }
-  if $yum::extrarepo =~ /puppetdevel/ and $osver[0] != '4' { include yum::repo::puppetdevel }
-  if $yum::extrarepo =~ /nginx/ and $osver[0] != '4' { include yum::repo::nginx }
-  if $yum::extrarepo =~ /mongodb/ and $osver[0] != '4' { include yum::repo::mongodb }
-  if $yum::extrarepo =~ /repoforge/ { include yum::repo::repoforge }
-  if $yum::extrarepo =~ /repoforgeextras/ { include yum::repo::repoforgeextras }
-  if $yum::extrarepo =~ /integ_ganeti/ { include yum::repo::integ_ganeti }
-  if $yum::extrarepo =~ /elrepo/ { include yum::repo::elrepo }
-  if $yum::extrarepo =~ /centalt/ { include yum::repo::centalt }
-
-  if $yum::bool_defaultrepo {
-    case $::operatingsystem {
-      centos: {
-        if $osver[0] == '6' { include yum::repo::centos6 }
-        if $osver[0] == '5' { include yum::repo::centos5 }
-        if $osver[0] == '4' { include yum::repo::centos4 }
-        if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing }
-        if $yum::extrarepo =~ /karan/ { include yum::repo::karan }
-        if $yum::extrarepo =~ /atomic/ { include yum::repo::atomic }
-      }
-      redhat: {
-      }
-      scientific: {
-        if $osver[0] == '6' { include yum::repo::sl6 }
-        if $osver[0] == '5' { include yum::repo::sl5 }
-        if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing }
-        if $yum::extrarepo =~ /karan/ { include yum::repo::karan }
-      }
-      default: { }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp
deleted file mode 100644
index c4617f420ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp
+++ /dev/null
@@ -1,329 +0,0 @@
-# = Class: yum
-#
-# This class manages yum repositories for RedHat based distros:
-# RHEL, Centos, Scientific Linux
-#
-# Copyright 2008, admin(at)immerda.ch
-# Copyright 2008, Puzzle ITC GmbH
-# Marcel Harry haerry+puppet(at)puzzle.ch
-# Simon Josi josi+puppet(at)puzzle.ch
-#
-# This program is free software; you can redistribute
-# it and/or modify it under the terms of the GNU
-# General Public License version 3 as published by
-# the Free Software Foundation.
-#
-# Apapted for Example42 by Alessandro Franceschi
-#
-# == Parameters
-#
-# [*install_all_keys*]
-#   If to provide all the module's known rpm gpgp keys.
-#   Default true, set to false to keep backwards compatibility
-#
-# [*update*]
-#   If you want yum automatic updates. Possibile values:
-#   cron - Updates in a cronjob
-#   updatesd - Updates via updatesd (Only on Centos/RedHat/SL 5)
-#   false/no - Automatic updates disabled (Default)
-#
-# [*update_disable*]
-#   Set to true if you have enabled updates and now wish to disable
-#   Defaults to false.  Logic pertaining to this parameter is only applied
-#   when the update method parameter (immediately above) is set.
-#
-# [*defaultrepo*]
-#   If you want to enable default repositories for supported OS
-#   Default: true
-#   Note: This variable is ignored if you provide a custom source_repo_dir
-#
-# [*extrarepo*]
-#   If you want to enable some (supported) extra repositories
-#   Can be an array. Default: 'epel'
-#   (Epel is used by many modules)
-#   Note: This variable is ignored if you provide a custom source_repo_dir
-#
-# [*plugins_source_dir*]
-#   The path of the plugins configuration directory
-#
-# [*repo_dir*]
-#   The path of the yum.repos.d directory
-#
-# [*source_repo_dir*]
-#   The source path to use to populate the yum.repos.d directory
-#
-# [*clean_repos*]
-#   Boolean. Defines if you want to cleanup the yum.repos.d dir
-#   and be sure that it contains only files managed by Puppet
-#   Default: false
-#
-# [*my_class*]
-#   Name of a custom class to autoload to manage module's customizations
-#   If defined, yum class will automatically "include $my_class"
-#   Can be defined also by the (top scope) variable $yum_myclass
-#
-# [*source*]
-#   Sets the content of source parameter for main configuration file
-#   If defined, yum main config file will have the param: source => $source
-#   Can be defined also by the (top scope) variable $yum_source
-#
-# [*source_dir*]
-#   If defined, the whole yum configuration directory content is retrieved
-#   recursively from the specified source
-#   (source => $source_dir , recurse => true)
-#   Can be defined also by the (top scope) variable $yum_source_dir
-#
-# [*source_dir_purge*]
-#   If set to true (default false) the existing configuration directory is
-#   mirrored with the content retrieved from source_dir
-#   (source => $source_dir , recurse => true , purge => true)
-#   Can be defined also by the (top scope) variable $yum_source_dir_purge
-#
-# [*template*]
-#   Sets the path to the template to use as content for main configuration file
-#   If defined, yum main config file has: content => content("$template")
-#   Note source and template parameters are mutually exclusive: don't use both
-#   Can be defined also by the (top scope) variable $yum_template
-#
-# [*options*]
-#   An hash of custom options to be used in templates for arbitrary settings.
-#   Can be defined also by the (top scope) variable $yum_options
-#
-# [*absent*]
-#   Set to 'true' to remove package(s) installed by module
-#   Can be defined also by the (top scope) variable $yum_absent
-#
-# [*disable*]
-#   Set to 'true' to disable service(s) managed by module
-#   Can be defined also by the (top scope) variable $yum_disable
-#
-# [*disableboot*]
-#   Set to 'true' to disable service(s) at boot, without checks if it's running
-#   Use this when the service is managed by a tool like a cluster software
-#   Can be defined also by the (top scope) variable $yum_disableboot
-#
-# [*puppi*]
-#   Set to 'true' to enable creation of module data files that are used by puppi
-#   Can be defined also by the (top scope) variables $yum_puppi and $puppi
-#
-# [*puppi_helper*]
-#   Specify the helper to use for puppi commands. The default for this module
-#   is specified in params.pp and is generally a good choice.
-#   You can customize the output of puppi commands for this module using another
-#   puppi helper. Use the define puppi::helper to create a new custom helper
-#   Can be defined also by the (top scope) variables $yum_puppi_helper
-#   and $puppi_helper
-#
-# [*debug*]
-#   Set to 'true' to enable modules debugging
-#   Can be defined also by the (top scope) variables $yum_debug and $debug
-#
-# [*audit_only*]
-#   Set to 'true' if you don't intend to override existing configuration files
-#   and want to audit the difference between existing files and the ones
-#   managed by Puppet.
-#   Can be defined also by the (top scope) variables $yum_audit_only
-#   and $audit_only
-#
-# [*config_dir*]
-#   Main configuration directory. Used by puppi
-#
-# [*config_file*]
-#   Main configuration file path
-#
-# [*config_file_mode*]
-#   Main configuration file path mode
-#
-# [*config_file_owner*]
-#   Main configuration file path owner
-#
-# [*config_file_group*]
-#   Main configuration file path group
-#
-# [*cron_params*]
-#   Optional extra arguments for $update = cron ONLY
-#
-# [*cron_mailto*]
-#   Optional mail addres to send update reports for $update = cron ONLY
-#
-# [*cron_dotw*]
-#   Days of the week to perform yum updates by cron
-#   0123456 (default)
-#
-# [*log_file*]
-#   Log file(s). Used by puppi
-#
-class yum (
-  $install_all_keys    = params_lookup( 'install_all_keys' ),
-  $update              = params_lookup( 'update' ),
-  $update_disable      = params_lookup( 'update_disable' ),
-  $defaultrepo         = params_lookup( 'defaultrepo' ),
-  $extrarepo           = params_lookup( 'extrarepo' ),
-  $plugins_source_dir  = params_lookup( 'plugins_source_dir' ),
-  $repo_dir            = params_lookup( 'repo_dir' ),
-  $source_repo_dir     = params_lookup( 'source_repo_dir' ),
-  $clean_repos         = params_lookup( 'clean_repos' ),
-  $my_class            = params_lookup( 'my_class' ),
-  $source              = params_lookup( 'source' ),
-  $source_dir          = params_lookup( 'source_dir' ),
-  $source_dir_purge    = params_lookup( 'source_dir_purge' ),
-  $template            = params_lookup( 'template' ),
-  $options             = params_lookup( 'options' ),
-  $absent              = params_lookup( 'absent' ),
-  $disable             = params_lookup( 'disable' ),
-  $disableboot         = params_lookup( 'disableboot' ),
-  $puppi               = params_lookup( 'puppi' , 'global' ),
-  $puppi_helper        = params_lookup( 'puppi_helper' , 'global' ),
-  $debug               = params_lookup( 'debug' , 'global' ),
-  $audit_only          = params_lookup( 'audit_only' , 'global' ),
-  $config_dir          = params_lookup( 'config_dir' ),
-  $config_file         = params_lookup( 'config_file' ),
-  $config_file_mode    = params_lookup( 'config_file_mode' ),
-  $config_file_owner   = params_lookup( 'config_file_owner' ),
-  $config_file_group   = params_lookup( 'config_file_group' ),
-  $update_template     = params_lookup( 'update_template' ),
-  $cron_param          = params_lookup( 'cron_param' ),
-  $cron_mailto         = params_lookup( 'cron_mailto' ),
-  $cron_dotw           = params_lookup( 'cron_dotw' ),
-  $log_file            = params_lookup( 'log_file' )
-  ) inherits yum::params {
-
-  $bool_install_all_keys=any2bool($install_all_keys)
-  $bool_defaultrepo=any2bool($defaultrepo)
-  $bool_clean_repos=any2bool($clean_repos)
-  $bool_source_dir_purge=any2bool($source_dir_purge)
-  $bool_absent=any2bool($absent)
-  $bool_disable=any2bool($disable)
-  $bool_disableboot=any2bool($disableboot)
-  $bool_puppi=any2bool($puppi)
-  $bool_debug=any2bool($debug)
-  $bool_audit_only=any2bool($audit_only)
-  $bool_update_disable=any2bool($update_disable)
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  $manage_service_enable = $yum::bool_disableboot ? {
-    true    => false,
-    default => $yum::bool_disable ? {
-      true    => false,
-      default => $yum::bool_absent ? {
-        true  => false,
-        false => true,
-      },
-    },
-  }
-
-  $manage_service_ensure = $yum::bool_disable ? {
-    true    => 'stopped',
-    default =>  $yum::bool_absent ? {
-      true    => 'stopped',
-      default => 'running',
-    },
-  }
-
-  $manage_file = $yum::bool_absent ? {
-    true    => 'absent',
-    default => 'present',
-  }
-
-  $manage_audit = $yum::bool_audit_only ? {
-    true  => 'all',
-    false => undef,
-  }
-
-  $manage_file_replace = $yum::bool_audit_only ? {
-    true  => false,
-    false => true,
-  }
-
-  $manage_file_source = $yum::source ? {
-    ''        => undef,
-    default   => $yum::source,
-  }
-
-  $manage_file_content = $yum::template ? {
-    ''        => undef,
-    default   => template($yum::template),
-  }
-
-  $manage_updates = $yum::update ? {
-    'cron'     => true,
-    'updatesd' => true,
-    default    => false,
-  }
-
-  file { 'yum.repo_dir':
-    ensure  => directory,
-    path    => $yum::repo_dir,
-    source  => $yum::source_repo_dir,
-    recurse => true,
-    purge   => $yum::bool_clean_repos,
-    replace => $yum::manage_file_replace,
-    audit   => $yum::manage_audit,
-  }
-
-  if $yum::source_repo_dir == undef {
-    include yum::defaults
-  }
-
-  # Yum Configuration file
-  file { 'yum.conf':
-    ensure  => $yum::manage_file,
-    path    => $yum::config_file,
-    mode    => $yum::config_file_mode,
-    owner   => $yum::config_file_owner,
-    group   => $yum::config_file_group,
-    source  => $yum::manage_file_source,
-    content => $yum::manage_file_content,
-    replace => $yum::manage_file_replace,
-    audit   => $yum::manage_audit,
-  }
-
-  # The whole yum configuration directory can be recursively overriden
-  if $yum::source_dir {
-    file { 'yum.dir':
-      ensure  => directory,
-      path    => $yum::config_dir,
-      source  => $yum::source_dir,
-      recurse => true,
-      purge   => $yum::source_dir_purge,
-      replace => $yum::manage_file_replace,
-      audit   => $yum::manage_audit,
-    }
-  }
-
-  ### Manage Automatic Updates
-  if $yum::manage_updates {
-    include $yum::update
-  }
-
-  ### Include custom class if $my_class is set
-  if $yum::my_class {
-    include $yum::my_class
-  }
-
-
-  ### Provide puppi data, if enabled ( puppi => true )
-  if $yum::bool_puppi == true {
-    $classvars=get_class_args()
-    puppi::ze { 'yum':
-      ensure    => $yum::manage_file,
-      variables => $classvars,
-      helper    => $yum::puppi_helper,
-    }
-  }
-
-  ### Debugging, if enabled ( debug => true )
-  if $yum::bool_debug == true {
-    file { 'debug_yum':
-      ensure  => $yum::manage_file,
-      path    => "${settings::vardir}/debug-yum",
-      mode    => '0640',
-      owner   => 'root',
-      group   => 'root',
-      content => inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*|.*psk.*|.*key)/ }.to_yaml %>'),
-    }
-  }
-
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp
deleted file mode 100644
index bc74acda903..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Define yum::managed_yumrepo
-#
-define yum::managed_yumrepo (
-  $descr          = 'absent',
-  $baseurl        = 'absent',
-  $mirrorlist     = 'absent',
-  $enabled        = 0,
-  $gpgcheck       = 0,
-  $gpgkey         = 'absent',
-  $gpgkey_source  = '',
-  $gpgkey_name    = '',
-  $failovermethod = 'absent',
-  $priority       = 99,
-  $protect        = 'absent',
-  $exclude        = 'absent',
-  $autokeyimport  = 'no',
-  $includepkgs    = 'absent') {
-
-  # ensure that everything is setup
-  include yum::prerequisites
-
-  if $protect != 'absent' {
-    if ! defined(Yum::Plugin['protectbase']) {
-      yum::plugin { 'protectbase': }
-    }
-  }
-
-  file { "/etc/yum.repos.d/${name}.repo":
-    ensure  => file,
-    replace => false,
-    before  => Yumrepo[ $name ],
-    mode    => '0644',
-    owner   => 'root',
-    group   => 0,
-  }
-
-  $gpgkey_real_name = $gpgkey_name ? {
-    ''      => url_parse($gpgkey_source,'filename'),
-    default => $gpgkey_name,
-  }
-
-  if $gpgkey_source != '' {
-    if ! defined(File["/etc/pki/rpm-gpg/${gpgkey_real_name}"]) {
-      file { "/etc/pki/rpm-gpg/${gpgkey_real_name}":
-        ensure  => file,
-        replace => false,
-        before  => Yumrepo[ $name ],
-        source  => $gpgkey_source,
-        mode    => '0644',
-        owner   => 'root',
-        group   => 0,
-      }
-    }
-  }
-  yumrepo { $name:
-    descr          => $descr,
-    baseurl        => $baseurl,
-    mirrorlist     => $mirrorlist,
-    enabled        => $enabled,
-    gpgcheck       => $gpgcheck,
-    gpgkey         => $gpgkey,
-    failovermethod => $failovermethod,
-    priority       => $priority,
-    protect        => $protect,
-    exclude        => $exclude,
-    includepkgs    => $includepkgs,
-  }
-
-  if $autokeyimport == 'yes' and $gpgkey != '' {
-    exec { "rpmkey_add_${gpgkey}":
-      command     => "rpm --import ${gpgkey}",
-      before      => Yumrepo[ $name ],
-      refreshonly => true,
-      path        => '/sbin:/bin:/usr/sbin:/usr/bin',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp
deleted file mode 100644
index 708793bad0f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp
+++ /dev/null
@@ -1,62 +0,0 @@
-# = Class yum::params
-#
-class yum::params  {
-
-  $install_all_keys = false
-
-  $update = false
-
-  $defaultrepo = true
-
-  $extrarepo = 'epel'
-
-  $clean_repos = false
-
-  $plugins_config_dir = '/etc/yum/pluginconf.d'
-
-  $source_repo_dir = undef
-
-  $repo_dir = '/etc/yum.repos.d'
-
-  $config_dir = '/etc/yum'
-
-  $config_file = '/etc/yum.conf'
-
-  $config_file_mode = '0644'
-
-  $config_file_owner = 'root'
-
-  $config_file_group = 'root'
-
-  $log_file = '/var/log/yum.log'
-
-  # parameters for the auto-update classes cron.pp/updatesd.pp
-  $update_disable = false
-
-  $update_template = $::operatingsystemrelease ? {
-    /6.*/ => 'yum/yum-cron.erb',
-    default => undef,
-  }
-
-  # The following two params are for cron.pp only
-
-  $cron_param = ''
-
-  $cron_mailto = ''
-
-  $cron_dotw = '0123456'
-
-  $source = ''
-  $source_dir = ''
-  $source_dir_purge = false
-  $template = ''
-  $options = ''
-  $absent = false
-  $disable = false
-  $disableboot = false
-  $puppi = false
-  $puppi_helper = 'standard'
-  $debug = false
-  $audit_only = false
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp
deleted file mode 100644
index 6e5d372ace7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-# Define: pagios::plugin
-#
-# Adds a yum plugin
-#
-# Usage:
-# With standard source package:
-# yum::plugin { 'priorities': }
-#
-# With custom config file source
-# yum::plugin { 'priorities':
-#   source => 'puppet:///modules/example42/yum/plugin-priorities'
-# }
-#
-# With custom package name (default is taken from $name)
-# yum::plugin { 'priorities':
-#   package_name => 'yum-priorities'
-# }
-#
-define yum::plugin (
-  $package_name = '',
-  $source       = '',
-  $enable       = true
-  ) {
-
-  include yum
-
-  $ensure = bool2ensure( $enable )
-
-  $yum_plugins_prefix = $yum::osver[0] ? {
-    5       => 'yum',
-    6       => 'yum-plugin',
-    default => 'yum-plugin',
-  }
-
-  $real_package_name = $package_name ? {
-    ''      => "${yum_plugins_prefix}-${name}",
-    default => $package_name,
-  }
-
-  package { $real_package_name :
-    ensure => $ensure
-  }
-
-  if ( $source != '' ) {
-    file { "yum_plugin_conf_${name}":
-      ensure  => $ensure,
-      path    => "${yum::plugins_config_dir}/${name}.conf",
-      owner   => root,
-      group   => root,
-      mode    => '0755',
-      source  => $source,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp
deleted file mode 100644
index def976ff396..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# = Class yum::prerequisites
-#
-class yum::prerequisites {
-
-  require yum
-
-  yum::plugin { 'priorities': }
-#  yum::plugin { 'security': }
-
-  if $yum::bool_install_all_keys == true {
-    file { 'rpm_gpg':
-      path    => '/etc/pki/rpm-gpg/',
-      source  => "puppet:///modules/yum/${::operatingsystem}.${yum::osver[0]}/rpm-gpg/",
-      recurse => true,
-      ignore  => '.svn',
-      mode    => '0644',
-      owner   => root,
-      group   => 0,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp
deleted file mode 100644
index 3f6bbf5d477..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# = Class: yum::repo::10gen
-#
-# This class installs the 10gen repo for MongoDB
-#
-class yum::repo::10gen {
-  yum::managed_yumrepo { '10gen':
-    descr       => '10gen Repository',
-    baseurl     => "http://downloads-distro.mongodb.org/repo/redhat/os/${::architecture}",
-    enabled     => 1,
-    gpgcheck    => 0,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp
deleted file mode 100644
index 13a24149dd5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::atomic
-#
-# This class installs the atomic repo
-#
-class yum::repo::atomic {
-  yum::managed_yumrepo { 'atomic':
-    descr          => 'CentOS / Red Hat Enterprise Linux $releasever - atomicrocketturtle.com',
-    mirrorlist     => 'http://www.atomicorp.com/channels/mirrorlist/atomic/centos-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.art',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.art',
-    priority       => 1,
-    exclude        => 'nmap-ncat',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp
deleted file mode 100644
index dce3b67d47a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::atrpms
-#
-# This class installs the atrpms repo
-#
-class yum::repo::atrpms {
-
-  yum::managed_yumrepo { 'centos5-atrpms':
-    descr          => 'CentOS $releasever - $basearch - ATrpms',
-    baseurl        => 'http://dl.atrpms.net/el$releasever-$basearch/atrpms/stable',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.atrpms',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.atrpms',
-    priority       => 30,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp
deleted file mode 100644
index 238b1e19c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# = Class: yum::repo::centalt
-#
-# This class installs the centalt repo
-#
-class yum::repo::centalt {
-  $osver = split($::operatingsystemrelease, '[.]')
-  $release = $::operatingsystem ? {
-    /(?i:Centos|RedHat|Scientific)/ => $osver[0],
-    default                         => '6',
-  }
-
-  yum::managed_yumrepo { 'centalt':
-    descr          => 'CentALT RPM Repository',
-    baseurl        => "http://centos.alt.ru/repository/centos/${release}/\$basearch/",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://centos.alt.ru/repository/centos/RPM-GPG-KEY-CentALT',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp
deleted file mode 100644
index 7d0330d9066..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-# = Class: yum::repo::centos4
-#
-# Base Centos4 repos
-#
-class yum::repo::centos4 {
-
-  yum::managed_yumrepo { 'base':
-    descr      => 'CentOS-$releasever - Base',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr      => 'CentOS-$releasever - Updates',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'addons':
-    descr      => 'CentOS-$releasever - Addons',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr      => 'CentOS-$releasever - Extras',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr      => 'CentOS-$releasever - Centosplus',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    enabled    => 0,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr      => 'CentOS-$releasever - Contrib',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    enabled    => 0,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 2,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp
deleted file mode 100644
index c48cccdefc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-# = Class: yum::repo::centos5
-#
-# Base Centos5 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `rsync://msync.centos.org::CentOS`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/centos`
-#   Default: `undef`
-#
-class yum::repo::centos5 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_base = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/os/\$basearch/",
-  }
-
-  $baseurl_updates = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/updates/\$basearch/",
-  }
-
-  $baseurl_addons = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/addons/\$basearch/",
-  }
-
-  $baseurl_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/extras/\$basearch/",
-  }
-
-  $baseurl_centosplus = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/centosplus/\$basearch/",
-  }
-
-  $baseurl_contrib = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/contrib/\$basearch/",
-  }
-
-  yum::managed_yumrepo { 'base':
-    descr          => 'CentOS-$releasever - Base',
-    baseurl        => $baseurl_base,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr          => 'CentOS-$releasever - Updates',
-    baseurl        => $baseurl_updates,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'addons':
-    descr          => 'CentOS-$releasever - Addons',
-    baseurl        => $baseurl_addons,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr          => 'CentOS-$releasever - Extras',
-    baseurl        => $baseurl_extras,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr          => 'CentOS-$releasever - Centosplus',
-    baseurl        => $baseurl_centosplus,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr          => 'CentOS-$releasever - Contrib',
-    baseurl        => $baseurl_contrib,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp
deleted file mode 100644
index ddfdaf46fef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# = Class: yum::repo::centos6
-#
-# Base Centos6 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `rsync://msync.centos.org::CentOS`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/centos`
-#   Default: `undef`
-#
-class yum::repo::centos6 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_base = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/os/\$basearch/",
-  }
-
-  $baseurl_updates = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/updates/\$basearch/",
-  }
-
-  $baseurl_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/extras/\$basearch/",
-  }
-
-  $baseurl_centosplus = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/centosplus/\$basearch/",
-  }
-
-  $baseurl_contrib = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/contrib/\$basearch/",
-  }
-
-  yum::managed_yumrepo { 'base':
-    descr          => 'CentOS-$releasever - Base',
-    baseurl        => $baseurl_base,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr          => 'CentOS-$releasever - Updates',
-    baseurl        => $baseurl_updates,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr          => 'CentOS-$releasever - Extras',
-    baseurl        => $baseurl_extras,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr          => 'CentOS-$releasever - Centosplus',
-    baseurl        => $baseurl_centosplus,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr          => 'CentOS-$releasever - Contrib',
-    baseurl        => $baseurl_contrib,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp
deleted file mode 100644
index a71f311bcb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# = Class: yum::repo::centos_testing
-#
-# Centos Testing
-#
-class yum::repo::centos_testing (
-  $include_pkgs = '',
-  $exclude_pkgs = undef
-  ) {
-  if $include_pkgs == '' {
-    fail('Please configure $include_pkgs as we run the testing repo with highest repository')
-  }
-
-  yum::managed_yumrepo{'centos5-testing':
-    descr       => 'CentOS-$releasever - Testing',
-    baseurl     => 'http://dev.centos.org/centos/$releasever/testing/$basearch',
-    enabled     => 1,
-    gpgcheck    => 1,
-    gpgkey      => 'http://dev.centos.org/centos/RPM-GPG-KEY-CentOS-testing',
-    priority    => 1,
-    includepkgs => $include_pkgs,
-    exclude     => $exclude_pkgs,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp
deleted file mode 100644
index 33449ecf501..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::ceph
-#
-# This class installs the official ceph repo
-#
-class yum::repo::ceph (
-  $release = 'emperor'
-) {
-
-  yum::managed_yumrepo { 'ceph':
-    descr          => "Ceph ${release} repository",
-    baseurl        => "http://ceph.com/rpm-${release}/\$releasever/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
-    autokeyimport  => 'yes',
-    priority       => 5,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp
deleted file mode 100644
index d55e8120733..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::elasticsearch10
-#
-# This class installs the elasticsearch10 repo
-#
-class yum::repo::elasticsearch10 {
-
-  yum::managed_yumrepo { 'elasticsearch-1.0':
-    descr          => 'Elasticsearch repository for 1.0.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/elasticsearch/1.0/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp
deleted file mode 100644
index 50e312ebab5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::elasticsearch90
-#
-# This class installs the elasticsearch90 repo
-#
-class yum::repo::elasticsearch90 {
-
-  yum::managed_yumrepo { 'elasticsearch-0.90':
-    descr          => 'Elasticsearch repository for 0.90.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/elasticsearch/0.90/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp
deleted file mode 100644
index 60ae3e0a6cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp
+++ /dev/null
@@ -1,105 +0,0 @@
-# = Class: yum::repo::elrepo
-#
-# This class installs the ELRepo repository
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://elrepo.org/linux/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://elrepo.org/linux/`
-#   Default: `undef`
-#
-class yum::repo::elrepo (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  # Workaround for Facter < 1.7.0
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  case $::operatingsystem {
-    'RedHat','CentOS','Scientific': {
-      $release = "el${osver[0]}"
-    }
-    default: {
-      fail("${title}: Operating system '${::operatingsystem}' is not currently supported")
-    }
-  }
-
-  $baseurl_elrepo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/elrepo/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_testing = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_kernel = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/kernel/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/extras/${release}/\$basearch",
-  }
-
-  yum::managed_yumrepo { 'elrepo':
-    descr          => "ELRepo.org Community Enterprise Linux Repository - ${release}",
-    baseurl        => $baseurl_elrepo,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo.${release}",
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-testing':
-    descr          => "ELRepo.org Community Enterprise Linux Testing Repository - ${release}",
-    baseurl        => $baseurl_elrepo_testing,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-testing.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-kernel':
-    descr          => "ELRepo.org Community Enterprise Linux Kernel Repository - ${release}",
-    baseurl        => $baseurl_elrepo_kernel,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-kernel.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-extras':
-    descr          => "ELRepo.org Community Enterprise Linux Extras Repository - ${release}",
-    baseurl        => $baseurl_elrepo_extras,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-extras.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp
deleted file mode 100644
index 4039d81ebd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp
+++ /dev/null
@@ -1,132 +0,0 @@
-# = Class: yum::repo::epel
-#
-# This class installs the epel repo
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://dl.fedoraproject.org/pub/epel/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/epel`
-#   Default: `undef`
-#
-class yum::repo::epel (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  if $::operatingsystem == 'Amazon' {
-    $osver = [ '6' ]
-  } else {
-    $osver = split($::operatingsystemrelease, '[.]')
-  }
-
-  $baseurl_epel = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/\$basearch/",
-  }
-
-  $baseurl_epel_debuginfo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/\$basearch/debug",
-  }
-
-  $baseurl_epel_source = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/SRPMS/",
-  }
-
-  $baseurl_epel_testing = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/\$basearch/",
-  }
-
-  $baseurl_epel_testing_debuginfo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/\$basearch/debug",
-  }
-
-  $baseurl_epel_testing_source = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/SRPMS/",
-  }
-
-  yum::managed_yumrepo { 'epel':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch",
-    baseurl        => $baseurl_epel,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    gpgkey_source  => "puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-debuginfo':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Debug",
-    baseurl        => $baseurl_epel_debuginfo,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-source':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Source",
-    baseurl        => $baseurl_epel_source,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-testing':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch",
-    baseurl        => $baseurl_epel_testing,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'epel-testing-debuginfo':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Debug",
-    baseurl        => $baseurl_epel_testing_debuginfo,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'epel-testing-source':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Source",
-    baseurl        => $baseurl_epel_testing_source,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp
deleted file mode 100644
index b62b4c77474..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::foreman
-#
-# This class installs the foreman repo
-#
-class yum::repo::foreman {
-
-  yum::managed_yumrepo { 'foreman':
-    descr          => 'Foreman Repo',
-    baseurl        => 'http://yum.theforeman.org/stable/',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    # gpgkey       => 'http://yum.theforeman.org/RPM-GPG-KEY-foreman',
-    priority       => 1,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp
deleted file mode 100644
index f43eb97062f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# = Class: yum::repo::integ_ganeti
-#
-# This class installs the Integ Ganeti Yum repo
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://jfut.integ.jp/linux/ganeti/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/ganeti`
-#   Default: `undef`
-#
-class yum::repo::integ_ganeti (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  # Workaround for Facter < 1.7.0
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  case $::operatingsystem {
-    'Fedora': {
-      $release = 'fedora'
-    }
-    'RedHat','CentOS','Scientific': {
-      $release = $osver[0]
-    }
-    default: {
-      fail("${title}: Operating system '${::operatingsystem}' is not currently supported")
-    }
-  }
-
-  $baseurl_integ_ganeti = $mirror_url ? {
-    undef   => "http://jfut.integ.jp/linux/ganeti/${release}/\$basearch",
-    default => "${mirror_url}/${release}/\$basearch",
-  }
-
-  $baseurl_integ_ganeti_source = $mirror_url ? {
-    undef   => "http://jfut.integ.jp/linux/ganeti/${release}/SRPMS",
-    default => "${mirror_url}/${release}/SRPMS",
-  }
-
-  yum::managed_yumrepo { 'integ-ganeti':
-    descr          => "Integ Ganeti Packages ${osver[0]} - \$basearch",
-    baseurl        => $baseurl_integ_ganeti,
-    enabled        => 1,
-    gpgcheck       => 0,
-    priority       => 15,
-  }
-
-  yum::managed_yumrepo { 'integ-ganeti-source':
-    descr          => "Integ Ganeti Packages ${osver[0]} - Source",
-    baseurl        => $baseurl_integ_ganeti_source,
-    enabled        => 0,
-    gpgcheck       => 0,
-    priority       => 15,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp
deleted file mode 100644
index 3cf0a6c88fc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# = Class: yum::repo::jpackage5
-#
-# This class installs the jpackage5 repo
-#
-class yum::repo::jpackage5 {
-
-  include yum
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0':
-    descr          => 'JPackage (free), generic',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0-updates':
-    descr          => 'JPackage (free), generic updates',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0-updates',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-rhel':
-    descr          => 'JPackage (free) for Red Hat Enterprise Linux $releasever',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=redhat-el-$releasever&type=free&release=5.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0-devel':
-    descr          => 'JPackage (free), generic',
-    baseurl        => 'http://mirrors.dotsrc.org/jpackage/5.0/generic/devel',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 0,
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp
deleted file mode 100644
index 373006d1a84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::jpackage6
-#
-# This class installs the jpackage6 repo
-#
-class yum::repo::jpackage6 {
-
-  yum::managed_yumrepo { 'jpackage':
-    descr          => 'JPackage 6 generic',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=6.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp
deleted file mode 100644
index 96059ec3758..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# = Class: yum::repo::karan
-#
-# This class installs the karan repo
-#
-class yum::repo::karan {
-
-  yum::managed_yumrepo { 'kbs-CentOS-Extras':
-    descr          => 'CentOS.Karan.Org-EL$releasever - Stable',
-    baseurl        => 'http://centos.karan.org/el$releasever/extras/stable/$basearch/RPMS/',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority       => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Extras-Testing':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Testing',
-    baseurl  => 'http://centos.karan.org/el$releasever/extras/testing/$basearch/RPMS/',
-    enabled  => 0,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Misc':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Stable',
-    baseurl  => 'http://centos.karan.org/el$releasever/misc/stable/$basearch/RPMS/',
-    enabled  => 1,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Misc-Testing':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Testing',
-    baseurl  => 'http://centos.karan.org/el$releasever/misc/testing/$basearch/RPMS/',
-    enabled  => 0,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp
deleted file mode 100644
index 9e6ca82c708..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::logstash13
-#
-# This class installs the logstash13 repo
-#
-class yum::repo::logstash13 {
-
-  yum::managed_yumrepo { 'logstash-1.3':
-    descr          => 'logstash repository for 1.3.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/logstash/1.3/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp
deleted file mode 100644
index 9b2f6968af4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::mongodb
-#
-# This class installs the mongodb repo
-#
-class yum::repo::mongodb {
-
-  yum::managed_yumrepo { 'mongodb':
-    descr     => '10gen MongoDB Repo',
-    baseurl   => 'http://downloads-distro.mongodb.org/repo/redhat/os/x86_64',
-    enabled   => 1,
-    gpgcheck  => 0,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp
deleted file mode 100644
index 8ebea58a5ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::monitoringsucks
-#
-# This class installs the monitoringsucks repo
-#
-class yum::repo::monitoringsucks {
-
-  yum::managed_yumrepo { 'monitoringsucks':
-    descr          => 'MonitoringSuck at Inuits',
-    baseurl        => 'http://pulp.inuits.eu/pulp/repos/monitoring',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    priority       => 99,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp
deleted file mode 100644
index 3d81ae09a06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::newrelic
-#
-# This class installs the newrelic repo
-#
-class yum::repo::newrelic {
-
-  yum::managed_yumrepo { 'newrelic':
-    descr     => 'Newrelic official release packages',
-    baseurl   => 'http://yum.newrelic.com/pub/newrelic/el5/$basearch/',
-    enabled   => 1,
-    gpgcheck  => 0,
-    priority  => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp
deleted file mode 100644
index c361aa33cde..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::nginx
-#
-# This class installs the nginx repo
-#
-class yum::repo::nginx {
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  yum::managed_yumrepo { 'nginx':
-    descr    => 'Nginx official release packages',
-    baseurl  => "http://nginx.org/packages/rhel/${osver[0]}/\$basearch/",
-    enabled  => 1,
-    gpgcheck => 0,
-    priority => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp
deleted file mode 100644
index 175916194f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::openstack_grizzly
-#
-# This class installs the EPEL-6 repo for OpenStack Grizzly
-#
-class yum::repo::openstack_grizzly {
-
-  yum::managed_yumrepo { 'epel-openstack-grizzly':
-    descr          => 'OpenStack Grizzly Repository for EPEL 6',
-    baseurl        => 'http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/epel-6',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp
deleted file mode 100644
index c80d668bbea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::passenger
-#
-# This class installs the passenger repo
-#
-class yum::repo::passenger {
-
-  yum::managed_yumrepo { 'passenger':
-    descr          => 'Red Hat Enterprise $releasever - Phusion Passenger',
-    baseurl        => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch',
-    mirrorlist     => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-    enabled        => 1 ,
-    gpgcheck       => 0, # To fix key autoimport
-    failovermethod => 'priority',
-    gpgkey         => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-    autokeyimport  => 'yes',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp
deleted file mode 100644
index 89fe7c9cf4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd91
-#
-# This class installs the postgresql 9.1 repo
-#
-class yum::repo::pgdg91 {
-
-  yum::managed_yumrepo { 'pgdg91':
-    descr          => 'PostgreSQL 9.1 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.1/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp
deleted file mode 100644
index fe2dc057e69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd92
-#
-# This class installs the postgresql 9.2 repo
-#
-class yum::repo::pgdg92 {
-
-  yum::managed_yumrepo { 'pgdg92':
-    descr          => 'PostgreSQL 9.2 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.2/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp
deleted file mode 100644
index c3064ba12f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd93
-#
-# This class installs the postgresql 9.3 repo
-#
-class yum::repo::pgdg93 {
-
-  yum::managed_yumrepo { 'pgdg93':
-    descr          => 'PostgreSQL 9.3 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.3/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp
deleted file mode 100644
index 1e553bedb4a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# = Class: yum::repo::puppetdevel
-#
-# This class installs the puppetdevel repo
-#
-class yum::repo::puppetdevel {
-
-  yum::managed_yumrepo { 'puppetlabs_devel':
-    descr          => 'Puppet Labs Packages - Devel',
-    baseurl        => 'http://yum.puppetlabs.com/el/$releasever/devel/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 15,
-  }
-
-  yum::managed_yumrepo { 'puppetlabs_dependencies':
-    descr          => 'Puppet Labs Packages - Dependencies',
-    baseurl        => 'http://yum.puppetlabs.com/el/$releasever/dependencies/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 15,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp
deleted file mode 100644
index 0b3f5ea996a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# = Class: yum::repo::puppetlabs
-#
-# This class installs the puppetlabs repo
-#
-class yum::repo::puppetlabs {
-  $osver = split($::operatingsystemrelease, '[.]')
-  $release = $::operatingsystem ? {
-    /(?i:Centos|RedHat|Scientific)/ => $osver[0],
-    default                         => '6',
-  }
-
-  yum::managed_yumrepo { 'puppetlabs':
-    descr          => 'Puppet Labs Packages',
-    baseurl        => "http://yum.puppetlabs.com/el/${release}/products/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 1,
-  }
-
-  # The dependencies repo has the same priority as base,
-  # because it needs to override base packages.
-  # E.g. puppet-3.0 requires Ruby => 1.8.7, but EL5 ships with 1.8.5.
-  #
-  yum::managed_yumrepo { 'puppetlabs_dependencies':
-    descr          => 'Puppet Labs Packages',
-    baseurl        => "http://yum.puppetlabs.com/el/${release}/dependencies/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp
deleted file mode 100644
index 85d22bff89f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::rbel
-#
-# This class installs the rbel repo
-#
-class yum::repo::rbel {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-  yum::managed_yumrepo { 'rbel':
-    descr          => 'RBEL Repo',
-    baseurl        => "http://rbel.frameos.org/stable/el${osver[0]}/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RBEL' ,
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-RBEL',
-    priority       => 16,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp
deleted file mode 100644
index f27d6c9a290..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# = Class: yum::repo::remi
-#
-# This class installs the remi repo
-#
-class yum::repo::remi {
-  yum::managed_yumrepo { 'remi':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/remi/mirror',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'remi-test':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - Test',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/test/mirror',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp
deleted file mode 100755
index 13a9412f5a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::remi_php55
-#
-# This class installs the remi-php55 repo
-#
-class yum::repo::remi_php55 {
-  yum::managed_yumrepo { 'remi-php55':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - PHP 5.5',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/php55/mirror',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp
deleted file mode 100644
index b43e57dc565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::repoforge
-#
-# This class installs the repoforge repo
-#
-class yum::repo::repoforge {
-
-  yum::managed_yumrepo { 'repoforge':
-    descr          => 'RepoForge packages',
-    baseurl        => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/rpmforge',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority       => 1,
-    exclude        => 'nagios-*',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp
deleted file mode 100644
index 5242b5849a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::repoforgeextras
-#
-# This class installs the repoforge extras repo
-#
-class yum::repo::repoforgeextras {
-
-  yum::managed_yumrepo { 'repoforgeextras':
-    descr    => 'RepoForge extra packages',
-    baseurl  => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/extras',
-    enabled  => 1,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority => 1,
-    exclude  => 'perl-IO-Compress-* perl-DBD-MySQL',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp
deleted file mode 100644
index d6c048d2f43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::rpmforge
-#
-# This class installs the rpmforce repo
-#
-class yum::repo::rpmforge {
-
-  yum::managed_yumrepo { 'rpmforge-rhel5':
-    descr          => 'RPMForge RHEL5 packages',
-    baseurl        => 'http://wftp.tu-chemnitz.de/pub/linux/dag/redhat/el$releasever/en/$basearch/dag',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority       => 30,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp
deleted file mode 100644
index 39f2633641c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Class: yum::repo::sl5
-#
-# Base Scientific Linux 5 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/scientific`
-#   Default: `undef`
-#
-class yum::repo::sl5 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_sl5x = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/os/",
-  }
-
-  $baseurl_sl5x_security = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/updates/security/",
-  }
-
-  $baseurl_sl5x_fastbugs = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/updates/fastbugs/",
-  }
-
-  yum::managed_yumrepo { 'sl5x':
-    descr          => 'Scientific Linux 5x - $basearch',
-    baseurl        => $baseurl_sl5x,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl',
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'sl5x-security':
-    descr          => 'Scientific Linux 5x - $basearch - security updates',
-    baseurl        => $baseurl_sl5x_security,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'sl5x-fastbugs':
-    descr          => 'Scientific Linux 5x - $basearch - fastbug updates',
-    baseurl        => $baseurl_sl5x_fastbugs,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp
deleted file mode 100644
index 4e2daa4e453..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-# = Class: yum::repo::sl6
-#
-# Base Scientific Linux 6 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/scientific`
-#   Default: `undef`
-#
-class yum::repo::sl6 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_sl6x = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/os/",
-  }
-
-  $baseurl_sl6x_security = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/updates/security/",
-  }
-
-  $baseurl_sl6x_fastbugs = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/updates/fastbugs/",
-  }
-
-  yum::managed_yumrepo { 'sl6x':
-    descr          => 'Scientific Linux 6x - $basearch',
-    baseurl        => $baseurl_sl6x,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl',
-  }
-
-  yum::managed_yumrepo { 'sl6x-security':
-    descr          => 'Scientific Linux 6x - $basearch - security updates',
-    baseurl        => $baseurl_sl6x_security,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-  }
-
-  yum::managed_yumrepo { 'sl6x-fastbugs':
-    descr          => 'Scientific Linux 6x - $basearch - fastbug updates',
-    baseurl        => $baseurl_sl6x_fastbugs,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp
deleted file mode 100644
index f53ba9a0f3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# = Class: yum::repo::tmz
-#
-# This class installs the tmz repo
-#
-class yum::repo::tmz {
-
-  yum::managed_yumrepo { 'tmz-puppet':
-    descr          => 'Puppet for EL $releasever - $basearch',
-    baseurl        => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz',
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'tmz-puppet-source':
-    descr          => 'Puppet for EL $releasever - Source',
-    baseurl        => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/SRPMS',
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz',
-    priority       => 16,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp
deleted file mode 100644
index 75cc4584752..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::varnish
-#
-# This class installs the varnish 3.0 repo
-#
-class yum::repo::varnish {
-
-  yum::managed_yumrepo { 'varnish':
-    descr          => 'Varnish 3.0 for Enterprise Linux 5 - $basearch',
-    baseurl        => 'http://repo.varnish-cache.org/redhat/varnish-3.0/el5/$basearch',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    # gpgkey       => 'http://yum.theforeman.org/RPM-GPG-KEY-VARNISH',
-    priority       => 26,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp
deleted file mode 100644
index 7e7847de317..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::vfabric
-#
-# This class installs the vfabric repo
-#
-class yum::repo::vfabric {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  yum::managed_yumrepo { 'vfabric':
-    descr          => 'vFabric 5.2 Repo - $basesearch',
-    baseurl        => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/RPM-GPG-KEY-VFABRIC-5.2-EL${osver[0]}",
-    priority       => 1,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp
deleted file mode 100644
index 171acf2df34..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::virtualbox
-#
-# This class installs the virtualbox repo
-#
-class yum::repo::virtualbox {
-
-  yum::managed_yumrepo { 'virtualbox':
-    descr          => 'RHEL/CentOS-$releasever / $basearch - VirtualBox',
-    baseurl        => 'http://download.virtualbox.org/virtualbox/rpm/rhel/$releasever/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc',
-    autokeyimport  => 'yes',
-    priority       => 18,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp
deleted file mode 100644
index adf9c5d8f1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# = Class: yum::repo::webtatic
-#
-# This class installs the webtatic repo
-#
-class yum::repo::webtatic {
-  $osver = split($::operatingsystemrelease, '[.]')
-  yum::managed_yumrepo { 'webtatic':
-    descr          => 'Webtatic Repository $releasever - $basearch',
-    mirrorlist     => $osver[0] ? {
-      5 => 'http://repo.webtatic.com/yum/centos/5/$basearch/mirrorlist',
-      6 => 'http://repo.webtatic.com/yum/el6/$basearch/mirrorlist',
-    },
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-andy',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-webtatic-andy',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp
deleted file mode 100644
index 264541d2a5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Class yum::updatesd
-#
-# Installs and enables yum updatesd
-#
-#
-class yum::updatesd {
-
-  require yum
-
-  $manage_update_package = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  $manage_update_service_ensure = $yum::bool_update_disable ? {
-    true    => stopped,
-    default => running,
-  }
-
-  $manage_update_service_enable = $yum::bool_update_disable ? {
-    true    => false,
-    default => true,
-  }
-
-  $manage_update_file = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  package { 'yum-updatesd':
-    ensure => $manage_update_package,
-    name   => 'yum-updatesd',
-  }
-
-  service { 'yum-updatesd':
-    ensure     => $manage_update_service_ensure,
-    enable     => $manage_update_service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-    require    => Package['yum-updatesd'],
-  }
-
-  file { 'yum-updatesd.conf':
-    ensure  => $manage_update_file,
-    path    => '/etc/yum/yum-updatesd.conf',
-    source  => 'puppet:///modules/yum/yum-updatesd.conf',
-    require => Package['yum-updatesd'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb
deleted file mode 100644
index 62d9f9c65ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'yum' do
-
-  let(:title) { 'yum' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test minimal installation' do
-    it { should contain_file('yum.conf').with_ensure('present') }
-  end
-
-  describe 'Test decommissioning - absent' do
-    let(:params) { {:absent => true } }
-    it 'should remove yum configuration file' do should contain_file('yum.conf').with_ensure('absent') end
-  end
-
-  describe 'Test customizations - source' do
-    let(:params) { {:source => "puppet:///modules/yum/spec"} }
-    it { should contain_file('yum.conf').with_source('puppet:///modules/yum/spec') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb
deleted file mode 100644
index f4f5971a83c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# File Managed by Puppet
-#
-# Pass any given paramter to yum, as run in all the scripts invoked
-# by this package.  Be aware that this is global, and yum is invoked in 
-# several modes by these scripts for which your own parameter might not
-# be appropriate
-YUM_PARAMETER=<%= scope.lookupvar('yum::cron_param') %>
-
-# Don't install, just check (valid: yes|no)
-CHECK_ONLY=no
-
-# Check to see if you can reach the repos before updating (valid: yes|no)
-CHECK_FIRST=no
-
-# Don't install, just check and download (valid: yes|no)
-# Implies CHECK_ONLY=yes (gotta check first to see what to download)
-DOWNLOAD_ONLY=no
-
-# Error level, practical range 0-10, 0 means print only critical errors which
-# you must be told, 1 means print all errors, even ones that are not important
-# Level 0 is the default
-# ERROR_LEVEL=0
-
-# Debug level, practical range 0-10, higher number means more output
-# Level 1 is a useful level if you want to see what's been done and
-# don't want to read /var/log/yum.log
-# Level 0 is the default
-# DEBUG_LEVEL=1
-
-# randomwait is used by yum to wait random time
-# default is 60 so yum waits random time from 1 to 60 minutes
-# the value must not be zero
-RANDOMWAIT="60"
-
-# if MAILTO is set and the mail command is available, the mail command 
-# is used to deliver yum output
-
-# by default MAILTO is unset, so crond mails the output by itself
-# example:  MAILTO=root
-MAILTO=<%= scope.lookupvar('yum::cron_mailto') %>
-
-# you may set SYSTEMNAME if you want your yum emails tagged differently
-# default is output of hostname command 
-# this variable is used only if MAILTO is set too
-#SYSTEMNAME="" 
-
-# you may set DAYS_OF_WEEK to the days of the week you want to run 
-# default is every day 
-#DAYS_OF_WEEK="0123456" 
-DAYS_OF_WEEK=<%= scope.lookupvar('yum::cron_dotw') %>
-
-# which day should it do cleanup on?  defaults to 0 (Sunday).  If this day isn't in the 
-# DAYS_OF_WEEK above, it'll never happen
-CLEANDAY="0"
-
-# set to yes to make the yum-cron service to wait for transactions to complete
-SERVICE_WAITS=yes
-
-# set maximum time period (in seconds) for the yum-cron service to wait for
-# transactions to complete.  The default is 300 seconds (5 minutes)
-SERVICE_WAIT_TIME=300
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh b/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
deleted file mode 100644
index 198d7e2dfb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-EXEC_ONCE_DIR="$1"
-EXEC_ALWAYS_DIR="$2"
-
-shopt -s nullglob
-files=("${VAGRANT_CORE_FOLDER}"/files/"${EXEC_ONCE_DIR}"/*)
-
-if [[ (${#files[@]} -gt 0) ]]; then
-    echo "Running files in files/${EXEC_ONCE_DIR}"
-
-    if [ ! -d "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" ]; then
-       mkdir "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran"
-       echo "Created directory /.puphpet-stuff/${EXEC_ONCE_DIR}-ran"
-    fi
-
-    find "${VAGRANT_CORE_FOLDER}/files/${EXEC_ONCE_DIR}" -maxdepth 1 -not -path '/.*' -type f \( ! -iname "empty" \) -exec cp -n '{}' "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" \;
-    find "/.puphpet-stuff/${EXEC_ONCE_DIR}-ran" -maxdepth 1 -type f -exec chmod +x '{}' \; -exec ls {} \; | sort | xargs -r0 sh -c
-    echo "Finished running files in files/${EXEC_ONCE_DIR}"
-    echo "To run again, delete file(s) you want rerun in /.puphpet-stuff/${EXEC_ONCE_DIR}-ran or the whole folder to rerun all"
-fi
-
-echo "Running files in files/${EXEC_ALWAYS_DIR}"
-find "${VAGRANT_CORE_FOLDER}/files/${EXEC_ALWAYS_DIR}" -maxdepth 1 -not -path '/.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec ls {} \; | sort | xargs -r0 sh -c
-echo "Finished running files in files/${EXEC_ALWAYS_DIR}"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt b/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt
deleted file mode 100644
index ce3331b3ced..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-===============================================================================
-You have the Vagrant::Hostsupdater plugin installed. You may be required to
-enter your host's root/privileged password below to continue!
-===============================================================================
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
deleted file mode 100644
index 21486cd3b93..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-if [[ -f '/.puphpet-stuff/displayed-important-notices' ]]; then
-    exit 0
-fi
-
-cat "${VAGRANT_CORE_FOLDER}/shell/important-notices.txt"
-
-touch '/.puphpet-stuff/displayed-important-notices'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt
deleted file mode 100644
index 0dc384f1e06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-                                              _
-                                             / )
-                                        .--.; |    _...,-"""-,
-                         .-""-.-""""-. /   _`'-._.'   /`      \
-                        /'     \      \|  (/'-._/     )        ;
-                .-""""-;       (       '--' /-'    _           |
-              .'       |        ;    e     /       a  ,       ;
-             /          \       |      __.'`-.__,    ;       /
-            /            `._     ;    .-'     `--.,__.\    /`
-           //|              \     \,-'                /\_.'
-          // |               `;.___>              /,-'.
-        /`|  /                |`\      _..---\    |    \
-        |/  /     _,.-----\   |  \   /`|      |   |\    \
-           /    .;   |    |   |   \ /  |      |   | \    )
-          |    / |   \    /   |\..' \   \     |   \  \..'
-       jgs \../  \.../    \.../ \.../---'     \.../
-
-Read me for some important information!
-
-If Puppet did not blow up (you do not see a sea of red above), then your VM
-was generated successfully!
-
-* A unique private key was generated for you! It is located at
-  "puphpet/files/dot/ssh/id_rsa". If you are on Windows, a PuTTY-friendly key
-  was also generated at same location with a ".ppk" extension.
-* If you want to use your own private key for future provisions, overwrite the
-  generated key above with your own. Make sure to follow the naming pattern,
-  and include a ".pub" public key.
-* If you wish to add packages, modules, Apache/Nginx vhosts, or anything else,
-  open up "puphpet/config.yaml" and make changes within! Some things will
-  have random strings like "DIdXRs2OI2LJ" - you must create a random string
-  as well! To do so, please apply face to keyboard and roll.
-* If you change "puphpet/config.yaml", simple run "$ vagrant provision" and
-  your VM will be updated with the changes you requested!
-
-Did something go wrong? Don't worry! I can (maybe) help! Please go to our
-Github issues page at https://github.com/puphpet/puphpet/issues and search for
-your problem. If you do not find your problem answered, open a new ticket!
-
-----------------------------------------------------------------------------
-PLEASE REMEMBER TO INCLUDE THE CONTENTS OF YOUR "puphpet/config.yaml" FILE.
-----------------------------------------------------------------------------
-
-Make sure to xxx out any potential API keys or passwords that you do not want
-others to see!
-
-Happy programming!
-                                                            - Juan Treminio
-
-┈╭━━━━━━━━━━━━┳━━╮┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈
- ┃         ╭╯ ┃ ▋┃╭━┓   ____                _      _    _                    _
-╭┫         ┃  ┃  ┃┃╭┛  |  _ \ ___  __ _  __| |    / \  | |__   _____   _____| |
-┃┃         ╰━━╯ ┃╰╯┃   | |_) / _ \/ _` |/ _` |   / _ \ | '_ \ / _ \ \ / / _ \ |
-╯┃              ╰┳━╯   |  _ <  __/ (_| | (_| |  / ___ \| |_) | (_) \ V /  __/_|
- ┃               ┃     |_| \_\___|\__,_|\__,_| /_/   \_\_.__/ \___/ \_/ \___(_)
- ┃ ┏━┳━━━━━━━┓ ┏ ┃
-▔┗━┻━┛▔▔▔▔▔▔▔┗━┻━┛▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh b/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
deleted file mode 100644
index e653f8991c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(echo "$1")
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-cat "${VAGRANT_CORE_FOLDER}/shell/self-promotion.txt"
-printf "\n"
-echo ""
-
-if [[ ! -d '/.puphpet-stuff' ]]; then
-    mkdir '/.puphpet-stuff'
-    echo 'Created directory /.puphpet-stuff'
-fi
-
-touch '/.puphpet-stuff/vagrant-core-folder.txt'
-echo "${VAGRANT_CORE_FOLDER}" > '/.puphpet-stuff/vagrant-core-folder.txt'
-
-if [[ -f '/.puphpet-stuff/initial-setup-base-packages' ]]; then
-    exit 0
-fi
-
-if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-    echo 'Running initial-setup apt-get update'
-    apt-get update >/dev/null
-    echo 'Finished running initial-setup apt-get update'
-
-    echo 'Installing git'
-    apt-get -y install git-core >/dev/null
-    echo 'Finished installing git'
-
-    if [[ "${CODENAME}" == 'lucid' || "${CODENAME}" == 'precise' ]]; then
-        echo 'Installing basic curl packages'
-        apt-get -y install libcurl3 libcurl4-gnutls-dev curl >/dev/null
-        echo 'Finished installing basic curl packages'
-    fi
-
-    echo 'Installing build-essential package'
-    apt-get -y install build-essential >/dev/null
-    echo 'Finished installing build-essential packages'
-elif [[ "${OS}" == 'centos' ]]; then
-    echo 'Adding repos: elrep, epel, scl'
-    perl -p -i -e 's@enabled=1@enabled=0@gi' /etc/yum/pluginconf.d/fastestmirror.conf
-    perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/os/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/os/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-    perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/updates/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/updates/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-    perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/extras/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/extras/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-
-    yum -y --nogpgcheck install 'http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm' >/dev/null
-    yum -y --nogpgcheck install 'https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm' >/dev/null
-    yum -y install centos-release-SCL >/dev/null
-    yum clean all >/dev/null
-    yum -y check-update >/dev/null
-    echo 'Finished adding repos: elrep, epel, scl'
-
-    echo 'Installing git'
-    yum -y install git >/dev/null
-    echo 'Finished installing git'
-
-    echo 'Installing Development Tools'
-    yum -y groupinstall 'Development Tools' >/dev/null
-    echo 'Finished installing Development Tools'
-fi
-
-touch '/.puphpet-stuff/initial-setup-base-packages'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh b/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh
deleted file mode 100644
index 93f1c32c6c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-RELEASE=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" RELEASE)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-if [[ -f '/.puphpet-stuff/install-puppet' ]]; then
-    exit 0
-fi
-
-if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-    apt-get -y install augeas-tools libaugeas-dev
-elif [[ "${OS}" == 'centos' ]]; then
-    yum -y install augeas-devel
-fi
-
-echo 'Installing Puppet requirements'
-/usr/bin/gem install haml hiera facter json ruby-augeas
-echo 'Finished installing Puppet requirements'
-
-echo 'Installing Puppet 3.4.3'
-/usr/bin/gem install puppet --version 3.4.3
-
-if [[ -f '/usr/bin/puppet' ]]; then
-    mv /usr/bin/puppet /usr/bin/puppet-old
-fi
-
-ln -s /usr/local/rvm/wrappers/default/puppet /usr/bin/puppet
-echo 'Finished installing Puppet 3.4.3'
-
-touch '/.puphpet-stuff/install-puppet'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh b/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh
deleted file mode 100644
index d1b94e37f7d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-RELEASE=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" RELEASE)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-if [[ -f '/.puphpet-stuff/install-ruby' ]]; then
-    exit 0
-fi
-
-if [[ -f '/usr/local/rvm/wrappers/default/ruby' ]]; then
-    RUBY_VERSION=$(/usr/local/rvm/wrappers/default/ruby --version);
-    if [ "grep '1.9.3' ${RUBY_VERSION}" ]; then
-        touch '/.puphpet-stuff/install-ruby'
-        exit 0
-    fi
-fi
-
-echo 'Installing Ruby 1.9.3 using RVM'
-
-curl -sSL https://get.rvm.io | bash -s stable --ruby=1.9.3
-source /usr/local/rvm/scripts/rvm
-
-if [[ -f '/usr/bin/ruby' ]]; then
-    mv /usr/bin/ruby /usr/bin/ruby-old
-fi
-
-if [[ -f '/usr/bin/gem' ]]; then
-    mv /usr/bin/gem /usr/bin/gem-old
-fi
-
-ln -s /usr/local/rvm/wrappers/default/ruby /usr/bin/ruby
-ln -s /usr/local/rvm/wrappers/default/gem /usr/bin/gem
-
-gem update --system >/dev/null
-
-touch '/.puphpet-stuff/install-ruby'
-
-echo 'Finished install Ruby 1.9.3 using RVM'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh b/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
deleted file mode 100644
index 5a73825dd59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-TYPE=$(echo "$1" | tr '[A-Z]' '[a-z]')
-OS=$(uname)
-ID='unknown'
-CODENAME='unknown'
-RELEASE='unknown'
-ARCH='unknown'
-
-# detect centos
-grep 'centos' /etc/issue -i -q
-if [ $? = '0' ]; then
-    ID='centos'
-    RELEASE=$(cat /etc/redhat-release | grep -o 'release [0-9]' | cut -d " " -f2)
-# could be debian or ubuntu
-elif [ $(which lsb_release) ]; then
-    ID=$(lsb_release -i | cut -f2)
-    CODENAME=$(lsb_release -c | cut -f2)
-    RELEASE=$(lsb_release -r | cut -f2)
-elif [ -f '/etc/lsb-release' ]; then
-    ID=$(cat /etc/lsb-release | grep DISTRIB_ID | cut -d "=" -f2)
-    CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d "=" -f2)
-    RELEASE=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f2)
-elif [ -f '/etc/issue' ]; then
-    ID=$(head -1 /etc/issue | cut -d " " -f1)
-    if [ -f '/etc/debian_version' ]; then
-      RELEASE=$(</etc/debian_version)
-    else
-      RELEASE=$(head -1 /etc/issue | cut -d " " -f2)
-    fi
-fi
-
-declare -A info
-
-info[id]=$(echo "${ID}" | tr '[A-Z]' '[a-z]')
-info[codename]=$(echo "${CODENAME}" | tr '[A-Z]' '[a-z]')
-info[release]=$(echo "${RELEASE}" | tr '[A-Z]' '[a-z]')
-info[arch]=$(uname -m)
-
-if [ "${TYPE}" ] ; then
-    echo "${info[${TYPE}]}"
-
-    exit 0
-fi
-
-echo -e "ID\t\t${info[id]}"
-echo -e "CODENAME\t${info[codename]}"
-echo -e "RELEASE\t\t${info[release]}"
-echo -e "ARCH\t\t${info[arch]}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt b/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt
deleted file mode 100644
index 8cd11701e7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-         ____        ____  _   _ ____      _      generated using
-        |  _ \ _   _|  _ \| | | |  _ \ ___| |_   ___ ___  _ __ ___
-        | |_) | | | | |_) | |_| | |_) / _ \ __| / __/ _ \| '_ ` _ \
-        |  __/| |_| |  __/|  _  |  __/  __/ |_ | (_| (_) | | | | | |
-        |_|    \__,_|_|   |_| |_|_|   \___|\__(_)___\___/|_| |_| |_|
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh b/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
deleted file mode 100644
index ef00495b2b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-VAGRANT_SSH_USERNAME=$(echo "$1")
-
-function create_key()
-{
-    BASE_KEY_NAME=$(echo "$1")
-
-    if [[ ! -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}" ]]; then
-        ssh-keygen -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}" -P ""
-
-        if [[ ! -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}.ppk" ]]; then
-            if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-                apt-get install -y putty-tools >/dev/null
-            elif [ "${OS}" == 'centos' ]; then
-                yum -y install putty >/dev/null
-            fi
-
-            puttygen "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}" -O private -o "${VAGRANT_CORE_FOLDER}/files/dot/ssh/${BASE_KEY_NAME}.ppk"
-        fi
-
-        echo "Your private key for SSH-based authentication has been saved to 'puphpet/files/dot/ssh/${BASE_KEY_NAME}'!"
-    else
-        echo "Pre-existing private key found at 'puphpet/files/dot/ssh/${BASE_KEY_NAME}'"
-    fi
-}
-
-create_key 'root_id_rsa'
-create_key 'id_rsa'
-
-PUBLIC_SSH_KEY=$(cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub")
-
-echo 'Adding generated key to /root/.ssh/id_rsa'
-echo 'Adding generated key to /root/.ssh/id_rsa.pub'
-echo 'Adding generated key to /root/.ssh/authorized_keys'
-
-mkdir -p /root/.ssh
-
-cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" '/root/.ssh/'
-cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" '/root/.ssh/'
-
-if [[ ! -f '/root/.ssh/authorized_keys' ]] || ! grep -q "${PUBLIC_SSH_KEY}" '/root/.ssh/authorized_keys'; then
-    cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" >> '/root/.ssh/authorized_keys'
-fi
-
-chown -R root '/root/.ssh'
-chgrp -R root '/root/.ssh'
-chmod 700 '/root/.ssh'
-chmod 644 '/root/.ssh/id_rsa.pub'
-chmod 600 '/root/.ssh/id_rsa'
-chmod 600 '/root/.ssh/authorized_keys'
-
-if [ "${VAGRANT_SSH_USERNAME}" != 'root' ]; then
-    VAGRANT_SSH_FOLDER="/home/${VAGRANT_SSH_USERNAME}/.ssh";
-
-    mkdir -p "${VAGRANT_SSH_FOLDER}"
-
-    echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/id_rsa"
-    echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/id_rsa.pub"
-    echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/authorized_keys"
-
-    cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" "${VAGRANT_SSH_FOLDER}/id_rsa"
-    cp "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" "${VAGRANT_SSH_FOLDER}/id_rsa.pub"
-
-    if [[ ! -f "${VAGRANT_SSH_FOLDER}/authorized_keys" ]] || ! grep -q "${PUBLIC_SSH_KEY}" "${VAGRANT_SSH_FOLDER}/authorized_keys"; then
-        cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" >> "${VAGRANT_SSH_FOLDER}/authorized_keys"
-    fi
-
-    chown -R "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}"
-    chgrp -R "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}"
-    chmod 700 "${VAGRANT_SSH_FOLDER}"
-    chmod 644 "${VAGRANT_SSH_FOLDER}/id_rsa.pub"
-    chmod 600 "${VAGRANT_SSH_FOLDER}/id_rsa"
-    chmod 600 "${VAGRANT_SSH_FOLDER}/authorized_keys"
-
-    passwd -d "${VAGRANT_SSH_USERNAME}" >/dev/null
-fi

From c120e7b3df34165c538cff0af831872c9d781648 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 16:10:11 +0100
Subject: [PATCH 154/345] Clean deprecated files. Add utility tool

---
 .../emulate_oscommerce/llx_osc_categories.sql |  26 ----
 .../llx_osc_customer.key.sql                  |  20 ---
 .../emulate_oscommerce/llx_osc_customer.sql   |  25 ----
 .../emulate_oscommerce/llx_osc_order.sql      |  25 ----
 .../emulate_oscommerce/llx_osc_product.sql    |  27 ----
 dev/initdata/sftpget_and_loaddump.php         | 138 ++++++++++++++++++
 6 files changed, 138 insertions(+), 123 deletions(-)
 delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
 delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
 delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
 delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
 delete mode 100755 dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
 create mode 100755 dev/initdata/sftpget_and_loaddump.php

diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
deleted file mode 100755
index 2fd2820cfd3..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 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_osc_categories (
-  rowid integer unsigned NOT NULL auto_increment,
-  dolicatid integer NOT NULL default '0',
-  osccatid integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY dolicatid (dolicatid),
-  UNIQUE KEY osccatid (osccatid)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
deleted file mode 100755
index 002509b4787..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 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_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
deleted file mode 100755
index 895e95e4935..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 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_osc_customer (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_soc integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_soc (fk_soc)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
deleted file mode 100755
index ea1bfbe2c14..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 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_osc_order (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_commande integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_commande (fk_commande)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
deleted file mode 100755
index f08db68358d..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 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_osc_product (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_product integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_product (fk_product)
-) ENGINE=InnoDB;
-
-
diff --git a/dev/initdata/sftpget_and_loaddump.php b/dev/initdata/sftpget_and_loaddump.php
new file mode 100755
index 00000000000..c91ddcc3e17
--- /dev/null
+++ b/dev/initdata/sftpget_and_loaddump.php
@@ -0,0 +1,138 @@
+#!/usr/bin/php
+<?php
+/* 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
+}
+
+// Global variables
+$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]:'';
+
+// Include Dolibarr environment
+$res=0;
+if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
+if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
+if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
+if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
+if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
+if (! $res) die ("Failed to include master.inc.php file\n");
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
+
+
+/*
+ *	Main
+ */
+
+$login='';
+$server='';
+if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg))
+{
+	$login=$reg[1];
+	$server=$reg[2];
+	$sourcefile=$reg[3];
+	$targetfile=basename($sourcefile);
+}
+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 "Return code: 0 if success, <>0 if error\n";
+	print "Warning, this script may take a long time.\n";
+	exit(-1);
+}
+
+
+$targetdir='/tmp';
+print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n";
+
+$sftpconnectstring=$sourceserver;
+print 'SFTP connect string : '.$sftpconnectstring."\n";
+//print 'SFTP password '.$password."\n";
+
+
+// SFTP connect
+if (! function_exists("ssh2_connect")) {
+	dol_print_error('','ssh2_connect function does not exists'); exit(1);
+}
+
+$connection = ssh2_connect($server, 22);
+if ($connection)
+{
+	if (! @ssh2_auth_password($connection, $login, $password))
+	{
+		dol_syslog("Could not authenticate with username ".$login." . and password ".$password,LOG_ERR);
+		exit(-5);
+	}
+	else
+	{
+		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
+		/*
+		print "Generate dump ".$filesys1.'.bz2'."\n";
+			$stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2');
+			stream_set_blocking($stream, true);
+			// The command may not finish properly if the stream is not read to end
+			$output = stream_get_contents($stream);
+		*/
+
+		$sftp = ssh2_sftp($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;
+		if (preg_match('/\.bz2$/',$targetfile))
+		{
+			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
+		}
+		if (preg_match('/\.gz$/',$targetfile))
+		{
+			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
+		}
+		print "Load dump with ".$fullcommand."\n";
+		$output=array();
+		$return_var=0;
+		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
+		exec($fullcommand, $output, $return_var);
+		foreach($output as $line) print $line."\n";
+
+		//ssh2_sftp_unlink($sftp, $fileinstalllock);
+		//print $output;
+	}
+}
+else
+{
+	print 'Failed to connect to ssh2 to '.$server;
+	exit(-6);
+}
+
+
+exit(0);

From 47cab9033625e859341a164012226e5b3e38cc39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 19:01:29 +0100
Subject: [PATCH 155/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.dtd |   3 +-
 dev/codesniffer/ruleset.xml | 116 +++++++++++++++++++++++++++++++++++-
 2 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/dev/codesniffer/ruleset.dtd b/dev/codesniffer/ruleset.dtd
index 0d498bb033c..e307d564e12 100755
--- a/dev/codesniffer/ruleset.dtd
+++ b/dev/codesniffer/ruleset.dtd
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT ruleset (description,rule+)>
+<!ELEMENT ruleset (description,exclude-pattern*,rule+)>
 <!ATTLIST ruleset name CDATA "">
 <!ELEMENT description (#PCDATA)>
+<!ELEMENT exclude-pattern (#PCDATA)>
 <!ELEMENT rule (properties*,severity*)>
 <!ATTLIST rule ref CDATA "">
 <!ELEMENT properties (property+)>
diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 24cc4b46e7b..7e4ae92274c 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -3,6 +3,13 @@
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>
 
+	<exclude-pattern>*/conf.php</exclude-pattern>
+	<exclude-pattern>*/includes/*</exclude-pattern>
+	<exclude-pattern>*/documents/*</exclude-pattern>
+	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
+	<exclude-pattern>*/custom/*</exclude-pattern>
+	<exclude-pattern>*/nltechno*</exclude-pattern>
+
 	<!-- List of all tests -->
 
 	<rule ref="Internal.NoCodeFound">
@@ -10,7 +17,17 @@
 	</rule>
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
- 
+
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
+		<severity>0</severity>
+	</rule>
+
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>
@@ -46,6 +63,9 @@
 		</rule>
 	-->
 
+    <!-- PHP code MUST use only UTF-8 without BOM. -->
+    <rule ref="Generic.Files.ByteOrderMark"/>
+
 	<!-- Lines can be 85 chars long, but never show errors -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
@@ -93,7 +113,7 @@
     <rule ref="Generic.Metrics.CyclomaticComplexity">
         <properties>
             <property name="complexity" value="80" />
-            <property name="absoluteComplexity" value="200" />
+            <property name="absoluteComplexity" value="250" />
         </properties>
     </rule>
     <rule ref="Generic.Metrics.NestingLevel">
@@ -150,7 +170,75 @@
     <rule ref="PEAR.Commenting.ClassComment.MissingTag">
         <severity>0</severity>
     </rule>
-    
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
+        
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
@@ -207,6 +295,24 @@
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
 	    <severity>0</severity>
 	</rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
+        <severity>0</severity>
+    </rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
+        <severity>0</severity>
+    </rule>
 	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -224,6 +330,10 @@
 	</rule>
 	
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
+        <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>
 	</rule>

From 1c2c1ff3d877d31d12d870d319a7318a9e18e4f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 19:09:15 +0100
Subject: [PATCH 156/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 7e4ae92274c..2b4cda4184b 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -21,6 +21,9 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedFOREACH">
+		<severity>0</severity>
+	</rule>
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
 		<severity>0</severity>
 	</rule>

From 789d588fde9bc1436ce220773254ea34a72f40d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 19 Dec 2014 19:09:15 +0100
Subject: [PATCH 157/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 9f9284cb463..ae13a41fcb2 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -21,6 +21,9 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
 		<severity>0</severity>
 	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedFOREACH">
+		<severity>0</severity>
+	</rule>
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
 		<severity>0</severity>
 	</rule>

From 11368e48fe9ea4c3d662477c64cd4298d4343521 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:11:12 +0100
Subject: [PATCH 158/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index ae13a41fcb2..9cff30f457d 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -30,7 +30,10 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
 		<severity>0</severity>
 	</rule>
-
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>

From d8838f9438fb5192084f7cdbaf9bccc7451bf34c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:11:12 +0100
Subject: [PATCH 159/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 3cf3f08b368..b121027ad10 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -36,7 +36,10 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
 		<severity>0</severity>
 	</rule>
-
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>

From 5bcb195c15368e39a547bccb1b1485891bd71419 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:11:12 +0100
Subject: [PATCH 160/345] Update codesniffer to remove travis errors.

---
 dev/codesniffer/ruleset.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 3cf3f08b368..b121027ad10 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -36,7 +36,10 @@
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
 		<severity>0</severity>
 	</rule>
-
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSEIF">
+		<severity>0</severity>
+	</rule>
+	
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
 	</rule>

From beaec59ab6619ee799c30f9b3fff2af458fceb16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 00:29:53 +0100
Subject: [PATCH 161/345] PHPCS

---
 htdocs/core/db/mysqli.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 7a964d07afc..f768a1115bd 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -351,7 +351,6 @@ class DoliDBMysqli extends DoliDB
      *	@return int		    Nombre de lignes
      *	@see    num_rows
      */
-
     function affected_rows($resultset)
     {
         // If resultset not provided, we take the last used by connexion

From 854ed90a6226eeb8c0cb62fee9a0f3af459a35c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 11:15:10 +0100
Subject: [PATCH 162/345] Fixed: bad place for the ajaxcombo.

---
 htdocs/core/class/html.form.class.php | 17 +++++++++++++++--
 htdocs/core/lib/agenda.lib.php        | 25 +------------------------
 htdocs/core/lib/ajax.lib.php          |  4 +++-
 htdocs/langs/en_US/main.lang          |  1 +
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index eec9318f9ba..b40438d4292 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1342,6 +1342,12 @@ class Form
                 $out.= '<option value="">'.$langs->trans("None").'</option>';
             }
             $out.= '</select>';
+            
+       		if (! empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				$out.= ajax_combobox($htmlname);
+			}
         }
         else
         {
@@ -4566,10 +4572,17 @@ class Form
             }
             else
             {
-                $out.= '<select class="flat" name="'.$htmlname.'" disabled="disabled">';
-                $out.= '<option value="">'.$langs->trans("None").'</option>';
+                $out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>';
+                if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
+                $out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>';
             }
             $out.= '</select>';
+
+            if (! empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				$out.= ajax_combobox($htmlname);
+			}
         }
         else
         {
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 236f418dd86..7bc5b931c0e 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -70,36 +70,13 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		print '<tr>';
 		print '<td class="nowrap">';
-		//print $langs->trans("ActionsAskedBy");
-		//print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
-		//print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
-		//print ' &nbsp; '.$langs->trans("or") . ' ';
 		print $langs->trans("ActionsOwnedBy").' &nbsp; ';
 		print '</td><td class="nowrap maxwidthonsmartphone">';
-		//print $langs->trans("User");
 		print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
-		if (! empty($conf->use_javascript_ajax))
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			print ajax_combobox('usertodo');
-		}
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' ';
-		else print '<br>';
-		print $langs->trans("Group").' &nbsp; ';
+		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("Group").' &nbsp; ';
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
-		if (! empty($conf->use_javascript_ajax))
-		{
-			print ajax_combobox('usergroup');
-		}
 		print '</td></tr>';
 
-		/*print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy");
-		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
-		print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit);
-		print '</td></tr>';*/
-
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 3966b29f874..74e715f7b4a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -321,8 +321,10 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
 	global $conf;
 
 	if (! empty($conf->browser->phone)) return '';	// combobox disabled for smartphones (does not works)
+	if (! empty($conf->dol_use_jmobile)) return '';	// combobox with jmobile (does not works)
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-
+	if (empty($conf->use_javascript_ajax)) return ''; 
+	
 	/* Some properties for combobox:
 	minLengthToAutocomplete: 2,
 	comboboxContainerClass: "comboboxContainer",
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cbc4deb40d7..fd07d379a44 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -169,6 +169,7 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.

From 27f26bba27c604317800b46423e1c0a4c50d552a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 11:17:04 +0100
Subject: [PATCH 163/345] Fixed: Missing test

---
 htdocs/core/class/html.form.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fff53e9d25c..864f7792eef 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1356,15 +1356,17 @@ class Form
             }
             $out.= '</select>';
 
-           	$out.= '<script type="text/javascript">
-						$(document).ready(function() {
-
+            if (! empty($conf->use_javascript_ajax))
+            {
+           		$out.= '<script type="text/javascript">
+					$(document).ready(function() {
 						$(\'#'.$htmlname.'\').select2({
 							width: \'resolve\',
 							minimumInputLength: 0
 						});
            			})
            		   </script>';
+            }
         }
         else
         {

From c9f3267649029d2876bf5bf3e27c40b9be93b8bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 11:34:37 +0100
Subject: [PATCH 164/345] Fixed: bad conditions

---
 htdocs/core/class/html.form.class.php | 6 +++---
 htdocs/core/lib/agenda.lib.php        | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b40438d4292..936a3b9cb53 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1343,7 +1343,7 @@ class Form
             }
             $out.= '</select>';
             
-       		if (! empty($conf->use_javascript_ajax))
+       		if (! empty($conf->use_javascript_ajax) && ! $show_empty)	// ajaxcombo works only on list with no empty value because of &nbsp;
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 				$out.= ajax_combobox($htmlname);
@@ -4573,12 +4573,12 @@ class Form
             else
             {
                 $out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>';
-                if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
+                if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'></option>'."\n";
                 $out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>';
             }
             $out.= '</select>';
 
-            if (! empty($conf->use_javascript_ajax))
+            if (! empty($conf->use_javascript_ajax) && ! $show_empty)	// ajax combo works only when no empty value
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 				$out.= ajax_combobox($htmlname);
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 7bc5b931c0e..3d51490f6b2 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -124,16 +124,18 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans("WorkingTimeRange").'</td>';
 		print "<td class='nowrap maxwidthonsmartphone'>";
-		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23"> - ';
+		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
 		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		print ' '.$langs->trans("H");
+		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
 		print '</td></tr>';
 
 		// Filter on days
 		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans("WorkingDaysRange").'</td>';
 		print "<td class='nowrap maxwidthonsmartphone'>";
-		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7"> - ';
+		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</td></tr>';
 	}

From 98019dd526e8146d187663ee1b7fd2aee7a6f46a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 14:26:58 +0100
Subject: [PATCH 165/345] Enhance scrutinizer

---
 .scrutinizer.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 1db2aa867ae..0ca95ace51d 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -5,12 +5,13 @@ imports:
 
 filter:
     excluded_paths:
-        - 'build/*'
-        - 'dev/*'
-        - 'doc/*'
-        - 'test/*'
-        - 'htdocs/includes/*'
-    paths: {  }
+        - build/*
+        - dev/*
+        - doc/*
+        - test/*
+    paths: 
+        - htdocs/*
+        - scripts/*
     
 tools:
     # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
@@ -18,15 +19,18 @@ tools:
         enabled: true
         extensions:
             - php
-        dependency_paths: {  }
+        dependency_paths: 
+            - htdocs/includes/
         filter:
             excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
+                - build/*
+                - dev/*
+                - doc/*
+                - test/*
+                - htdocs/includes/*
+            paths:
+                - htdocs/
+                - scripts/
         config:
             parameter_reference_check:
                 enabled:              true

From 8996953077b48206bda83a2ccb2e7304be79daf0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 15:42:03 +0100
Subject: [PATCH 166/345] Fix: error reported by scrutinizer

---
 dev/skeletons/skeleton_webservice_server.php  |  2 +-
 htdocs/adherents/class/adherent.class.php     |  2 +-
 htdocs/compta/bank/class/bankcateg.class.php  |  6 ++---
 htdocs/compta/facture/class/facture.class.php | 12 +++++-----
 .../class/bonprelevement.class.php            |  4 ++--
 htdocs/compta/tva/class/tva.class.php         |  2 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/core/db/pgsql.class.php                |  4 ++--
 htdocs/core/db/sqlite.class.php               |  4 ++--
 htdocs/core/lib/pdf.lib.php                   |  2 +-
 .../modules/syslog/logHandlerInterface.php    |  2 +-
 htdocs/expedition/class/expedition.class.php  |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 htdocs/holiday/tomergewithdefine_holiday.php  |  2 +-
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/user/class/user.class.php              |  2 +-
 htdocs/webservices/server_contact.php         |  2 +-
 .../webservices/server_productorservice.php   | 24 +++++++++----------
 htdocs/webservices/server_user.php            |  2 +-
 20 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
index 52bb46455cb..54a050ff9da 100644
--- a/dev/skeletons/skeleton_webservice_server.php
+++ b/dev/skeletons/skeleton_webservice_server.php
@@ -141,7 +141,7 @@ $server->register(
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of object
  * @param	string		$ref				Ref of object
- * @param	ref_ext		$ref_ext			Ref external of object
+ * @param	string		$ref_ext			Ref external of object
  * @return	mixed
  */
 function getSkeleton($authentication,$id,$ref='',$ref_ext='')
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 6c61c51f1f1..8c8c2d604ca 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1045,7 +1045,7 @@ class Adherent extends CommonObject
      *	@param	int		$rowid      Id of object to load
      * 	@param	string	$ref		To load member from its ref
      * 	@param	int		$fk_soc		To load member from its link to third party
-     * 	@param	int		$ref_ext	External reference
+     * 	@param	string	$ref_ext	External reference
      *	@return int         		>0 if OK, 0 if not found, <0 if KO
      */
     function fetch($rowid,$ref='',$fk_soc='',$ref_ext='')
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 8811ad7c878..fb796b219ee 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -30,9 +30,7 @@
 
 
 /**
- *      \class      BankCateg
- *      \brief      Class to manage bank categories
- *		\remarks	Initialy built by build_class_from_table on 2009-01-02 15:26
+ *	Class to manage bank categories
  */
 class BankCateg // extends CommonObject
 {
@@ -300,7 +298,7 @@ class BankCateg // extends CommonObject
 
         $error=0;
 
-        $object=new Bank_categ($this->db);
+        $object=new BankCateg($this->db);
 
         $this->db->begin();
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cd8ba3b06a1..632381c8541 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2479,7 +2479,7 @@ class Facture extends CommonInvoice
 	 *      Return next reference of customer invoice not already used (or last reference)
 	 *      according to numbering module defined into constant FACTURE_ADDON
 	 *
-	 *      @param	   Society		$soc		object company
+	 *      @param	   Societe		$soc		object company
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
@@ -2838,7 +2838,7 @@ class Facture extends CommonInvoice
 	function demande_prelevement($user)
 	{
 		$error=0;
-		
+
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
 		if ($this->statut > 0 && $this->paye == 0)
@@ -2896,12 +2896,12 @@ class Facture extends CommonInvoice
         			{
         				// Force payment mode of invoice to withdraw
         				$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement');
-        				if ($payment_mode_id > 0) 
+        				if ($payment_mode_id > 0)
         				{
         					$result=$this->setPaymentMethods($payment_mode_id);
         				}
-        			}            
-                    
+        			}
+
                     if ($error) return -1;
                     return 1;
                 }
@@ -3519,7 +3519,7 @@ class FactureLigne extends CommonInvoiceLine
 				return -1;
 			}
 		}
-		
+
 		// 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';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 5da94a28b76..497d690072b 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -58,7 +58,7 @@ class BonPrelevement extends CommonObject
 
     var $invoice_in_error=array();
 
-    
+
     /**
      *	Constructor
      *
@@ -1634,7 +1634,7 @@ class BonPrelevement extends CommonObject
      *	@param	int		$nombre			0 or 1
      *	@param	float	$total			Total
      *	@param	string	$CrLf			End of line character
-     *	@return	SEPA
+     *	@return	string					String with SEAP Sender
      */
     function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n')
     {	// SEPA INITIALISATION
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index a86af28cace..a300579fc1f 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -343,7 +343,7 @@ class Tva extends CommonObject
     }
 
     /**
-     * 	Total of the VAT from invoices emitted by the society.
+     * 	Total of the VAT from invoices emitted by the thirdparty.
      *
      *	@param	int		$year		Year
      *	@return	double				Amount
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1399ae40215..ae384195162 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -88,7 +88,7 @@ class Contrat extends CommonObject
 	/**
 	 *	Return next contract ref
 	 *
-	 *	@param	Societe		$soc		objet society
+	 *	@param	Societe		$soc		Thirdparty object
 	 *	@return string					free reference for contract
 	 */
 	function getNextNumRef($soc)
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index a7baf59783d..1c0d1ee21fc 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -669,7 +669,7 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 * Renvoie le code erreur generique de l'operation precedente.
 	 *
-	 * @return    error_num       (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 * @return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	function errno()
 	{
@@ -735,7 +735,7 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 * Renvoie le texte de l'erreur pgsql de l'operation precedente
 	 *
-	 * @return		error_text
+	 * @return	string		Error text
 	 */
 	function error()
 	{
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 53ecb880dce..88efde86394 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -536,7 +536,7 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Renvoie le code erreur generique de l'operation precedente.
      *
-     *	@return	string	$error_num       (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
      */
     function errno()
     {
@@ -598,7 +598,7 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Renvoie le texte de l'erreur mysql de l'operation precedente.
      *
-     *	@return	string	$error_text
+     *	@return	string	Error text
      */
     function error()
     {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index bf2e5f2c218..129d32fc7d9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1273,7 +1273,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
  *
  *	@param	Object		$object				Object
  *	@param	int			$i					Current line number
- *  @param  Tranlate	$outputlangs		Object langs for output
+ *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide value (0 = no,	1 = yes, 2 = just special lines)
  *  @return	void
  */
diff --git a/htdocs/core/modules/syslog/logHandlerInterface.php b/htdocs/core/modules/syslog/logHandlerInterface.php
index 7b5a4aa1bdd..47807d8f8f6 100644
--- a/htdocs/core/modules/syslog/logHandlerInterface.php
+++ b/htdocs/core/modules/syslog/logHandlerInterface.php
@@ -44,7 +44,7 @@ interface LogHandlerInterface
 	/**
 	 * 	Return if logger active
 	 *
-	 * 	@return	boolen		True if active
+	 * 	@return	boolean		True if active
 	 */
 	public function isActive();
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2cc0667d58a..7d96d1de12c 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -113,7 +113,7 @@ class Expedition extends CommonObject
 	/**
 	 *	Return next contract ref
 	 *
-	 *	@param	Societe		$soc	Objet society
+	 *	@param	Societe		$soc	Thirdparty object
 	 *	@return string				Free reference for contract
 	 */
 	function getNextNumRef($soc)
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index bc12821530f..28ef737de13 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -572,7 +572,7 @@ class Fichinter extends CommonObject
 	 *	Returns the next non used reference of intervention
 	 *	depending on the module numbering assets within FICHEINTER_ADDON
 	 *
-	 *	@param	    Societe		$soc		Object society
+	 *	@param	    Societe		$soc		Thirdparty object
 	 *	@return     string					Free reference for intervention
 	 */
 	function getNextNumRef($soc)
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 69c235fd831..95da7550db7 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1493,7 +1493,7 @@ class FactureFournisseur extends CommonInvoice
       *      Return next reference of supplier invoice not already used (or last reference)
       *      according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER
       *
-      *      @param	   Society		$soc		object company
+      *      @param	   Societe		$soc		Thirdparty object
       *      @param    string		$mode		'next' for next value or 'last' for last value
       *      @return   string					free ref or last ref
       */
diff --git a/htdocs/holiday/tomergewithdefine_holiday.php b/htdocs/holiday/tomergewithdefine_holiday.php
index 4bf904528a0..46dde3028a4 100644
--- a/htdocs/holiday/tomergewithdefine_holiday.php
+++ b/htdocs/holiday/tomergewithdefine_holiday.php
@@ -46,7 +46,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
 
 print_fiche_titre($langs->trans('MenuConfCP'));
 
-$congespayes = new Holidays($db);
+$congespayes = new Holiday($db);
 $listUsers = $congespayes->fetchUsers(false, true);
 
 // Si il y a une action de mise à jour
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fbdf42d86f5..2732080e944 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2382,7 +2382,7 @@ class Societe extends CommonObject
      *
      *    @param	int		$idprof		1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
      *    @param	string	$value		Value of profid
-     *    @param	int		$socid		Id of society if update
+     *    @param	int		$socid		Id of thirdparty if update
      *    @return   boolean				true if exists, false if not
      */
     function id_prof_exists($idprof,$value,$socid=0)
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 0b0c452020c..837be155929 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -138,7 +138,7 @@ class User extends CommonObject
 	 *
 	 *	@param	int		$id		       		Si defini, id a utiliser pour recherche
 	 * 	@param  string	$login       		Si defini, login a utiliser pour recherche
-	 *	@param  strinf	$sid				Si defini, sid a utiliser pour recherche
+	 *	@param  string	$sid				Si defini, sid a utiliser pour recherche
 	 * 	@param	int		$loadpersonalconf	Also load personal conf of user (in $user->conf->xxx)
 	 * 	@return	int							<0 if KO, 0 not found, >0 if OK
 	 */
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 4d19dbe2d10..b7550244fc2 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -234,7 +234,7 @@ $server->register(
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of object
  * @param	string		$ref				Ref of object
- * @param	ref_ext		$ref_ext			Ref external of object
+ * @param	string		$ref_ext			Ref external of object
  * @return	mixed
  */
 function getContact($authentication,$id,$ref='',$ref_ext='')
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index ffe25f8e3e8..6f36b664a3b 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -327,7 +327,7 @@ $server->register(
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of object
  * @param	string		$ref				Ref of object
- * @param	ref_ext		$ref_ext			Ref external of object
+ * @param	string		$ref_ext			Ref external of object
  * @param   string      $lang               Lang to force
  * @return	mixed
  */
@@ -378,7 +378,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
             	if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
             	if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
             	if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
-		
+
 		$productorservice_result_fields = array(
 		    'id' => $product->id,
 	   	    'ref' => $product->ref,
@@ -396,7 +396,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
 		    'country_id' => $product->country_id>0?$product->country_id:'',
 		    'country_code' => $product->country_code,
 		    'custom_code' => $product->customcode,
-	
+
 	            'price_net' => $product->price,
 	            'price' => $product->price_ttc,
 	            'price_min_net' => $product->price_min,
@@ -408,7 +408,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
 		    //! Spanish local taxes
 		    'localtax1_tx' => $product->localtax1_tx,
 		    'localtax2_tx' => $product->localtax2_tx,
-	
+
 		    'stock_real' => $product->stock_reel,
 		    'stock_alert' => $product->seuil_stock_alerte,
 		    'pmp' => $product->pmp,
@@ -416,19 +416,19 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
 		    'dir' => $pdir,
 		    'images' => $product->liste_photos($dir,$nbmax=10)
                 );
-                
+
                 //Retreive all extrafield for thirdsparty
             	// fetch optionals attributes and labels
             	$extrafields=new ExtraFields($db);
             	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
             	//Get extrafield values
             	$product->fetch_optionals($product->id,$extralabels);
-            	
+
             	foreach($extrafields->attribute_label as $key=>$label)
             	{
             		$productorservice_result_fields=array_merge($productorservice_result_fields,array('options_'.$key => $product->array_options['options_'.$key]));
             	}
-		
+
                 // Create
                 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
@@ -533,7 +533,7 @@ function createProductOrService($authentication,$product)
         }*/
         //var_dump($product['ref_ext']);
         //var_dump($product['lines'][0]['type']);
-        
+
         $extrafields=new ExtraFields($db);
 	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
 	foreach($extrafields->attribute_label as $key=>$label)
@@ -652,7 +652,7 @@ function updateProductOrService($authentication,$product)
         }*/
         //var_dump($product['ref_ext']);
         //var_dump($product['lines'][0]['type']);
-        
+
 	$extrafields=new ExtraFields($db);
 	$extralabels=$extrafields->fetch_name_optionals_label('product',true);
 	foreach($extrafields->attribute_label as $key=>$label)
@@ -965,19 +965,19 @@ function getProductsForCategory($authentication,$id,$lang='')
 		                		'dir' => $pdir,
 		                		'images' => $obj->liste_photos($dir,$nbmax=10)
 							);
-							
+
 							//Retreive all extrafield for thirdsparty
 							// fetch optionals attributes and labels
 							$extrafields=new ExtraFields($db);
 							$extralabels=$extrafields->fetch_name_optionals_label('product',true);
 							//Get extrafield values
 							$product->fetch_optionals($obj->id,$extralabels);
-							
+
 							foreach($extrafields->attribute_label as $key=>$label)
 							{
 								$products[$iProduct]=array_merge($products[$iProduct],array('options_'.$key => $product->array_options['options_'.$key]));
 							}
-							
+
 							$iProduct++;
 						}
 
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 4fb5cc81e8c..6339486922f 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -299,7 +299,7 @@ $server->register(
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Id of object
  * @param	string		$ref				Ref of object
- * @param	ref_ext		$ref_ext			Ref external of object
+ * @param	string		$ref_ext			Ref external of object
  * @return	mixed
  */
 function getUser($authentication,$id,$ref='',$ref_ext='')

From 219cd0f8552c4e635ced30a32fe4c355290aa7cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 15:52:50 +0100
Subject: [PATCH 167/345] Fixed: Translation

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

diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 5f0f1c522b9..daf273cee3d 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -199,7 +199,7 @@ AccountancyJournal=Code journal comptabilité
 COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits
 COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
 COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services
-COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits
+COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services
 COMPTA_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
 COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA
 COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients

From c05c2fe427d2b203bd30c96310058323e3303823 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Dec 2014 18:46:29 +0100
Subject: [PATCH 168/345] Info to help debug perf pb.

---
 htdocs/admin/system/perf.php    | 8 ++++++++
 htdocs/admin/system/phpinfo.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 27c447e7c15..0e49564ece7 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -24,6 +24,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("admin");
 $langs->load("install");
@@ -51,6 +52,13 @@ print_fiche_titre($langs->trans("PerfDolibarr"),'','setup');
 
 print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
+// Recupere la version de PHP
+$phpversion=version_php();
+print "<br>PHP - ".$langs->trans("Version").": ".$phpversion."<br>\n";
+
+// Recupere la version du serveur web
+print "<br>Web server - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+
 // XDebug
 print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 22fecdfd524..681c5d43cf3 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -54,7 +54,7 @@ print "\n";
 
 $var=false;
 
-// Recupere la version de l'OS
+// Recupere la version de PHP
 $phpversion=version_php();
 print "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
 

From 268723be7bb02499c8c12ae9d50207a4a3275114 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Dec 2014 01:39:20 +0100
Subject: [PATCH 169/345] Fixed: sql syntax error

---
 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 936a3b9cb53..445aa827416 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1256,7 +1256,7 @@ class Form
         if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')";
         if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')";
         if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut <> 0";
-        if (! empty($morefilter)) $sql.=$morefilter;
+        if (! empty($morefilter)) $sql.=" ".$morefilter;
         $sql.= " ORDER BY u.lastname ASC";
 
         dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
@@ -1342,7 +1342,7 @@ class Form
                 $out.= '<option value="">'.$langs->trans("None").'</option>';
             }
             $out.= '</select>';
-            
+
        		if (! empty($conf->use_javascript_ajax) && ! $show_empty)	// ajaxcombo works only on list with no empty value because of &nbsp;
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

From 22c27e870364f57f5a859f3805dfc93298251f7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Dec 2014 02:21:12 +0100
Subject: [PATCH 170/345] PHPCS

---
 htdocs/core/class/dolprintipp.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 71ee2a1be37..b6e09547743 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -45,7 +45,6 @@ class dolprintIPP
      * @param   string      $userid     userid
      * @param   string      $user       user
      * @param   string      $password   password
-     * @return  printIPP
      */
     function __construct($db,$host,$port,$userid,$user,$password)
     {
@@ -90,7 +89,7 @@ class dolprintIPP
         global $conf,$db;
 
         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
         $ipp->setHost($this->host);
@@ -121,12 +120,12 @@ class dolprintIPP
             	}
             }
         }
-        
+
         // Set number of copy
         $ipp->setCopies($obj->copy);
         $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file);
         $ipp->printJob();
-        
+
         return '';
     }
 

From 6f4ba2552dcdcb831d3201512fefd471e3f4df16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 21 Dec 2014 10:14:51 +0100
Subject: [PATCH 171/345] Typo on conf variable

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

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 0ac5d78aead..007a3964d18 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1312,7 +1312,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
     // Bank Account
-    if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->module->banque->enabled) {
+    if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) {
         print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
         $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
         print '</td></tr>';

From 3d9ce4c1dc3a01d08e9d03e73501fa3d6290becd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 21 Dec 2014 10:32:11 +0100
Subject: [PATCH 172/345] Admin config for ask for payment bank during order

---
 htdocs/admin/commande.php | 51 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index a0f535c2b7b..aaa1949d7dd 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -147,7 +147,7 @@ if ($action == 'setModuleOptions')
 }
 
 // Activate a model
-if ($action == 'set')
+else if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
@@ -222,7 +222,7 @@ else if ($action == 'set_COMMANDE_FREE_TEXT')
     }
 }
 
-//Activate Set Shippable Icon In List
+// Activate Set Shippable Icon In List
 else if ($action=="setshippableiconinlist") {
     $setshippableiconinlist = GETPOST('value','int');
     $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity);
@@ -234,6 +234,23 @@ else if ($action=="setshippableiconinlist") {
     }
 }
 
+// Activate ask for payment bank
+else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
+{
+    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ORDER",$value,'chaine',0,'',$conf->entity);
+
+    if (! $res > 0) $error++;
+
+    if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
 
 /*
  * View
@@ -576,6 +593,36 @@ if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
 print '</a></td>';
 print '</tr>';
 
+// Ask for payment bank during order
+if ($conf->banque->enabled)
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
+    if (! empty($conf->use_javascript_ajax))
+    {
+        print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
+    }
+    else
+    {
+        if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        }
+        else
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+        }
+    }
+    print '</td></tr>';
+}
+else
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+}
+
 print '</table>';
 
 print '<br>';

From 82d403c347f5c3c1343ce93b6ae47bf3219fda8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 21 Dec 2014 10:39:54 +0100
Subject: [PATCH 173/345] Update admin.lang

---
 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 f0dd8219f06..cbf898a67fc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1152,6 +1152,7 @@ ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes i
 FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).

From bdb47921e7bbfc5e6de690e7266b413050e4fb6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Dec 2014 14:15:36 +0100
Subject: [PATCH 174/345] Fixed: Bad value for % increase for first year.

---
 htdocs/compta/stats/index.php | 109 +++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index b3fb130e185..cfd816c29b6 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -209,6 +209,8 @@ $maxyear=substr($maxyearmonth,0,4);
 $nowyear=strftime("%Y",dol_now());
 $nowyearmonth=strftime("%Y-%m",dol_now());
 $maxyearmonth=max($maxyearmonth,$nowyearmonth);
+$now=dol_now();
+$casenow = dol_print_date($now,"%Y-%m");
 
 // Loop on each month
 $nb_mois_decalage = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START-1):0;
@@ -220,22 +222,37 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 	print "<tr ".$bc[$var].">";
 
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B")."</td>";
-	for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+	for ($annee = $year_start -1 ; $annee <= $year_end ; $annee++)	// We start one year before to have data to be able to make delta
 	{
-		$now=dol_now();
 		$annee_decalage=$annee;
 		if ($mois>12) {$annee_decalage=$annee+1;}
-		$casenow = dol_print_date($now,"%Y-%m");
 		$case = dol_print_date(dol_mktime(1,1,1,$mois_modulo,1,$annee_decalage),"%Y-%m");
 		$caseprev = dol_print_date(dol_mktime(1,1,1,$mois_modulo,1,$annee_decalage-1),"%Y-%m");
 
-		if ($modecompta == 'CREANCES-DETTES') {
-			// Valeur CA du mois w/o VAT
+		if ($annee >= $year_start)
+		{
+			if ($modecompta == 'CREANCES-DETTES') {
+				// Valeur CA du mois w/o VAT
+				print '<td align="right">';
+				if ($cum_ht[$case])
+				{
+					$now_show_delta=1;  // On a trouve le premier mois de la premiere annee generant du chiffre.
+					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum_ht[$case],1).'</a>';
+				}
+				else
+				{
+					if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; }
+					else { print '&nbsp;'; }
+				}
+				print "</td>";
+			}
+
+			// Valeur CA du mois
 			print '<td align="right">';
-			if ($cum_ht[$case])
+			if ($cum[$case])
 			{
 				$now_show_delta=1;  // On a trouve le premier mois de la premiere annee generant du chiffre.
-				print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum_ht[$case],1).'</a>';
+				print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum[$case],1).'</a>';
 			}
 			else
 			{
@@ -243,60 +260,46 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 				else { print '&nbsp;'; }
 			}
 			print "</td>";
-		}
 
-		// Valeur CA du mois
-		print '<td align="right">';
-		if ($cum[$case])
-		{
-			$now_show_delta=1;  // On a trouve le premier mois de la premiere annee generant du chiffre.
-			print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum[$case],1).'</a>';
-		}
-		else
-		{
-			if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; }
-			else { print '&nbsp;'; }
-		}
-		print "</td>";
-
-		// Pourcentage du mois
-		if ($annee_decalage > $minyear && $case <= $casenow)
-		{
-			if ($cum[$caseprev] && $cum[$case])
+			// Pourcentage du mois
+			if ($annee_decalage > $minyear && $case <= $casenow)
 			{
-				$percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100);
-				//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
-				print '<td align="right" class="borderrightlight">'.($percent>=0?"+$percent":"$percent").'%</td>';
+				if ($cum[$caseprev] && $cum[$case])
+				{
+					$percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100);
+					//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
+					print '<td align="right" class="borderrightlight">'.($percent>=0?"+$percent":"$percent").'%</td>';
+				}
+				if ($cum[$caseprev] && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">-100%</td>';
+				}
+				if (! $cum[$caseprev] && $cum[$case])
+				{
+					//print '<td align="right">+Inf%</td>';
+					print '<td align="right" class="borderrightlight">-</td>';
+				}
+				if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">+0%</td>';
+				}
+				if (! isset($cum[$caseprev]) && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">-</td>';
+				}
 			}
-			if ($cum[$caseprev] && ! $cum[$case])
+			else
 			{
-				print '<td align="right" class="borderrightlight">-100%</td>';
+				print '<td align="right" class="borderrightlight">';
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
+				else { print '&nbsp;'; }
+				print '</td>';
 			}
-			if (! $cum[$caseprev] && $cum[$case])
-			{
-				//print '<td align="right">+Inf%</td>';
-				print '<td align="right" class="borderrightlight">-</td>';
-			}
-			if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
-			{
-				print '<td align="right" class="borderrightlight">+0%</td>';
-			}
-			if (! isset($cum[$caseprev]) && ! $cum[$case])
-			{
-				print '<td align="right" class="borderrightlight">-</td>';
-			}
-		}
-		else
-		{
-			print '<td align="right" class="borderrightlight">';
-			if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-			else { print '&nbsp;'; }
-			print '</td>';
+			if ($annee_decalage != $year_end) print '<td width="15">&nbsp;</td>';
 		}
 
 		$total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;;
 		$total[$annee]+=$cum[$case];
-		if ($annee_decalage != $year_end) print '<td width="15">&nbsp;</td>';
 	}
 
 	print '</tr>';
@@ -406,7 +409,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 		}
 		if (! $total[$annee-1] && $total[$annee])
 		{
-			print '<td align="right" class="borderrightlight">+Inf%</td>';
+			print '<td align="right" class="borderrightlight">+zzzz'.$total[$annee-1].$langs->trans('Inf').'%</td>';
 		}
 		if (! $total[$annee-1] && ! $total[$annee])
 		{

From 932fadbdbd99eae5e8492d94dbb1f47eda3ebc9c Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 21 Dec 2014 14:24:55 +0100
Subject: [PATCH 175/345] Update style.css.php

harmonisation with eldy theme for tabs feature
---
 htdocs/theme/amarok/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index abfeef4aa2a..bd41d0735a5 100644
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -298,7 +298,7 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
-div.inline-block
+.inline-block
 {
 	display:inline-block;
 }

From 7e9596c97185bf18feda5997878966e24754b810 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 21 Dec 2014 14:25:54 +0100
Subject: [PATCH 176/345] Update style.css.php

---
 htdocs/theme/auguria/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 6e4ba602ade..35e0cdd36c9 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -196,7 +196,7 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
-div.inline-block
+.inline-block
 {
 	display:inline-block;
 }

From e802b934fa58bc1baed01e418ec94ac765fd03fd Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 21 Dec 2014 14:26:22 +0100
Subject: [PATCH 177/345] Update style.css.php

---
 htdocs/theme/bureau2crea/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index b4573c1fc13..b720bd4a802 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -221,7 +221,7 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
-div.inline-block
+.inline-block
 {
 	display:inline-block;
 }

From 7cca53ed049575069175da115999c7b2f4bdef5a Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 21 Dec 2014 14:26:46 +0100
Subject: [PATCH 178/345] Update style.css.php

---
 htdocs/theme/cameleo/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 096eab6c74d..a49ad6daaec 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -197,7 +197,7 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
-div.inline-block
+.inline-block
 {
 	display:inline-block;
 }

From 31f782ffe9119db94683f06bac91bf727f550487 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Dec 2014 14:58:18 +0100
Subject: [PATCH 179/345] Fix: Several fixes into tasks and time spent
 management

---
 htdocs/core/class/html.form.class.php | 82 ++++++++++++++++++---------
 htdocs/core/lib/project.lib.php       | 20 ++++---
 htdocs/projet/activity/list.php       |  2 +-
 htdocs/projet/tasks/contact.php       |  2 -
 htdocs/projet/tasks/document.php      |  2 -
 htdocs/projet/tasks/note.php          |  2 -
 htdocs/projet/tasks/task.php          |  8 +--
 htdocs/projet/tasks/time.php          | 11 ++--
 8 files changed, 75 insertions(+), 54 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 445aa827416..61d1c08f2aa 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3800,7 +3800,7 @@ class Form
      *	@param	string		$prefix			Prefix for fields name
      *	@param	int			$h				1=Show also hours
      *	@param	int			$m				1=Show also minutes
-     *	@param	int			$empty			0=Fields required, 1=Empty input is allowed
+     *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
      *	@param	string		$form_name 		Not used
      *	@param	int			$d				1=Show days, month, years
      * 	@param	int			$addnowbutton	Add a button "Now"
@@ -3819,9 +3819,13 @@ class Form
         if($prefix=='') $prefix='re';
         if($h == '') $h=0;
         if($m == '') $m=0;
-        if($empty == '') $empty=0;
+        $emptydate=0;
+        $emptyhours=0;
+    	if ($empty == 1) { $emptydate=1; $emptyhours=1; }
+    	if ($empty == 2) { $emptydate=0; $emptyhours=1; }
+		$orig_set_time=$set_time;
 
-        if ($set_time === '' && $empty == 0)
+        if ($set_time === '' && $emptydate == 0)
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
         	$set_time = dol_now('tzuser')-(getServerTimeZoneInt('now')*3600); // set_time must be relative to PHP server timezone
@@ -3843,8 +3847,11 @@ class Form
             $syear = dol_print_date($set_time, "%Y");
             $smonth = dol_print_date($set_time, "%m");
             $sday = dol_print_date($set_time, "%d");
-            $shour = dol_print_date($set_time, "%H");
-            $smin = dol_print_date($set_time, "%M");
+            if ($orig_set_time != '')
+            {
+            	$shour = dol_print_date($set_time, "%H");
+            	$smin = dol_print_date($set_time, "%M");
+            }
         }
         else
         {
@@ -3906,7 +3913,7 @@ class Form
                 // Day
                 $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'day">';
 
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
@@ -3919,7 +3926,7 @@ class Form
                 $retstring.="</select>";
 
                 $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'month">';
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
@@ -3934,7 +3941,7 @@ class Form
                 $retstring.="</select>";
 
                 // Year
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<input'.($disabled?' disabled="disabled"':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year" value="'.$syear.'">';
                 }
@@ -3957,7 +3964,7 @@ class Form
         {
             // Show hour
             $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'hour':'').'" name="'.$prefix.'hour">';
-            if ($empty) $retstring.='<option value="-1">&nbsp;</option>';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($hour = 0; $hour < 24; $hour++)
             {
                 if (strlen($hour) < 2) $hour = "0" . $hour;
@@ -3971,7 +3978,7 @@ class Form
         {
             // Show minutes
             $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'min':'').'" name="'.$prefix.'min">';
-            if ($empty) $retstring.='<option value="-1">&nbsp;</option>';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($min = 0; $min < 60 ; $min++)
             {
                 if (strlen($min) < 2) $min = "0" . $min;
@@ -4030,18 +4037,22 @@ class Form
     /**
      *	Function to show a form to select a duration on a page
      *
-     *	@param	string	$prefix   		Prefix
+     *	@param	string	$prefix   		Prefix for input fields
      *	@param  int		$iSecond  		Default preselected duration (number of seconds)
      * 	@param	int		$disabled		Disable the combo box
      * 	@param	string	$typehour		If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo
      *  @param	string	$minunderhours	If 1, show minutes selection under the hours
+     * 	@param	int		$nooutput		Do not output html string but return it
      *  @return	void
      */
-    function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0)
+    function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0)
     {
     	global $langs;
 
+    	$retstring='';
+
     	$hourSelected=0; $minSelected=0;
+
         if ($iSecond)
         {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -4052,36 +4063,51 @@ class Form
 
         if ($typehour=='select')
         {
-	        print '<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>';
+	        $retstring.='<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>';
 	        for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
 	        {
-	            print '<option value="'.$hour.'"';
+	            $retstring.='<option value="'.$hour.'"';
 	            if ($hourSelected == $hour)
 	            {
-	                print " selected=\"true\"";
+	                $retstring.=" selected=\"true\"";
 	            }
-	            print ">".$hour."</option>";
+	            $retstring.=">".$hour."</option>";
 	        }
-	        print "</select>";
+	        $retstring.="</select>";
         }
         elseif ($typehour=='text')
         {
-        	print '<input type="text" size="3" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.((int) $hourSelected).'">';
+        	$retstring.='<input type="text" size="2" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
-        print ' '.$langs->trans('HourShort');
+        else return 'BadValueForParameterTypeHour';
 
-        if ($minunderhours) print '<br>';
-        else print "&nbsp;";
+        $retstring.=' '.$langs->trans('HourShort');
 
-        print '<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').'>';
-        for ($min = 0; $min <= 55; $min=$min+5)
+        if ($minunderhours) $retstring.='<br>';
+        else $retstring.="&nbsp;";
+
+        if ($typehour=='select')
         {
-            print '<option value="'.$min.'"';
-            if ($minSelected == $min) print ' selected="selected"';
-            print '>'.$min.'</option>';
+	        $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').'>';
+	        for ($min = 0; $min <= 55; $min=$min+5)
+	        {
+	            $retstring.='<option value="'.$min.'"';
+	            if ($minSelected == $min) $retstring.=' selected="selected"';
+	            $retstring.='>'.$min.'</option>';
+	        }
+	        $retstring.="</select>";
         }
-        print "</select>";
-        print ' '.$langs->trans('MinuteShort'). "&nbsp;";
+        elseif ($typehour=='text')
+        {
+        	$retstring.='<input type="text" size="2" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        }
+        $retstring.=' '.$langs->trans('MinuteShort');
+        $retstring.="&nbsp;";
+
+        if (! empty($nooutput)) return $retstring;
+
+        print $retstring;
+        return;
     }
 
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 637d5e6ccca..a2c6cca18eb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -384,10 +384,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				else print '</a>';
 				print '</td>';
 
-				// Progress calculated
-				// Note: ->duration is in fact time spent i think
+				// Progress calculated (Note: ->duration is time spent)
 				print '<td align="right">';
-				if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+				if ($lines[$i]->planned_workload || $lines[$i]->duration)
+				{
+					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					else print $langs->trans('WorkloadNotDefined');
+				}
 				print '</td>';
 
 				// Tick to drag and drop
@@ -430,7 +433,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent_if_planned / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
 		print '</td>';
 		if ($addordertick) print '<td class="hideonsmartphone"></td>';
 		print '</tr>';
@@ -562,13 +565,16 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
 					$disabledtask=1;
 				}
 
-				print '<td class="nowrap">';
-				$s =$form->select_date('',$lines[$i]->id,'','','',"addtime",1,0,1,$disabledtask);
+				// Form to add new time
+				print '<td class="nowrap" align="right">';
+				$s='';
+				$s.=$form->select_date('',$lines[$i]->id,0,0,2,"addtime",1,0,1,$disabledtask);
 				$s.='&nbsp;&nbsp;&nbsp;';
-				$s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text');
+				$s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text',0,1);
 				$s.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled="disabled"':'').' value="'.$langs->trans("Add").'">';
 				print $s;
 				print '</td>';
+
 				print '<td align="right">';
 				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
 				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index 0c2cebc2e27..692e4ab08b4 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -181,7 +181,7 @@ print '<td align="center">'.$langs->trans("DateEnd").'</td>';
 print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
-print '<td colspan="2">'.$langs->trans("AddDuration").'</td>';
+print '<td colspan="2" align="right">'.$langs->trans("NewTimeSpent").'</td>';
 print "</tr>\n";
 
 // By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index efec0f68223..cd736acf3f7 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -215,8 +215,6 @@ if ($id > 0 || ! empty($ref))
     		print '</table>';
 
     		dol_fiche_end();
-
-    		print '<br>';
 		}
 
 		// To verify role of users
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index e75278e9631..ee3b9288d3c 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -179,8 +179,6 @@ if ($object->id > 0)
 		print '</table>';
 
 		dol_fiche_end();
-
-		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 30e6c3fe291..5b479085f61 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -161,8 +161,6 @@ if ($object->id > 0)
 		print '</table>';
 
 		dol_fiche_end();
-
-		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 2dc0adaa500..11bc8ffea09 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -262,8 +262,6 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
-
-			print '<br>';
 		}
 
 		/*
@@ -305,7 +303,7 @@ if ($id > 0 || ! empty($ref))
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 			dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
-			
+
 			print '<table class="border" width="100%">';
 
 			// Ref
@@ -372,7 +370,7 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
-			
+
 			print '<div align="center">';
 			print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -389,7 +387,7 @@ if ($id > 0 || ! empty($ref))
 			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 			dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
-			
+
 			if ($action == 'delete')
 			{
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject,$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 09ffb36ce53..d489581e078 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -259,8 +259,6 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
-
-			print '<br>';
 		}
 
 		$head=task_prepare_head($object);
@@ -362,8 +360,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td>'.$langs->trans("By").'</td>';
 			print '<td>'.$langs->trans("Note").'</td>';
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
-			print '<td align="right">'.$langs->trans("Duration").'</td>';
-			print '<td width="80">&nbsp;</td>';
+			print '<td align="right" colspan="2">'.$langs->trans("NewTimeSpent").'</td>';
 			print "</tr>\n";
 
 			print '<tr '.$bc[false].'>';
@@ -396,7 +393,7 @@ if ($id > 0 || ! empty($ref))
 			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
 			print '</td>';
 
-			// Duration
+			// Duration - Time spent
 			print '<td class="nowrap" align="right">';
 			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
 			print '</td>';
@@ -446,13 +443,13 @@ if ($id > 0 || ! empty($ref))
 		print '<input type="hidden" name="action" value="updateline">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-		
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td width="100">'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("By").'</td>';
 		print '<td align="left">'.$langs->trans("Note").'</td>';
-		print '<td align="right">'.$langs->trans("Duration").'</td>';
+		print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 

From 38b51c0a14d0d85bb831d3859eae1f148175215a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 21 Dec 2014 21:07:31 +0100
Subject: [PATCH 180/345] Prepare 3.7 release

---
 dev/initdata/mysqldump_dolibarr_3.7.0.sql | 7687 +++++++++++++++++++++
 dev/initdata/savedemo.sh                  |    4 +-
 2 files changed, 7690 insertions(+), 1 deletion(-)
 create mode 100644 dev/initdata/mysqldump_dolibarr_3.7.0.sql

diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql
new file mode 100644
index 00000000000..97b066a80cf
--- /dev/null
+++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql
@@ -0,0 +1,7687 @@
+-- MySQL dump 10.13  Distrib 5.5.37, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: dolibarr_37
+-- ------------------------------------------------------
+-- Server version	5.5.37-0ubuntu0.12.04.1
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `llx_accounting_bookkeeping`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_bookkeeping`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_bookkeeping` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `doc_date` date NOT NULL,
+  `doc_type` varchar(30) NOT NULL,
+  `doc_ref` varchar(30) NOT NULL,
+  `fk_doc` int(11) NOT NULL,
+  `fk_docdet` int(11) NOT NULL,
+  `code_tiers` varchar(24) DEFAULT NULL,
+  `numero_compte` varchar(32) DEFAULT NULL,
+  `label_compte` varchar(128) NOT NULL,
+  `debit` double NOT NULL,
+  `credit` double NOT NULL,
+  `montant` double NOT NULL,
+  `sens` varchar(1) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `code_journal` varchar(10) DEFAULT NULL,
+  `piece_num` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accounting_bookkeeping`
+--
+
+LOCK TABLES `llx_accounting_bookkeeping` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_bookkeeping` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accounting_bookkeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accounting_fiscalyear`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_fiscalyear`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_fiscalyear` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(128) NOT NULL,
+  `date_start` date DEFAULT NULL,
+  `date_end` date DEFAULT NULL,
+  `statut` tinyint(4) NOT NULL DEFAULT '0',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accounting_fiscalyear`
+--
+
+LOCK TABLES `llx_accounting_fiscalyear` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_fiscalyear` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accounting_fiscalyear` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accounting_system`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_system`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_system` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `pcg_version` varchar(12) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `active` smallint(6) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_accounting_system_pcg_version` (`pcg_version`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accounting_system`
+--
+
+LOCK TABLES `llx_accounting_system` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_system` DISABLE KEYS */;
+INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE',1,'The simple accountancy french plan',1),(2,'PCG99-BASE',1,'The base accountancy french plan',1),(3,'PCMN-BASE',2,'The base accountancy belgium plan',1),(4,'PCG08-PYME',4,'The PYME accountancy spanish plan',1);
+/*!40000 ALTER TABLE `llx_accounting_system` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingaccount`
+--
+
+DROP TABLE IF EXISTS `llx_accountingaccount`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingaccount` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_pcg_version` varchar(12) NOT NULL,
+  `pcg_type` varchar(20) NOT NULL,
+  `pcg_subtype` varchar(20) NOT NULL,
+  `account_number` varchar(32) DEFAULT NULL,
+  `account_parent` varchar(32) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_accountingaccount_fk_pcg_version` (`fk_pcg_version`),
+  CONSTRAINT `fk_accountingaccount_fk_pcg_version` FOREIGN KEY (`fk_pcg_version`) REFERENCES `llx_accounting_system` (`pcg_version`)
+) ENGINE=InnoDB AUTO_INCREMENT=4785 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accountingaccount`
+--
+
+LOCK TABLES `llx_accountingaccount` WRITE;
+/*!40000 ALTER TABLE `llx_accountingaccount` DISABLE KEYS */;
+INSERT INTO `llx_accountingaccount` VALUES (1,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','CAPITAL','101','1401','Capital',NULL,NULL,1),(2,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','105','1401','Ecarts de réévaluation',NULL,NULL,1),(3,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1061','1401','Réserve légale',NULL,NULL,1),(4,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1063','1401','Réserves statutaires ou contractuelles',NULL,NULL,1),(5,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1064','1401','Réserves réglementées',NULL,NULL,1),(6,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1068','1401','Autres réserves',NULL,NULL,1),(7,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','108','1401','Compte de l\'exploitant',NULL,NULL,1),(8,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','12','1401','Résultat de l\'exercice',NULL,NULL,1),(9,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','145','1401','Amortissements dérogatoires',NULL,NULL,1),(10,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','146','1401','Provision spéciale de réévaluation',NULL,NULL,1),(11,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','147','1401','Plus-values réinvesties',NULL,NULL,1),(12,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','148','1401','Autres provisions réglementées',NULL,NULL,1),(13,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','15','1401','Provisions pour risques et charges',NULL,NULL,1),(14,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','16','1401','Emprunts et dettes assimilees',NULL,NULL,1),(15,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','20','1402','Immobilisations incorporelles',NULL,NULL,1),(16,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','201','15','Frais d\'établissement',NULL,NULL,1),(17,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','206','15','Droit au bail',NULL,NULL,1),(18,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','207','15','Fonds commercial',NULL,NULL,1),(19,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','208','15','Autres immobilisations incorporelles',NULL,NULL,1),(20,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','21','1402','Immobilisations corporelles',NULL,NULL,1),(21,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','23','1402','Immobilisations en cours',NULL,NULL,1),(22,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','27','1402','Autres immobilisations financieres',NULL,NULL,1),(23,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','280','1402','Amortissements des immobilisations incorporelles',NULL,NULL,1),(24,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','281','1402','Amortissements des immobilisations corporelles',NULL,NULL,1),(25,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','290','1402','Provisions pour dépréciation des immobilisations incorporelles',NULL,NULL,1),(26,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','291','1402','Provisions pour dépréciation des immobilisations corporelles',NULL,NULL,1),(27,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','297','1402','Provisions pour dépréciation des autres immobilisations financières',NULL,NULL,1),(28,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','31','1403','Matieres premières',NULL,NULL,1),(29,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','32','1403','Autres approvisionnements',NULL,NULL,1),(30,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','33','1403','En-cours de production de biens',NULL,NULL,1),(31,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','34','1403','En-cours de production de services',NULL,NULL,1),(32,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','35','1403','Stocks de produits',NULL,NULL,1),(33,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','37','1403','Stocks de marchandises',NULL,NULL,1),(34,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','391','1403','Provisions pour dépréciation des matières premières',NULL,NULL,1),(35,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','392','1403','Provisions pour dépréciation des autres approvisionnements',NULL,NULL,1),(36,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','393','1403','Provisions pour dépréciation des en-cours de production de biens',NULL,NULL,1),(37,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','394','1403','Provisions pour dépréciation des en-cours de production de services',NULL,NULL,1),(38,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','395','1403','Provisions pour dépréciation des stocks de produits',NULL,NULL,1),(39,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','397','1403','Provisions pour dépréciation des stocks de marchandises',NULL,NULL,1),(40,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','SUPPLIER','400','1404','Fournisseurs et Comptes rattachés',NULL,NULL,1),(41,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','409','1404','Fournisseurs débiteurs',NULL,NULL,1),(42,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','CUSTOMER','410','1404','Clients et Comptes rattachés',NULL,NULL,1),(43,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','419','1404','Clients créditeurs',NULL,NULL,1),(44,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','421','1404','Personnel',NULL,NULL,1),(45,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','428','1404','Personnel',NULL,NULL,1),(46,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','43','1404','Sécurité sociale et autres organismes sociaux',NULL,NULL,1),(47,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','444','1404','Etat - impôts sur bénéfice',NULL,NULL,1),(48,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','445','1404','Etat - Taxes sur chiffre affaires',NULL,NULL,1),(49,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','447','1404','Autres impôts, taxes et versements assimilés',NULL,NULL,1),(50,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','45','1404','Groupe et associes',NULL,NULL,1),(51,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','455','50','Associés',NULL,NULL,1),(52,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','46','1404','Débiteurs divers et créditeurs divers',NULL,NULL,1),(53,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','47','1404','Comptes transitoires ou d\'attente',NULL,NULL,1),(54,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','481','1404','Charges à répartir sur plusieurs exercices',NULL,NULL,1),(55,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','486','1404','Charges constatées d\'avance',NULL,NULL,1),(56,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','487','1404','Produits constatés d\'avance',NULL,NULL,1),(57,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','491','1404','Provisions pour dépréciation des comptes de clients',NULL,NULL,1),(58,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','496','1404','Provisions pour dépréciation des comptes de débiteurs divers',NULL,NULL,1),(59,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','50','1405','Valeurs mobilières de placement',NULL,NULL,1),(60,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','BANK','51','1405','Banques, établissements financiers et assimilés',NULL,NULL,1),(61,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','CASH','53','1405','Caisse',NULL,NULL,1),(62,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','54','1405','Régies d\'avance et accréditifs',NULL,NULL,1),(63,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','58','1405','Virements internes',NULL,NULL,1),(64,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','590','1405','Provisions pour dépréciation des valeurs mobilières de placement',NULL,NULL,1),(65,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','PRODUCT','60','1406','Achats',NULL,NULL,1),(66,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','603','65','Variations des stocks',NULL,NULL,1),(67,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','SERVICE','61','1406','Services extérieurs',NULL,NULL,1),(68,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','62','1406','Autres services extérieurs',NULL,NULL,1),(69,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','63','1406','Impôts, taxes et versements assimiles',NULL,NULL,1),(70,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','641','1406','Rémunérations du personnel',NULL,NULL,1),(71,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','644','1406','Rémunération du travail de l\'exploitant',NULL,NULL,1),(72,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','SOCIAL','645','1406','Charges de sécurité sociale et de prévoyance',NULL,NULL,1),(73,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','646','1406','Cotisations sociales personnelles de l\'exploitant',NULL,NULL,1),(74,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','65','1406','Autres charges de gestion courante',NULL,NULL,1),(75,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','66','1406','Charges financières',NULL,NULL,1),(76,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','67','1406','Charges exceptionnelles',NULL,NULL,1),(77,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','681','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(78,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','686','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(79,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','687','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(80,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','691','1406','Participation des salariés aux résultats',NULL,NULL,1),(81,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','695','1406','Impôts sur les bénéfices',NULL,NULL,1),(82,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','697','1406','Imposition forfaitaire annuelle des sociétés',NULL,NULL,1),(83,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','699','1406','Produits',NULL,NULL,1),(84,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','701','1407','Ventes de produits finis',NULL,NULL,1),(85,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','SERVICE','706','1407','Prestations de services',NULL,NULL,1),(86,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','707','1407','Ventes de marchandises',NULL,NULL,1),(87,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','708','1407','Produits des activités annexes',NULL,NULL,1),(88,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','709','1407','Rabais, remises et ristournes accordés par l\'entreprise',NULL,NULL,1),(89,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','713','1407','Variation des stocks',NULL,NULL,1),(90,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','72','1407','Production immobilisée',NULL,NULL,1),(91,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','73','1407','Produits nets partiels sur opérations à long terme',NULL,NULL,1),(92,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','74','1407','Subventions d\'exploitation',NULL,NULL,1),(93,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','75','1407','Autres produits de gestion courante',NULL,NULL,1),(94,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','753','93','Jetons de présence et rémunérations d\'administrateurs, gérants,...',NULL,NULL,1),(95,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','754','93','Ristournes perçues des coopératives',NULL,NULL,1),(96,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','755','93','Quotes-parts de résultat sur opérations faites en commun',NULL,NULL,1),(97,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','76','1407','Produits financiers',NULL,NULL,1),(98,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','77','1407','Produits exceptionnels',NULL,NULL,1),(99,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','781','1407','Reprises sur amortissements et provisions',NULL,NULL,1),(100,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','786','1407','Reprises sur provisions pour risques',NULL,NULL,1),(101,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','787','1407','Reprises sur provisions',NULL,NULL,1),(102,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','79','1407','Transferts de charges',NULL,NULL,1),(103,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','10','1501','Capital  et réserves',NULL,NULL,1),(104,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','CAPITAL','101','103','Capital',NULL,NULL,1),(105,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','104','103','Primes liées au capital social',NULL,NULL,1),(106,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','105','103','Ecarts de réévaluation',NULL,NULL,1),(107,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','106','103','Réserves',NULL,NULL,1),(108,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','107','103','Ecart d\'equivalence',NULL,NULL,1),(109,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','108','103','Compte de l\'exploitant',NULL,NULL,1),(110,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','109','103','Actionnaires : capital souscrit - non appelé',NULL,NULL,1),(111,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','11','1501','Report à nouveau (solde créditeur ou débiteur)',NULL,NULL,1),(112,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','110','111','Report à nouveau (solde créditeur)',NULL,NULL,1),(113,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','119','111','Report à nouveau (solde débiteur)',NULL,NULL,1),(114,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','12','1501','Résultat de l\'exercice (bénéfice ou perte)',NULL,NULL,1),(115,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','120','114','Résultat de l\'exercice (bénéfice)',NULL,NULL,1),(116,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','129','114','Résultat de l\'exercice (perte)',NULL,NULL,1),(117,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','13','1501','Subventions d\'investissement',NULL,NULL,1),(118,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','131','117','Subventions d\'équipement',NULL,NULL,1),(119,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','138','117','Autres subventions d\'investissement',NULL,NULL,1),(120,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','139','117','Subventions d\'investissement inscrites au compte de résultat',NULL,NULL,1),(121,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','14','1501','Provisions réglementées',NULL,NULL,1),(122,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','142','121','Provisions réglementées relatives aux immobilisations',NULL,NULL,1),(123,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','143','121','Provisions réglementées relatives aux stocks',NULL,NULL,1),(124,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','144','121','Provisions réglementées relatives aux autres éléments de l\'actif',NULL,NULL,1),(125,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','145','121','Amortissements dérogatoires',NULL,NULL,1),(126,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','146','121','Provision spéciale de réévaluation',NULL,NULL,1),(127,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','147','121','Plus-values réinvesties',NULL,NULL,1),(128,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','148','121','Autres provisions réglementées',NULL,NULL,1),(129,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','15','1501','Provisions pour risques et charges',NULL,NULL,1),(130,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','151','129','Provisions pour risques',NULL,NULL,1),(131,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','153','129','Provisions pour pensions et obligations similaires',NULL,NULL,1),(132,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','154','129','Provisions pour restructurations',NULL,NULL,1),(133,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','155','129','Provisions pour impôts',NULL,NULL,1),(134,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','156','129','Provisions pour renouvellement des immobilisations (entreprises concessionnaires)',NULL,NULL,1),(135,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','157','129','Provisions pour charges à répartir sur plusieurs exercices',NULL,NULL,1),(136,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','158','129','Autres provisions pour charges',NULL,NULL,1),(137,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','16','1501','Emprunts et dettes assimilees',NULL,NULL,1),(138,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','161','137','Emprunts obligataires convertibles',NULL,NULL,1),(139,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','163','137','Autres emprunts obligataires',NULL,NULL,1),(140,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','164','137','Emprunts auprès des établissements de crédit',NULL,NULL,1),(141,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','165','137','Dépôts et cautionnements reçus',NULL,NULL,1),(142,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','166','137','Participation des salariés aux résultats',NULL,NULL,1),(143,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','167','137','Emprunts et dettes assortis de conditions particulières',NULL,NULL,1),(144,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','168','137','Autres emprunts et dettes assimilées',NULL,NULL,1),(145,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','169','137','Primes de remboursement des obligations',NULL,NULL,1),(146,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','17','1501','Dettes rattachées à des participations',NULL,NULL,1),(147,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','171','146','Dettes rattachées à des participations (groupe)',NULL,NULL,1),(148,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','174','146','Dettes rattachées à des participations (hors groupe)',NULL,NULL,1),(149,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','178','146','Dettes rattachées à des sociétés en participation',NULL,NULL,1),(150,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','18','1501','Comptes de liaison des établissements et sociétés en participation',NULL,NULL,1),(151,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','181','150','Comptes de liaison des établissements',NULL,NULL,1),(152,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','186','150','Biens et prestations de services échangés entre établissements (charges)',NULL,NULL,1),(153,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','187','150','Biens et prestations de services échangés entre établissements (produits)',NULL,NULL,1),(154,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','188','150','Comptes de liaison des sociétés en participation',NULL,NULL,1),(155,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','20','1502','Immobilisations incorporelles',NULL,NULL,1),(156,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','201','155','Frais d\'établissement',NULL,NULL,1),(157,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','203','155','Frais de recherche et de développement',NULL,NULL,1),(158,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','205','155','Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(159,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','206','155','Droit au bail',NULL,NULL,1),(160,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','207','155','Fonds commercial',NULL,NULL,1),(161,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','208','155','Autres immobilisations incorporelles',NULL,NULL,1),(162,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','21','1502','Immobilisations corporelles',NULL,NULL,1),(163,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','211','162','Terrains',NULL,NULL,1),(164,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','212','162','Agencements et aménagements de terrains',NULL,NULL,1),(165,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','213','162','Constructions',NULL,NULL,1),(166,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','214','162','Constructions sur sol d\'autrui',NULL,NULL,1),(167,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','215','162','Installations techniques, matériels et outillage industriels',NULL,NULL,1),(168,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','218','162','Autres immobilisations corporelles',NULL,NULL,1),(169,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','22','1502','Immobilisations mises en concession',NULL,NULL,1),(170,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','23','1502','Immobilisations en cours',NULL,NULL,1),(171,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','231','170','Immobilisations corporelles en cours',NULL,NULL,1),(172,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','232','170','Immobilisations incorporelles en cours',NULL,NULL,1),(173,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','237','170','Avances et acomptes versés sur immobilisations incorporelles',NULL,NULL,1),(174,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','238','170','Avances et acomptes versés sur commandes d\'immobilisations corporelles',NULL,NULL,1),(175,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','25','1502','Parts dans des entreprises liées et créances sur des entreprises liées',NULL,NULL,1),(176,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','26','1502','Participations et créances rattachées à des participations',NULL,NULL,1),(177,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','261','176','Titres de participation',NULL,NULL,1),(178,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','266','176','Autres formes de participation',NULL,NULL,1),(179,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','267','176','Créances rattachées à des participations',NULL,NULL,1),(180,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','268','176','Créances rattachées à des sociétés en participation',NULL,NULL,1),(181,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','269','176','Versements restant à effectuer sur titres de participation non libérés',NULL,NULL,1),(182,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','27','1502','Autres immobilisations financieres',NULL,NULL,1),(183,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','271','183','Titres immobilisés autres que les titres immobilisés de l\'activité de portefeuille (droit de propriété)',NULL,NULL,1),(184,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','272','183','Titres immobilisés (droit de créance)',NULL,NULL,1),(185,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','273','183','Titres immobilisés de l\'activité de portefeuille',NULL,NULL,1),(186,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','274','183','Prêts',NULL,NULL,1),(187,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','275','183','Dépôts et cautionnements versés',NULL,NULL,1),(188,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','276','183','Autres créances immobilisées',NULL,NULL,1),(189,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','277','183','(Actions propres ou parts propres)',NULL,NULL,1),(190,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','279','183','Versements restant à effectuer sur titres immobilisés non libérés',NULL,NULL,1),(191,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','28','1502','Amortissements des immobilisations',NULL,NULL,1),(192,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','280','191','Amortissements des immobilisations incorporelles',NULL,NULL,1),(193,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','281','191','Amortissements des immobilisations corporelles',NULL,NULL,1),(194,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','282','191','Amortissements des immobilisations mises en concession',NULL,NULL,1),(195,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','29','1502','Dépréciations des immobilisations',NULL,NULL,1),(196,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','290','195','Dépréciations des immobilisations incorporelles',NULL,NULL,1),(197,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','291','195','Dépréciations des immobilisations corporelles',NULL,NULL,1),(198,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','292','195','Dépréciations des immobilisations mises en concession',NULL,NULL,1),(199,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','293','195','Dépréciations des immobilisations en cours',NULL,NULL,1),(200,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','296','195','Provisions pour dépréciation des participations et créances rattachées à des participations',NULL,NULL,1),(201,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','297','195','Provisions pour dépréciation des autres immobilisations financières',NULL,NULL,1),(202,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','31','1503','Matières premières (et fournitures)',NULL,NULL,1),(203,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','311','202','Matières (ou groupe) A',NULL,NULL,1),(204,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','312','202','Matières (ou groupe) B',NULL,NULL,1),(205,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','317','202','Fournitures A, B, C,',NULL,NULL,1),(206,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','32','1503','Autres approvisionnements',NULL,NULL,1),(207,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','321','206','Matières consommables',NULL,NULL,1),(208,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','322','206','Fournitures consommables',NULL,NULL,1),(209,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','326','206','Emballages',NULL,NULL,1),(210,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','33','1503','En-cours de production de biens',NULL,NULL,1),(211,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','331','210','Produits en cours',NULL,NULL,1),(212,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','335','210','Travaux en cours',NULL,NULL,1),(213,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','34','1503','En-cours de production de services',NULL,NULL,1),(214,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','341','213','Etudes en cours',NULL,NULL,1),(215,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','345','213','Prestations de services en cours',NULL,NULL,1),(216,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','35','1503','Stocks de produits',NULL,NULL,1),(217,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','351','216','Produits intermédiaires',NULL,NULL,1),(218,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','355','216','Produits finis',NULL,NULL,1),(219,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','358','216','Produits résiduels (ou matières de récupération)',NULL,NULL,1),(220,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','37','1503','Stocks de marchandises',NULL,NULL,1),(221,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','371','220','Marchandises (ou groupe) A',NULL,NULL,1),(222,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','372','220','Marchandises (ou groupe) B',NULL,NULL,1),(223,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','39','1503','Provisions pour dépréciation des stocks et en-cours',NULL,NULL,1),(224,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','391','223','Provisions pour dépréciation des matières premières',NULL,NULL,1),(225,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','392','223','Provisions pour dépréciation des autres approvisionnements',NULL,NULL,1),(226,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','393','223','Provisions pour dépréciation des en-cours de production de biens',NULL,NULL,1),(227,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','394','223','Provisions pour dépréciation des en-cours de production de services',NULL,NULL,1),(228,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','395','223','Provisions pour dépréciation des stocks de produits',NULL,NULL,1),(229,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','397','223','Provisions pour dépréciation des stocks de marchandises',NULL,NULL,1),(230,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','40','1504','Fournisseurs et Comptes rattachés',NULL,NULL,1),(231,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','400','230','Fournisseurs et Comptes rattachés',NULL,NULL,1),(232,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','SUPPLIER','401','230','Fournisseurs',NULL,NULL,1),(233,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','403','230','Fournisseurs - Effets à payer',NULL,NULL,1),(234,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','404','230','Fournisseurs d\'immobilisations',NULL,NULL,1),(235,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','405','230','Fournisseurs d\'immobilisations - Effets à payer',NULL,NULL,1),(236,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','408','230','Fournisseurs - Factures non parvenues',NULL,NULL,1),(237,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','409','230','Fournisseurs débiteurs',NULL,NULL,1),(238,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','41','1504','Clients et comptes rattachés',NULL,NULL,1),(239,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','410','238','Clients et Comptes rattachés',NULL,NULL,1),(240,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','CUSTOMER','411','238','Clients',NULL,NULL,1),(241,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','413','238','Clients - Effets à recevoir',NULL,NULL,1),(242,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','416','238','Clients douteux ou litigieux',NULL,NULL,1),(243,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','418','238','Clients - Produits non encore facturés',NULL,NULL,1),(244,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','419','238','Clients créditeurs',NULL,NULL,1),(245,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','42','1504','Personnel et comptes rattachés',NULL,NULL,1),(246,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','421','245','Personnel - Rémunérations dues',NULL,NULL,1),(247,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','422','245','Comités d\'entreprises, d\'établissement, ...',NULL,NULL,1),(248,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','424','245','Participation des salariés aux résultats',NULL,NULL,1),(249,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','425','245','Personnel - Avances et acomptes',NULL,NULL,1),(250,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','426','245','Personnel - Dépôts',NULL,NULL,1),(251,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','427','245','Personnel - Oppositions',NULL,NULL,1),(252,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','428','245','Personnel - Charges à payer et produits à recevoir',NULL,NULL,1),(253,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','43','1504','Sécurité sociale et autres organismes sociaux',NULL,NULL,1),(254,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','431','253','Sécurité sociale',NULL,NULL,1),(255,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','437','253','Autres organismes sociaux',NULL,NULL,1),(256,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','438','253','Organismes sociaux - Charges à payer et produits à recevoir',NULL,NULL,1),(257,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','44','1504','État et autres collectivités publiques',NULL,NULL,1),(258,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','441','257','État - Subventions à recevoir',NULL,NULL,1),(259,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','442','257','Etat - Impôts et taxes recouvrables sur des tiers',NULL,NULL,1),(260,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','443','257','Opérations particulières avec l\'Etat, les collectivités publiques, les organismes internationaux',NULL,NULL,1),(261,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','444','257','Etat - Impôts sur les bénéfices',NULL,NULL,1),(262,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','445','257','Etat - Taxes sur le chiffre d\'affaires',NULL,NULL,1),(263,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','446','257','Obligations cautionnées',NULL,NULL,1),(264,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','447','257','Autres impôts, taxes et versements assimilés',NULL,NULL,1),(265,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','448','257','Etat - Charges à payer et produits à recevoir',NULL,NULL,1),(266,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','449','257','Quotas d\'émission à restituer à l\'Etat',NULL,NULL,1),(267,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','45','1504','Groupe et associes',NULL,NULL,1),(268,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','451','267','Groupe',NULL,NULL,1),(269,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','455','267','Associés - Comptes courants',NULL,NULL,1),(270,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','456','267','Associés - Opérations sur le capital',NULL,NULL,1),(271,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','457','267','Associés - Dividendes à payer',NULL,NULL,1),(272,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','458','267','Associés - Opérations faites en commun et en G.I.E.',NULL,NULL,1),(273,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','46','1504','Débiteurs divers et créditeurs divers',NULL,NULL,1),(274,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','462','273','Créances sur cessions d\'immobilisations',NULL,NULL,1),(275,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','464','273','Dettes sur acquisitions de valeurs mobilières de placement',NULL,NULL,1),(276,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','465','273','Créances sur cessions de valeurs mobilières de placement',NULL,NULL,1),(277,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','467','273','Autres comptes débiteurs ou créditeurs',NULL,NULL,1),(278,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','468','273','Divers - Charges à payer et produits à recevoir',NULL,NULL,1),(279,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','47','1504','Comptes transitoires ou d\'attente',NULL,NULL,1),(280,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','471','279','Comptes d\'attente',NULL,NULL,1),(281,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','476','279','Différence de conversion - Actif',NULL,NULL,1),(282,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','477','279','Différences de conversion - Passif',NULL,NULL,1),(283,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','478','279','Autres comptes transitoires',NULL,NULL,1),(284,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','48','1504','Comptes de régularisation',NULL,NULL,1),(285,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','481','284','Charges à répartir sur plusieurs exercices',NULL,NULL,1),(286,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','486','284','Charges constatées d\'avance',NULL,NULL,1),(287,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','487','284','Produits constatés d\'avance',NULL,NULL,1),(288,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','488','284','Comptes de répartition périodique des charges et des produits',NULL,NULL,1),(289,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','489','284','Quotas d\'émission alloués par l\'Etat',NULL,NULL,1),(290,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','49','1504','Provisions pour dépréciation des comptes de tiers',NULL,NULL,1),(291,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','491','290','Provisions pour dépréciation des comptes de clients',NULL,NULL,1),(292,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','495','290','Provisions pour dépréciation des comptes du groupe et des associés',NULL,NULL,1),(293,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','496','290','Provisions pour dépréciation des comptes de débiteurs divers',NULL,NULL,1),(294,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','50','1505','Valeurs mobilières de placement',NULL,NULL,1),(295,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','501','294','Parts dans des entreprises liées',NULL,NULL,1),(296,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','502','294','Actions propres',NULL,NULL,1),(297,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','503','294','Actions',NULL,NULL,1),(298,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','504','294','Autres titres conférant un droit de propriété',NULL,NULL,1),(299,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','505','294','Obligations et bons émis par la société et rachetés par elle',NULL,NULL,1),(300,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','506','294','Obligations',NULL,NULL,1),(301,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','507','294','Bons du Trésor et bons de caisse à court terme',NULL,NULL,1),(302,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','508','294','Autres valeurs mobilières de placement et autres créances assimilées',NULL,NULL,1),(303,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','509','294','Versements restant à effectuer sur valeurs mobilières de placement non libérées',NULL,NULL,1),(304,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','51','1505','Banques, établissements financiers et assimilés',NULL,NULL,1),(305,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','511','304','Valeurs à l\'encaissement',NULL,NULL,1),(306,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','BANK','512','304','Banques',NULL,NULL,1),(307,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','514','304','Chèques postaux',NULL,NULL,1),(308,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','515','304','\"Caisses\" du Trésor et des établissements publics',NULL,NULL,1),(309,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','516','304','Sociétés de bourse',NULL,NULL,1),(310,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','517','304','Autres organismes financiers',NULL,NULL,1),(311,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','518','304','Intérêts courus',NULL,NULL,1),(312,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','519','304','Concours bancaires courants',NULL,NULL,1),(313,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','52','1505','Instruments de trésorerie',NULL,NULL,1),(314,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','CASH','53','1505','Caisse',NULL,NULL,1),(315,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','531','314','Caisse siège social',NULL,NULL,1),(316,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','532','314','Caisse succursale (ou usine) A',NULL,NULL,1),(317,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','533','314','Caisse succursale (ou usine) B',NULL,NULL,1),(318,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','54','1505','Régies d\'avance et accréditifs',NULL,NULL,1),(319,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','58','1505','Virements internes',NULL,NULL,1),(320,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','59','1505','Provisions pour dépréciation des comptes financiers',NULL,NULL,1),(321,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','590','320','Provisions pour dépréciation des valeurs mobilières de placement',NULL,NULL,1),(322,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','PRODUCT','60','1506','Achats',NULL,NULL,1),(323,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','601','322','Achats stockés - Matières premières (et fournitures)',NULL,NULL,1),(324,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','602','322','Achats stockés - Autres approvisionnements',NULL,NULL,1),(325,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','603','322','Variations des stocks (approvisionnements et marchandises)',NULL,NULL,1),(326,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','604','322','Achats stockés - Matières premières (et fournitures)',NULL,NULL,1),(327,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','605','322','Achats de matériel, équipements et travaux',NULL,NULL,1),(328,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','606','322','Achats non stockés de matière et fournitures',NULL,NULL,1),(329,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','607','322','Achats de marchandises',NULL,NULL,1),(330,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','608','322','(Compte réservé, le cas échéant, à la récapitulation des frais accessoires incorporés aux achats)',NULL,NULL,1),(331,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','609','322','Rabais, remises et ristournes obtenus sur achats',NULL,NULL,1),(332,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','SERVICE','61','1506','Services extérieurs',NULL,NULL,1),(333,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','611','332','Sous-traitance générale',NULL,NULL,1),(334,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','612','332','Redevances de crédit-bail',NULL,NULL,1),(335,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','613','332','Locations',NULL,NULL,1),(336,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','614','332','Charges locatives et de copropriété',NULL,NULL,1),(337,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','615','332','Entretien et réparations',NULL,NULL,1),(338,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','616','332','Primes d\'assurances',NULL,NULL,1),(339,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','617','332','Etudes et recherches',NULL,NULL,1),(340,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','618','332','Divers',NULL,NULL,1),(341,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','619','332','Rabais, remises et ristournes obtenus sur services extérieurs',NULL,NULL,1),(342,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','62','1506','Autres services extérieurs',NULL,NULL,1),(343,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','621','342','Personnel extérieur à l\'entreprise',NULL,NULL,1),(344,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','622','342','Rémunérations d\'intermédiaires et honoraires',NULL,NULL,1),(345,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','623','342','Publicité, publications, relations publiques',NULL,NULL,1),(346,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','624','342','Transports de biens et transports collectifs du personnel',NULL,NULL,1),(347,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','625','342','Déplacements, missions et réceptions',NULL,NULL,1),(348,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','626','342','Frais postaux et de télécommunications',NULL,NULL,1),(349,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','627','342','Services bancaires et assimilés',NULL,NULL,1),(350,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','628','342','Divers',NULL,NULL,1),(351,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','629','342','Rabais, remises et ristournes obtenus sur autres services extérieurs',NULL,NULL,1),(352,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','63','1506','Impôts, taxes et versements assimilés',NULL,NULL,1),(353,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','631','352','Impôts, taxes et versements assimilés sur rémunérations (administrations des impôts)',NULL,NULL,1),(354,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','633','352','Impôts, taxes et versements assimilés sur rémunérations (autres organismes)',NULL,NULL,1),(355,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','635','352','Autres impôts, taxes et versements assimilés (administrations des impôts)',NULL,NULL,1),(356,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','637','352','Autres impôts, taxes et versements assimilés (autres organismes)',NULL,NULL,1),(357,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','64','1506','Charges de personnel',NULL,NULL,1),(358,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','641','357','Rémunérations du personnel',NULL,NULL,1),(359,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','644','357','Rémunération du travail de l\'exploitant',NULL,NULL,1),(360,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','SOCIAL','645','357','Charges de sécurité sociale et de prévoyance',NULL,NULL,1),(361,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','646','357','Cotisations sociales personnelles de l\'exploitant',NULL,NULL,1),(362,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','647','357','Autres charges sociales',NULL,NULL,1),(363,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','648','357','Autres charges de personnel',NULL,NULL,1),(364,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','65','1506','Autres charges de gestion courante',NULL,NULL,1),(365,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','651','364','Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(366,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','653','364','Jetons de présence',NULL,NULL,1),(367,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','654','364','Pertes sur créances irrécouvrables',NULL,NULL,1),(368,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','655','364','Quote-part de résultat sur opérations faites en commun',NULL,NULL,1),(369,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','658','364','Charges diverses de gestion courante',NULL,NULL,1),(370,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','66','1506','Charges financières',NULL,NULL,1),(371,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','661','370','Charges d\'intérêts',NULL,NULL,1),(372,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','664','370','Pertes sur créances liées à des participations',NULL,NULL,1),(373,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','665','370','Escomptes accordés',NULL,NULL,1),(374,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','666','370','Pertes de change',NULL,NULL,1),(375,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','667','370','Charges nettes sur cessions de valeurs mobilières de placement',NULL,NULL,1),(376,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','668','370','Autres charges financières',NULL,NULL,1),(377,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','67','1506','Charges exceptionnelles',NULL,NULL,1),(378,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','671','377','Charges exceptionnelles sur opérations de gestion',NULL,NULL,1),(379,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','672','377','(Compte à la disposition des entités pour enregistrer, en cours d\'exercice, les charges sur exercices antérieurs)',NULL,NULL,1),(380,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','675','377','Valeurs comptables des éléments d\'actif cédés',NULL,NULL,1),(381,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','678','377','Autres charges exceptionnelles',NULL,NULL,1),(382,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','68','1506','Dotations aux amortissements et aux provisions',NULL,NULL,1),(383,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','681','382','Dotations aux amortissements et aux provisions - Charges d\'exploitation',NULL,NULL,1),(384,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','686','382','Dotations aux amortissements et aux provisions - Charges financières',NULL,NULL,1),(385,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','687','382','Dotations aux amortissements et aux provisions - Charges exceptionnelles',NULL,NULL,1),(386,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','69','1506','Participation des salariés - impôts sur les bénéfices et assimiles',NULL,NULL,1),(387,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','691','386','Participation des salariés aux résultats',NULL,NULL,1),(388,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','695','386','Impôts sur les bénéfices',NULL,NULL,1),(389,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','696','386','Suppléments d\'impôt sur les sociétés liés aux distributions',NULL,NULL,1),(390,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','697','386','Imposition forfaitaire annuelle des sociétés',NULL,NULL,1),(391,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','698','386','Intégration fiscale',NULL,NULL,1),(392,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','699','386','Produits - Reports en arrière des déficits',NULL,NULL,1),(393,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','70','1507','Ventes de produits fabriqués, prestations de services, marchandises',NULL,NULL,1),(394,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','701','393','Ventes de produits finis',NULL,NULL,1),(395,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','702','393','Ventes de produits intermédiaires',NULL,NULL,1),(396,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','703','393','Ventes de produits résiduels',NULL,NULL,1),(397,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','704','393','Travaux',NULL,NULL,1),(398,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','705','393','Etudes',NULL,NULL,1),(399,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','SERVICE','706','393','Prestations de services',NULL,NULL,1),(400,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','707','393','Ventes de marchandises',NULL,NULL,1),(401,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','708','393','Produits des activités annexes',NULL,NULL,1),(402,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','709','393','Rabais, remises et ristournes accordés par l\'entreprise',NULL,NULL,1),(403,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','71','1507','Production stockée (ou déstockage)',NULL,NULL,1),(404,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','713','403','Variation des stocks (en-cours de production, produits)',NULL,NULL,1),(405,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','72','1507','Production immobilisée',NULL,NULL,1),(406,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','721','405','Immobilisations incorporelles',NULL,NULL,1),(407,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','722','405','Immobilisations corporelles',NULL,NULL,1),(408,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','74','1507','Subventions d\'exploitation',NULL,NULL,1),(409,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','75','1507','Autres produits de gestion courante',NULL,NULL,1),(410,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','751','409','Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(411,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','752','409','Revenus des immeubles non affectés à des activités professionnelles',NULL,NULL,1),(412,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','753','409','Jetons de présence et rémunérations d\'administrateurs, gérants,...',NULL,NULL,1),(413,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','754','409','Ristournes perçues des coopératives (provenant des excédents)',NULL,NULL,1),(414,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','755','409','Quotes-parts de résultat sur opérations faites en commun',NULL,NULL,1),(415,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','758','409','Produits divers de gestion courante',NULL,NULL,1),(416,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','76','1507','Produits financiers',NULL,NULL,1),(417,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','761','416','Produits de participations',NULL,NULL,1),(418,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','762','416','Produits des autres immobilisations financières',NULL,NULL,1),(419,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','763','416','Revenus des autres créances',NULL,NULL,1),(420,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','764','416','Revenus des valeurs mobilières de placement',NULL,NULL,1),(421,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','765','416','Escomptes obtenus',NULL,NULL,1),(422,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','766','416','Gains de change',NULL,NULL,1),(423,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','767','416','Produits nets sur cessions de valeurs mobilières de placement',NULL,NULL,1),(424,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','768','416','Autres produits financiers',NULL,NULL,1),(425,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','77','1507','Produits exceptionnels',NULL,NULL,1),(426,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','771','425','Produits exceptionnels sur opérations de gestion',NULL,NULL,1),(427,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','772','425','(Compte à la disposition des entités pour enregistrer, en cours d\'exercice, les produits sur exercices antérieurs)',NULL,NULL,1),(428,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','775','425','Produits des cessions d\'éléments d\'actif',NULL,NULL,1),(429,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','777','425','Quote-part des subventions d\'investissement virée au résultat de l\'exercice',NULL,NULL,1),(430,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','778','425','Autres produits exceptionnels',NULL,NULL,1),(431,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','78','1507','Reprises sur amortissements et provisions',NULL,NULL,1),(432,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','781','431','Reprises sur amortissements et provisions (à inscrire dans les produits d\'exploitation)',NULL,NULL,1),(433,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','786','431','Reprises sur provisions pour risques (à inscrire dans les produits financiers)',NULL,NULL,1),(434,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','787','431','Reprises sur provisions (à inscrire dans les produits exceptionnels)',NULL,NULL,1),(435,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','79','1507','Transferts de charges',NULL,NULL,1),(436,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','791','435','Transferts de charges d\'exploitation ',NULL,NULL,1),(437,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','796','435','Transferts de charges financières',NULL,NULL,1),(438,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','797','435','Transferts de charges exceptionnelles',NULL,NULL,1),(439,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','10','1351','Capital',NULL,NULL,1),(440,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','100','439','Capital souscrit ou capital personnel',NULL,NULL,1),(441,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1000','440','Capital non amorti',NULL,NULL,1),(442,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1001','440','Capital amorti',NULL,NULL,1),(443,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','101','439','Capital non appelé',NULL,NULL,1),(444,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','109','439','Compte de l\'exploitant',NULL,NULL,1),(445,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1090','444','Opérations courantes',NULL,NULL,1),(446,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1091','444','Impôts personnels',NULL,NULL,1),(447,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1092','444','Rémunérations et autres avantages',NULL,NULL,1),(448,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','11','1351','Primes d\'émission',NULL,NULL,1),(449,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','12','1351','Plus-values de réévaluation',NULL,NULL,1),(450,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','120','449','Plus-values de réévaluation sur immobilisations incorporelles',NULL,NULL,1),(451,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1200','450','Plus-values de réévaluation',NULL,NULL,1),(452,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1201','450','Reprises de réductions de valeur',NULL,NULL,1),(453,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','121','449','Plus-values de réévaluation sur immobilisations corporelles',NULL,NULL,1),(454,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1210','453','Plus-values de réévaluation',NULL,NULL,1),(455,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1211','453','Reprises de réductions de valeur',NULL,NULL,1),(456,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','122','449','Plus-values de réévaluation sur immobilisations financières',NULL,NULL,1),(457,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1220','456','Plus-values de réévaluation',NULL,NULL,1),(458,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1221','456','Reprises de réductions de valeur',NULL,NULL,1),(459,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','123','449','Plus-values de réévaluation sur stocks',NULL,NULL,1),(460,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','124','449','Reprises de réductions de valeur sur placements de trésorerie',NULL,NULL,1),(461,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','13','1351','Réserve',NULL,NULL,1),(462,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','130','461','Réserve légale',NULL,NULL,1),(463,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','131','461','Réserves indisponibles',NULL,NULL,1),(464,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1310','463','Réserve pour actions propres',NULL,NULL,1),(465,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1311','463','Autres réserves indisponibles',NULL,NULL,1),(466,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','132','461','Réserves immunisées',NULL,NULL,1),(467,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','133','461','Réserves disponibles',NULL,NULL,1),(468,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1330','467','Réserve pour régularisation de dividendes',NULL,NULL,1),(469,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1331','467','Réserve pour renouvellement des immobilisations',NULL,NULL,1),(470,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1332','467','Réserve pour installations en faveur du personnel 1333 Réserves libres',NULL,NULL,1),(471,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','14','1351','Bénéfice reporté (ou perte reportée)',NULL,NULL,1),(472,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','15','1351','Subsides en capital',NULL,NULL,1),(473,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','150','472','Montants obtenus',NULL,NULL,1),(474,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','151','472','Montants transférés aux résultats',NULL,NULL,1),(475,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','16','1351','Provisions pour risques et charges',NULL,NULL,1),(476,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','160','475','Provisions pour pensions et obligations similaires',NULL,NULL,1),(477,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','161','475','Provisions pour charges fiscales',NULL,NULL,1),(478,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','162','475','Provisions pour grosses réparations et gros entretiens',NULL,NULL,1),(479,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','163','475','à 169 Provisions pour autres risques et charges',NULL,NULL,1),(480,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','164','475','Provisions pour sûretés personnelles ou réelles constituées à l\'appui de dettes et d\'engagements de tiers',NULL,NULL,1),(481,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','165','475','Provisions pour engagements relatifs à l\'acquisition ou à la cession d\'immobilisations',NULL,NULL,1),(482,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','166','475','Provisions pour exécution de commandes passées ou reçues',NULL,NULL,1),(483,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','167','475','Provisions pour positions et marchés à terme en devises ou positions et marchés à terme en marchandises',NULL,NULL,1),(484,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','168','475','Provisions pour garanties techniques attachées aux ventes et prestations déjà effectuées par l\'entreprise',NULL,NULL,1),(485,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','169','475','Provisions pour autres risques et charges',NULL,NULL,1),(486,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1690','485','Pour litiges en cours',NULL,NULL,1),(487,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1691','485','Pour amendes, doubles droits et pénalités',NULL,NULL,1),(488,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1692','485','Pour propre assureur',NULL,NULL,1),(489,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1693','485','Pour risques inhérents aux opérations de crédits à moyen ou long terme',NULL,NULL,1),(490,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1695','485','Provision pour charge de liquidation',NULL,NULL,1),(491,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1696','485','Provision pour départ de personnel',NULL,NULL,1),(492,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1699','485','Pour risques divers',NULL,NULL,1),(493,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17','1351','Dettes à plus d\'un an',NULL,NULL,1),(494,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','170','493','Emprunts subordonnés',NULL,NULL,1),(495,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1700','494','Convertibles',NULL,NULL,1),(496,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1701','494','Non convertibles',NULL,NULL,1),(497,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','171','493','Emprunts obligataires non subordonnés',NULL,NULL,1),(498,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1710','498','Convertibles',NULL,NULL,1),(499,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1711','498','Non convertibles',NULL,NULL,1),(500,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','172','493','Dettes de location-financement et assimilés',NULL,NULL,1),(501,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1720','500','Dettes de location-financement de biens immobiliers',NULL,NULL,1),(502,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1721','500','Dettes de location-financement de biens mobiliers',NULL,NULL,1),(503,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1722','500','Dettes sur droits réels sur immeubles',NULL,NULL,1),(504,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','173','493','Etablissements de crédit',NULL,NULL,1),(505,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1730','504','Dettes en compte',NULL,NULL,1),(506,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17300','505','Banque A',NULL,NULL,1),(507,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17301','505','Banque B',NULL,NULL,1),(508,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17302','505','Banque C',NULL,NULL,1),(509,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17303','505','Banque D',NULL,NULL,1),(510,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1731','504','Promesses',NULL,NULL,1),(511,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17310','510','Banque A',NULL,NULL,1),(512,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17311','510','Banque B',NULL,NULL,1),(513,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17312','510','Banque C',NULL,NULL,1),(514,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17313','510','Banque D',NULL,NULL,1),(515,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1732','504','Crédits d\'acceptation',NULL,NULL,1),(516,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17320','515','Banque A',NULL,NULL,1),(517,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17321','515','Banque B',NULL,NULL,1),(518,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17322','515','Banque C',NULL,NULL,1),(519,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17323','515','Banque D',NULL,NULL,1),(520,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','174','493','Autres emprunts',NULL,NULL,1),(521,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175','493','Dettes commerciales',NULL,NULL,1),(522,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1750','521','Fournisseurs : dettes en compte',NULL,NULL,1),(523,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17500','522','Entreprises apparentées',NULL,NULL,1),(524,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175000','523','Entreprises liées',NULL,NULL,1),(525,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175001','523','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(526,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17501','522','Fournisseurs ordinaires',NULL,NULL,1),(527,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175010','526','Fournisseurs belges',NULL,NULL,1),(528,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175011','526','Fournisseurs C.E.E.',NULL,NULL,1),(529,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175012','526','Fournisseurs importation',NULL,NULL,1),(530,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1751','521','Effets à payer',NULL,NULL,1),(531,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17510','530','Entreprises apparentées',NULL,NULL,1),(532,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175100','531','Entreprises liées',NULL,NULL,1),(533,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175101','531','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(534,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17511','530','Fournisseurs ordinaires',NULL,NULL,1),(535,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175110','534','Fournisseurs belges',NULL,NULL,1),(536,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175111','534','Fournisseurs C.E.E.',NULL,NULL,1),(537,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175112','534','Fournisseurs importation',NULL,NULL,1),(538,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','176','493','Acomptes reçus sur commandes',NULL,NULL,1),(539,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','178','493','Cautionnements reçus en numéraires',NULL,NULL,1),(540,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','179','493','Dettes diverses',NULL,NULL,1),(541,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1790','540','Entreprises liées',NULL,NULL,1),(542,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1791','540','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(543,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1792','540','Administrateurs, gérants et associés',NULL,NULL,1),(544,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1794','540','Rentes viagères capitalisées',NULL,NULL,1),(545,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1798','540','Dettes envers les coparticipants des associations momentanées et en participation',NULL,NULL,1),(546,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1799','540','Autres dettes diverses',NULL,NULL,1),(547,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','18','1351','Comptes de liaison des établissements et succursales',NULL,NULL,1),(548,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','20','1352','Frais d\'établissement',NULL,NULL,1),(549,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','200','548','Frais de constitution et d\'augmentation de capital',NULL,NULL,1),(550,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2000','549','Frais de constitution et d\'augmentation de capital',NULL,NULL,1),(551,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2009','549','Amortissements sur frais de constitution et d\'augmentation de capital',NULL,NULL,1),(552,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','201','548','Frais d\'émission d\'emprunts et primes de remboursement',NULL,NULL,1),(553,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2010','552','Agios sur emprunts et frais d\'émission d\'emprunts',NULL,NULL,1),(554,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2019','552','Amortissements sur agios sur emprunts et frais d\'émission d\'emprunts',NULL,NULL,1),(555,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','202','548','Autres frais d\'établissement',NULL,NULL,1),(556,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2020','555','Autres frais d\'établissement',NULL,NULL,1),(557,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2029','555','Amortissements sur autres frais d\'établissement',NULL,NULL,1),(558,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','203','548','Intérêts intercalaires',NULL,NULL,1),(559,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2030','558','Intérêts intercalaires',NULL,NULL,1),(560,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2039','558','Amortissements sur intérêts intercalaires',NULL,NULL,1),(561,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','204','548','Frais de restructuration',NULL,NULL,1),(562,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2040','561','Coût des frais de restructuration',NULL,NULL,1),(563,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2049','561','Amortissements sur frais de restructuration',NULL,NULL,1),(564,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','21','1352','Immobilisations incorporelles',NULL,NULL,1),(565,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','210','564','Frais de recherche et de développement',NULL,NULL,1),(566,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2100','565','Frais de recherche et de mise au point',NULL,NULL,1),(567,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2108','565','Plus-values actées sur frais de recherche et de mise au point',NULL,NULL,1),(568,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2109','565','Amortissements sur frais de recherche et de mise au point',NULL,NULL,1),(569,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','211','564','Concessions, brevets, licences, savoir-faire, marque et droits similaires',NULL,NULL,1),(570,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2110','569','Concessions, brevets, licences, marques, etc',NULL,NULL,1),(571,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2118','569','Plus-values actées sur concessions, etc',NULL,NULL,1),(572,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2119','569','Amortissements sur concessions, etc',NULL,NULL,1),(573,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','212','564','Goodwill',NULL,NULL,1),(574,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2120','573','Coût d\'acquisition',NULL,NULL,1),(575,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2128','573','Plus-values actées',NULL,NULL,1),(576,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2129','573','Amortissements sur goodwill',NULL,NULL,1),(577,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','213','564','Acomptes versés',NULL,NULL,1),(578,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22','1352','Terrains et constructions',NULL,NULL,1),(579,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','220','578','Terrains',NULL,NULL,1),(580,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2200','579','Terrains',NULL,NULL,1),(581,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2201','579','Frais d\'acquisition sur terrains',NULL,NULL,1),(582,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2208','579','Plus-values actées sur terrains',NULL,NULL,1),(583,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2209','579','Amortissements et réductions de valeur',NULL,NULL,1),(584,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22090','583','Amortissements sur frais d\'acquisition',NULL,NULL,1),(585,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22091','583','Réductions de valeur sur terrains',NULL,NULL,1),(586,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','221','578','Constructions',NULL,NULL,1),(587,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2210','586','Bâtiments industriels',NULL,NULL,1),(588,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2211','586','Bâtiments administratifs et commerciaux',NULL,NULL,1),(589,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2212','586','Autres bâtiments d\'exploitation',NULL,NULL,1),(590,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2213','586','Voies de transport et ouvrages d\'art',NULL,NULL,1),(591,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2215','586','Constructions sur sol d\'autrui',NULL,NULL,1),(592,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2216','586','Frais d\'acquisition sur constructions',NULL,NULL,1),(593,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2218','586','Plus-values actées',NULL,NULL,1),(594,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22180','593','Sur bâtiments industriels',NULL,NULL,1),(595,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22181','593','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(596,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22182','593','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(597,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22184','593','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(598,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2219','586','Amortissements sur constructions',NULL,NULL,1),(599,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22190','598','Sur bâtiments industriels',NULL,NULL,1),(600,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22191','598','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(601,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22192','598','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(602,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22194','598','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(603,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22195','598','Sur constructions sur sol d\'autrui',NULL,NULL,1),(604,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22196','598','Sur frais d\'acquisition sur constructions',NULL,NULL,1),(605,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','222','578','Terrains bâtis',NULL,NULL,1),(606,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2220','605','Valeur d\'acquisition',NULL,NULL,1),(607,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22200','606','Bâtiments industriels',NULL,NULL,1),(608,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22201','606','Bâtiments administratifs et commerciaux',NULL,NULL,1),(609,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22202','606','Autres bâtiments d\'exploitation',NULL,NULL,1),(610,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22203','606','Voies de transport et ouvrages d\'art',NULL,NULL,1),(611,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22204','606','Frais d\'acquisition des terrains à bâtir',NULL,NULL,1),(612,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2228','605','Plus-values actées',NULL,NULL,1),(613,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22280','612','Sur bâtiments industriels',NULL,NULL,1),(614,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22281','612','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(615,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22282','612','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(616,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22283','612','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(617,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2229','605','Amortissements sur terrains bâtis',NULL,NULL,1),(618,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22290','617','Sur bâtiments industriels',NULL,NULL,1),(619,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22291','617','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(620,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22292','617','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(621,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22293','617','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(622,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22294','617','Sur frais d\'acquisition des terrains bâtis',NULL,NULL,1),(623,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','223','578','Autres droits réels sur des immeubles',NULL,NULL,1),(624,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2230','623','Valeur d\'acquisition',NULL,NULL,1),(625,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2238','623','Plus-values actées',NULL,NULL,1),(626,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2239','623','Amortissements',NULL,NULL,1),(627,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','23','1352','Installations, machines et outillages',NULL,NULL,1),(628,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','230','627','Installations',NULL,NULL,1),(629,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2300','628','Installations bâtiments industriels',NULL,NULL,1),(630,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2301','628','Installations bâtiments administratifs et commerciaux',NULL,NULL,1),(631,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2302','628','Installations bâtiments d\'exploitation',NULL,NULL,1),(632,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2303','628','Installations voies de transport et ouvrages d\'art',NULL,NULL,1),(633,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2300','628','Installation d\'eau',NULL,NULL,1),(634,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2301','628','Installation d\'électricité',NULL,NULL,1),(635,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2302','628','Installation de vapeur',NULL,NULL,1),(636,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2303','628','Installation de gaz',NULL,NULL,1),(637,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2304','628','Installation de chauffage',NULL,NULL,1),(638,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2305','628','Installation de conditionnement d\'air',NULL,NULL,1),(639,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2306','628','Installation de chargement',NULL,NULL,1),(640,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','231','627','Machines',NULL,NULL,1),(641,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2310','640','Division A',NULL,NULL,1),(642,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2311','640','Division B',NULL,NULL,1),(643,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2312','640','Division C',NULL,NULL,1),(644,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','237','627','Outillage',NULL,NULL,1),(645,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2370','644','Division A',NULL,NULL,1),(646,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2371','644','Division B',NULL,NULL,1),(647,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2372','644','Division C',NULL,NULL,1),(648,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','238','627','Plus-values actées',NULL,NULL,1),(649,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2380','648','Sur installations',NULL,NULL,1),(650,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2381','648','Sur machines',NULL,NULL,1),(651,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2382','648','Sur outillage',NULL,NULL,1),(652,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','239','627','Amortissements',NULL,NULL,1),(653,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2390','652','Sur installations',NULL,NULL,1),(654,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2391','652','Sur machines',NULL,NULL,1),(655,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2392','652','Sur outillage',NULL,NULL,1),(656,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24','1352','Mobilier et matériel roulant',NULL,NULL,1),(657,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','240','656','Mobilier',NULL,NULL,1),(658,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2400','656','Mobilier',NULL,NULL,1),(659,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24000','658','Mobilier des bâtiments industriels',NULL,NULL,1),(660,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24001','658','Mobilier des bâtiments administratifs et commerciaux',NULL,NULL,1),(661,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24002','658','Mobilier des autres bâtiments d\'exploitation',NULL,NULL,1),(662,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24003','658','Mobilier oeuvres sociales',NULL,NULL,1),(663,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2401','657','Matériel de bureau et de service social',NULL,NULL,1),(664,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24010','663','Des bâtiments industriels',NULL,NULL,1),(665,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24011','663','Des bâtiments administratifs et commerciaux',NULL,NULL,1),(666,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24012','663','Des autres bâtiments d\'exploitation',NULL,NULL,1),(667,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24013','663','Des oeuvres sociales',NULL,NULL,1),(668,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2408','657','Plus-values actées',NULL,NULL,1),(669,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24080','668','Plus-values actées sur mobilier',NULL,NULL,1),(670,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24081','668','Plus-values actées sur matériel de bureau et service social',NULL,NULL,1),(671,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2409','657','Amortissements',NULL,NULL,1),(672,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24090','671','Amortissements sur mobilier',NULL,NULL,1),(673,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24091','671','Amortissements sur matériel de bureau et service social',NULL,NULL,1),(674,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','241','656','Matériel roulant',NULL,NULL,1),(675,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2410','674','Matériel automobile',NULL,NULL,1),(676,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24100','675','Voitures',NULL,NULL,1),(677,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24105','675','Camions',NULL,NULL,1),(678,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2411','674','Matériel ferroviaire',NULL,NULL,1),(679,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2412','674','Matériel fluvial',NULL,NULL,1),(680,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2413','674','Matériel naval',NULL,NULL,1),(681,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2414','674','Matériel aérien',NULL,NULL,1),(682,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2418','674','Plus-values sur matériel roulant',NULL,NULL,1),(683,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24180','682','Plus-values sur matériel automobile',NULL,NULL,1),(684,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24181','682','Idem sur matériel ferroviaire',NULL,NULL,1),(685,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24182','682','Idem sur matériel fluvial',NULL,NULL,1),(686,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24183','682','Idem sur matériel naval',NULL,NULL,1),(687,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24184','682','Idem sur matériel aérien',NULL,NULL,1),(688,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2419','674','Amortissements sur matériel roulant',NULL,NULL,1),(689,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24190','688','Amortissements sur matériel automobile',NULL,NULL,1),(690,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24191','688','Idem sur matériel ferroviaire',NULL,NULL,1),(691,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24192','688','Idem sur matériel fluvial',NULL,NULL,1),(692,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24193','688','Idem sur matériel naval',NULL,NULL,1),(693,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24194','688','Idem sur matériel aérien',NULL,NULL,1),(694,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','25','1352','Immobilisation détenues en location-financement et droits similaires',NULL,NULL,1),(695,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','250','694','Terrains et constructions',NULL,NULL,1),(696,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2500','695','Terrains',NULL,NULL,1),(697,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2501','695','Constructions',NULL,NULL,1),(698,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2508','695','Plus-values sur emphytéose,  leasing et droits similaires : terrains et constructions',NULL,NULL,1),(699,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2509','695','Amortissements et réductions de valeur sur terrains et constructions en leasing',NULL,NULL,1),(700,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','251','694','Installations,  machines et outillage',NULL,NULL,1),(701,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2510','700','Installations',NULL,NULL,1),(702,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2511','700','Machines',NULL,NULL,1),(703,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2512','700','Outillage',NULL,NULL,1),(704,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2518','700','Plus-values actées sur installations machines et outillage pris en leasing',NULL,NULL,1),(705,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2519','700','Amortissements sur installations machines et outillage pris en leasing',NULL,NULL,1),(706,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','252','694','Mobilier et matériel roulant',NULL,NULL,1),(707,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2520','706','Mobilier',NULL,NULL,1),(708,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2521','706','Matériel roulant',NULL,NULL,1),(709,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2528','706','Plus-values actées sur mobilier et matériel roulant en leasing',NULL,NULL,1),(710,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2529','706','Amortissements sur mobilier et matériel roulant en leasing',NULL,NULL,1),(711,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','26','1352','Autres immobilisations corporelles',NULL,NULL,1),(712,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','260','711','Frais d\'aménagements de locaux pris en location',NULL,NULL,1),(713,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','261','711','Maison d\'habitation',NULL,NULL,1),(714,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','262','711','Réserve immobilière',NULL,NULL,1),(715,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','263','711','Matériel d\'emballage',NULL,NULL,1),(716,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','264','711','Emballages récupérables',NULL,NULL,1),(717,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','268','711','Plus-values actées sur autres immobilisations corporelles',NULL,NULL,1),(718,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','269','711','Amortissements sur autres immobilisations corporelles',NULL,NULL,1),(719,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2690','718','Amortissements sur frais d\'aménagement des locaux pris en location',NULL,NULL,1),(720,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2691','718','Amortissements sur maison d\'habitation',NULL,NULL,1),(721,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2692','718','Amortissements sur réserve immobilière',NULL,NULL,1),(722,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2693','718','Amortissements sur matériel d\'emballage',NULL,NULL,1),(723,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2694','718','Amortissements sur emballages récupérables',NULL,NULL,1),(724,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','27','1352','Immobilisations corporelles en cours et acomptes versés',NULL,NULL,1),(725,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','270','724','Immobilisations en cours',NULL,NULL,1),(726,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2700','725','Constructions',NULL,NULL,1),(727,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2701','725','Installations machines et outillage',NULL,NULL,1),(728,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2702','725','Mobilier et matériel roulant',NULL,NULL,1),(729,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2703','725','Autres immobilisations corporelles',NULL,NULL,1),(730,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','271','724','Avances et acomptes versés sur immobilisations en cours',NULL,NULL,1),(731,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','28','1352','Immobilisations financières',NULL,NULL,1),(732,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','280','731','Participations dans des entreprises liées',NULL,NULL,1),(733,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2800','732','Valeur d\'acquisition (peut être subdivisé par participation)',NULL,NULL,1),(734,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2801','732','Montants non appelés (idem)',NULL,NULL,1),(735,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2808','732','Plus-values actées (idem)',NULL,NULL,1),(736,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2809','732','Réductions de valeurs actées (idem)',NULL,NULL,1),(737,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','281','731','Créances sur des entreprises liées',NULL,NULL,1),(738,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2810','737','Créances en compte',NULL,NULL,1),(739,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2811','737','Effets à recevoir',NULL,NULL,1),(740,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2812','737','Titres à revenu fixes',NULL,NULL,1),(741,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2817','737','Créances douteuses',NULL,NULL,1),(742,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2819','737','Réductions de valeurs actées',NULL,NULL,1),(743,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','282','731','Participations dans des entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(744,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2820','743','Valeur d\'acquisition (peut être subdivisé par participation)',NULL,NULL,1),(745,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2821','743','Montants non appelés (idem)',NULL,NULL,1),(746,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2828','743','Plus-values actées (idem)',NULL,NULL,1),(747,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2829','743','Réductions de valeurs actées (idem)',NULL,NULL,1),(748,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','283','731','Créances sur des entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(749,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2830','748','Créances en compte',NULL,NULL,1),(750,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2831','748','Effets à recevoir',NULL,NULL,1),(751,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2832','748','Titres à revenu fixe',NULL,NULL,1),(752,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2837','748','Créances douteuses',NULL,NULL,1),(753,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2839','748','Réductions de valeurs actées',NULL,NULL,1),(754,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','284','731','Autres actions et parts',NULL,NULL,1),(755,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2840','754','Valeur d\'acquisition',NULL,NULL,1),(756,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2841','754','Montants non appelés',NULL,NULL,1),(757,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2848','754','Plus-values actées',NULL,NULL,1),(758,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2849','754','Réductions de valeur actées',NULL,NULL,1),(759,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','285','731','Autres créances',NULL,NULL,1),(760,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2850','759','Créances en compte',NULL,NULL,1),(761,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2851','759','Effets à recevoir',NULL,NULL,1),(762,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2852','759','Titres à revenu fixe',NULL,NULL,1),(763,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2857','759','Créances douteuses',NULL,NULL,1),(764,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2859','759','Réductions de valeur actées',NULL,NULL,1),(765,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','288','731','Cautionnements versés en numéraires',NULL,NULL,1),(766,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2880','765','Téléphone, téléfax, télex',NULL,NULL,1),(767,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2881','765','Gaz',NULL,NULL,1),(768,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2882','765','Eau',NULL,NULL,1),(769,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2883','765','Electricité',NULL,NULL,1),(770,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2887','765','Autres cautionnements versés en numéraires',NULL,NULL,1),(771,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29','1352','Créances à plus d\'un an',NULL,NULL,1),(772,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','290','771','Créances commerciales',NULL,NULL,1),(773,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2900','772','Clients',NULL,NULL,1),(774,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29000','773','Créances en compte sur entreprises liées',NULL,NULL,1),(775,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29001','773','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(776,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29002','773','Sur clients Belgique',NULL,NULL,1),(777,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29003','773','Sur clients C.E.E.',NULL,NULL,1),(778,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29004','773','Sur clients exportation hors C.E.E.',NULL,NULL,1),(779,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29005','773','Créances sur les coparticipants (associations momentanées)',NULL,NULL,1),(780,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2901','772','Effets à recevoir',NULL,NULL,1),(781,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29010','780','Sur entreprises liées',NULL,NULL,1),(782,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29011','780','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(783,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29012','780','Sur clients Belgique',NULL,NULL,1),(784,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29013','780','Sur clients C.E.E.',NULL,NULL,1),(785,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29014','780','Sur clients exportation hors C.E.E.',NULL,NULL,1),(786,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2905','772','Retenues sur garanties',NULL,NULL,1),(787,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2906','772','Acomptes versés',NULL,NULL,1),(788,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2907','772','Créances douteuses (à ventiler comme clients 2900)',NULL,NULL,1),(789,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2909','772','Réductions de valeur actées (à ventiler comme clients 2900)',NULL,NULL,1),(790,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','291','771','Autres créances',NULL,NULL,1),(791,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2910','790','Créances en compte',NULL,NULL,1),(792,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29100','791','Sur entreprises liées',NULL,NULL,1),(793,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29101','791','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(794,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29102','791','Sur autres débiteurs',NULL,NULL,1),(795,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2911','790','Effets à recevoir',NULL,NULL,1),(796,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29110','795','Sur entreprises liées',NULL,NULL,1),(797,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29111','795','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(798,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29112','795','Sur autres débiteurs',NULL,NULL,1),(799,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2912','790','Créances résultant de la cession d\'immobilisations données en leasing',NULL,NULL,1),(800,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2917','790','Créances douteuses',NULL,NULL,1),(801,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2919','790','Réductions de valeur actées',NULL,NULL,1),(802,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','30','1353','Approvisionnements - matières premières',NULL,NULL,1),(803,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','300','802','Valeur d\'acquisition',NULL,NULL,1),(804,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','309','802','Réductions de valeur actées',NULL,NULL,1),(805,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31','1353','Approvsionnements et fournitures',NULL,NULL,1),(806,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','310','805','Valeur d\'acquisition',NULL,NULL,1),(807,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3100','806','Matières d\'approvisionnement',NULL,NULL,1),(808,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3101','806','Energie, charbon, coke, mazout, essence, propane',NULL,NULL,1),(809,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3102','806','Produits d\'entretien',NULL,NULL,1),(810,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3103','806','Fournitures diverses et petit outillage',NULL,NULL,1),(811,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3104','806','Imprimés et fournitures de bureau',NULL,NULL,1),(812,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3105','806','Fournitures de services sociaux',NULL,NULL,1),(813,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3106','806','Emballages commerciaux',NULL,NULL,1),(814,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31060','813','Emballages perdus',NULL,NULL,1),(815,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31061','813','Emballages récupérables',NULL,NULL,1),(816,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','319','805','Réductions de valeur actées',NULL,NULL,1),(817,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','32','1353','En cours de fabrication',NULL,NULL,1),(818,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','320','817','Valeur d\'acquisition',NULL,NULL,1),(819,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3200','818','Produits semi-ouvrés',NULL,NULL,1),(820,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3201','818','Produits en cours de fabrication',NULL,NULL,1),(821,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3202','818','Travaux en cours',NULL,NULL,1),(822,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3205','818','Déchets',NULL,NULL,1),(823,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3206','818','Rebuts',NULL,NULL,1),(824,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3209','818','Travaux en association momentanée',NULL,NULL,1),(825,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','329','817','Réductions de valeur actées',NULL,NULL,1),(826,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','33','1353','Produits finis',NULL,NULL,1),(827,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','330','826','Valeur d\'acquisition',NULL,NULL,1),(828,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3300','827','Produits finis',NULL,NULL,1),(829,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','339','826','Réductions de valeur actées',NULL,NULL,1),(830,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','34','1353','Marchandises',NULL,NULL,1),(831,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','340','830','Valeur d\'acquisition',NULL,NULL,1),(832,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3400','831','Groupe A',NULL,NULL,1),(833,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3401','831','Groupe B',NULL,NULL,1),(834,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3402','831','Groupe C',NULL,NULL,1),(835,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','349','830','Réductions de valeur actées',NULL,NULL,1),(836,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','35','1353','Immeubles destinés à la vente',NULL,NULL,1),(837,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','350','836','Valeur d\'acquisition',NULL,NULL,1),(838,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3500','837','Immeuble A',NULL,NULL,1),(839,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3501','837','Immeuble B',NULL,NULL,1),(840,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3502','837','Immeuble C',NULL,NULL,1),(841,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','351','836','Immeubles construits en vue de leur revente',NULL,NULL,1),(842,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3510','841','Immeuble A',NULL,NULL,1),(843,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3511','841','Immeuble B',NULL,NULL,1),(844,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3512','841','Immeuble C',NULL,NULL,1),(845,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','359','836','Réductions de valeurs actées',NULL,NULL,1),(846,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','36','1353','Acomptes versés sur achats pour stocks',NULL,NULL,1),(847,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','360','846','Acomptes versés (à ventiler éventuellement par catégorie)',NULL,NULL,1),(848,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','369','846','Réductions de valeur actées',NULL,NULL,1),(849,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','37','1353','Commandes en cours d\'exécution',NULL,NULL,1),(850,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','370','849','Valeur d\'acquisition',NULL,NULL,1),(851,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','371','849','Bénéfice pris en compte',NULL,NULL,1),(852,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','379','849','Réductions de valeur actées',NULL,NULL,1),(853,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','40','1354','Créances commerciales',NULL,NULL,1),(854,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','400','853','Clients',NULL,NULL,1),(855,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4007','854','Rabais, remises et  ristournes à accorder et autres notes de crédit à établir',NULL,NULL,1),(856,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4008','854','Créances résultant de livraisons de biens (associations momentanées)',NULL,NULL,1),(857,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','401','853','Effets à recevoir',NULL,NULL,1),(858,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4010','857','Effets à recevoir',NULL,NULL,1),(859,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4013','857','Effets à l\'encaissement',NULL,NULL,1),(860,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4015','857','Effets à l\'escompte',NULL,NULL,1),(861,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','402','853','Clients, créances courantes, entreprises apparentées, administrateurs et gérants',NULL,NULL,1),(862,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4020','861','Entreprises liées',NULL,NULL,1),(863,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4021','861','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(864,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4022','861','Administrateurs et gérants d\'entreprise',NULL,NULL,1),(865,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','403','853','Effets à recevoir sur entreprises apparentées et administrateurs et gérants',NULL,NULL,1),(866,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4030','865','Entreprises liées',NULL,NULL,1),(867,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4031','865','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(868,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4032','865','Administrateurs et gérants de l\'entreprise',NULL,NULL,1),(869,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','404','853','Produits à recevoir (factures à établir)',NULL,NULL,1),(870,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','405','853','Clients : retenues sur garanties',NULL,NULL,1),(871,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','406','853','Acomptes versés',NULL,NULL,1),(872,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','407','853','Créances douteuses',NULL,NULL,1),(873,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','408','853','Compensation clients',NULL,NULL,1),(874,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','409','853','Réductions de valeur actées',NULL,NULL,1),(875,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41','1354','Autres créances',NULL,NULL,1),(876,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','410','875','Capital appelé, non versé',NULL,NULL,1),(877,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4100','876','Appels de fonds',NULL,NULL,1),(878,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4101','876','Actionnaires défaillants',NULL,NULL,1),(879,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','411','875','T.V.A. à récupérer',NULL,NULL,1),(880,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4110','879','T.V.A. due',NULL,NULL,1),(881,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4111','879','T.V.A. déductible',NULL,NULL,1),(882,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4112','879','Compte courant administration T.V.A.',NULL,NULL,1),(883,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4118','879','Taxe d\'égalisation due',NULL,NULL,1),(884,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','412','875','Impôts et versements fiscaux à récupérer',NULL,NULL,1),(885,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4120','884','Impôts belges sur le résultat',NULL,NULL,1),(886,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4125','884','Autres impôts belges',NULL,NULL,1),(887,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4128','884','Impôts étrangers',NULL,NULL,1),(888,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','414','875','Produits à recevoir',NULL,NULL,1),(889,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','416','875','Créances diverses',NULL,NULL,1),(890,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4160','889','Associés (compte d\'apport en société)',NULL,NULL,1),(891,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4161','889','Avances et prêts au personnel',NULL,NULL,1),(892,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4162','889','Compte courant des associés en S.P.R.L.',NULL,NULL,1),(893,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4163','889','Compte courant des administrateurs et gérants',NULL,NULL,1),(894,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4164','889','Créances sur sociétés apparentées',NULL,NULL,1),(895,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4166','889','Emballages et matériel à rendre',NULL,NULL,1),(896,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4167','889','Etat et établissements publics',NULL,NULL,1),(897,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41670','896','Subsides à recevoir',NULL,NULL,1),(898,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41671','896','Autres créances',NULL,NULL,1),(899,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4168','889','Rabais, ristournes et remises à obtenir et autres avoirs non encore reçus',NULL,NULL,1),(900,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','417','875','Créances douteuses',NULL,NULL,1),(901,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','418','875','Cautionnements versés en numéraires',NULL,NULL,1),(902,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','419','875','Réductions de valeur actées',NULL,NULL,1),(903,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','42','1354','Dettes à plus d\'un an échéant dans l\'année',NULL,NULL,1),(904,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','420','903','Emprunts subordonnés',NULL,NULL,1),(905,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4200','904','Convertibles',NULL,NULL,1),(906,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4201','904','Non convertibles',NULL,NULL,1),(907,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','421','903','Emprunts obligataires non subordonnés',NULL,NULL,1),(908,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4210','907','Convertibles',NULL,NULL,1),(909,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4211','907','Non convertibles',NULL,NULL,1),(910,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','422','903','Dettes de location-financement et assimilées',NULL,NULL,1),(911,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4220','910','Financement de biens immobiliers',NULL,NULL,1),(912,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4221','910','Financement de biens mobiliers',NULL,NULL,1),(913,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','423','903','Etablissements de crédit',NULL,NULL,1),(914,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4230','913','Dettes en compte',NULL,NULL,1),(915,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4231','913','Promesses',NULL,NULL,1),(916,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4232','913','Crédits d\'acceptation',NULL,NULL,1),(917,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','424','903','Autres emprunts',NULL,NULL,1),(918,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','425','903','Dettes commerciales',NULL,NULL,1),(919,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4250','918','Fournisseurs',NULL,NULL,1),(920,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4251','918','Effets à payer',NULL,NULL,1),(921,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','426','903','Cautionnements reçus en numéraires',NULL,NULL,1),(922,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','429','903','Dettes diverses',NULL,NULL,1),(923,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4290','922','Entreprises liées',NULL,NULL,1),(924,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4291','922','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(925,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4292','922','Administrateurs, gérants, associés',NULL,NULL,1),(926,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4299','922','Autres dettes',NULL,NULL,1),(927,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','43','1354','Dettes financières',NULL,NULL,1),(928,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','430','927','Etablissements de crédit. Emprunts en compte à terme fixe',NULL,NULL,1),(929,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','431','927','Etablissements de crédit. Promesses',NULL,NULL,1),(930,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','432','927','Etablissements de crédit. Crédits d\'acceptation',NULL,NULL,1),(931,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','433','927','Etablissements de crédit. Dettes en compte courant',NULL,NULL,1),(932,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','439','927','Autres emprunts',NULL,NULL,1),(933,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44','1354','Dettes commerciales',NULL,NULL,1),(934,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','440','933','Fournisseurs',NULL,NULL,1),(935,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4400','934','Entreprises apparentées',NULL,NULL,1),(936,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44000','935','Entreprises liées',NULL,NULL,1),(937,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44001','935','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(938,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4401','934','Fournisseurs ordinaires',NULL,NULL,1),(939,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44010','938','Fournisseurs belges',NULL,NULL,1),(940,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44011','938','Fournisseurs CEE',NULL,NULL,1),(941,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44012','938','Fournisseurs importation',NULL,NULL,1),(942,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4402','934','Dettes envers les coparticipants (associations momentanées)',NULL,NULL,1),(943,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4403','934','Fournisseurs - retenues de garanties',NULL,NULL,1),(944,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','441','933','Effets à payer',NULL,NULL,1),(945,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4410','944','Entreprises apparentées',NULL,NULL,1),(946,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44100','945','Entreprises liées',NULL,NULL,1),(947,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44101','945','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(948,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4411','944','Fournisseurs ordinaires',NULL,NULL,1),(949,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44110','948','Fournisseurs belges',NULL,NULL,1),(950,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44111','948','Fournisseurs CEE',NULL,NULL,1),(951,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44112','948','Fournisseurs importation',NULL,NULL,1),(952,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','444','933','Factures à recevoir',NULL,NULL,1),(953,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','446','933','Acomptes reçus',NULL,NULL,1),(954,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','448','933','Compensations fournisseurs',NULL,NULL,1),(955,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45','1354','Dettes fiscales, salariales et sociales',NULL,NULL,1),(956,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','450','955','Dettes fiscales estimées',NULL,NULL,1),(957,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4501','956','Impôts sur le résultat',NULL,NULL,1),(958,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4505','956','Autres impôts en Belgique',NULL,NULL,1),(959,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4508','956','Impôts à l\'étranger',NULL,NULL,1),(960,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','451','955','T.V.A. à payer',NULL,NULL,1),(961,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4510','960','T.V.A. due',NULL,NULL,1),(962,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4511','960','T.V.A. déductible',NULL,NULL,1),(963,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4512','960','Compte courant administration T.V.A.',NULL,NULL,1),(964,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4518','960','Taxe d\'égalisation due',NULL,NULL,1),(965,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','452','955','Impôts et taxes à payer',NULL,NULL,1),(966,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4520','965','Autres impôts sur le résultat',NULL,NULL,1),(967,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4525','965','Autres impôts et taxes en Belgique',NULL,NULL,1),(968,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45250','967','Précompte immobilier',NULL,NULL,1),(969,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45251','967','Impôts communaux à payer',NULL,NULL,1),(970,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45252','967','Impôts provinciaux à payer',NULL,NULL,1),(971,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45253','967','Autres impôts et taxes à payer',NULL,NULL,1),(972,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4528','965','Impôts et taxes à l\'étranger',NULL,NULL,1),(973,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','453','955','Précomptes retenus',NULL,NULL,1),(974,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4530','973','Précompte professionnel retenu sur rémunérations',NULL,NULL,1),(975,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4531','973','Précompte professionnel retenu sur tantièmes',NULL,NULL,1),(976,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4532','973','Précompte mobilier retenu sur dividendes attribués',NULL,NULL,1),(977,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4533','973','Précompte mobilier retenu sur intérêts payés',NULL,NULL,1),(978,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4538','973','Autres précomptes retenus',NULL,NULL,1),(979,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','454','955','Office National de la Sécurité Sociale',NULL,NULL,1),(980,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4540','979','Arriérés',NULL,NULL,1),(981,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4541','979','1er trimestre',NULL,NULL,1),(982,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4542','979','2ème trimestre',NULL,NULL,1),(983,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4543','979','3ème trimestre',NULL,NULL,1),(984,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4544','979','4ème trimestre',NULL,NULL,1),(985,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','455','955','Rémunérations',NULL,NULL,1),(986,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4550','985','Administrateurs,  gérants et commissaires (non réviseurs)',NULL,NULL,1),(987,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4551','985','Direction',NULL,NULL,1),(988,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4552','985','Employés',NULL,NULL,1),(989,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4553','985','Ouvriers',NULL,NULL,1),(990,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','456','955','Pécules de vacances',NULL,NULL,1),(991,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4560','990','Direction',NULL,NULL,1),(992,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4561','990','Employés',NULL,NULL,1),(993,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4562','990','Ouvriers',NULL,NULL,1),(994,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','459','955','Autres dettes sociales',NULL,NULL,1),(995,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4590','994','Provision pour gratifications de fin d\'année',NULL,NULL,1),(996,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4591','994','Départs de personnel',NULL,NULL,1),(997,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4592','994','Oppositions sur rémunérations',NULL,NULL,1),(998,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4593','994','Assurances relatives au personnel',NULL,NULL,1),(999,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45930','998','Assurance loi',NULL,NULL,1),(1000,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45931','998','Assurance salaire garanti',NULL,NULL,1),(1001,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45932','998','Assurance groupe',NULL,NULL,1),(1002,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45933','998','Assurances individuelles',NULL,NULL,1),(1003,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4594','994','Caisse d\'assurances sociales pour travailleurs indépendants',NULL,NULL,1),(1004,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4597','994','Dettes et provisions sociales diverses',NULL,NULL,1),(1005,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','46','1354','Acomptes reçus sur commande',NULL,NULL,1),(1006,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','47','1354','Dettes découlant de l\'affectation des résultats',NULL,NULL,1),(1007,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','470','1006','Dividendes et tantièmes d\'exercices antérieurs',NULL,NULL,1),(1008,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','471','1006','Dividendes de l\'exercice',NULL,NULL,1),(1009,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','472','1006','Tantièmes de l\'exercice',NULL,NULL,1),(1010,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','473','1006','Autres allocataires',NULL,NULL,1),(1011,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','48','4','Dettes diverses',NULL,NULL,1),(1012,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','480','1011','Obligations et coupons échus',NULL,NULL,1),(1013,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','481','1011','Actionnaires - capital à rembourser',NULL,NULL,1),(1014,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','482','1011','Participation du personnel à payer',NULL,NULL,1),(1015,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','483','1011','Acomptes reçus d\'autres tiers à moins d\'un an',NULL,NULL,1),(1016,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','486','1011','Emballages et matériel consignés',NULL,NULL,1),(1017,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','488','1011','Cautionnements reçus en numéraires',NULL,NULL,1),(1018,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','489','1011','Autres dettes diverses',NULL,NULL,1),(1019,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49','1354','Comptes de régularisation et compte d\'attente',NULL,NULL,1),(1020,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','490','1019','Charges à reporter (à subdiviser par catégorie de charges)',NULL,NULL,1),(1021,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','491','1019','Produits acquis',NULL,NULL,1),(1022,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4910','1021','Produits d\'exploitation',NULL,NULL,1),(1023,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49100','1022','Ristournes et rabais à obtenir',NULL,NULL,1),(1024,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49101','1022','Commissions à obtenir',NULL,NULL,1),(1025,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49102','1022','Autres produits d\'exploitation (redevances par exemple)',NULL,NULL,1),(1026,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4911','1021','Produits financiers',NULL,NULL,1),(1027,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49110','1026','Intérêts courus et non échus sur prêts et débits',NULL,NULL,1),(1028,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49111','1026','Autres produits financiers',NULL,NULL,1),(1029,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','492','1019','Charges à imputer (à subdiviser par catégorie de charges)',NULL,NULL,1),(1030,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','493','1019','Produits à reporter',NULL,NULL,1),(1031,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4930','1030','Produits d\'exploitation à reporter',NULL,NULL,1),(1032,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4931','1030','Produits financiers à reporter',NULL,NULL,1),(1033,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','499','1019','Comptes d\'attente',NULL,NULL,1),(1034,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4990','1033','Compte d\'attente',NULL,NULL,1),(1035,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4991','1033','Compte de répartition périodique des charges',NULL,NULL,1),(1036,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4999','1033','Transferts d\'exercice',NULL,NULL,1),(1037,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','50','1355','Actions propres',NULL,NULL,1),(1038,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','51','1355','Actions et parts',NULL,NULL,1),(1039,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','510','1038','Valeur d\'acquisition',NULL,NULL,1),(1040,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','511','1038','Montants non appelés',NULL,NULL,1),(1041,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','519','1038','Réductions de valeur actées',NULL,NULL,1),(1042,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','52','1355','Titres à revenus fixes',NULL,NULL,1),(1043,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','520','1042','Valeur d\'acquisition',NULL,NULL,1),(1044,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','529','1042','Réductions de valeur actées',NULL,NULL,1),(1045,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','53','1355','Dépots à terme',NULL,NULL,1),(1046,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','530','1045','De plus d\'un an',NULL,NULL,1),(1047,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','531','1045','De plus d\'un mois et à un an au plus',NULL,NULL,1),(1048,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','532','1045','d\'un mois au plus',NULL,NULL,1),(1049,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','539','1045','Réductions de valeur actées',NULL,NULL,1),(1050,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','54','1355','Valeurs échues à l\'encaissement',NULL,NULL,1),(1051,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','540','1050','Chèques à encaisser',NULL,NULL,1),(1052,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','541','1050','Coupons à encaisser',NULL,NULL,1),(1053,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','55','1355','Etablissements de crédit - Comptes ouverts auprès des divers établissements.',NULL,NULL,1),(1054,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','550','1053','Comptes courants',NULL,NULL,1),(1055,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','551','1053','Chèques émis',NULL,NULL,1),(1056,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','559','1053','Réductions de valeur actées',NULL,NULL,1),(1057,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','56','1355','Office des chèques postaux',NULL,NULL,1),(1058,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','560','1057','Compte courant',NULL,NULL,1),(1059,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','561','1057','Chèques émis',NULL,NULL,1),(1060,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','57','1355','Caisses',NULL,NULL,1),(1061,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','570','1060','à 577 Caisses - espèces ( 0 - centrale ; 7 - succursales et agences)',NULL,NULL,1),(1062,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','578','1060','Caisses - timbres ( 0 - fiscaux ; 1 - postaux)',NULL,NULL,1),(1063,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','58','1355','Virements internes',NULL,NULL,1),(1064,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','60','1356','Approvisionnements et marchandises',NULL,NULL,1),(1065,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','600','1064','Achats de matières premières',NULL,NULL,1),(1066,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','601','1064','Achats de fournitures',NULL,NULL,1),(1067,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','602','1064','Achats de services, travaux et études',NULL,NULL,1),(1068,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','603','1064','Sous-traitances générales',NULL,NULL,1),(1069,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','604','1064','Achats de marchandises',NULL,NULL,1),(1070,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','605','1064','Achats d\'immeubles destinés à la revente',NULL,NULL,1),(1071,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','608','1064','Remises , ristournes et rabais obtenus sur achats',NULL,NULL,1),(1072,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','609','1064','Variations de stocks',NULL,NULL,1),(1073,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6090','1072','De matières premières',NULL,NULL,1),(1074,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6091','1072','De fournitures',NULL,NULL,1),(1075,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6094','1072','De marchandises',NULL,NULL,1),(1076,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6095','1072','d\'immeubles destinés à la vente',NULL,NULL,1),(1077,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61','1356','Services et biens divers',NULL,NULL,1),(1078,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','610','1077','Loyers et charges locatives',NULL,NULL,1),(1079,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6100','1078','Loyers divers',NULL,NULL,1),(1080,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6101','1078','Charges locatives (assurances, frais de confort,etc)',NULL,NULL,1),(1081,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','611','1077','Entretien et réparation (fournitures et prestations)',NULL,NULL,1),(1082,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','612','1077','Fournitures faites à l\'entreprise',NULL,NULL,1),(1083,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6120','1082','Eau, gaz, électricité, vapeur',NULL,NULL,1),(1084,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61200','1083','Eau',NULL,NULL,1),(1085,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61201','1083','Gaz',NULL,NULL,1),(1086,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61202','1083','Electricité',NULL,NULL,1),(1087,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61203','1083','Vapeur',NULL,NULL,1),(1088,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6121','1082','Téléphone, télégrammes, télex, téléfax, frais postaux',NULL,NULL,1),(1089,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61210','1088','Téléphone',NULL,NULL,1),(1090,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61211','1088','Télégrammes',NULL,NULL,1),(1091,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61212','1088','Télex et téléfax',NULL,NULL,1),(1092,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61213','1088','Frais postaux',NULL,NULL,1),(1093,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6122','1082','Livres, bibliothèque',NULL,NULL,1),(1094,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6123','1082','Imprimés et fournitures de bureau (si non comptabilisé au 601)',NULL,NULL,1),(1095,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','613','1077','Rétributions de tiers',NULL,NULL,1),(1096,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6130','1095','Redevances et royalties',NULL,NULL,1),(1097,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61300','1096','Redevances pour brevets, licences, marques et accessoires',NULL,NULL,1),(1098,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61301','1096','Autres redevances (procédés de fabrication)',NULL,NULL,1),(1099,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6131','1095','Assurances non relatives au personnel',NULL,NULL,1),(1100,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61310','1099','Assurance incendie',NULL,NULL,1),(1101,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61311','1099','Assurance vol',NULL,NULL,1),(1102,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61312','1099','Assurance autos',NULL,NULL,1),(1103,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61313','1099','Assurance crédit',NULL,NULL,1),(1104,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61314','1099','Assurances frais généraux',NULL,NULL,1),(1105,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6132','1095','Divers',NULL,NULL,1),(1106,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61320','1105','Commissions aux tiers',NULL,NULL,1),(1107,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61321','1105','Honoraires d\'avocats, d\'experts, etc',NULL,NULL,1),(1108,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61322','1105','Cotisations aux groupements professionnels',NULL,NULL,1),(1109,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61323','1105','Dons, libéralités, etc',NULL,NULL,1),(1110,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61324','1105','Frais de contentieux',NULL,NULL,1),(1111,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61325','1105','Publications légales',NULL,NULL,1),(1112,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6133','1095','Transports et déplacements',NULL,NULL,1),(1113,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61330','1112','Transports de personnel',NULL,NULL,1),(1114,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61331','1112','Voyages, déplacements et représentations',NULL,NULL,1),(1115,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6134','1095','Personnel intérimaire',NULL,NULL,1),(1116,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','614','1077','Annonces, publicité, propagande et documentation',NULL,NULL,1),(1117,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6140','1116','Annonces et insertions',NULL,NULL,1),(1118,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6141','1116','Catalogues et imprimés',NULL,NULL,1),(1119,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6142','1116','Echantillons',NULL,NULL,1),(1120,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6143','1116','Foires et expositions',NULL,NULL,1),(1121,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6144','1116','Primes',NULL,NULL,1),(1122,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6145','1116','Cadeaux à la clientèle',NULL,NULL,1),(1123,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6146','1116','Missions et réceptions',NULL,NULL,1),(1124,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6147','1116','Documentation',NULL,NULL,1),(1125,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','615','1077','Sous-traitants',NULL,NULL,1),(1126,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6150','1125','Sous-traitants pour activités propres',NULL,NULL,1),(1127,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6151','1125','Sous-traitants d\'associations momentanées (coparticipants)',NULL,NULL,1),(1128,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6152','1125','Quote-part bénéficiaire des coparticipants',NULL,NULL,1),(1129,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','617','1077','Personnel intérimaire et personnes mises à la disposition de l\'entreprise',NULL,NULL,1),(1130,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','618','1077','Rémunérations, primes pour assurances extralégales, pensions de retraite et de survie des administrateurs, gérants et associés actifs qui ne sont pas attribuées en vertu d\'un contrat de travail',NULL,NULL,1),(1131,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62','1356','Rémunérations, charges sociales et pensions',NULL,NULL,1),(1132,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','620','1131','Rémunérations et avantages sociaux directs',NULL,NULL,1),(1133,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6200','1132','Administrateurs ou gérants',NULL,NULL,1),(1134,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6201','1132','Personnel de direction',NULL,NULL,1),(1135,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6202','1132','Employés',NULL,NULL,1),(1136,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6203','1132','Ouvriers',NULL,NULL,1),(1137,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6204','1132','Autres membres du personnel',NULL,NULL,1),(1138,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','621','1131','Cotisations patronales d\'assurances sociales',NULL,NULL,1),(1139,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6210','1138','Sur salaires',NULL,NULL,1),(1140,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6211','1138','Sur appointements et commissions',NULL,NULL,1),(1141,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','622','1131','Primes patronales pour assurances extralégales',NULL,NULL,1),(1142,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','623','1131','Autres frais de personnel',NULL,NULL,1),(1143,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6230','1142','Assurances du personnel',NULL,NULL,1),(1144,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62300','1143','Assurances loi, responsabilité civile, chemin du travail',NULL,NULL,1),(1145,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62301','1143','Assurance salaire garanti',NULL,NULL,1),(1146,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62302','1143','Assurances individuelles',NULL,NULL,1),(1147,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6231','1142','Charges sociales diverses',NULL,NULL,1),(1148,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62310','1147','Jours fériés payés',NULL,NULL,1),(1149,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62311','1147','Salaire hebdomadaire garanti',NULL,NULL,1),(1150,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62312','1147','Allocations familiales complémentaires',NULL,NULL,1),(1151,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6232','1142','Charges sociales des administrateurs, gérants et commissaires',NULL,NULL,1),(1152,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62320','1151','Allocations familiales complémentaires pour non salariés',NULL,NULL,1),(1153,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62321','1151','Lois sociales pour indépendants',NULL,NULL,1),(1154,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62322','1151','Divers',NULL,NULL,1),(1155,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','624','1131','Pensions de retraite et de survie',NULL,NULL,1),(1156,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6240','1155','Administrateurs et gérants',NULL,NULL,1),(1157,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6241','1155','Personnel',NULL,NULL,1),(1158,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','625','1131','Provision pour pécule de vacances',NULL,NULL,1),(1159,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6250','1158','Dotations',NULL,NULL,1),(1160,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6251','1158','Utilisations et reprises',NULL,NULL,1),(1161,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','63','1356','Amortissements, réductions de valeur et provisions pour risques et charges',NULL,NULL,1),(1162,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','630','1161','Dotations aux amortissements et aux réductions de valeur sur immobilisations',NULL,NULL,1),(1163,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6300','1162','Dotations aux amortissements sur frais d\'établissement',NULL,NULL,1),(1164,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6301','1162','Dotations aux amortissements sur immobilisations incorporelles',NULL,NULL,1),(1165,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6302','1162','Dotations aux amortissements sur immobilisations corporelles',NULL,NULL,1),(1166,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6308','1162','Dotations aux réductions de valeur sur immobilisations incorporelles',NULL,NULL,1),(1167,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6309','1162','Dotations aux réductions de valeur sur immobilisations corporelles',NULL,NULL,1),(1168,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','631','1161','Réductions de valeur sur stocks',NULL,NULL,1),(1169,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6310','1168','Dotations',NULL,NULL,1),(1170,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6311','1168','Reprises',NULL,NULL,1),(1171,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','632','1161','Réductions de valeur sur commandes en cours d\'exécution',NULL,NULL,1),(1172,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6320','1171','Dotations',NULL,NULL,1),(1173,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6321','1171','Reprises',NULL,NULL,1),(1174,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','633','1161','Réductions de valeur sur créances commerciales à plus d\'un an',NULL,NULL,1),(1175,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6330','1174','Dotations',NULL,NULL,1),(1176,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6331','1174','Reprises',NULL,NULL,1),(1177,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','634','1161','Réductions de valeur sur créances commerciales à un an au plus',NULL,NULL,1),(1178,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6340','1177','Dotations',NULL,NULL,1),(1179,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6341','1177','Reprises',NULL,NULL,1),(1180,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','635','1161','Provisions pour pensions et obligations similaires',NULL,NULL,1),(1181,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6350','1180','Dotations',NULL,NULL,1),(1182,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6351','1180','Utilisations et reprises',NULL,NULL,1),(1183,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','636','11613','Provisions pour grosses réparations et gros entretiens',NULL,NULL,1),(1184,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6360','1183','Dotations',NULL,NULL,1),(1185,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6361','1183','Utilisations et reprises',NULL,NULL,1),(1186,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','637','1161','Provisions pour autres risques et charges',NULL,NULL,1),(1187,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6370','1186','Dotations',NULL,NULL,1),(1188,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6371','1186','Utilisations et reprises',NULL,NULL,1),(1189,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64','1356','Autres charges d\'exploitation',NULL,NULL,1),(1190,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','640','1189','Charges fiscales d\'exploitation',NULL,NULL,1),(1191,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6400','1190','Taxes et impôts directs',NULL,NULL,1),(1192,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64000','1191','Taxes sur autos et camions',NULL,NULL,1),(1193,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6401','1190','Taxes et impôts indirects',NULL,NULL,1),(1194,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64010','1193','Timbres fiscaux pris en charge par la firme',NULL,NULL,1),(1195,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64011','1193','Droits d\'enregistrement',NULL,NULL,1),(1196,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64012','1193','T.V.A. non déductible',NULL,NULL,1),(1197,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6402','1190','Impôts provinciaux et communaux',NULL,NULL,1),(1198,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64020','1197','Taxe sur la force motrice',NULL,NULL,1),(1199,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64021','1197','Taxe sur le personnel occupé',NULL,NULL,1),(1200,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6403','1190','Taxes diverses',NULL,NULL,1),(1201,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','641','1189','Moins-values sur réalisations courantes d\'immobilisations corporelles',NULL,NULL,1),(1202,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','642','1189','Moins-values sur réalisations de créances commerciales',NULL,NULL,1),(1203,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','643','1189','à 648 Charges d\'exploitations diverses',NULL,NULL,1),(1204,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','649','1189','Charges d\'exploitation portées à l\'actif au titre de restructuration',NULL,NULL,1),(1205,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','65','1356','Charges financières',NULL,NULL,1),(1206,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','650','1205','Charges des dettes',NULL,NULL,1),(1207,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6500','1206','Intérêts, commissions et frais afférents aux dettes',NULL,NULL,1),(1208,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6501','1206','Amortissements des agios et frais d\'émission d\'emprunts',NULL,NULL,1),(1209,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6502','1206','Autres charges de dettes',NULL,NULL,1),(1210,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6503','1206','Intérêts intercalaires portés à l\'actif',NULL,NULL,1),(1211,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','651','1205','Réductions de valeur sur actifs circulants',NULL,NULL,1),(1212,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6510','1211','Dotations',NULL,NULL,1),(1213,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6511','1211','Reprises',NULL,NULL,1),(1214,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','652','1205','Moins-values sur réalisation d\'actifs circulants',NULL,NULL,1),(1215,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','653','1205','Charges d\'escompte de créances',NULL,NULL,1),(1216,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','654','1205','Différences de change',NULL,NULL,1),(1217,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','655','1205','Ecarts de conversion des devises',NULL,NULL,1),(1218,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','656','1205','Frais de banques, de chèques postaux',NULL,NULL,1),(1219,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','657','1205','Commissions sur ouvertures de crédit, cautions et avals',NULL,NULL,1),(1220,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','658','1205','Frais de vente des titres',NULL,NULL,1),(1221,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','66','1356','Charges exceptionnelles',NULL,NULL,1),(1222,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','660','1221','Amortissements et réductions de valeur exceptionnels',NULL,NULL,1),(1223,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6600','1222','Sur frais d\'établissement',NULL,NULL,1),(1224,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6601','1222','Sur immobilisations incorporelles',NULL,NULL,1),(1225,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6602','1222','Sur immobilisations corporelles',NULL,NULL,1),(1226,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','661','1221','Réductions de valeur sur immobilisations financières',NULL,NULL,1),(1227,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','662','1221','Provisions pour risques et charges exceptionnels',NULL,NULL,1),(1228,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','663','1221','Moins-values sur réalisation d\'actifs immobilisés',NULL,NULL,1),(1229,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6630','1228','Sur immobilisations incorporelles',NULL,NULL,1),(1230,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6631','1228','Sur immobilisations corporelles',NULL,NULL,1),(1231,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6632','1228','Sur immobilisations détenues en location-financement et droits similaires',NULL,NULL,1),(1232,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6633','1228','Sur immobilisations financières',NULL,NULL,1),(1233,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6634','1228','Sur immeubles acquis ou construits en vue de la revente',NULL,NULL,1),(1234,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','664','1221','à 668 Autres charges exceptionnelles',NULL,NULL,1),(1235,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','664','1221','Pénalités et amendes diverses',NULL,NULL,1),(1236,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','665','1221','Différence de charge',NULL,NULL,1),(1237,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','669','1221','Charges exceptionnelles transférées à l\'actif en frais de restructuration',NULL,NULL,1),(1238,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','67','1356','Impôts sur le résultat',NULL,NULL,1),(1239,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','670','1238','Impôts belges sur le résultat de l\'exercice',NULL,NULL,1),(1240,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6700','1239','Impôts et précomptes dus ou versés',NULL,NULL,1),(1241,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6701','1239','Excédent de versements d\'impôts et précomptes porté à l\'actif',NULL,NULL,1),(1242,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6702','1239','Charges fiscales estimées',NULL,NULL,1),(1243,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','671','1238','Impôts belges sur le résultat d\'exercices antérieurs',NULL,NULL,1),(1244,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6710','1243','Suppléments d\'impôts dus ou versés',NULL,NULL,1),(1245,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6711','1243','Suppléments d\'impôts estimés',NULL,NULL,1),(1246,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6712','1243','Provisions fiscales constituées',NULL,NULL,1),(1247,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','672','1238','Impôts étrangers sur le résultat de l\'exercice',NULL,NULL,1),(1248,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','673','1238','Impôts étrangers sur le résultat d\'exercices antérieurs',NULL,NULL,1),(1249,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','68','1356','Transferts aux réserves immunisées',NULL,NULL,1),(1250,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','69','1356','Affectation des résultats',NULL,NULL,1),(1251,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','690','1250','Perte reportée de l\'exercice précédent',NULL,NULL,1),(1252,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','691','1250','Dotation à la réserve légale',NULL,NULL,1),(1253,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','692','1250','Dotation aux autres réserves',NULL,NULL,1),(1254,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','693','1250','Bénéfice à reporter',NULL,NULL,1),(1255,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','694','1250','Rémunération du capital',NULL,NULL,1),(1256,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','695','1250','Administrateurs ou gérants',NULL,NULL,1),(1257,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','696','1250','Autres allocataires',NULL,NULL,1),(1258,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','70','1357','Chiffre d\'affaires',NULL,NULL,1),(1260,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','700','1258','Ventes de marchandises',NULL,NULL,1),(1261,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7000','1260','Ventes en Belgique',NULL,NULL,1),(1262,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7001','1260','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1263,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7002','1260','Ventes à l\'exportation',NULL,NULL,1),(1264,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','701','1258','Ventes de produits finis',NULL,NULL,1),(1265,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7010','1264','Ventes en Belgique',NULL,NULL,1),(1266,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7011','1264','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1267,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7012','1264','Ventes à l\'exportation',NULL,NULL,1),(1268,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','702','1258','Ventes de déchets et rebuts',NULL,NULL,1),(1269,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7020','1268','Ventes en Belgique',NULL,NULL,1),(1270,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7021','1268','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1271,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7022','1268','Ventes à l\'exportation',NULL,NULL,1),(1272,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','703','1258','Ventes d\'emballages récupérables',NULL,NULL,1),(1273,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','704','1258','Facturations des travaux en cours (associations momentanées)',NULL,NULL,1),(1274,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','705','1258','Prestations de services',NULL,NULL,1),(1275,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7050','1274','Prestations de services en Belgique',NULL,NULL,1),(1276,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7051','1274','Prestations de services dans les pays membres de la C.E.E.',NULL,NULL,1),(1277,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7052','1274','Prestations de services en vue de l\'exportation',NULL,NULL,1),(1278,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','706','1258','Pénalités et dédits obtenus par l\'entreprise',NULL,NULL,1),(1279,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','708','1258','Remises, ristournes et rabais accordés',NULL,NULL,1),(1280,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7080','1279','Sur ventes de marchandises',NULL,NULL,1),(1281,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7081','1279','Sur ventes de produits finis',NULL,NULL,1),(1282,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7082','1279','Sur ventes de déchets et rebuts',NULL,NULL,1),(1283,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7083','1279','Sur prestations de services',NULL,NULL,1),(1284,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7084','1279','Mali sur travaux facturés aux associations momentanées',NULL,NULL,1),(1285,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71','1357','Variation des stocks et des commandes en cours d\'exécution',NULL,NULL,1),(1286,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','712','1285','Des en cours de fabrication',NULL,NULL,1),(1287,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','713','1285','Des produits finis',NULL,NULL,1),(1288,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','715','1285','Des immeubles construits destinés à la vente',NULL,NULL,1),(1289,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','717','1285','Des commandes en cours d\'exécution',NULL,NULL,1),(1290,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7170','1289','Commandes en cours - Coût de revient',NULL,NULL,1),(1291,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71700','1290','Coût des commandes en cours d\'exécution',NULL,NULL,1),(1292,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71701','1290','Coût des travaux en cours des associations momentanées',NULL,NULL,1),(1293,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7171','1289','Bénéfices portés en compte sur commandes en cours',NULL,NULL,1),(1294,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71710','1293','Sur commandes en cours d\'exécution',NULL,NULL,1),(1295,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71711','1293','Sur travaux en cours des associations momentanées',NULL,NULL,1),(1296,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','72','1357','Production immobilisée',NULL,NULL,1),(1297,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','720','1296','En frais d\'établissement',NULL,NULL,1),(1298,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','721','1296','En immobilisations incorporelles',NULL,NULL,1),(1299,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','722','1296','En immobilisations corporelles',NULL,NULL,1),(1300,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','723','1296','En immobilisations en cours',NULL,NULL,1),(1301,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','74','1357','Autres produits d\'exploitation',NULL,NULL,1),(1302,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','740','1301','Subsides d\'exploitation et montants compensatoires',NULL,NULL,1),(1303,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','741','1301','Plus-values sur réalisations courantes d\'immobilisations corporelles',NULL,NULL,1),(1304,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','742','1301','Plus-values sur réalisations de créances commerciales',NULL,NULL,1),(1305,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','743','1301','à 749 Produits d\'exploitation divers',NULL,NULL,1),(1306,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','743','1301','Produits de services exploités dans l\'intérêt du personnel',NULL,NULL,1),(1307,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','744','1301','Commissions et courtages',NULL,NULL,1),(1308,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','745','1301','Redevances pour brevets et licences',NULL,NULL,1),(1309,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','746','1301','Prestations de services (transports, études, etc)',NULL,NULL,1),(1310,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','747','1301','Revenus des immeubles affectés aux activités non professionnelles',NULL,NULL,1),(1311,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','748','1301','Locations diverses à caractère professionnel',NULL,NULL,1),(1312,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','749','1301','Produits divers',NULL,NULL,1),(1313,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7490','1312','Bonis sur reprises d\'emballages consignés',NULL,NULL,1),(1314,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7491','1312','Bonis sur travaux en associations momentanées',NULL,NULL,1),(1315,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','75','1357','Produits financiers',NULL,NULL,1),(1316,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','750','1315','Produits des immobilisations financières',NULL,NULL,1),(1317,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7500','1316','Revenus des actions',NULL,NULL,1),(1318,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7501','1316','Revenus des obligations',NULL,NULL,1),(1319,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7502','1316','Revenus des créances à plus d\'un an',NULL,NULL,1),(1320,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','751','1315','Produits des actifs circulants',NULL,NULL,1),(1321,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','752','1315','Plus-values sur réalisations d\'actifs circulants',NULL,NULL,1),(1322,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','753','1315','Subsides en capital et en intérêts',NULL,NULL,1),(1323,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','754','1315','Différences de change',NULL,NULL,1),(1324,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','755','1315','Ecarts de conversion des devises',NULL,NULL,1),(1325,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','756','1315','à 759 Produits financiers divers',NULL,NULL,1),(1326,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','756','1315','Produits des autres créances',NULL,NULL,1),(1327,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','757','1315','Escomptes obtenus',NULL,NULL,1),(1328,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','76','1357','Produits exceptionnels',NULL,NULL,1),(1329,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','760','1328','Reprises d\'amortissements et de réductions de valeur',NULL,NULL,1),(1330,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7600','1329','Sur immobilisations incorporelles',NULL,NULL,1),(1331,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7601','1329','Sur immobilisations corporelles',NULL,NULL,1),(1332,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','761','1328','Reprises de réductions de valeur sur immobilisations financières',NULL,NULL,1),(1333,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','762','1328','Reprises de provisions pour risques et charges exceptionnelles',NULL,NULL,1),(1334,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','763','1328','Plus-values sur réalisation d\'actifs immobilisés',NULL,NULL,1),(1335,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7630','1334','Sur immobilisations incorporelles',NULL,NULL,1),(1336,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7631','1334','Sur immobilisations corporelles',NULL,NULL,1),(1337,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7632','1334','Sur immobilisations financières',NULL,NULL,1),(1338,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','764','1328','Autres produits exceptionnels',NULL,NULL,1),(1339,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','77','1357','Régularisations d\'impôts et reprises de provisions fiscales',NULL,NULL,1),(1340,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','771','1339','Impôts belges sur le résultat',NULL,NULL,1),(1341,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7710','1340','Régularisations d\'impôts dus ou versés',NULL,NULL,1),(1342,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7711','1340','Régularisations d\'impôts estimés',NULL,NULL,1),(1343,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7712','1340','Reprises de provisions fiscales',NULL,NULL,1),(1344,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','773','1339','Impôts étrangers sur le résultat',NULL,NULL,1),(1345,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','79','1357','Affectation aux résultats',NULL,NULL,1),(1346,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','790','1345','Bénéfice reporté de l\'exercice précédent',NULL,NULL,1),(1347,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','791','1345','Prélèvement sur le capital et les primes d\'émission',NULL,NULL,1),(1348,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','792','1345','Prélèvement sur les réserves',NULL,NULL,1),(1349,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','793','1345','Perte à reporter',NULL,NULL,1),(1350,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','794','1345','Intervention d\'associés (ou du propriétaire) dans la perte',NULL,NULL,1),(1351,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1352,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1353,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1354,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1355,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1356,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1357,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(1401,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1402,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1403,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1404,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1405,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1406,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1407,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(1501,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1502,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1503,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1504,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1505,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1506,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1507,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(4001,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1','','Financiación básica',NULL,NULL,1),(4002,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','ACTIVO','XXXXXX','2','','Activo no corriente',NULL,NULL,1),(4003,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','EXISTENCIAS','XXXXXX','3','','Existencias',NULL,NULL,1),(4004,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4','','Acreedores y deudores por operaciones comerciales',NULL,NULL,1),(4005,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5','','Cuentas financieras',NULL,NULL,1),(4006,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6','','Compras y gastos',NULL,NULL,1),(4007,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7','','Ventas e ingresos',NULL,NULL,1),(4008,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','10','4001','CAPITAL',NULL,NULL,1),(4009,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','100','4008','Capital social',NULL,NULL,1),(4010,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','101','4008','Fondo social',NULL,NULL,1),(4011,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','CAPITAL','102','4008','Capital',NULL,NULL,1),(4012,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','103','4008','Socios por desembolsos no exigidos',NULL,NULL,1),(4013,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1030','4012','Socios por desembolsos no exigidos capital social',NULL,NULL,1),(4014,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1034','4012','Socios por desembolsos no exigidos capital pendiente de inscripción',NULL,NULL,1),(4015,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','104','4008','Socios por aportaciones no dineradas pendientes',NULL,NULL,1),(4016,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1040','4015','Socios por aportaciones no dineradas pendientes capital social',NULL,NULL,1),(4017,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1044','4015','Socios por aportaciones no dineradas pendientes capital pendiente de inscripción',NULL,NULL,1),(4018,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','108','4008','Acciones o participaciones propias en situaciones especiales',NULL,NULL,1),(4019,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','109','4008','Acciones o participaciones propias para reducción de capital',NULL,NULL,1),(4020,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','11','4001','Reservas y otros instrumentos de patrimonio',NULL,NULL,1),(4021,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','110','4020','Prima de emisión o asunción',NULL,NULL,1),(4022,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','111','4020','Otros instrumentos de patrimonio neto',NULL,NULL,1),(4023,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1110','4022','Patrimonio neto por emisión de instrumentos financieros compuestos',NULL,NULL,1),(4024,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1111','4022','Resto de instrumentos de patrimoio neto',NULL,NULL,1),(4025,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','112','4020','Reserva legal',NULL,NULL,1),(4026,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','113','4020','Reservas voluntarias',NULL,NULL,1),(4027,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','114','4020','Reservas especiales',NULL,NULL,1),(4028,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1140','4027','Reservas para acciones o participaciones de la sociedad dominante',NULL,NULL,1),(4029,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1141','4027','Reservas estatutarias',NULL,NULL,1),(4030,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1142','4027','Reservas por capital amortizado',NULL,NULL,1),(4031,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1143','4027','Reservas por fondo de comercio',NULL,NULL,1),(4032,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1144','4028','Reservas por acciones propias aceptadas en garantía',NULL,NULL,1),(4033,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','115','4020','Reservas por pérdidas y ganancias actuariales y otros ajustes',NULL,NULL,1),(4034,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','118','4020','Aportaciones de socios o propietarios',NULL,NULL,1),(4035,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','119','4020','Diferencias por ajuste del capital a euros',NULL,NULL,1),(4036,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','12','4001','Resultados pendientes de aplicación',NULL,NULL,1),(4037,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','120','4036','Remanente',NULL,NULL,1),(4038,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','121','4036','Resultados negativos de ejercicios anteriores',NULL,NULL,1),(4039,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','129','4036','Resultado del ejercicio',NULL,NULL,1),(4040,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','13','4001','Subvenciones, donaciones y ajustes por cambio de valor',NULL,NULL,1),(4041,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','130','4040','Subvenciones oficiales de capital',NULL,NULL,1),(4042,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','131','4040','Donaciones y legados de capital',NULL,NULL,1),(4043,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','132','4040','Otras subvenciones, donaciones y legados',NULL,NULL,1),(4044,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','133','4040','Ajustes por valoración en activos financieros disponibles para la venta',NULL,NULL,1),(4045,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','134','4040','Operaciones de cobertura',NULL,NULL,1),(4046,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1340','4045','Cobertura de flujos de efectivo',NULL,NULL,1),(4047,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1341','4045','Cobertura de una inversión neta en un negocio extranjero',NULL,NULL,1),(4048,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','135','4040','Diferencias de conversión',NULL,NULL,1),(4049,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','136','4040','Ajustes por valoración en activos no corrientes y grupos enajenables de elementos mantenidos para la venta',NULL,NULL,1),(4050,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','137','4040','Ingresos fiscales a distribuir en varios ejercicios',NULL,NULL,1),(4051,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1370','4050','Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios',NULL,NULL,1),(4052,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1371','4050','Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios',NULL,NULL,1),(4053,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','14','4001','Provisiones',NULL,NULL,1),(4054,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','141','4053','Provisión para impuestos',NULL,NULL,1),(4055,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','142','4053','Provisión para otras responsabilidades',NULL,NULL,1),(4056,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','143','4053','Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado',NULL,NULL,1),(4057,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','145','4053','Provisión para actuaciones medioambientales',NULL,NULL,1),(4058,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','15','4001','Deudas a largo plazo con características especiales',NULL,NULL,1),(4059,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','150','4058','Acciones o participaciones a largo plazo consideradas como pasivos financieros',NULL,NULL,1),(4060,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','153','4058','Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4061,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1533','4060','Desembolsos no exigidos empresas del grupo',NULL,NULL,1),(4062,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1534','4060','Desembolsos no exigidos empresas asociadas',NULL,NULL,1),(4063,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1535','4060','Desembolsos no exigidos otras partes vinculadas',NULL,NULL,1),(4064,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1536','4060','Otros desembolsos no exigidos',NULL,NULL,1),(4065,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','154','4058','Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4066,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1543','4065','Aportaciones no dinerarias pendientes empresas del grupo',NULL,NULL,1),(4067,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1544','4065','Aportaciones no dinerarias pendientes empresas asociadas',NULL,NULL,1),(4068,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1545','4065','Aportaciones no dinerarias pendientes otras partes vinculadas',NULL,NULL,1),(4069,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1546','4065','Otras aportaciones no dinerarias pendientes',NULL,NULL,1),(4070,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','16','4001','Deudas a largo plazo con partes vinculadas',NULL,NULL,1),(4071,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','160','4070','Deudas a largo plazo con entidades de crédito vinculadas',NULL,NULL,1),(4072,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1603','4071','Deudas a largo plazo con entidades de crédito empresas del grupo',NULL,NULL,1),(4073,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1604','4071','Deudas a largo plazo con entidades de crédito empresas asociadas',NULL,NULL,1),(4074,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1605','4071','Deudas a largo plazo con otras entidades de crédito vinculadas',NULL,NULL,1),(4075,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','161','4070','Proveedores de inmovilizado a largo plazo partes vinculadas',NULL,NULL,1),(4076,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1613','4075','Proveedores de inmovilizado a largo plazo empresas del grupo',NULL,NULL,1),(4077,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1614','4075','Proveedores de inmovilizado a largo plazo empresas asociadas',NULL,NULL,1),(4078,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1615','4075','Proveedores de inmovilizado a largo plazo otras partes vinculadas',NULL,NULL,1),(4079,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','162','4070','Acreedores por arrendamiento financiero a largo plazo partes vinculadas',NULL,NULL,1),(4080,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1623','4079','Acreedores por arrendamiento financiero a largo plazo empresas del grupo',NULL,NULL,1),(4081,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1624','4080','Acreedores por arrendamiento financiero a largo plazo empresas asociadas',NULL,NULL,1),(4082,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1625','4080','Acreedores por arrendamiento financiero a largo plazo otras partes vinculadas',NULL,NULL,1),(4083,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','163','4070','Otras deudas a largo plazo con partes vinculadas',NULL,NULL,1),(4084,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1633','4083','Otras deudas a largo plazo empresas del grupo',NULL,NULL,1),(4085,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1634','4083','Otras deudas a largo plazo empresas asociadas',NULL,NULL,1),(4086,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1635','4083','Otras deudas a largo plazo otras partes vinculadas',NULL,NULL,1),(4087,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','17','4001','Deudas a largo plazo por préstamos recibidos empresitos y otros conceptos',NULL,NULL,1),(4088,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','170','4087','Deudas a largo plazo con entidades de crédito',NULL,NULL,1),(4089,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','171','4087','Deudas a largo plazo',NULL,NULL,1),(4090,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','172','4087','Deudas a largo plazo transformables en suvbenciones donaciones y legados',NULL,NULL,1),(4091,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','173','4087','Proveedores de inmovilizado a largo plazo',NULL,NULL,1),(4092,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','174','4087','Acreedores por arrendamiento financiero a largo plazo',NULL,NULL,1),(4093,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','175','4087','Efectos a pagar a largo plazo',NULL,NULL,1),(4094,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','176','4087','Pasivos por derivados financieros a largo plazo',NULL,NULL,1),(4095,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','177','4087','Obligaciones y bonos',NULL,NULL,1),(4096,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','179','4087','Deudas representadas en otros valores negociables',NULL,NULL,1),(4097,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','18','4001','Pasivos por fianzas garantias y otros conceptos a largo plazo',NULL,NULL,1),(4098,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','180','4097','Fianzas recibidas a largo plazo',NULL,NULL,1),(4099,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','181','4097','Anticipos recibidos por ventas o prestaciones de servicios a largo plazo',NULL,NULL,1),(4100,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','185','4097','Depositos recibidos a largo plazo',NULL,NULL,1),(4101,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','19','4001','Situaciones transitorias de financiación',NULL,NULL,1),(4102,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','190','4101','Acciones o participaciones emitidas',NULL,NULL,1),(4103,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','192','4101','Suscriptores de acciones',NULL,NULL,1),(4104,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','194','4101','Capital emitido pendiente de inscripción',NULL,NULL,1),(4105,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','195','4101','Acciones o participaciones emitidas consideradas como pasivos financieros',NULL,NULL,1),(4106,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','197','4101','Suscriptores de acciones consideradas como pasivos financieros',NULL,NULL,1),(4107,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','199','4101','Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción',NULL,NULL,1),(4108,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','20','4002','Inmovilizaciones intangibles',NULL,NULL,1),(4109,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','200','4108','Investigación',NULL,NULL,1),(4110,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','201','4108','Desarrollo',NULL,NULL,1),(4111,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','202','4108','Concesiones administrativas',NULL,NULL,1),(4112,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','203','4108','Propiedad industrial',NULL,NULL,1),(4113,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','205','4108','Derechos de transpaso',NULL,NULL,1),(4114,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','206','4108','Aplicaciones informáticas',NULL,NULL,1),(4115,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','209','4108','Anticipos para inmovilizaciones intangibles',NULL,NULL,1),(4116,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','21','4002','Inmovilizaciones materiales',NULL,NULL,1),(4117,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','210','4116','Terrenos y bienes naturales',NULL,NULL,1),(4118,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','211','4116','Construcciones',NULL,NULL,1),(4119,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','212','4116','Instalaciones técnicas',NULL,NULL,1),(4120,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','213','4116','Maquinaria',NULL,NULL,1),(4121,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','214','4116','Utillaje',NULL,NULL,1),(4122,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','215','4116','Otras instalaciones',NULL,NULL,1),(4123,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','216','4116','Mobiliario',NULL,NULL,1),(4124,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','217','4116','Equipos para procesos de información',NULL,NULL,1),(4125,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','218','4116','Elementos de transporte',NULL,NULL,1),(4126,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','219','4116','Otro inmovilizado material',NULL,NULL,1),(4127,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','22','4002','Inversiones inmobiliarias',NULL,NULL,1),(4128,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','220','4127','Inversiones en terreons y bienes naturales',NULL,NULL,1),(4129,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','221','4127','Inversiones en construcciones',NULL,NULL,1),(4130,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','23','4002','Inmovilizaciones materiales en curso',NULL,NULL,1),(4131,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','230','4130','Adaptación de terrenos y bienes naturales',NULL,NULL,1),(4132,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','231','4130','Construcciones en curso',NULL,NULL,1),(4133,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','232','4130','Instalaciones técnicas en montaje',NULL,NULL,1),(4134,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','233','4130','Maquinaria en montaje',NULL,NULL,1),(4135,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','237','4130','Equipos para procesos de información en montaje',NULL,NULL,1),(4136,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','239','4130','Anticipos para inmovilizaciones materiales',NULL,NULL,1),(4137,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','24','4002','Inversiones financieras a largo plazo en partes vinculadas',NULL,NULL,1),(4138,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','240','4137','Participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4139,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2403','4138','Participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4140,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2404','4138','Participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4141,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2405','4138','Participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4142,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','241','4137','Valores representativos de deuda a largo plazo de partes vinculadas',NULL,NULL,1),(4143,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2413','4142','Valores representativos de deuda a largo plazo de empresas del grupo',NULL,NULL,1),(4144,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2414','4142','Valores representativos de deuda a largo plazo de empresas asociadas',NULL,NULL,1),(4145,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2415','4142','Valores representativos de deuda a largo plazo de otras partes vinculadas',NULL,NULL,1),(4146,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','242','4137','Créditos a largo plazo a partes vinculadas',NULL,NULL,1),(4147,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2423','4146','Créditos a largo plazo a empresas del grupo',NULL,NULL,1),(4148,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2424','4146','Créditos a largo plazo a empresas asociadas',NULL,NULL,1),(4149,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2425','4146','Créditos a largo plazo a otras partes vinculadas',NULL,NULL,1),(4150,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','249','4137','Desembolsos pendientes sobre participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4151,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2493','4150','Desembolsos pendientes sobre participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4152,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2494','4150','Desembolsos pendientes sobre participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4153,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2495','4150','Desembolsos pendientes sobre participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4154,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','25','4002','Otras inversiones financieras a largo plazo',NULL,NULL,1),(4155,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','250','4154','Inversiones financieras a largo plazo en instrumentos de patrimonio',NULL,NULL,1),(4156,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','251','4154','Valores representativos de deuda a largo plazo',NULL,NULL,1),(4157,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','252','4154','Créditos a largo plazo',NULL,NULL,1),(4158,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','253','4154','Créditos a largo plazo por enajenación de inmovilizado',NULL,NULL,1),(4159,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','254','4154','Créditos a largo plazo al personal',NULL,NULL,1),(4160,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','255','4154','Activos por derivados financieros a largo plazo',NULL,NULL,1),(4161,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','258','4154','Imposiciones a largo plazo',NULL,NULL,1),(4162,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','259','4154','Desembolsos pendientes sobre participaciones en el patrimonio neto a largo plazo',NULL,NULL,1),(4163,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','26','4002','Fianzas y depósitos constituidos a largo plazo',NULL,NULL,1),(4164,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','260','4163','Fianzas constituidas a largo plazo',NULL,NULL,1),(4165,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','261','4163','Depósitos constituidos a largo plazo',NULL,NULL,1),(4166,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','28','4002','Amortización acumulada del inmovilizado',NULL,NULL,1),(4167,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','280','4166','Amortización acumulado del inmovilizado intangible',NULL,NULL,1),(4168,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2800','4167','Amortización acumulada de investigación',NULL,NULL,1),(4169,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2801','4167','Amortización acumulada de desarrollo',NULL,NULL,1),(4170,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2802','4167','Amortización acumulada de concesiones administrativas',NULL,NULL,1),(4171,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2803','4167','Amortización acumulada de propiedad industrial',NULL,NULL,1),(4172,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2805','4167','Amortización acumulada de derechos de transpaso',NULL,NULL,1),(4173,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2806','4167','Amortización acumulada de aplicaciones informáticas',NULL,NULL,1),(4174,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','281','4166','Amortización acumulado del inmovilizado material',NULL,NULL,1),(4175,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2811','4174','Amortización acumulada de construcciones',NULL,NULL,1),(4176,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2812','4174','Amortización acumulada de instalaciones técnicas',NULL,NULL,1),(4177,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2813','4174','Amortización acumulada de maquinaria',NULL,NULL,1),(4178,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2814','4174','Amortización acumulada de utillaje',NULL,NULL,1),(4179,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2815','4174','Amortización acumulada de otras instalaciones',NULL,NULL,1),(4180,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2816','4174','Amortización acumulada de mobiliario',NULL,NULL,1),(4181,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2817','4174','Amortización acumulada de equipos para proceso de información',NULL,NULL,1),(4182,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2818','4174','Amortización acumulada de elementos de transporte',NULL,NULL,1),(4183,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2819','4175','Amortización acumulada de otro inmovilizado material',NULL,NULL,1),(4184,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','282','4166','Amortización acumulada de las inversiones inmobiliarias',NULL,NULL,1),(4185,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','29','4002','Deterioro de valor de activos no corrientes',NULL,NULL,1),(4186,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','290','4185','Deterioro de valor del inmovilizado intangible',NULL,NULL,1),(4187,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2900','4186','Deterioro de valor de investigación',NULL,NULL,1),(4188,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2901','4186','Deterioro de valor de desarrollo',NULL,NULL,1),(4189,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2902','4186','Deterioro de valor de concesiones administrativas',NULL,NULL,1),(4190,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2903','4186','Deterioro de valor de propiedad industrial',NULL,NULL,1),(4191,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2905','4186','Deterioro de valor de derechos de transpaso',NULL,NULL,1),(4192,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2906','4186','Deterioro de valor de aplicaciones informáticas',NULL,NULL,1),(4193,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','291','4185','Deterioro de valor del inmovilizado material',NULL,NULL,1),(4194,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2910','4193','Deterioro de valor de terrenos y bienes naturales',NULL,NULL,1),(4195,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2911','4193','Deterioro de valor de construcciones',NULL,NULL,1),(4196,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2912','4193','Deterioro de valor de instalaciones técnicas',NULL,NULL,1),(4197,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2913','4193','Deterioro de valor de maquinaria',NULL,NULL,1),(4198,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2914','4193','Deterioro de valor de utillajes',NULL,NULL,1),(4199,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2915','4194','Deterioro de valor de otras instalaciones',NULL,NULL,1),(4200,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2916','4194','Deterioro de valor de mobiliario',NULL,NULL,1),(4201,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2917','4194','Deterioro de valor de equipos para proceso de información',NULL,NULL,1),(4202,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2918','4194','Deterioro de valor de elementos de transporte',NULL,NULL,1),(4203,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2919','4194','Deterioro de valor de otro inmovilizado material',NULL,NULL,1),(4204,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','292','4185','Deterioro de valor de las inversiones inmobiliarias',NULL,NULL,1),(4205,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2920','4204','Deterioro de valor de terrenos y bienes naturales',NULL,NULL,1),(4206,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2921','4204','Deterioro de valor de construcciones',NULL,NULL,1),(4207,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','293','4185','Deterioro de valor de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4208,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2933','4207','Deterioro de valor de participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4209,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2934','4207','Deterioro de valor de sobre participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4210,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2935','4207','Deterioro de valor de sobre participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4211,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','294','4185','Deterioro de valor de valores representativos de deuda a largo plazo en partes vinculadas',NULL,NULL,1),(4212,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2943','4211','Deterioro de valor de valores representativos de deuda a largo plazo en empresas del grupo',NULL,NULL,1),(4213,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2944','4211','Deterioro de valor de valores representativos de deuda a largo plazo en empresas asociadas',NULL,NULL,1),(4214,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2945','4211','Deterioro de valor de valores representativos de deuda a largo plazo en otras partes vinculadas',NULL,NULL,1),(4215,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','295','4185','Deterioro de valor de créditos a largo plazo a partes vinculadas',NULL,NULL,1),(4216,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2953','4215','Deterioro de valor de créditos a largo plazo a empresas del grupo',NULL,NULL,1),(4217,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2954','4215','Deterioro de valor de créditos a largo plazo a empresas asociadas',NULL,NULL,1),(4218,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2955','4215','Deterioro de valor de créditos a largo plazo a otras partes vinculadas',NULL,NULL,1),(4219,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','296','4185','Deterioro de valor de participaciones en el patrimonio netoa largo plazo',NULL,NULL,1),(4220,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','297','4185','Deterioro de valor de valores representativos de deuda a largo plazo',NULL,NULL,1),(4221,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','298','4185','Deterioro de valor de créditos a largo plazo',NULL,NULL,1),(4222,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','30','4003','Comerciales',NULL,NULL,1),(4223,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','300','4222','Mercaderías A',NULL,NULL,1),(4224,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','301','4222','Mercaderías B',NULL,NULL,1),(4225,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','31','4003','Materias primas',NULL,NULL,1),(4226,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','310','4225','Materias primas A',NULL,NULL,1),(4227,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','311','4225','Materias primas B',NULL,NULL,1),(4228,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','32','4003','Otros aprovisionamientos',NULL,NULL,1),(4229,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','320','4228','Elementos y conjuntos incorporables',NULL,NULL,1),(4230,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','321','4228','Combustibles',NULL,NULL,1),(4231,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','322','4228','Repuestos',NULL,NULL,1),(4232,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','325','4228','Materiales diversos',NULL,NULL,1),(4233,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','326','4228','Embalajes',NULL,NULL,1),(4234,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','327','4228','Envases',NULL,NULL,1),(4235,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','328','4229','Material de oficina',NULL,NULL,1),(4236,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','33','4003','Productos en curso',NULL,NULL,1),(4237,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','330','4236','Productos en curos A',NULL,NULL,1),(4238,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','331','4236','Productos en curso B',NULL,NULL,1),(4239,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','34','4003','Productos semiterminados',NULL,NULL,1),(4240,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','340','4239','Productos semiterminados A',NULL,NULL,1),(4241,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','341','4239','Productos semiterminados B',NULL,NULL,1),(4242,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','35','4003','Productos terminados',NULL,NULL,1),(4243,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','350','4242','Productos terminados A',NULL,NULL,1),(4244,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','351','4242','Productos terminados B',NULL,NULL,1),(4245,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','36','4003','Subproductos, residuos y materiales recuperados',NULL,NULL,1),(4246,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','360','4245','Subproductos A',NULL,NULL,1),(4247,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','361','4245','Subproductos B',NULL,NULL,1),(4248,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','365','4245','Residuos A',NULL,NULL,1),(4249,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','366','4245','Residuos B',NULL,NULL,1),(4250,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','368','4245','Materiales recuperados A',NULL,NULL,1),(4251,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','369','4245','Materiales recuperados B',NULL,NULL,1),(4252,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','39','4003','Deterioro de valor de las existencias',NULL,NULL,1),(4253,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','390','4252','Deterioro de valor de las mercaderías',NULL,NULL,1),(4254,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','391','4252','Deterioro de valor de las materias primas',NULL,NULL,1),(4255,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','392','4252','Deterioro de valor de otros aprovisionamientos',NULL,NULL,1),(4256,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','393','4252','Deterioro de valor de los productos en curso',NULL,NULL,1),(4257,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','394','4252','Deterioro de valor de los productos semiterminados',NULL,NULL,1),(4258,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','395','4252','Deterioro de valor de los productos terminados',NULL,NULL,1),(4259,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','396','4252','Deterioro de valor de los subproductos, residuos y materiales recuperados',NULL,NULL,1),(4260,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','PROVEEDORES','40','4004','Proveedores',NULL,NULL,1),(4261,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','PROVEEDORES','400','4260','Proveedores',NULL,NULL,1),(4262,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4000','4261','Proveedores euros',NULL,NULL,1),(4263,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4004','4261','Proveedores moneda extranjera',NULL,NULL,1),(4264,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4009','4261','Proveedores facturas pendientes de recibir o formalizar',NULL,NULL,1),(4265,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','401','4260','Proveedores efectos comerciales a pagar',NULL,NULL,1),(4266,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','403','4260','Proveedores empresas del grupo',NULL,NULL,1),(4267,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4030','4266','Proveedores empresas del grupo euros',NULL,NULL,1),(4268,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4031','4266','Efectos comerciales a pagar empresas del grupo',NULL,NULL,1),(4269,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4034','4266','Proveedores empresas del grupo moneda extranjera',NULL,NULL,1),(4270,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4036','4266','Envases y embalajes a devolver a proveedores empresas del grupo',NULL,NULL,1),(4271,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4039','4266','Proveedores empresas del grupo facturas pendientes de recibir o de formalizar',NULL,NULL,1),(4272,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','404','4260','Proveedores empresas asociadas',NULL,NULL,1),(4273,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','405','4260','Proveedores otras partes vinculadas',NULL,NULL,1),(4274,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','406','4260','Envases y embalajes a devolver a proveedores',NULL,NULL,1),(4275,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','407','4260','Anticipos a proveedores',NULL,NULL,1),(4276,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','41','4004','Acreedores varios',NULL,NULL,1),(4277,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','410','4276','Acreedores por prestaciones de servicios',NULL,NULL,1),(4278,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4100','4277','Acreedores por prestaciones de servicios euros',NULL,NULL,1),(4279,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4104','4277','Acreedores por prestaciones de servicios moneda extranjera',NULL,NULL,1),(4280,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4109','4277','Acreedores por prestaciones de servicios facturas pendientes de recibir o formalizar',NULL,NULL,1),(4281,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','411','4276','Acreedores efectos comerciales a pagar',NULL,NULL,1),(4282,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','419','4276','Acreedores por operaciones en común',NULL,NULL,1),(4283,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','CLIENTES','43','4004','Clientes',NULL,NULL,1),(4284,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','CLIENTES','430','4283','Clientes',NULL,NULL,1),(4285,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4300','4284','Clientes euros',NULL,NULL,1),(4286,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4304','4284','Clientes moneda extranjera',NULL,NULL,1),(4287,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4309','4284','Clientes facturas pendientes de formalizar',NULL,NULL,1),(4288,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','431','4283','Clientes efectos comerciales a cobrar',NULL,NULL,1),(4289,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4310','4288','Efectos comerciales en cartera',NULL,NULL,1),(4290,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4311','4288','Efectos comerciales descontados',NULL,NULL,1),(4291,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4312','4288','Efectos comerciales en gestión de cobro',NULL,NULL,1),(4292,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4315','4288','Efectos comerciales impagados',NULL,NULL,1),(4293,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','432','4283','Clientes operaciones de factoring',NULL,NULL,1),(4294,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','433','4283','Clientes empresas del grupo',NULL,NULL,1),(4295,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4330','4294','Clientes empresas del grupo euros',NULL,NULL,1),(4296,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4331','4294','Efectos comerciales a cobrar empresas del grupo',NULL,NULL,1),(4297,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4332','4294','Clientes empresas del grupo operaciones de factoring',NULL,NULL,1),(4298,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4334','4294','Clientes empresas del grupo moneda extranjera',NULL,NULL,1),(4299,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4336','4294','Clientes empresas del grupo dudoso cobro',NULL,NULL,1),(4300,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4337','4294','Envases y embalajes a devolver a clientes empresas del grupo',NULL,NULL,1),(4301,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4339','4294','Clientes empresas del grupo facturas pendientes de formalizar',NULL,NULL,1),(4302,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','434','4283','Clientes empresas asociadas',NULL,NULL,1),(4303,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','435','4283','Clientes otras partes vinculadas',NULL,NULL,1),(4304,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','436','4283','Clientes de dudoso cobro',NULL,NULL,1),(4305,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','437','4283','Envases y embalajes a devolver por clientes',NULL,NULL,1),(4306,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','438','4283','Anticipos de clientes',NULL,NULL,1),(4307,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','44','4004','Deudores varios',NULL,NULL,1),(4308,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','440','4307','Deudores',NULL,NULL,1),(4309,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4400','4308','Deudores euros',NULL,NULL,1),(4310,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4404','4308','Deudores moneda extranjera',NULL,NULL,1),(4311,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4409','4308','Deudores facturas pendientes de formalizar',NULL,NULL,1),(4312,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','441','4307','Deudores efectos comerciales a cobrar',NULL,NULL,1),(4313,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4410','4312','Deudores efectos comerciales en cartera',NULL,NULL,1),(4314,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4411','4312','Deudores efectos comerciales descontados',NULL,NULL,1),(4315,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4412','4312','Deudores efectos comerciales en gestión de cobro',NULL,NULL,1),(4316,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4415','4312','Deudores efectos comerciales impagados',NULL,NULL,1),(4317,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','446','4307','Deudores de dusoso cobro',NULL,NULL,1),(4318,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','449','4307','Deudores por operaciones en común',NULL,NULL,1),(4319,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','46','4004','Personal',NULL,NULL,1),(4320,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','460','4319','Anticipos de renumeraciones',NULL,NULL,1),(4321,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','465','4319','Renumeraciones pendientes de pago',NULL,NULL,1),(4322,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','47','4004','Administraciones Públicas',NULL,NULL,1),(4323,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','470','4322','Hacienda Pública deudora por diversos conceptos',NULL,NULL,1),(4324,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4700','4323','Hacienda Pública deudora por IVA',NULL,NULL,1),(4325,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4708','4323','Hacienda Pública deudora por subvenciones concedidas',NULL,NULL,1),(4326,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4709','4323','Hacienda Pública deudora por devolución de impuestos',NULL,NULL,1),(4327,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','471','4322','Organismos de la Seguridad Social deudores',NULL,NULL,1),(4328,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','472','4322','Hacienda Pública IVA soportado',NULL,NULL,1),(4329,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','473','4322','Hacienda Pública retenciones y pagos a cuenta',NULL,NULL,1),(4330,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','474','4322','Activos por impuesto diferido',NULL,NULL,1),(4331,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4740','4330','Activos por diferencias temporarias deducibles',NULL,NULL,1),(4332,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4742','4330','Derechos por deducciones y bonificaciones pendientes de aplicar',NULL,NULL,1),(4333,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4745','4330','Crédito por pérdidasa compensar del ejercicio',NULL,NULL,1),(4334,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','475','4322','Hacienda Pública acreedora por conceptos fiscales',NULL,NULL,1),(4335,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4750','4334','Hacienda Pública acreedora por IVA',NULL,NULL,1),(4336,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4751','4334','Hacienda Pública acreedora por retenciones practicadas',NULL,NULL,1),(4337,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4752','4334','Hacienda Pública acreedora por impuesto sobre sociedades',NULL,NULL,1),(4338,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4758','4334','Hacienda Pública acreedora por subvenciones a integrar',NULL,NULL,1),(4339,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','476','4322','Organismos de la Seguridad Social acreedores',NULL,NULL,1),(4340,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','477','4322','Hacienda Pública IVA repercutido',NULL,NULL,1),(4341,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','479','4322','Pasivos por diferencias temporarias imponibles',NULL,NULL,1),(4342,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','48','4004','Ajustes por periodificación',NULL,NULL,1),(4343,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','480','4342','Gastos anticipados',NULL,NULL,1),(4344,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','485','4342','Ingresos anticipados',NULL,NULL,1),(4345,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','49','4004','Deterioro de valor de créditos comerciales y provisiones a corto plazo',NULL,NULL,1),(4346,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','490','4345','Deterioro de valor de créditos por operaciones comerciales',NULL,NULL,1),(4347,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','493','4345','Deterioro de valor de créditos por operaciones comerciales con partes vinculadas',NULL,NULL,1),(4348,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4933','4347','Deterioro de valor de créditos por operaciones comerciales con empresas del grupo',NULL,NULL,1),(4349,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4934','4347','Deterioro de valor de créditos por operaciones comerciales con empresas asociadas',NULL,NULL,1),(4350,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4935','4347','Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas',NULL,NULL,1),(4351,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','499','4345','Provisiones por operaciones comerciales',NULL,NULL,1),(4352,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4994','4351','Provisión para contratos anerosos',NULL,NULL,1),(4353,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4999','4351','Provisión para otras operaciones comerciales',NULL,NULL,1),(4354,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','50','4005','Emprésitos deudas con características especiales y otras emisiones análogas a corto plazo',NULL,NULL,1),(4355,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','500','4354','Obligaciones y bonos a corto plazo',NULL,NULL,1),(4356,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','502','4354','Acciones o participaciones a corto plazo consideradas como pasivos financieros',NULL,NULL,1),(4357,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','505','4354','Deudas representadas en otros valores negociables a corto plazo',NULL,NULL,1),(4358,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','506','4354','Intereses a corto plazo de emprésitos y otras emisiones analógicas',NULL,NULL,1),(4359,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','507','4354','Dividendos de acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4360,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','509','4354','Valores negociables amortizados',NULL,NULL,1),(4361,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5090','4360','Obligaciones y bonos amortizados',NULL,NULL,1),(4362,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5095','4360','Otros valores negociables amortizados',NULL,NULL,1),(4363,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','51','4005','Deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4364,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','510','4363','Deudas a corto plazo con entidades de crédito vinculadas',NULL,NULL,1),(4365,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5103','4364','Deudas a corto plazo con entidades de crédito empresas del grupo',NULL,NULL,1),(4366,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5104','4364','Deudas a corto plazo con entidades de crédito empresas asociadas',NULL,NULL,1),(4367,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5105','4364','Deudas a corto plazo con otras entidades de crédito vinculadas',NULL,NULL,1),(4368,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','511','4363','Proveedores de inmovilizado a corto plazo partes vinculadas',NULL,NULL,1),(4369,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5113','4368','Proveedores de inmovilizado a corto plazo empresas del grupo',NULL,NULL,1),(4370,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5114','4368','Proveedores de inmovilizado a corto plazo empresas asociadas',NULL,NULL,1),(4371,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5115','4368','Proveedores de inmovilizado a corto plazo otras partes vinculadas',NULL,NULL,1),(4372,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','512','4363','Acreedores por arrendamiento financiero a corto plazo partes vinculadas',NULL,NULL,1),(4373,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5123','4372','Acreedores por arrendamiento financiero a corto plazo empresas del grupo',NULL,NULL,1),(4374,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5124','4372','Acreedores por arrendamiento financiero a corto plazo empresas asociadas',NULL,NULL,1),(4375,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5125','4372','Acreedores por arrendamiento financiero a corto plazo otras partes vinculadas',NULL,NULL,1),(4376,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','513','4363','Otras deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4377,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5133','4376','Otras deudas a corto plazo con empresas del grupo',NULL,NULL,1),(4378,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5134','4376','Otras deudas a corto plazo con empresas asociadas',NULL,NULL,1),(4379,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5135','4376','Otras deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4380,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','514','4363','Intereses a corto plazo con partes vinculadas',NULL,NULL,1),(4381,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5143','4380','Intereses a corto plazo empresas del grupo',NULL,NULL,1),(4382,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5144','4380','Intereses a corto plazo empresas asociadas',NULL,NULL,1),(4383,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5145','4380','Intereses deudas a corto plazo partes vinculadas',NULL,NULL,1),(4384,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','52','4005','Deudas a corto plazo por préstamos recibidos y otros conceptos',NULL,NULL,1),(4385,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','520','4384','Deudas a corto plazo con entidades de crédito',NULL,NULL,1),(4386,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5200','4385','Préstamos a corto plazo de entidades de crédito',NULL,NULL,1),(4387,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5201','4385','Deudas a corto plazo por crédito dispuesto',NULL,NULL,1),(4388,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5208','4385','Deudas por efectos descontados',NULL,NULL,1),(4389,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5209','4385','Deudas por operaciones de factoring',NULL,NULL,1),(4390,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','521','4384','Deudas a corto plazo',NULL,NULL,1),(4391,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','522','4384','Deudas a corto plazo transformables en subvenciones donaciones y legados',NULL,NULL,1),(4392,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','523','4384','Proveedores de inmovilizado a corto plazo',NULL,NULL,1),(4393,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','526','4384','Dividendo activo a pagar',NULL,NULL,1),(4394,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','527','4384','Intereses a corto plazo de deudas con entidades de crédito',NULL,NULL,1),(4395,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','528','4384','Intereses a corto plazo de deudas',NULL,NULL,1),(4396,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','529','4384','Provisiones a corto plazo',NULL,NULL,1),(4397,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5291','4396','Provisión a corto plazo para impuestos',NULL,NULL,1),(4398,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5292','4396','Provisión a corto plazo para otras responsabilidades',NULL,NULL,1),(4399,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5293','4396','Provisión a corto plazo por desmantelamiento retiro o rehabilitación del inmovilizado',NULL,NULL,1),(4400,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5295','4396','Provisión a corto plazo para actuaciones medioambientales',NULL,NULL,1),(4401,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','53','4005','Inversiones financieras a corto plazo en partes vinculadas',NULL,NULL,1),(4402,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','530','4401','Participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4403,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5303','4402','Participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4404,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5304','4402','Participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4405,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5305','4402','Participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4406,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','531','4401','Valores representativos de deuda a corto plazo de partes vinculadas',NULL,NULL,1),(4407,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5313','4406','Valores representativos de deuda a corto plazo de empresas del grupo',NULL,NULL,1),(4408,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5314','4406','Valores representativos de deuda a corto plazo de empresas asociadas',NULL,NULL,1),(4409,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5315','4406','Valores representativos de deuda a corto plazo de otras partes vinculadas',NULL,NULL,1),(4410,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','532','4401','Créditos a corto plazo a partes vinculadas',NULL,NULL,1),(4411,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5323','4410','Créditos a corto plazo a empresas del grupo',NULL,NULL,1),(4412,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5324','4410','Créditos a corto plazo a empresas asociadas',NULL,NULL,1),(4413,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5325','4410','Créditos a corto plazo a otras partes vinculadas',NULL,NULL,1),(4414,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','533','4401','Intereses a corto plazo de valores representativos de deuda de partes vinculadas',NULL,NULL,1),(4415,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5333','4414','Intereses a corto plazo de valores representativos de deuda en empresas del grupo',NULL,NULL,1),(4416,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5334','4414','Intereses a corto plazo de valores representativos de deuda en empresas asociadas',NULL,NULL,1),(4417,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5335','4414','Intereses a corto plazo de valores representativos de deuda en otras partes vinculadas',NULL,NULL,1),(4418,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','534','4401','Intereses a corto plazo de créditos a partes vinculadas',NULL,NULL,1),(4419,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5343','4418','Intereses a corto plazo de créditos a empresas del grupo',NULL,NULL,1),(4420,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5344','4418','Intereses a corto plazo de créditos a empresas asociadas',NULL,NULL,1),(4421,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5345','4418','Intereses a corto plazo de créditos a otras partes vinculadas',NULL,NULL,1),(4422,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','535','4401','Dividendo a cobrar de inversiones financieras en partes vinculadas',NULL,NULL,1),(4423,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5353','4422','Dividendo a cobrar de empresas del grupo',NULL,NULL,1),(4424,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5354','4422','Dividendo a cobrar de empresas asociadas',NULL,NULL,1),(4425,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5355','4422','Dividendo a cobrar de otras partes vinculadas',NULL,NULL,1),(4426,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','539','4401','Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4427,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5393','4426','Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4428,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5394','4426','Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4429,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5395','4426','Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4430,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','54','4005','Otras inversiones financieras a corto plazo',NULL,NULL,1),(4431,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','540','4430','Inversiones financieras a corto plazo en instrumentos de patrimonio',NULL,NULL,1),(4432,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','541','4430','Valores representativos de deuda a corto plazo',NULL,NULL,1),(4433,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','542','4430','Créditos a corto plazo',NULL,NULL,1),(4434,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','543','4430','Créditos a corto plazo por enejenación de inmovilizado',NULL,NULL,1),(4435,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','544','4430','Créditos a corto plazo al personal',NULL,NULL,1),(4436,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','545','4430','Dividendo a cobrar',NULL,NULL,1),(4437,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','546','4430','Intereses a corto plazo de valores reprsentativos de deuda',NULL,NULL,1),(4438,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','547','4430','Intereses a corto plazo de créditos',NULL,NULL,1),(4439,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','548','4430','Imposiciones a corto plazo',NULL,NULL,1),(4440,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','549','4430','Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo',NULL,NULL,1),(4441,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','55','4005','Otras cuentas no bancarias',NULL,NULL,1),(4442,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','550','4441','Titular de la explotación',NULL,NULL,1),(4443,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','551','4441','Cuenta corriente con socios y administradores',NULL,NULL,1),(4444,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','552','4441','Cuenta corriente otras personas y entidades vinculadas',NULL,NULL,1),(4445,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5523','4444','Cuenta corriente con empresas del grupo',NULL,NULL,1),(4446,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5524','4444','Cuenta corriente con empresas asociadas',NULL,NULL,1),(4447,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5525','4444','Cuenta corriente con otras partes vinculadas',NULL,NULL,1),(4448,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','554','4441','Cuenta corriente con uniones temporales de empresas y comunidades de bienes',NULL,NULL,1),(4449,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','555','4441','Partidas pendientes de aplicación',NULL,NULL,1),(4450,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','556','4441','Desembolsos exigidos sobre participaciones en el patrimonio neto',NULL,NULL,1),(4451,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5563','4450','Desembolsos exigidos sobre participaciones empresas del grupo',NULL,NULL,1),(4452,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5564','4450','Desembolsos exigidos sobre participaciones empresas asociadas',NULL,NULL,1),(4453,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5565','4450','Desembolsos exigidos sobre participaciones otras partes vinculadas',NULL,NULL,1),(4454,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5566','4450','Desembolsos exigidos sobre participaciones otras empresas',NULL,NULL,1),(4455,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','557','4441','Dividendo activo a cuenta',NULL,NULL,1),(4456,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','558','4441','Socios por desembolsos exigidos',NULL,NULL,1),(4457,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5580','4456','Socios por desembolsos exigidos sobre acciones o participaciones ordinarias',NULL,NULL,1),(4458,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5585','4456','Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4459,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','559','4441','Derivados financieros a corto plazo',NULL,NULL,1),(4460,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5590','4459','Activos por derivados financieros a corto plazo',NULL,NULL,1),(4461,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5595','4459','Pasivos por derivados financieros a corto plazo',NULL,NULL,1),(4462,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','56','4005','Finanzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación',NULL,NULL,1),(4463,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','560','4462','Finanzas recibidas a corto plazo',NULL,NULL,1),(4464,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','561','4462','Depósitos recibidos a corto plazo',NULL,NULL,1),(4465,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','565','4462','Finanzas constituidas a corto plazo',NULL,NULL,1),(4466,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','566','4462','Depósitos constituidos a corto plazo',NULL,NULL,1),(4467,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','567','4462','Intereses pagados por anticipado',NULL,NULL,1),(4468,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','568','4462','Intereses cobrados a corto plazo',NULL,NULL,1),(4469,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','57','4005','Tesorería',NULL,NULL,1),(4470,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','CAJA','570','4469','Caja euros',NULL,NULL,1),(4471,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','571','4469','Caja moneda extranjera',NULL,NULL,1),(4472,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','BANCOS','572','4469','Bancos e instituciones de crédito cc vista euros',NULL,NULL,1),(4473,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','573','4469','Bancos e instituciones de crédito cc vista moneda extranjera',NULL,NULL,1),(4474,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','574','4469','Bancos e instituciones de crédito cuentas de ahorro euros',NULL,NULL,1),(4475,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','575','4469','Bancos e instituciones de crédito cuentas de ahorro moneda extranjera',NULL,NULL,1),(4476,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','576','4469','Inversiones a corto plazo de gran liquidez',NULL,NULL,1),(4477,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','59','4005','Deterioro del valor de las inversiones financieras a corto plazo',NULL,NULL,1),(4478,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','593','4477','Deterioro del valor de participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4479,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5933','4478','Deterioro del valor de participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4480,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5934','4478','Deterioro del valor de participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4481,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5935','4478','Deterioro del valor de participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4482,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','594','4477','Deterioro del valor de valores representativos de deuda a corto plazo en partes vinculadas',NULL,NULL,1),(4483,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5943','4482','Deterioro del valor de valores representativos de deuda a corto plazo en empresas del grupo',NULL,NULL,1),(4484,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5944','4482','Deterioro del valor de valores representativos de deuda a corto plazo en empresas asociadas',NULL,NULL,1),(4485,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5945','4482','Deterioro del valor de valores representativos de deuda a corto plazo en otras partes vinculadas',NULL,NULL,1),(4486,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','595','4477','Deterioro del valor de créditos a corto plazo en partes vinculadas',NULL,NULL,1),(4487,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5953','4486','Deterioro del valor de créditos a corto plazo en empresas del grupo',NULL,NULL,1),(4488,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5954','4486','Deterioro del valor de créditos a corto plazo en empresas asociadas',NULL,NULL,1),(4489,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5955','4486','Deterioro del valor de créditos a corto plazo en otras partes vinculadas',NULL,NULL,1),(4490,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','596','4477','Deterioro del valor de participaciones a corto plazo',NULL,NULL,1),(4491,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','597','4477','Deterioro del valor de valores representativos de deuda a corto plazo',NULL,NULL,1),(4492,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','598','4477','Deterioro de valor de créditos a corto plazo',NULL,NULL,1),(4493,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','60','4006','Compras',NULL,NULL,1),(4494,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','600','4493','Compras de mercaderías',NULL,NULL,1),(4495,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','601','4493','Compras de materias primas',NULL,NULL,1),(4496,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','602','4493','Compras de otros aprovisionamientos',NULL,NULL,1),(4497,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','606','4493','Descuentos sobre compras por pronto pago',NULL,NULL,1),(4498,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6060','4497','Descuentos sobre compras por pronto pago de mercaderías',NULL,NULL,1),(4499,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6061','4497','Descuentos sobre compras por pronto pago de materias primas',NULL,NULL,1),(4500,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6062','4497','Descuentos sobre compras por pronto pago de otros aprovisionamientos',NULL,NULL,1),(4501,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','607','4493','Trabajos realizados por otras empresas',NULL,NULL,1),(4502,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','608','4493','Devoluciones de compras y operaciones similares',NULL,NULL,1),(4503,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6080','4502','Devoluciones de compras de mercaderías',NULL,NULL,1),(4504,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6081','4502','Devoluciones de compras de materias primas',NULL,NULL,1),(4505,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6082','4502','Devoluciones de compras de otros aprovisionamientos',NULL,NULL,1),(4506,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','609','4493','Rappels por compras',NULL,NULL,1),(4507,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6090','4506','Rappels por compras de mercaderías',NULL,NULL,1),(4508,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6091','4506','Rappels por compras de materias primas',NULL,NULL,1),(4509,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6092','4506','Rappels por compras de otros aprovisionamientos',NULL,NULL,1),(4510,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','61','4006','Variación de existencias',NULL,NULL,1),(4511,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','610','4510','Variación de existencias de mercaderías',NULL,NULL,1),(4512,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','611','4510','Variación de existencias de materias primas',NULL,NULL,1),(4513,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','612','4510','Variación de existencias de otros aprovisionamientos',NULL,NULL,1),(4514,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','62','4006','Servicios exteriores',NULL,NULL,1),(4515,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','620','4514','Gastos en investigación y desarrollo del ejercicio',NULL,NULL,1),(4516,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','621','4514','Arrendamientos y cánones',NULL,NULL,1),(4517,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','622','4514','Reparaciones y conservación',NULL,NULL,1),(4518,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','623','4514','Servicios profesionales independientes',NULL,NULL,1),(4519,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','624','4514','Transportes',NULL,NULL,1),(4520,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','625','4514','Primas de seguros',NULL,NULL,1),(4521,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','626','4514','Servicios bancarios y similares',NULL,NULL,1),(4522,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','627','4514','Publicidad, propaganda y relaciones públicas',NULL,NULL,1),(4523,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','628','4514','Suministros',NULL,NULL,1),(4524,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','629','4514','Otros servicios',NULL,NULL,1),(4525,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','63','4006','Tributos',NULL,NULL,1),(4526,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','630','4525','Impuesto sobre benecifios',NULL,NULL,1),(4527,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6300','4526','Impuesto corriente',NULL,NULL,1),(4528,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6301','4526','Impuesto diferido',NULL,NULL,1),(4529,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','631','4525','Otros tributos',NULL,NULL,1),(4530,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','633','4525','Ajustes negativos en la imposición sobre beneficios',NULL,NULL,1),(4531,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','634','4525','Ajustes negativos en la imposición indirecta',NULL,NULL,1),(4532,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6341','4531','Ajustes negativos en IVA de activo corriente',NULL,NULL,1),(4533,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6342','4531','Ajustes negativos en IVA de inversiones',NULL,NULL,1),(4534,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','636','4525','Devolución de impuestos',NULL,NULL,1),(4535,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','638','4525','Ajustes positivos en la imposición sobre beneficios',NULL,NULL,1),(4536,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','639','4525','Ajustes positivos en la imposición directa',NULL,NULL,1),(4537,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6391','4536','Ajustes positivos en IVA de activo corriente',NULL,NULL,1),(4538,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6392','4536','Ajustes positivos en IVA de inversiones',NULL,NULL,1),(4539,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','64','4006','Gastos de personal',NULL,NULL,1),(4540,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','640','4539','Sueldos y salarios',NULL,NULL,1),(4541,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','641','4539','Indemnizaciones',NULL,NULL,1),(4542,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','642','4539','Seguridad social a cargo de la empresa',NULL,NULL,1),(4543,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','649','4539','Otros gastos sociales',NULL,NULL,1),(4544,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','65','4006','Otros gastos de gestión',NULL,NULL,1),(4545,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','650','4544','Pérdidas de créditos comerciales incobrables',NULL,NULL,1),(4546,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','651','4544','Resultados de operaciones en común',NULL,NULL,1),(4547,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6510','4546','Beneficio transferido gestor',NULL,NULL,1),(4548,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6511','4546','Pérdida soportada participe o asociado no gestor',NULL,NULL,1),(4549,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','659','4544','Otras pérdidas en gestión corriente',NULL,NULL,1),(4550,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','66','4006','Gastos financieros',NULL,NULL,1),(4551,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','660','4550','Gastos financieros por actualización de provisiones',NULL,NULL,1),(4552,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','661','4550','Intereses de obligaciones y bonos',NULL,NULL,1),(4553,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6610','4452','Intereses de obligaciones y bonos a largo plazo empresas del grupo',NULL,NULL,1),(4554,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6611','4452','Intereses de obligaciones y bonos a largo plazo empresas asociadas',NULL,NULL,1),(4555,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6612','4452','Intereses de obligaciones y bonos a largo plazo otras partes vinculadas',NULL,NULL,1),(4556,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6613','4452','Intereses de obligaciones y bonos a largo plazo otras empresas',NULL,NULL,1),(4557,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6615','4452','Intereses de obligaciones y bonos a corto plazo empresas del grupo',NULL,NULL,1),(4558,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6616','4452','Intereses de obligaciones y bonos a corto plazo empresas asociadas',NULL,NULL,1),(4559,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6617','4452','Intereses de obligaciones y bonos a corto plazo otras partes vinculadas',NULL,NULL,1),(4560,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6618','4452','Intereses de obligaciones y bonos a corto plazo otras empresas',NULL,NULL,1),(4561,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','662','4550','Intereses de deudas',NULL,NULL,1),(4562,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6620','4561','Intereses de deudas empresas del grupo',NULL,NULL,1),(4563,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6621','4561','Intereses de deudas empresas asociadas',NULL,NULL,1),(4564,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6622','4561','Intereses de deudas otras partes vinculadas',NULL,NULL,1),(4565,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6623','4561','Intereses de deudas con entidades de crédito',NULL,NULL,1),(4566,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6624','4561','Intereses de deudas otras empresas',NULL,NULL,1),(4567,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','663','4550','Pérdidas por valorización de activos y pasivos financieros por su valor razonable',NULL,NULL,1),(4568,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','664','4550','Gastos por dividendos de acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4569,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6640','4568','Dividendos de pasivos empresas del grupo',NULL,NULL,1),(4570,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6641','4568','Dividendos de pasivos empresas asociadas',NULL,NULL,1),(4571,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6642','4568','Dividendos de pasivos otras partes vinculadas',NULL,NULL,1),(4572,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6643','4568','Dividendos de pasivos otras empresas',NULL,NULL,1),(4573,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','665','4550','Intereses por descuento de efectos y operaciones de factoring',NULL,NULL,1),(4574,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6650','4573','Intereses por descuento de efectos en entidades de crédito del grupo',NULL,NULL,1),(4575,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6651','4573','Intereses por descuento de efectos en entidades de crédito asociadas',NULL,NULL,1),(4576,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6652','4573','Intereses por descuento de efectos en entidades de crédito vinculadas',NULL,NULL,1),(4577,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6653','4573','Intereses por descuento de efectos en otras entidades de crédito',NULL,NULL,1),(4578,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6654','4573','Intereses por operaciones de factoring con entidades de crédito del grupo',NULL,NULL,1),(4579,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6655','4573','Intereses por operaciones de factoring con entidades de crédito asociadas',NULL,NULL,1),(4580,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6656','4573','Intereses por operaciones de factoring con otras entidades de crédito vinculadas',NULL,NULL,1),(4581,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6657','4573','Intereses por operaciones de factoring con otras entidades de crédito',NULL,NULL,1),(4582,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','666','4550','Pérdidas en participaciones y valores representativos de deuda',NULL,NULL,1),(4583,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6660','4582','Pérdidas en valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4584,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6661','4582','Pérdidas en valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4585,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6662','4582','Pérdidas en valores representativos de deuda a largo plazo otras partes vinculadas',NULL,NULL,1),(4586,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6663','4582','Pérdidas en participaciones y valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4587,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6665','4582','Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4588,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6666','4582','Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4589,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6667','4582','Pérdidas en valores representativos de deuda a corto plazo otras partes vinculadas',NULL,NULL,1),(4590,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6668','4582','Pérdidas en valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4591,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','667','4550','Pérdidas de créditos no comerciales',NULL,NULL,1),(4592,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6670','4591','Pérdidas de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4593,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6671','4591','Pérdidas de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4594,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6672','4591','Pérdidas de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4595,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6673','4591','Pérdidas de créditos a largo plazo otras empresas',NULL,NULL,1),(4596,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6675','4591','Pérdidas de créditos a corto plazo empresas del grupo',NULL,NULL,1),(4597,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6676','4591','Pérdidas de créditos a corto plazo empresas asociadas',NULL,NULL,1),(4598,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6677','4591','Pérdidas de créditos a corto plazo otras partes vinculadas',NULL,NULL,1),(4599,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6678','4591','Pérdidas de créditos a corto plazo otras empresas',NULL,NULL,1),(4600,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','668','4550','Diferencias negativas de cambio',NULL,NULL,1),(4601,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','669','4550','Otros gastos financieros',NULL,NULL,1),(4602,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','67','4006','Pérdidas procedentes de activos no corrientes y gastos excepcionales',NULL,NULL,1),(4603,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','670','4602','Pérdidas procedentes del inmovilizado intangible',NULL,NULL,1),(4604,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','671','4602','Pérdidas procedentes del inmovilizado material',NULL,NULL,1),(4605,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','672','4602','Pérdidas procedentes de las inversiones inmobiliarias',NULL,NULL,1),(4607,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','673','4602','Pérdidas procedentes de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4608,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6733','4607','Pérdidas procedentes de participaciones a largo plazo empresas del grupo',NULL,NULL,1),(4609,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6734','4607','Pérdidas procedentes de participaciones a largo plazo empresas asociadas',NULL,NULL,1),(4610,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6735','4607','Pérdidas procedentes de participaciones a largo plazo otras partes vinculadas',NULL,NULL,1),(4611,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','675','4602','Pérdidas por operaciones con obligaciones propias',NULL,NULL,1),(4612,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','678','4602','Gastos excepcionales',NULL,NULL,1),(4613,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','68','4006','Dotaciones para amortizaciones',NULL,NULL,1),(4614,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','680','4613','Amortización del inmovilizado intangible',NULL,NULL,1),(4615,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','681','4613','Amortización del inmovilizado material',NULL,NULL,1),(4616,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','682','4613','Amortización de las inversiones inmobiliarias',NULL,NULL,1),(4617,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','69','4006','Pérdidas por deterioro y otras dotaciones',NULL,NULL,1),(4618,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','690','4617','Pérdidas por deterioro del inmovilizado intangible',NULL,NULL,1),(4619,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','691','4617','Pérdidas por deterioro del inmovilizado material',NULL,NULL,1),(4620,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','692','4617','Pérdidas por deterioro de las inversiones inmobiliarias',NULL,NULL,1),(4621,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','693','4617','Pérdidas por deterioro de existencias',NULL,NULL,1),(4622,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6930','4621','Pérdidas por deterioro de productos terminados y en curso de fabricación',NULL,NULL,1),(4623,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6931','4621','Pérdidas por deterioro de mercaderías',NULL,NULL,1),(4624,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6932','4621','Pérdidas por deterioro de materias primas',NULL,NULL,1),(4625,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6933','4621','Pérdidas por deterioro de otros aprovisionamientos',NULL,NULL,1),(4626,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','694','4617','Pérdidas por deterioro de créditos por operaciones comerciales',NULL,NULL,1),(4627,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','695','4617','Dotación a la provisión por operaciones comerciales',NULL,NULL,1),(4628,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6954','4627','Dotación a la provisión por contratos onerosos',NULL,NULL,1),(4629,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6959','4628','Dotación a la provisión para otras operaciones comerciales',NULL,NULL,1),(4630,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','696','4617','Pérdidas por deterioro de participaciones y valores representativos de deuda a largo plazo',NULL,NULL,1),(4631,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6960','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo',NULL,NULL,1),(4632,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6961','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas',NULL,NULL,1),(4633,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6962','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas',NULL,NULL,1),(4634,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6963','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas',NULL,NULL,1),(4635,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6965','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4636,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6966','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4637,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6967','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo otras partes vinculadas',NULL,NULL,1),(4638,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6968','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4639,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','697','4617','Pérdidas por deterioro de créditos a largo plazo',NULL,NULL,1),(4640,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6970','4639','Pérdidas por deterioro de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4641,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6971','4639','Pérdidas por deterioro de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4642,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6972','4639','Pérdidas por deterioro de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4643,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6973','4639','Pérdidas por deterioro de créditos a largo plazo otras empresas',NULL,NULL,1),(4644,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','698','4617','Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo',NULL,NULL,1),(4645,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6980','4644','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo',NULL,NULL,1),(4646,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6981','4644','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas',NULL,NULL,1),(4647,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6985','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4648,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6986','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4649,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6988','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo de otras empresas',NULL,NULL,1),(4650,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','699','4617','Pérdidas por deterioro de crédito a corto plazo',NULL,NULL,1),(4651,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6990','4650','Pérdidas por deterioro de crédito a corto plazo empresas del grupo',NULL,NULL,1),(4652,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6991','4650','Pérdidas por deterioro de crédito a corto plazo empresas asociadas',NULL,NULL,1),(4653,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6992','4650','Pérdidas por deterioro de crédito a corto plazo otras partes vinculadas',NULL,NULL,1),(4654,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6993','4650','Pérdidas por deterioro de crédito a corto plazo otras empresas',NULL,NULL,1),(4655,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','70','4007','Ventas',NULL,NULL,1),(4656,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','700','4655','Ventas de mercaderías',NULL,NULL,1),(4657,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','701','4655','Ventas de productos terminados',NULL,NULL,1),(4658,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','702','4655','Ventas de productos semiterminados',NULL,NULL,1),(4659,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','703','4655','Ventas de subproductos y residuos',NULL,NULL,1),(4660,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','704','4655','Ventas de envases y embalajes',NULL,NULL,1),(4661,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','705','4655','Prestaciones de servicios',NULL,NULL,1),(4662,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','706','4655','Descuentos sobre ventas por pronto pago',NULL,NULL,1),(4663,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7060','4662','Descuentos sobre ventas por pronto pago de mercaderías',NULL,NULL,1),(4664,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7061','4662','Descuentos sobre ventas por pronto pago de productos terminados',NULL,NULL,1),(4665,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7062','4662','Descuentos sobre ventas por pronto pago de productos semiterminados',NULL,NULL,1),(4666,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7063','4662','Descuentos sobre ventas por pronto pago de subproductos y residuos',NULL,NULL,1),(4667,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','708','4655','Devoluciones de ventas y operacioes similares',NULL,NULL,1),(4668,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7080','4667','Devoluciones de ventas de mercaderías',NULL,NULL,1),(4669,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7081','4667','Devoluciones de ventas de productos terminados',NULL,NULL,1),(4670,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7082','4667','Devoluciones de ventas de productos semiterminados',NULL,NULL,1),(4671,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7083','4667','Devoluciones de ventas de subproductos y residuos',NULL,NULL,1),(4672,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7084','4667','Devoluciones de ventas de envases y embalajes',NULL,NULL,1),(4673,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','71','4007','Variación de existencias',NULL,NULL,1),(4674,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','710','4673','Variación de existencias de productos en curso',NULL,NULL,1),(4675,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','711','4673','Variación de existencias de productos semiterminados',NULL,NULL,1),(4676,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','712','4673','Variación de existencias de productos terminados',NULL,NULL,1),(4677,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','713','4673','Variación de existencias de subproductos, residuos y materiales recuperados',NULL,NULL,1),(4678,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','73','4007','Trabajos realizados para la empresa',NULL,NULL,1),(4679,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','730','4678','Trabajos realizados para el inmovilizado intangible',NULL,NULL,1),(4680,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','731','4678','Trabajos realizados para el inmovilizado tangible',NULL,NULL,1),(4681,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','732','4678','Trabajos realizados en inversiones inmobiliarias',NULL,NULL,1),(4682,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','733','4678','Trabajos realizados para el inmovilizado material en curso',NULL,NULL,1),(4683,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','74','4007','Subvenciones, donaciones y legados',NULL,NULL,1),(4684,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','740','4683','Subvenciones, donaciones y legados a la explotación',NULL,NULL,1),(4685,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','746','4683','Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio',NULL,NULL,1),(4686,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','747','4683','Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio',NULL,NULL,1),(4687,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','75','4007','Otros ingresos de gestión',NULL,NULL,1),(4688,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','751','4687','Resultados de operaciones en común',NULL,NULL,1),(4689,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7510','4688','Pérdida transferida gestor',NULL,NULL,1),(4690,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7511','4688','Beneficio atribuido participe o asociado no gestor',NULL,NULL,1),(4691,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','752','4687','Ingreso por arrendamiento',NULL,NULL,1),(4692,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','753','4687','Ingresos de propiedad industrial cedida en explotación',NULL,NULL,1),(4693,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','754','4687','Ingresos por comisiones',NULL,NULL,1),(4694,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','755','4687','Ingresos por servicios al personal',NULL,NULL,1),(4695,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','759','4687','Ingresos por servicios diversos',NULL,NULL,1),(4696,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76','4007','Ingresos financieros',NULL,NULL,1),(4697,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','760','4696','Ingresos de participaciones en instrumentos de patrimonio',NULL,NULL,1),(4698,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7600','4697','Ingresos de participaciones en instrumentos de patrimonio empresas del grupo',NULL,NULL,1),(4699,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7601','4697','Ingresos de participaciones en instrumentos de patrimonio empresas asociadas',NULL,NULL,1),(4700,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7602','4697','Ingresos de participaciones en instrumentos de patrimonio otras partes asociadas',NULL,NULL,1),(4701,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7603','4697','Ingresos de participaciones en instrumentos de patrimonio otras empresas',NULL,NULL,1),(4702,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','761','4696','Ingresos de valores representativos de deuda',NULL,NULL,1),(4703,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7610','4702','Ingresos de valores representativos de deuda empresas del grupo',NULL,NULL,1),(4704,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7611','4702','Ingresos de valores representativos de deuda empresas asociadas',NULL,NULL,1),(4705,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7612','4702','Ingresos de valores representativos de deuda otras partes asociadas',NULL,NULL,1),(4706,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7613','4702','Ingresos de valores representativos de deuda otras empresas',NULL,NULL,1),(4707,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','762','4696','Ingresos de créditos',NULL,NULL,1),(4708,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7620','4707','Ingresos de créditos a largo plazo',NULL,NULL,1),(4709,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76200','4708','Ingresos de crédito a largo plazo empresas del grupo',NULL,NULL,1),(4710,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76201','4708','Ingresos de crédito a largo plazo empresas asociadas',NULL,NULL,1),(4711,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76202','4708','Ingresos de crédito a largo plazo otras partes asociadas',NULL,NULL,1),(4712,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76203','4708','Ingresos de crédito a largo plazo otras empresas',NULL,NULL,1),(4713,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7621','4707','Ingresos de créditos a corto plazo',NULL,NULL,1),(4714,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76210','4713','Ingresos de crédito a corto plazo empresas del grupo',NULL,NULL,1),(4715,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76211','4713','Ingresos de crédito a corto plazo empresas asociadas',NULL,NULL,1),(4716,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76212','4713','Ingresos de crédito a corto plazo otras partes asociadas',NULL,NULL,1),(4717,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76213','4713','Ingresos de crédito a corto plazo otras empresas',NULL,NULL,1),(4718,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','763','4696','Beneficios por valorización de activos y pasivos financieros por su valor razonable',NULL,NULL,1),(4719,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','766','4696','Beneficios en participaciones y valores representativos de deuda',NULL,NULL,1),(4720,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7660','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4721,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7661','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4722,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7662','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo otras partes asociadas',NULL,NULL,1),(4723,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7663','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4724,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7665','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4725,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7666','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4726,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7667','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo otras partes asociadas',NULL,NULL,1),(4727,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7668','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4728,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','768','4696','Diferencias positivas de cambio',NULL,NULL,1),(4729,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','769','4696','Otros ingresos financieros',NULL,NULL,1),(4730,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','77','4007','Beneficios procedentes de activos no corrientes e ingresos excepcionales',NULL,NULL,1),(4731,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','770','4730','Beneficios procedentes del inmovilizado intangible',NULL,NULL,1),(4732,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','771','4730','Beneficios procedentes del inmovilizado material',NULL,NULL,1),(4733,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','772','4730','Beneficios procedentes de las inversiones inmobiliarias',NULL,NULL,1),(4734,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','773','4730','Beneficios procedentes de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4735,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7733','4734','Beneficios procedentes de participaciones a largo plazo empresas del grupo',NULL,NULL,1),(4736,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7734','4734','Beneficios procedentes de participaciones a largo plazo empresas asociadas',NULL,NULL,1),(4737,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7735','4734','Beneficios procedentes de participaciones a largo plazo otras partes vinculadas',NULL,NULL,1),(4738,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','775','4730','Beneficios por operaciones con obligaciones propias',NULL,NULL,1),(4739,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','778','4730','Ingresos excepcionales',NULL,NULL,1),(4741,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79','4007','Excesos y aplicaciones de provisiones y pérdidas por deterioro',NULL,NULL,1),(4742,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','790','4741','Revisión del deterioro del inmovilizado intangible',NULL,NULL,1),(4743,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','791','4741','Revisión del deterioro del inmovilizado material',NULL,NULL,1),(4744,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','792','4741','Revisión del deterioro de las inversiones inmobiliarias',NULL,NULL,1),(4745,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','793','4741','Revisión del deterioro de las existencias',NULL,NULL,1),(4746,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7930','4745','Revisión del deterioro de productos terminados y en curso de fabricación',NULL,NULL,1),(4747,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7931','4745','Revisión del deterioro de mercaderías',NULL,NULL,1),(4748,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7932','4745','Revisión del deterioro de materias primas',NULL,NULL,1),(4749,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7933','4745','Revisión del deterioro de otros aprovisionamientos',NULL,NULL,1),(4750,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','794','4741','Revisión del deterioro de créditos por operaciones comerciales',NULL,NULL,1),(4751,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','795','4741','Exceso de provisiones',NULL,NULL,1),(4752,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7951','4751','Exceso de provisión para impuestos',NULL,NULL,1),(4753,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7952','4751','Exceso de provisión para otras responsabilidades',NULL,NULL,1),(4755,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7954','4751','Exceso de provisión para operaciones comerciales',NULL,NULL,1),(4756,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79544','4755','Exceso de provisión por contratos onerosos',NULL,NULL,1),(4757,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79549','4755','Exceso de provisión para otras operaciones comerciales',NULL,NULL,1),(4758,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7955','4751','Exceso de provisión para actuaciones medioambienteales',NULL,NULL,1),(4759,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','796','4741','Revisión del deterioro de participaciones y valores representativos de deuda a largo plazo',NULL,NULL,1),(4760,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7960','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo',NULL,NULL,1),(4761,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7961','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas',NULL,NULL,1),(4762,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7962','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas',NULL,NULL,1),(4763,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7963','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas',NULL,NULL,1),(4764,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7965','4759','Revisión del deterioro de valores representativos a largo plazo empresas del grupo',NULL,NULL,1),(4765,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7966','4759','Revisión del deterioro de valores representativos a largo plazo empresas asociadas',NULL,NULL,1),(4766,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7967','4759','Revisión del deterioro de valores representativos a largo otras partes vinculadas',NULL,NULL,1),(4767,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7968','4759','Revisión del deterioro de valores representativos a largo plazo otras empresas',NULL,NULL,1),(4768,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','797','4741','Revisión del deterioro de créditos a largo plazo',NULL,NULL,1),(4769,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7970','4768','Revisión del deterioro de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4770,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7971','4768','Revisión del deterioro de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4771,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7972','4768','Revisión del deterioro de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4772,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7973','4768','Revisión del deterioro de créditos a largo plazo otras empresas',NULL,NULL,1),(4773,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','798','4741','Revisión del deterioro de participaciones y valores representativos de deuda a corto plazo',NULL,NULL,1),(4774,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7980','4773','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo',NULL,NULL,1),(4775,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7981','4773','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas',NULL,NULL,1),(4776,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7985','4773','Revisión del deterioro de valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4777,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7986','4773','Revisión del deterioro de valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4778,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7987','4773','Revisión del deterioro de valores representativos de deuda a corto plazo otras partes vinculadas',NULL,NULL,1),(4779,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7988','4773','Revisión del deterioro de valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4780,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','799','4741','Revisión del deterioro de créditos a corto plazo',NULL,NULL,1),(4781,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7990','4780','Revisión del deterioro de créditos a corto plazo empresas del grupo',NULL,NULL,1),(4782,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7991','4780','Revisión del deterioro de créditos a corto plazo empresas asociadas',NULL,NULL,1),(4783,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7992','4780','Revisión del deterioro de créditos a corto plazo otras partes vinculadas',NULL,NULL,1),(4784,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7993','4780','Revisión del deterioro de créditos a corto plazo otras empresas',NULL,NULL,1);
+/*!40000 ALTER TABLE `llx_accountingaccount` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingdebcred`
+--
+
+DROP TABLE IF EXISTS `llx_accountingdebcred`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingdebcred` (
+  `fk_transaction` int(11) NOT NULL,
+  `fk_account` int(11) NOT NULL,
+  `amount` double NOT NULL,
+  `direction` varchar(1) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accountingdebcred`
+--
+
+LOCK TABLES `llx_accountingdebcred` WRITE;
+/*!40000 ALTER TABLE `llx_accountingdebcred` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accountingdebcred` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingtransaction`
+--
+
+DROP TABLE IF EXISTS `llx_accountingtransaction`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingtransaction` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(128) NOT NULL,
+  `datec` date NOT NULL,
+  `fk_author` varchar(20) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_facture` int(11) DEFAULT NULL,
+  `fk_facture_fourn` int(11) DEFAULT NULL,
+  `fk_paiement` int(11) DEFAULT NULL,
+  `fk_paiement_fourn` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accountingtransaction`
+--
+
+LOCK TABLES `llx_accountingtransaction` WRITE;
+/*!40000 ALTER TABLE `llx_accountingtransaction` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accountingtransaction` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datep` datetime DEFAULT NULL,
+  `datep2` datetime DEFAULT NULL,
+  `datea` datetime DEFAULT NULL,
+  `datea2` datetime DEFAULT NULL,
+  `fk_action` int(11) DEFAULT NULL,
+  `code` varchar(32) DEFAULT NULL,
+  `label` varchar(128) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_contact` int(11) DEFAULT NULL,
+  `fk_parent` int(11) NOT NULL DEFAULT '0',
+  `fk_user_action` int(11) DEFAULT NULL,
+  `transparency` int(11) DEFAULT NULL,
+  `fk_user_done` int(11) DEFAULT NULL,
+  `priority` smallint(6) DEFAULT NULL,
+  `fulldayevent` smallint(6) NOT NULL DEFAULT '0',
+  `punctual` smallint(6) NOT NULL DEFAULT '1',
+  `percent` smallint(6) NOT NULL DEFAULT '0',
+  `location` varchar(128) DEFAULT NULL,
+  `durationp` double DEFAULT NULL,
+  `durationa` double DEFAULT NULL,
+  `note` text,
+  `fk_element` int(11) DEFAULT NULL,
+  `elementtype` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_actioncomm_datea` (`datea`),
+  KEY `idx_actioncomm_fk_soc` (`fk_soc`),
+  KEY `idx_actioncomm_fk_contact` (`fk_contact`),
+  KEY `idx_actioncomm_fk_element` (`fk_element`)
+) ENGINE=InnoDB AUTO_INCREMENT=232 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm`
+--
+
+LOCK TABLES `llx_actioncomm` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',NULL,NULL,50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',NULL,NULL,50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',NULL,NULL,50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2014-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',NULL,NULL,50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',NULL,NULL,50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2014-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',NULL,NULL,50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2014-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',NULL,NULL,50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',NULL,NULL,50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2014-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',NULL,NULL,50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',NULL,NULL,50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice'),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',NULL,NULL,50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',NULL,NULL,5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',NULL,NULL,50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',NULL,NULL,50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2014-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',NULL,NULL,50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',NULL,NULL,5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',NULL,NULL,50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',NULL,NULL,50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',NULL,NULL,50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',NULL,NULL,50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal'),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',NULL,NULL,50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice'),(24,NULL,1,'2011-07-28 01:37:00',NULL,NULL,NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',NULL,NULL,50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2014-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe'),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',NULL,NULL,50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2014-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe'),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',NULL,NULL,50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe'),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice'),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice'),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice'),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice'),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',NULL,NULL,50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice'),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',NULL,NULL,50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice'),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',NULL,NULL,50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice'),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',NULL,NULL,50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice'),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',NULL,NULL,50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice'),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',NULL,NULL,50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice'),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',NULL,NULL,50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order'),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',NULL,NULL,50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order'),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',NULL,NULL,50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal'),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',NULL,NULL,50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal'),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',NULL,NULL,50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier'),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',NULL,NULL,40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice'),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',NULL,NULL,40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice'),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',NULL,NULL,40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice'),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',NULL,NULL,40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe'),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',NULL,NULL,40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice'),(121,NULL,1,'2012-12-06 10:00:00',NULL,NULL,NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',NULL,NULL,40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@destailleur.fr> à laurent@destailleur.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice'),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',NULL,NULL,40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier'),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',NULL,NULL,40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe'),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',NULL,NULL,40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2014-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe'),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',NULL,NULL,40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice'),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice'),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice'),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice'),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice'),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',NULL,NULL,50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons'),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',NULL,NULL,40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2014-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe'),(134,NULL,1,'2013-01-23 17:34:00',NULL,NULL,NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',NULL,NULL,40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2014-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice'),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',NULL,NULL,40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order'),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',NULL,NULL,40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal'),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',NULL,NULL,40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice'),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',NULL,NULL,40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal'),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',NULL,NULL,40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order'),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',NULL,NULL,40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order'),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',NULL,NULL,40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2014-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe'),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',NULL,NULL,40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe'),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',NULL,NULL,5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,NULL,NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',NULL,NULL,40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract'),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',NULL,NULL,40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice'),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',NULL,NULL,40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice'),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',NULL,NULL,40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice'),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',NULL,NULL,40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice'),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',NULL,NULL,40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2014-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe'),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',NULL,NULL,40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal'),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',NULL,NULL,40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier'),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',NULL,NULL,40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2014-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe'),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',NULL,NULL,40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe'),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice'),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice'),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice'),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice'),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice'),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2014-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe'),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2014-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe'),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2014-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe'),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2014-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe'),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2014-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe'),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2014-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe'),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2014-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe'),(220,NULL,1,'2014-03-02 17:24:04','2014-03-02 17:24:04',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2014-03-02 17:24:04','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice'),(221,NULL,1,'2014-03-02 17:24:28','2014-03-02 17:24:28',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 17:24:28','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice'),(222,NULL,1,'2014-03-05 10:00:00','2014-03-05 10:00:00',NULL,NULL,5,NULL,'RDV John','2014-03-02 19:54:48','2014-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL),(223,NULL,1,'2014-03-13 10:00:00','2014-03-17 00:00:00',NULL,NULL,50,NULL,'Congress','2014-03-02 19:55:11','2014-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,'',309600,NULL,'',NULL,NULL),(224,NULL,1,'2014-03-14 10:00:00',NULL,NULL,NULL,1,NULL,'Call john','2014-03-02 19:55:56','2014-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,0,'',NULL,NULL,'tttt',NULL,NULL),(225,NULL,1,'2014-03-02 20:11:31','2014-03-02 20:11:31',NULL,NULL,40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2014-03-02 20:11:31','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice'),(226,NULL,1,'2014-03-02 20:13:39','2014-03-02 20:13:39',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 20:13:39','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice'),(227,NULL,1,'2014-03-03 19:20:10','2014-03-03 19:20:10',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2014-03-03 19:20:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice'),(228,NULL,1,'2014-03-03 19:20:25','2014-03-03 19:20:25',NULL,NULL,40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2014-03-03 19:20:25','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice'),(229,NULL,1,'2014-03-03 19:20:56','2014-03-03 19:20:56',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2014-03-03 19:20:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice'),(230,NULL,1,'2014-03-03 19:21:29','2014-03-03 19:21:29',NULL,NULL,40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2014-03-03 19:21:29','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice'),(231,NULL,1,'2014-03-03 19:22:16','2014-03-03 19:22:16',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2014-03-03 19:22:16','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice');
+/*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_actioncomm_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm_extrafields`
+--
+
+LOCK TABLES `llx_actioncomm_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_actioncomm_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm_resources`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm_resources`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm_resources` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_actioncomm` int(11) NOT NULL,
+  `element_type` varchar(50) NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `answer_status` varchar(50) DEFAULT NULL,
+  `mandatory` smallint(6) DEFAULT NULL,
+  `transparency` smallint(6) DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_actioncomm_resources_idx1` (`fk_actioncomm`,`element_type`,`fk_element`),
+  KEY `idx_actioncomm_resources_fk_element` (`fk_element`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm_resources`
+--
+
+LOCK TABLES `llx_actioncomm_resources` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm_resources` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_actioncomm_resources` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent`
+--
+
+DROP TABLE IF EXISTS `llx_adherent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `civility` varchar(6) DEFAULT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `login` varchar(50) DEFAULT NULL,
+  `pass` varchar(50) DEFAULT NULL,
+  `fk_adherent_type` int(11) NOT NULL,
+  `morphy` varchar(3) NOT NULL,
+  `societe` varchar(128) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `address` text,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `state_id` varchar(50) DEFAULT NULL,
+  `country` varchar(50) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `skype` varchar(255) DEFAULT NULL,
+  `phone` varchar(30) DEFAULT NULL,
+  `phone_perso` varchar(30) DEFAULT NULL,
+  `phone_mobile` varchar(30) DEFAULT NULL,
+  `birth` date DEFAULT NULL,
+  `photo` varchar(255) DEFAULT NULL,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `public` smallint(6) NOT NULL DEFAULT '0',
+  `datefin` datetime DEFAULT NULL,
+  `note` text,
+  `datevalid` datetime DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `canvas` varchar(32) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_adherent_login` (`login`,`entity`),
+  UNIQUE KEY `uk_adherent_fk_soc` (`fk_soc`),
+  KEY `idx_adherent_fk_adherent_type` (`fk_adherent_type`),
+  CONSTRAINT `adherent_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_adherent_adherent_type` FOREIGN KEY (`fk_adherent_type`) REFERENCES `llx_adherent_type` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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,'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,'Dupont','Alain','adupont','adupont',2,'phy',NULL,12,NULL,NULL,NULL,NULL,'1','toto@aa.com',NULL,NULL,NULL,NULL,'1972-07-08',NULL,1,1,'2017-07-17 00:00:00',NULL,'2010-07-10 15:03:32','2010-07-10 15:03:09','2013-03-06 15:48:16',1,1,1,NULL,NULL),(3,1,NULL,NULL,'john','doe','john','8bs6gty5',2,'phy',NULL,18,NULL,NULL,NULL,NULL,'1','johndoe@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,'2011-07-18 21:28:00','2011-07-18 21:10:09','2012-12-09 19:14:42',1,1,1,NULL,NULL),(4,1,NULL,NULL,'smith','smith','Smith','s6hjp10f',2,'phy',NULL,24,NULL,NULL,NULL,NULL,'11','smith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,'2011-07-18 21:27:52','2011-07-18 21:27:44','2013-03-06 16:13:59',1,1,1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_adherent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `zzz` varchar(125) DEFAULT NULL,
+  `aaa` varchar(255) DEFAULT NULL,
+  `sssss` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_adherent_options` (`fk_object`),
+  KEY `idx_adherent_extrafields` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_extrafields`
+--
+
+LOCK TABLES `llx_adherent_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_adherent_extrafields` VALUES (2,'2011-06-19 12:03:23',12,'aaa',NULL,NULL,NULL),(3,'2011-06-19 14:19:32',13,NULL,NULL,NULL,NULL),(8,'2011-06-19 18:08:09',7,'zzz',NULL,NULL,NULL),(34,'2011-06-22 10:06:51',14,'moo',NULL,NULL,NULL),(37,'2011-06-22 10:43:55',16,'z',NULL,NULL,NULL),(40,'2011-06-22 10:55:37',17,NULL,NULL,NULL,NULL),(41,'2011-06-22 10:56:07',18,'l',NULL,NULL,NULL),(43,'2011-06-23 07:40:56',19,NULL,NULL,NULL,NULL),(44,'2011-06-26 18:13:20',20,'gdfgdf',NULL,NULL,NULL),(46,'2011-06-26 19:29:23',22,'gdfgdf',NULL,NULL,NULL),(47,'2011-07-03 16:17:56',23,NULL,NULL,NULL,NULL),(48,'2011-07-03 16:21:05',24,NULL,NULL,NULL,NULL),(49,'2011-07-03 16:30:54',25,NULL,NULL,NULL,NULL),(50,'2011-07-03 16:48:13',26,NULL,NULL,NULL,NULL),(51,'2011-07-03 16:51:36',27,NULL,NULL,NULL,NULL),(52,'2011-07-03 16:53:37',28,NULL,NULL,NULL,NULL),(53,'2011-07-03 16:54:24',29,NULL,NULL,NULL,NULL),(54,'2011-07-05 08:21:35',30,NULL,NULL,NULL,NULL),(55,'2011-07-05 08:26:15',31,NULL,NULL,NULL,NULL),(59,'2011-07-13 11:18:55',46,NULL,NULL,NULL,NULL),(61,'2011-07-13 11:50:36',47,NULL,NULL,NULL,NULL),(62,'2011-07-18 19:10:09',3,NULL,NULL,NULL,NULL),(63,'2011-07-18 19:27:44',4,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_adherent_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_type`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `libelle` varchar(50) NOT NULL,
+  `cotisation` varchar(3) NOT NULL DEFAULT 'yes',
+  `vote` varchar(3) NOT NULL DEFAULT 'yes',
+  `note` text,
+  `mail_valid` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_adherent_type_libelle` (`libelle`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_type`
+--
+
+LOCK TABLES `llx_adherent_type` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_type` DISABLE KEYS */;
+INSERT INTO `llx_adherent_type` VALUES (1,1,'2010-07-08 21:41:55',1,'Board members','1','1','','<br />'),(2,1,'2010-07-08 21:41:43',1,'Standard members','1','0','','<br />');
+/*!40000 ALTER TABLE `llx_adherent_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_type_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_type_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_type_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_adherent_type_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_type_extrafields`
+--
+
+LOCK TABLES `llx_adherent_type_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_type_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_adherent_type_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `elementtype` varchar(64) NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `format` varchar(8) NOT NULL,
+  `fieldsize` int(11) DEFAULT NULL,
+  `maxlength` int(11) DEFAULT NULL,
+  `options` varchar(255) DEFAULT NULL,
+  `rang` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_advanced_extrafields_name` (`elementtype`,`entity`,`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields`
+--
+
+LOCK TABLES `llx_advanced_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields_options`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields_options`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields_options` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_extrafields` int(11) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  `rang` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanced_extrafields_options_fk_advanced_extrafields` (`fk_extrafields`),
+  CONSTRAINT `fk_advanced_extrafields_options_fk_advanced_extrafields` FOREIGN KEY (`fk_extrafields`) REFERENCES `llx_advanced_extrafields` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields_options`
+--
+
+LOCK TABLES `llx_advanced_extrafields_options` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_options` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_options` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields_values`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields_values`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields_values` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `datem` datetime DEFAULT NULL,
+  `fk_element` int(11) NOT NULL,
+  `fk_extrafields` int(11) NOT NULL,
+  `value` varchar(255) DEFAULT NULL,
+  `fk_user_create` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanced_extrafields_values_fk_advanced_extrafields` (`fk_extrafields`,`entity`),
+  CONSTRAINT `fk_advanced_extrafields_values_fk_advanced_extrafields` FOREIGN KEY (`fk_extrafields`) REFERENCES `llx_advanced_extrafields` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields_values`
+--
+
+LOCK TABLES `llx_advanced_extrafields_values` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_values` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_values` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank`
+--
+
+DROP TABLE IF EXISTS `llx_bank`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datev` date DEFAULT NULL,
+  `dateo` date DEFAULT NULL,
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `label` varchar(255) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_rappro` int(11) DEFAULT NULL,
+  `fk_type` varchar(6) DEFAULT NULL,
+  `num_releve` varchar(50) DEFAULT NULL,
+  `num_chq` varchar(50) DEFAULT NULL,
+  `rappro` tinyint(4) DEFAULT '0',
+  `note` text,
+  `fk_bordereau` int(11) DEFAULT '0',
+  `banque` varchar(255) DEFAULT NULL,
+  `emetteur` varchar(255) DEFAULT NULL,
+  `author` varchar(40) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_bank_datev` (`datev`),
+  KEY `idx_bank_dateo` (`dateo`),
+  KEY `idx_bank_fk_account` (`fk_account`),
+  KEY `idx_bank_rappro` (`rappro`)
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank`
+--
+
+LOCK TABLES `llx_bank` WRITE;
+/*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
+INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','0000-00-00 00:00:00','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','0000-00-00 00:00:00','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','0000-00-00 00:00:00','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','0000-00-00 00:00:00','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','0000-00-00 00:00:00','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(24,'2014-03-02 19:57:58','2014-03-02 18:57:58','2013-07-09','2013-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL),(25,'2014-03-02 19:59:48','2014-03-02 18:59:48','2013-03-22','2013-03-22',30.00000000,'(CustomerInvoicePayment)',1,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(26,'2014-03-02 20:01:39','2014-03-02 19:01:39','2013-03-19','2013-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(27,'2014-03-02 20:02:06','2014-03-02 19:02:06','2013-03-21','2013-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL),(28,'2014-03-03 19:22:32','2014-03-03 18:22:32','2013-10-03','2013-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(29,'2014-03-03 19:23:16','2014-03-03 18:23:16','2013-03-10','2013-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_account`
+--
+
+DROP TABLE IF EXISTS `llx_bank_account`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_account` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(12) NOT NULL,
+  `label` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `bank` varchar(60) DEFAULT NULL,
+  `code_banque` varchar(8) DEFAULT NULL,
+  `code_guichet` varchar(6) DEFAULT NULL,
+  `number` varchar(255) DEFAULT NULL,
+  `cle_rib` varchar(5) DEFAULT NULL,
+  `bic` varchar(11) DEFAULT NULL,
+  `iban_prefix` varchar(34) DEFAULT NULL,
+  `country_iban` varchar(2) DEFAULT NULL,
+  `cle_iban` varchar(2) DEFAULT NULL,
+  `domiciliation` varchar(255) DEFAULT NULL,
+  `state_id` varchar(50) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `proprio` varchar(60) DEFAULT NULL,
+  `owner_address` text,
+  `courant` smallint(6) NOT NULL DEFAULT '0',
+  `clos` smallint(6) NOT NULL DEFAULT '0',
+  `rappro` smallint(6) DEFAULT '1',
+  `url` varchar(128) DEFAULT NULL,
+  `account_number` varchar(32) DEFAULT NULL,
+  `accountancy_journal` varchar(3) DEFAULT NULL,
+  `currency_code` varchar(3) NOT NULL,
+  `min_allowed` int(11) DEFAULT '0',
+  `min_desired` int(11) DEFAULT '0',
+  `comment` text,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bank_account_label` (`label`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_account`
+--
+
+LOCK TABLES `llx_bank_account` WRITE;
+/*!40000 ALTER TABLE `llx_bank_account` DISABLE KEYS */;
+INSERT INTO `llx_bank_account` VALUES (1,'2010-07-08 23:56:14','2014-03-02 15:39:52','SWIBAC','Swiss bank account',1,'TresorGold Bank','','','123456789','','','',NULL,NULL,'21 jum street',NULL,169,'Mac Golder','11 big road,\r\nSan Francisco',1,0,1,NULL,'',NULL,'EUR',1500,1500,'',NULL,NULL),(2,'2010-07-09 00:00:24','2013-03-24 14:50:40','SWIBAC2','Swiss bank account 2',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,169,NULL,NULL,1,1,1,NULL,'',NULL,'EUR',200,400,'',NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 11:33:42','ACCOUNTCASH','Account for cash',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'3',1,NULL,NULL,2,0,1,NULL,'',NULL,'EUR',0,0,'<br />',NULL,NULL);
+/*!40000 ALTER TABLE `llx_bank_account` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_categ`
+--
+
+DROP TABLE IF EXISTS `llx_bank_categ`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_categ` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_categ`
+--
+
+LOCK TABLES `llx_bank_categ` WRITE;
+/*!40000 ALTER TABLE `llx_bank_categ` DISABLE KEYS */;
+INSERT INTO `llx_bank_categ` VALUES (1,'Bank category one',1),(2,'Bank category two',1);
+/*!40000 ALTER TABLE `llx_bank_categ` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_class`
+--
+
+DROP TABLE IF EXISTS `llx_bank_class`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_class` (
+  `lineid` int(11) NOT NULL,
+  `fk_categ` int(11) NOT NULL,
+  UNIQUE KEY `uk_bank_class_lineid` (`lineid`,`fk_categ`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_class`
+--
+
+LOCK TABLES `llx_bank_class` WRITE;
+/*!40000 ALTER TABLE `llx_bank_class` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bank_class` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_url`
+--
+
+DROP TABLE IF EXISTS `llx_bank_url`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_url` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_bank` int(11) DEFAULT NULL,
+  `url_id` int(11) DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `type` varchar(20) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bank_url` (`fk_bank`,`type`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_url`
+--
+
+LOCK TABLES `llx_bank_url` WRITE;
+/*!40000 ALTER TABLE `llx_bank_url` DISABLE KEYS */;
+INSERT INTO `llx_bank_url` VALUES (1,4,1,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(2,4,9,'/dolibarrnew/compta/fiche.php?socid=','Client salon invidivdu','company'),(3,5,2,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(4,5,2,'/comm/fiche.php?socid=','Belin SARL','company'),(5,6,3,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(6,6,2,'/comm/fiche.php?socid=','Belin SARL','company'),(9,8,5,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(10,8,7,'/comm/fiche.php?socid=','Generic customer','company'),(17,12,4,'/compta/payment_sc/fiche.php?id=','(paiement)','payment_sc'),(18,12,4,'/compta/charges.php?id=','Assurance Chomage (fff)','sc'),(19,13,6,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(20,13,7,'/dolibarrnew/comm/fiche.php?socid=','Generic customer','company'),(21,14,8,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(22,14,2,'/comm/fiche.php?socid=','Belin SARL','company'),(23,15,9,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(24,15,10,'/comm/fiche.php?socid=','Smith Vick','company'),(25,16,17,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(26,16,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(27,17,18,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(28,17,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(29,18,19,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(30,18,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(31,19,20,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(32,19,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(33,20,21,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(34,20,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(35,21,23,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(36,21,1,'/comm/fiche.php?socid=','ABC and Co','company'),(37,22,24,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(38,22,12,'/dolibarrnew/comm/fiche.php?socid=','Dupont Alain','company'),(39,23,25,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(40,23,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(41,24,26,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(42,24,1,'/comm/fiche.php?socid=','ABC and Co','company'),(43,25,27,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(44,25,18,'/comm/fiche.php?socid=','doe john','company'),(45,26,29,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(46,26,1,'/comm/fiche.php?socid=','ABC and Co','company'),(47,27,30,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(48,27,1,'/comm/fiche.php?socid=','ABC and Co','company'),(49,28,32,'/dolibarr_new/compta/paiement/fiche.php?id=','(paiement)','payment'),(50,28,1,'/dolibarr_new/comm/fiche.php?socid=','ABC and Co','company'),(51,29,33,'/dolibarr_new/compta/paiement/fiche.php?id=','(paiement)','payment'),(52,29,1,'/dolibarr_new/comm/fiche.php?socid=','ABC and Co','company');
+/*!40000 ALTER TABLE `llx_bank_url` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bookkeeping`
+--
+
+DROP TABLE IF EXISTS `llx_bookkeeping`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bookkeeping` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `doc_date` date NOT NULL,
+  `doc_type` varchar(30) NOT NULL,
+  `doc_ref` varchar(30) NOT NULL,
+  `fk_doc` int(11) NOT NULL,
+  `fk_docdet` int(11) NOT NULL,
+  `code_tiers` varchar(24) DEFAULT NULL,
+  `numero_compte` varchar(50) DEFAULT NULL,
+  `label_compte` varchar(128) NOT NULL,
+  `debit` double NOT NULL,
+  `credit` double NOT NULL,
+  `montant` double NOT NULL,
+  `sens` varchar(1) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `code_journal` varchar(10) DEFAULT NULL,
+  `piece_num` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bookkeeping`
+--
+
+LOCK TABLES `llx_bookkeeping` WRITE;
+/*!40000 ALTER TABLE `llx_bookkeeping` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bookkeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bookmark`
+--
+
+DROP TABLE IF EXISTS `llx_bookmark`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bookmark` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_user` int(11) NOT NULL,
+  `dateb` datetime DEFAULT NULL,
+  `url` varchar(255) NOT NULL,
+  `target` varchar(16) DEFAULT NULL,
+  `title` varchar(64) DEFAULT NULL,
+  `favicon` varchar(24) DEFAULT NULL,
+  `position` int(11) DEFAULT '0',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bookmark_url` (`fk_user`,`url`),
+  UNIQUE KEY `uk_bookmark_title` (`fk_user`,`title`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bookmark`
+--
+
+LOCK TABLES `llx_bookmark` WRITE;
+/*!40000 ALTER TABLE `llx_bookmark` DISABLE KEYS */;
+INSERT INTO `llx_bookmark` VALUES (1,NULL,0,'2010-07-09 01:29:03','http://wiki.dolibarr.org','1','Online documentation','none',1,1),(2,NULL,0,'2010-07-09 01:30:15','http://www.dolibarr.org','1','Official portal','none',2,1),(3,NULL,0,'2010-07-09 01:30:53','http://www.dolistore.com','1','DoliStore','none',10,1),(4,NULL,0,'2010-07-09 01:31:35','http://asso.dolibarr.org/index.php/Main_Page','1','The foundation','none',0,1),(5,NULL,0,'2014-03-02 16:40:41','http://www.facebook.com/dolibarr','1','Facebook page','none',50,1),(6,NULL,0,'2014-03-02 16:41:12','http://www.twitter.com/dolibarr','1','Twitter channel','none',60,1),(7,NULL,0,'2014-03-02 16:42:08','http://plus.google.com/+DolibarrOrg','1','Google+ page','none',55,1);
+/*!40000 ALTER TABLE `llx_bookmark` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bordereau_cheque`
+--
+
+DROP TABLE IF EXISTS `llx_bordereau_cheque`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bordereau_cheque` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime NOT NULL,
+  `date_bordereau` date DEFAULT NULL,
+  `number` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `amount` double(24,8) NOT NULL,
+  `nbcheque` smallint(6) NOT NULL,
+  `fk_bank_account` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `note` text,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bordereau_cheque` (`number`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bordereau_cheque`
+--
+
+LOCK TABLES `llx_bordereau_cheque` WRITE;
+/*!40000 ALTER TABLE `llx_bordereau_cheque` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bordereau_cheque` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_boxes`
+--
+
+DROP TABLE IF EXISTS `llx_boxes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_boxes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `box_id` int(11) NOT NULL,
+  `position` smallint(6) NOT NULL,
+  `box_order` varchar(3) NOT NULL,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `maxline` int(11) DEFAULT NULL,
+  `params` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_boxes` (`entity`,`box_id`,`position`,`fk_user`),
+  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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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);
+/*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_boxes_def`
+--
+
+DROP TABLE IF EXISTS `llx_boxes_def`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_boxes_def` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `file` varchar(200) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `note` varchar(130) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
+) ENGINE=InnoDB AUTO_INCREMENT=347 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_boxes_def`
+--
+
+LOCK TABLES `llx_boxes_def` WRITE;
+/*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
+INSERT INTO `llx_boxes_def` VALUES (20,'box_actions.php',1,'2010-07-08 11:29:29',NULL),(21,'box_bookmarks.php',1,'2010-07-08 11:30:03',NULL),(188,'box_services_vendus.php',1,'2011-08-05 20:40:27',NULL),(288,'box_clients.php',1,'2012-12-21 17:08:59',NULL),(289,'box_prospect.php',1,'2012-12-21 17:08:59',NULL),(290,'box_contacts.php',1,'2012-12-21 17:08:59',NULL),(295,'box_propales.php',1,'2013-01-02 20:33:16',NULL),(296,'box_contracts.php',1,'2013-01-02 20:33:17',NULL),(297,'box_services_expired.php',1,'2013-01-02 20:33:17',NULL),(298,'box_services_contracts.php',1,'2013-01-02 20:33:17',NULL),(299,'box_commandes.php',1,'2013-01-02 20:33:19',NULL),(309,'box_activity.php',1,'2013-01-16 15:37:16','(WarningUsingThisBoxSlowDown)'),(316,'box_produits.php',1,'2013-01-19 17:16:10',NULL),(317,'box_produits_alerte_stock.php',1,'2013-01-19 17:16:10',NULL),(323,'box_actions.php',2,'2013-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2013-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2013-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2013-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2013-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2013-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2013-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2013-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2013-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2013-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2013-03-13 20:33:09',NULL),(334,'box_factures_imp.php',1,'2013-03-20 20:04:28',NULL),(335,'box_factures.php',1,'2013-03-20 20:04:28',NULL),(336,'box_comptes.php',1,'2013-03-20 20:04:28',NULL),(337,'box_fournisseurs.php',1,'2013-03-22 09:24:29',NULL),(338,'box_factures_fourn_imp.php',1,'2013-03-22 09:24:29',NULL),(339,'box_factures_fourn.php',1,'2013-03-22 09:24:29',NULL),(340,'box_supplier_orders.php',1,'2013-03-22 09:24:29',NULL),(341,'box_graph_product_distribution.php',1,'2013-11-06 23:35:12',NULL),(342,'box_graph_orders_permonth.php',1,'2013-11-06 23:35:12',NULL),(343,'box_graph_invoices_permonth.php',1,'2013-11-06 23:35:12',NULL),(344,'box_graph_invoices_supplier_permonth.php',1,'2013-11-06 23:35:12',NULL),(345,'box_graph_orders_supplier_permonth.php',1,'2013-11-06 23:35:12',NULL),(346,'box_googlemaps@google',1,'2013-11-07 00:01:39',NULL);
+/*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_action_trigger`
+--
+
+DROP TABLE IF EXISTS `llx_c_action_trigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_action_trigger` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(32) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `elementtype` varchar(16) NOT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_action_trigger_code` (`code`),
+  KEY `idx_action_trigger_rang` (`rang`)
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_action_trigger`
+--
+
+LOCK TABLES `llx_c_action_trigger` WRITE;
+/*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
+INSERT INTO `llx_c_action_trigger` VALUES (1,'FICHINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18),(2,'BILL_VALIDATE','Validation facture client','Executed when a customer invoice is approved','facture',6),(3,'ORDER_SUPPLIER_APPROVE','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier',11),(4,'ORDER_SUPPLIER_REFUSE','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier',12),(5,'ORDER_VALIDATE','Validation commande client','Executed when a customer order is validated','commande',4),(6,'PROPAL_VALIDATE','Validation proposition client','Executed when a commercial proposal is validated','propal',2),(9,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(10,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(11,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',17),(12,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(13,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(14,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(15,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(16,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(17,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',10),(18,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',13),(19,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',14),(20,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',15),(21,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',16),(22,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',19),(23,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',20),(24,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',21),(25,'MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',22),(26,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',23),(27,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',24),(28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29),(30,'PROJECT_CREATE','Project creation','Executed when a project is created','project',30),(31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31),(32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32),(33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33),(34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34),(35,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(36,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(37,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(38,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(39,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(41,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(42,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
+/*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_actioncomm`
+--
+
+DROP TABLE IF EXISTS `llx_c_actioncomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_actioncomm` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `type` varchar(10) NOT NULL DEFAULT 'system',
+  `libelle` varchar(48) NOT NULL,
+  `module` varchar(16) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `todo` tinyint(4) DEFAULT NULL,
+  `position` int(11) NOT NULL DEFAULT '0',
+  `color` varchar(9) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_actioncomm` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_actioncomm`
+--
+
+LOCK TABLES `llx_c_actioncomm` WRITE;
+/*!40000 ALTER TABLE `llx_c_actioncomm` DISABLE KEYS */;
+INSERT INTO `llx_c_actioncomm` VALUES (1,'AC_TEL','system','Phone call',NULL,1,NULL,2,NULL),(2,'AC_FAX','system','Send Fax',NULL,1,NULL,3,NULL),(3,'AC_PROP','systemauto','Send commercial proposal by email','propal',0,NULL,10,NULL),(4,'AC_EMAIL','system','Send Email',NULL,1,NULL,4,NULL),(5,'AC_RDV','system','Rendez-vous',NULL,1,NULL,1,NULL),(8,'AC_COM','systemauto','Send customer order by email','order',0,NULL,8,NULL),(9,'AC_FAC','systemauto','Send customer invoice by email','invoice',0,NULL,6,NULL),(10,'AC_SHIP','systemauto','Send shipping by email','shipping',0,NULL,11,NULL),(11,'AC_INT','system','Intervention on site',NULL,1,NULL,4,NULL),(30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,NULL,9,NULL),(31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,NULL,7,NULL),(40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL,1,NULL,20,NULL),(50,'AC_OTH','system','Other (manually inserted events)',NULL,1,NULL,5,NULL),(100700,'AC_CABMED','module','Send document by email','cabinetmed',0,NULL,100,NULL);
+/*!40000 ALTER TABLE `llx_c_actioncomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_availability`
+--
+
+DROP TABLE IF EXISTS `llx_c_availability`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_availability` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_availability` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_availability`
+--
+
+LOCK TABLES `llx_c_availability` WRITE;
+/*!40000 ALTER TABLE `llx_c_availability` DISABLE KEYS */;
+INSERT INTO `llx_c_availability` VALUES (1,'AV_NOW','Immediate',1),(2,'AV_1W','1 week',1),(3,'AV_2W','2 weeks',1),(4,'AV_3W','3 weeks',1);
+/*!40000 ALTER TABLE `llx_c_availability` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_barcode_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_barcode_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_barcode_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `libelle` varchar(50) NOT NULL,
+  `coder` varchar(16) NOT NULL,
+  `example` varchar(16) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_barcode_type`
+--
+
+LOCK TABLES `llx_c_barcode_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_barcode_type` DISABLE KEYS */;
+INSERT INTO `llx_c_barcode_type` VALUES (1,'EAN8',1,'EAN8','0','1234567'),(2,'EAN13',1,'EAN13','0','123456789012'),(3,'UPC',1,'UPC','0','123456789012'),(4,'ISBN',1,'ISBN','0','123456789'),(5,'C39',1,'Code 39','0','1234567890'),(6,'C128',1,'Code 128','0','ABCD1234567890');
+/*!40000 ALTER TABLE `llx_c_barcode_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_chargesociales`
+--
+
+DROP TABLE IF EXISTS `llx_c_chargesociales`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_chargesociales` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `libelle` varchar(80) DEFAULT NULL,
+  `deductible` smallint(6) NOT NULL DEFAULT '0',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `code` varchar(12) NOT NULL,
+  `fk_pays` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=231 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_chargesociales`
+--
+
+LOCK TABLES `llx_c_chargesociales` WRITE;
+/*!40000 ALTER TABLE `llx_c_chargesociales` DISABLE KEYS */;
+INSERT INTO `llx_c_chargesociales` VALUES (1,'Allocations familiales',1,1,'TAXFAM',1,NULL,NULL),(2,'CSG Deductible',1,1,'TAXCSGD',1,NULL,NULL),(3,'CSG/CRDS NON Deductible',0,1,'TAXCSGND',1,NULL,NULL),(10,'Taxe apprentissage',0,1,'TAXAPP',1,NULL,NULL),(11,'Taxe professionnelle',0,1,'TAXPRO',1,NULL,NULL),(12,'Cotisation foncière des entreprises',0,1,'TAXCFE',1,NULL,NULL),(13,'Cotisation sur la valeur ajoutée des entreprises',0,1,'TAXCVAE',1,NULL,NULL),(20,'Impots locaux/fonciers',0,1,'TAXFON',1,NULL,NULL),(25,'Impots revenus',0,1,'TAXREV',1,NULL,NULL),(30,'Assurance Sante',0,1,'TAXSECU',1,NULL,NULL),(40,'Mutuelle',0,1,'TAXMUT',1,NULL,NULL),(50,'Assurance vieillesse',0,1,'TAXRET',1,NULL,NULL),(60,'Assurance Chomage',0,1,'TAXCHOM',1,NULL,NULL),(201,'ONSS',1,1,'TAXBEONSS',2,NULL,NULL),(210,'Precompte professionnel',1,1,'TAXBEPREPRO',2,NULL,NULL),(220,'Prime d\'existence',1,1,'TAXBEPRIEXI',2,NULL,NULL),(230,'Precompte immobilier',1,1,'TAXBEPREIMMO',2,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_chargesociales` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_civilite`
+--
+
+DROP TABLE IF EXISTS `llx_c_civilite`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_civilite` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `civilite` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_civilite`
+--
+
+LOCK TABLES `llx_c_civilite` WRITE;
+/*!40000 ALTER TABLE `llx_c_civilite` DISABLE KEYS */;
+INSERT INTO `llx_c_civilite` VALUES (1,'MME','Madame',1,NULL),(3,'MR','Monsieur',1,NULL),(5,'MLE','Mademoiselle',1,NULL),(7,'MTRE','Maître',1,NULL),(8,'DR','Docteur',1,NULL);
+/*!40000 ALTER TABLE `llx_c_civilite` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_civility`
+--
+
+DROP TABLE IF EXISTS `llx_c_civility`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_civility` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `label` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_civility` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_civility`
+--
+
+LOCK TABLES `llx_c_civility` WRITE;
+/*!40000 ALTER TABLE `llx_c_civility` DISABLE KEYS */;
+INSERT INTO `llx_c_civility` VALUES (1,'MME','Madame',1,NULL),(3,'MR','Monsieur',1,NULL),(5,'MLE','Mademoiselle',1,NULL),(7,'MTRE','Maître',1,NULL),(8,'DR','Docteur',1,NULL);
+/*!40000 ALTER TABLE `llx_c_civility` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_country`
+--
+
+DROP TABLE IF EXISTS `llx_c_country`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_country` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(2) NOT NULL,
+  `code_iso` varchar(3) DEFAULT NULL,
+  `label` varchar(50) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `favorite` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_c_country_code` (`code`),
+  UNIQUE KEY `idx_c_country_label` (`label`),
+  UNIQUE KEY `idx_c_country_code_iso` (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_country`
+--
+
+LOCK TABLES `llx_c_country` WRITE;
+/*!40000 ALTER TABLE `llx_c_country` DISABLE KEYS */;
+INSERT INTO `llx_c_country` VALUES (0,'',NULL,'-',1,1),(1,'FR','FRA','France',1,0),(2,'BE','BEL','Belgium',1,0),(3,'IT','ITA','Italy',1,0),(4,'ES','ESP','Spain',1,0),(5,'DE','DEU','Germany',1,0),(6,'CH','CHE','Switzerland',1,0),(7,'GB','GBR','United Kingdom',1,0),(8,'IE','IRL','Irland',1,0),(9,'CN','CHN','China',1,0),(10,'TN','TUN','Tunisia',1,0),(11,'US','USA','United States',1,0),(12,'MA','MAR','Maroc',1,0),(13,'DZ','DZA','Algeria',1,0),(14,'CA','CAN','Canada',1,0),(15,'TG','TGO','Togo',1,0),(16,'GA','GAB','Gabon',1,0),(17,'NL','NLD','Nerderland',1,0),(18,'HU','HUN','Hongrie',1,0),(19,'RU','RUS','Russia',1,0),(20,'SE','SWE','Sweden',1,0),(21,'CI','CIV','Côte d\'Ivoire',1,0),(22,'SN','SEN','Senegal',1,0),(23,'AR','ARG','Argentine',1,0),(24,'CM','CMR','Cameroun',1,0),(25,'PT','PRT','Portugal',1,0),(26,'SA','SAU','Saudi Arabia',1,0),(27,'MC','MCO','Monaco',1,0),(28,'AU','AUS','Australia',1,0),(29,'SG','SGP','Singapour',1,0),(30,'AF','AFG','Afghanistan',1,0),(31,'AX','ALA','Iles Aland',1,0),(32,'AL','ALB','Albanie',1,0),(33,'AS','ASM','Samoa américaines',1,0),(34,'AD','AND','Andorre',1,0),(35,'AO','AGO','Angola',1,0),(36,'AI','AIA','Anguilla',1,0),(37,'AQ','ATA','Antarctique',1,0),(38,'AG','ATG','Antigua-et-Barbuda',1,0),(39,'AM','ARM','Arménie',1,0),(40,'AW','ABW','Aruba',1,0),(41,'AT','AUT','Autriche',1,0),(42,'AZ','AZE','Azerbaïdjan',1,0),(43,'BS','BHS','Bahamas',1,0),(44,'BH','BHR','Bahreïn',1,0),(45,'BD','BGD','Bangladesh',1,0),(46,'BB','BRB','Barbade',1,0),(47,'BY','BLR','Biélorussie',1,0),(48,'BZ','BLZ','Belize',1,0),(49,'BJ','BEN','Bénin',1,0),(50,'BM','BMU','Bermudes',1,0),(51,'BT','BTN','Bhoutan',1,0),(52,'BO','BOL','Bolivie',1,0),(53,'BA','BIH','Bosnie-Herzégovine',1,0),(54,'BW','BWA','Botswana',1,0),(55,'BV','BVT','Ile Bouvet',1,0),(56,'BR','BRA','Brazil',1,0),(57,'IO','IOT','Territoire britannique de l\'Océan Indien',1,0),(58,'BN','BRN','Brunei',1,0),(59,'BG','BGR','Bulgarie',1,0),(60,'BF','BFA','Burkina Faso',1,0),(61,'BI','BDI','Burundi',1,0),(62,'KH','KHM','Cambodge',1,0),(63,'CV','CPV','Cap-Vert',1,0),(64,'KY','CYM','Iles Cayman',1,0),(65,'CF','CAF','République centrafricaine',1,0),(66,'TD','TCD','Tchad',1,0),(67,'CL','CHL','Chili',1,0),(68,'CX','CXR','Ile Christmas',1,0),(69,'CC','CCK','Iles des Cocos (Keeling)',1,0),(70,'CO','COL','Colombie',1,0),(71,'KM','COM','Comores',1,0),(72,'CG','COG','Congo',1,0),(73,'CD','COD','République démocratique du Congo',1,0),(74,'CK','COK','Iles Cook',1,0),(75,'CR','CRI','Costa Rica',1,0),(76,'HR','HRV','Croatie',1,0),(77,'CU','CUB','Cuba',1,0),(78,'CY','CYP','Chypre',1,0),(79,'CZ','CZE','République Tchèque',1,0),(80,'DK','DNK','Danemark',1,0),(81,'DJ','DJI','Djibouti',1,0),(82,'DM','DMA','Dominique',1,0),(83,'DO','DOM','République Dominicaine',1,0),(84,'EC','ECU','Equateur',1,0),(85,'EG','EGY','Egypte',1,0),(86,'SV','SLV','Salvador',1,0),(87,'GQ','GNQ','Guinée Equatoriale',1,0),(88,'ER','ERI','Erythrée',1,0),(89,'EE','EST','Estonia',1,0),(90,'ET','ETH','Ethiopie',1,0),(91,'FK','FLK','Iles Falkland',1,0),(92,'FO','FRO','Iles Féroé',1,0),(93,'FJ','FJI','Iles Fidji',1,0),(94,'FI','FIN','Finlande',1,0),(95,'GF','GUF','Guyane française',1,0),(96,'PF','PYF','Polynésie française',1,0),(97,'TF','ATF','Terres australes françaises',1,0),(98,'GM','GMB','Gambie',1,0),(99,'GE','GEO','Georgia',1,0),(100,'GH','GHA','Ghana',1,0),(101,'GI','GIB','Gibraltar',1,0),(102,'GR','GRC','Greece',1,0),(103,'GL','GRL','Groenland',1,0),(104,'GD','GRD','Grenade',1,0),(106,'GU','GUM','Guam',1,0),(107,'GT','GTM','Guatemala',1,0),(108,'GN','GIN','Guinea',1,0),(109,'GW','GNB','Guinea-Bissao',1,0),(111,'HT','HTI','Haiti',1,0),(112,'HM','HMD','Iles Heard et McDonald',1,0),(113,'VA','VAT','Saint-Siège (Vatican)',1,0),(114,'HN','HND','Honduras',1,0),(115,'HK','HKG','Hong Kong',1,0),(116,'IS','ISL','Islande',1,0),(117,'IN','IND','India',1,0),(118,'ID','IDN','Indonésie',1,0),(119,'IR','IRN','Iran',1,0),(120,'IQ','IRQ','Iraq',1,0),(121,'IL','ISR','Israel',1,0),(122,'JM','JAM','Jamaïque',1,0),(123,'JP','JPN','Japon',1,0),(124,'JO','JOR','Jordanie',1,0),(125,'KZ','KAZ','Kazakhstan',1,0),(126,'KE','KEN','Kenya',1,0),(127,'KI','KIR','Kiribati',1,0),(128,'KP','PRK','North Corea',1,0),(129,'KR','KOR','South Corea',1,0),(130,'KW','KWT','Koweït',1,0),(131,'KG','KGZ','Kirghizistan',1,0),(132,'LA','LAO','Laos',1,0),(133,'LV','LVA','Lettonie',1,0),(134,'LB','LBN','Liban',1,0),(135,'LS','LSO','Lesotho',1,0),(136,'LR','LBR','Liberia',1,0),(137,'LY','LBY','Libye',1,0),(138,'LI','LIE','Liechtenstein',1,0),(139,'LT','LTU','Lituanie',1,0),(140,'LU','LUX','Luxembourg',1,0),(141,'MO','MAC','Macao',1,0),(142,'MK','MKD','ex-République yougoslave de Macédoine',1,0),(143,'MG','MDG','Madagascar',1,0),(144,'MW','MWI','Malawi',1,0),(145,'MY','MYS','Malaisie',1,0),(146,'MV','MDV','Maldives',1,0),(147,'ML','MLI','Mali',1,0),(148,'MT','MLT','Malte',1,0),(149,'MH','MHL','Iles Marshall',1,0),(151,'MR','MRT','Mauritanie',1,0),(152,'MU','MUS','Maurice',1,0),(153,'YT','MYT','Mayotte',1,0),(154,'MX','MEX','Mexique',1,0),(155,'FM','FSM','Micronésie',1,0),(156,'MD','MDA','Moldavie',1,0),(157,'MN','MNG','Mongolie',1,0),(158,'MS','MSR','Monserrat',1,0),(159,'MZ','MOZ','Mozambique',1,0),(160,'MM','MMR','Birmanie (Myanmar)',1,0),(161,'NA','NAM','Namibie',1,0),(162,'NR','NRU','Nauru',1,0),(163,'NP','NPL','Népal',1,0),(164,'AN',NULL,'Antilles néerlandaises',1,0),(165,'NC','NCL','Nouvelle-Calédonie',1,0),(166,'NZ','NZL','Nouvelle-Zélande',1,0),(167,'NI','NIC','Nicaragua',1,0),(168,'NE','NER','Niger',1,0),(169,'NG','NGA','Nigeria',1,0),(170,'NU','NIU','Nioué',1,0),(171,'NF','NFK','Ile Norfolk',1,0),(172,'MP','MNP','Mariannes du Nord',1,0),(173,'NO','NOR','Norvège',1,0),(174,'OM','OMN','Oman',1,0),(175,'PK','PAK','Pakistan',1,0),(176,'PW','PLW','Palaos',1,0),(177,'PS','PSE','Territoire Palestinien Occupé',1,0),(178,'PA','PAN','Panama',1,0),(179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0),(180,'PY','PRY','Paraguay',1,0),(181,'PE','PER','Peru',1,0),(182,'PH','PHL','Philippines',1,0),(183,'PN','PCN','Iles Pitcairn',1,0),(184,'PL','POL','Pologne',1,0),(185,'PR','PRI','Porto Rico',1,0),(186,'QA','QAT','Qatar',1,0),(188,'RO','ROU','Roumanie',1,0),(189,'RW','RWA','Rwanda',1,0),(190,'SH','SHN','Sainte-Hélène',1,0),(191,'KN','KNA','Saint-Christophe-et-Niévès',1,0),(192,'LC','LCA','Sainte-Lucie',1,0),(193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0),(194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0),(195,'WS','WSM','Samoa',1,0),(196,'SM','SMR','Saint-Marin',1,0),(197,'ST','STP','Sao Tomé-et-Principe',1,0),(198,'RS','SRB','Serbie',1,0),(199,'SC','SYC','Seychelles',1,0),(200,'SL','SLE','Sierra Leone',1,0),(201,'SK','SVK','Slovaquie',1,0),(202,'SI','SVN','Slovénie',1,0),(203,'SB','SLB','Iles Salomon',1,0),(204,'SO','SOM','Somalie',1,0),(205,'ZA','ZAF','Afrique du Sud',1,0),(206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0),(207,'LK','LKA','Sri Lanka',1,0),(208,'SD','SDN','Soudan',1,0),(209,'SR','SUR','Suriname',1,0),(210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0),(211,'SZ','SWZ','Swaziland',1,0),(212,'SY','SYR','Syrie',1,0),(213,'TW','TWN','Taïwan',1,0),(214,'TJ','TJK','Tadjikistan',1,0),(215,'TZ','TZA','Tanzanie',1,0),(216,'TH','THA','Thaïlande',1,0),(217,'TL','TLS','Timor Oriental',1,0),(218,'TK','TKL','Tokélaou',1,0),(219,'TO','TON','Tonga',1,0),(220,'TT','TTO','Trinité-et-Tobago',1,0),(221,'TR','TUR','Turquie',1,0),(222,'TM','TKM','Turkménistan',1,0),(223,'TC','TCA','Iles Turks-et-Caicos',1,0),(224,'TV','TUV','Tuvalu',1,0),(225,'UG','UGA','Ouganda',1,0),(226,'UA','UKR','Ukraine',1,0),(227,'xx','ARE','Émirats arabes unishh',1,0),(228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0),(229,'UY','URY','Uruguay',1,0),(230,'UZ','UZB','Ouzbékistan',1,0),(231,'VU','VUT','Vanuatu',1,0),(232,'VE','VEN','Vénézuela',1,0),(233,'VN','VNM','Viêt Nam',1,0),(234,'VG','VGB','Iles Vierges britanniques',1,0),(235,'VI','VIR','Iles Vierges américaines',1,0),(236,'WF','WLF','Wallis-et-Futuna',1,0),(237,'EH','ESH','Sahara occidental',1,0),(238,'YE','YEM','Yémen',1,0),(239,'ZM','ZMB','Zambie',1,0),(240,'ZW','ZWE','Zimbabwe',1,0),(241,'GG','GGY','Guernesey',1,0),(242,'IM','IMN','Ile de Man',1,0),(243,'JE','JEY','Jersey',1,0),(244,'ME','MNE','Monténégro',1,0),(245,'BL','BLM','Saint-Barthélemy',1,0),(246,'MF','MAF','Saint-Martin',1,0),(247,'hh',NULL,'hhh',1,0);
+/*!40000 ALTER TABLE `llx_c_country` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_currencies`
+--
+
+DROP TABLE IF EXISTS `llx_c_currencies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_currencies` (
+  `code_iso` varchar(3) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `unicode` varchar(32) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_currencies`
+--
+
+LOCK TABLES `llx_c_currencies` WRITE;
+/*!40000 ALTER TABLE `llx_c_currencies` DISABLE KEYS */;
+INSERT INTO `llx_c_currencies` VALUES ('AED','United Arab Emirates Dirham',NULL,1),('AFN','Afghanistan Afghani','[1547]',1),('ALL','Albania Leklll','[76,101,107]',1),('ANG','Netherlands Antilles Guilder','[402]',1),('ARP','Pesos argentins',NULL,0),('ARS','Argentino Peso','[36]',1),('ATS','Shiliing autrichiens',NULL,0),('AUD','Australia Dollar','[36]',1),('AWG','Aruba Guilder','[402]',1),('AZN','Azerbaijan New Manat','[1084,1072,1085]',1),('BAM','Bosnia and Herzegovina Convertible Marka','[75,77]',1),('BBD','Barbados Dollar','[36]',1),('BEF','Francs belges',NULL,0),('BGN','Bulgaria Lev','[1083,1074]',1),('BMD','Bermuda Dollar','[36]',1),('BND','Brunei Darussalam Dollar','[36]',1),('BOB','Bolivia Boliviano','[36,98]',1),('BRL','Brazil Real','[82,36]',1),('BSD','Bahamas Dollar','[36]',1),('BWP','Botswana Pula','[80]',1),('BYR','Belarus Ruble','[112,46]',1),('BZD','Belize Dollar','[66,90,36]',1),('CAD','Canada Dollar','[36]',1),('CHF','Switzerland Franc','[67,72,70]',1),('CLP','Chile Peso','[36]',1),('CNY','China Yuan Renminbi','[165]',1),('COP','Colombia Peso','[36]',1),('CRC','Costa Rica Colon','[8353]',1),('CUP','Cuba Peso','[8369]',1),('CZK','Czech Republic Koruna','[75,269]',1),('DEM','Deutsch mark',NULL,0),('DKK','Denmark Krone','[107,114]',1),('DOP','Dominican Republic Peso','[82,68,36]',1),('DZD','Algeria Dinar',NULL,1),('EEK','Estonia Kroon','[107,114]',1),('EGP','Egypt Pound','[163]',1),('ESP','Pesete',NULL,0),('EUR','Euro Member Countries','[8364]',1),('FIM','Mark finlandais',NULL,0),('FJD','Fiji Dollar','[36]',1),('FKP','Falkland Islands (Malvinas) Pound','[163]',1),('FRF','Francs francais',NULL,0),('GBP','United Kingdom Pound','[163]',1),('GGP','Guernsey Pound','[163]',1),('GHC','Ghana Cedis','[162]',1),('GIP','Gibraltar Pound','[163]',1),('GRD','Drachme (grece)',NULL,0),('GTQ','Guatemala Quetzal','[81]',1),('GYD','Guyana Dollar','[36]',1),('hhh','ddd','[]',1),('HKD','Hong Kong Dollar','[36]',1),('HNL','Honduras Lempira','[76]',1),('HRK','Croatia Kuna','[107,110]',1),('HUF','Hungary Forint','[70,116]',1),('IDR','Indonesia Rupiah','[82,112]',1),('IEP','Livres irlandaises',NULL,0),('ILS','Israel Shekel','[8362]',1),('IMP','Isle of Man Pound','[163]',1),('INR','India Rupee',NULL,1),('IRR','Iran Rial','[65020]',1),('ISK','Iceland Krona','[107,114]',1),('ITL','Lires',NULL,0),('JEP','Jersey Pound','[163]',1),('JMD','Jamaica Dollar','[74,36]',1),('JPY','Japan Yen','[165]',1),('KGS','Kyrgyzstan Som','[1083,1074]',1),('KHR','Cambodia Riel','[6107]',1),('KPW','Korea (North) Won','[8361]',1),('KRW','Korea (South) Won','[8361]',1),('KYD','Cayman Islands Dollar','[36]',1),('KZT','Kazakhstan Tenge','[1083,1074]',1),('LAK','Laos Kip','[8365]',1),('LBP','Lebanon Pound','[163]',1),('LKR','Sri Lanka Rupee','[8360]',1),('LRD','Liberia Dollar','[36]',1),('LTL','Lithuania Litas','[76,116]',1),('LUF','Francs luxembourgeois',NULL,0),('LVL','Latvia Lat','[76,115]',1),('MAD','Morocco Dirham',NULL,1),('MKD','Macedonia Denar','[1076,1077,1085]',1),('MNT','Mongolia Tughrik','[8366]',1),('MRO','Mauritania Ouguiya',NULL,1),('MUR','Mauritius Rupee','[8360]',1),('MXN','Mexico Peso','[36]',1),('MXP','Pesos Mexicans',NULL,0),('MYR','Malaysia Ringgit','[82,77]',1),('MZN','Mozambique Metical','[77,84]',1),('NAD','Namibia Dollar','[36]',1),('NGN','Nigeria Naira','[8358]',1),('NIO','Nicaragua Cordoba','[67,36]',1),('NLG','Florins',NULL,0),('NOK','Norway Krone','[107,114]',1),('NPR','Nepal Rupee','[8360]',1),('NZD','New Zealand Dollar','[36]',1),('OMR','Oman Rial','[65020]',1),('PAB','Panama Balboa','[66,47,46]',1),('PEN','Peru Nuevo Sol','[83,47,46]',1),('PHP','Philippines Peso','[8369]',1),('PKR','Pakistan Rupee','[8360]',1),('PLN','Poland Zloty','[122,322]',1),('PTE','Escudos',NULL,0),('PYG','Paraguay Guarani','[71,115]',1),('QAR','Qatar Riyal','[65020]',1),('RON','Romania New Leu','[108,101,105]',1),('RSD','Serbia Dinar','[1044,1080,1085,46]',1),('RUB','Russia Ruble','[1088,1091,1073]',1),('SAR','Saudi Arabia Riyal','[65020]',1),('SBD','Solomon Islands Dollar','[36]',1),('SCR','Seychelles Rupee','[8360]',1),('SEK','Sweden Krona','[107,114]',1),('SGD','Singapore Dollar','[36]',1),('SHP','Saint Helena Pound','[163]',1),('SKK','Couronnes slovaques',NULL,0),('SOS','Somalia Shilling','[83]',1),('SRD','Suriname Dollar','[36]',1),('SUR','Rouble',NULL,0),('SVC','El Salvador Colon','[36]',1),('SYP','Syria Pound','[163]',1),('THB','Thailand Baht','[3647]',1),('TND','Tunisia Dinar',NULL,1),('TRL','Turkey Lira','[84,76]',1),('TRY','Turkey Lira','[8356]',1),('TTD','Trinidad and Tobago Dollar','[84,84,36]',1),('TVD','Tuvalu Dollar','[36]',1),('TWD','Taiwan New Dollar','[78,84,36]',1),('UAH','Ukraine Hryvna','[8372]',1),('USD','United States Dollar','[36]',1),('UYU','Uruguay Peso','[36,85]',1),('UZS','Uzbekistan Som','[1083,1074]',1),('VEF','Venezuela Bolivar Fuerte','[66,115]',1),('VND','Viet Nam Dong','[8363]',1),('XAF','Communaute Financiere Africaine (BEAC) CFA Franc',NULL,1),('XCD','East Caribbean Dollar','[36]',1),('XEU','Ecus',NULL,0),('XOF','Communaute Financiere Africaine (BCEAO) Franc',NULL,1),('YER','Yemen Rial','[65020]',1),('ZAR','South Africa Rand','[82]',1),('ZWD','Zimbabwe Dollar','[90,36]',1);
+/*!40000 ALTER TABLE `llx_c_currencies` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_departements`
+--
+
+DROP TABLE IF EXISTS `llx_c_departements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_departements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code_departement` varchar(6) NOT NULL,
+  `fk_region` int(11) DEFAULT NULL,
+  `cheflieu` varchar(50) DEFAULT NULL,
+  `tncc` int(11) DEFAULT NULL,
+  `ncc` varchar(50) DEFAULT NULL,
+  `nom` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_departements` (`code_departement`,`fk_region`),
+  KEY `idx_departements_fk_region` (`fk_region`),
+  CONSTRAINT `fk_departements_code_region` FOREIGN KEY (`fk_region`) REFERENCES `llx_c_regions` (`code_region`)
+) ENGINE=InnoDB AUTO_INCREMENT=1282 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_departements`
+--
+
+LOCK TABLES `llx_c_departements` WRITE;
+/*!40000 ALTER TABLE `llx_c_departements` DISABLE KEYS */;
+INSERT INTO `llx_c_departements` VALUES (1,'0',0,'0',0,'-','-',1),(2,'01',82,'01053',5,'AIN','Ain',1),(3,'02',22,'02408',5,'AISNE','Aisne',1),(4,'03',83,'03190',5,'ALLIER','Allier',1),(5,'04',93,'04070',4,'ALPES-DE-HAUTE-PROVENCE','Alpes-de-Haute-Provence',1),(6,'05',93,'05061',4,'HAUTES-ALPES','Hautes-Alpes',1),(7,'06',93,'06088',4,'ALPES-MARITIMES','Alpes-Maritimes',1),(8,'07',82,'07186',5,'ARDECHE','Ardèche',1),(9,'08',21,'08105',4,'ARDENNES','Ardennes',1),(10,'09',73,'09122',5,'ARIEGE','Ariège',1),(11,'10',21,'10387',5,'AUBE','Aube',1),(12,'11',91,'11069',5,'AUDE','Aude',1),(13,'12',73,'12202',5,'AVEYRON','Aveyron',1),(14,'13',93,'13055',4,'BOUCHES-DU-RHONE','Bouches-du-Rhône',1),(15,'14',25,'14118',2,'CALVADOS','Calvados',1),(16,'15',83,'15014',2,'CANTAL','Cantal',1),(17,'16',54,'16015',3,'CHARENTE','Charente',1),(18,'17',54,'17300',3,'CHARENTE-MARITIME','Charente-Maritime',1),(19,'18',24,'18033',2,'CHER','Cher',1),(20,'19',74,'19272',3,'CORREZE','Corrèze',1),(21,'2A',94,'2A004',3,'CORSE-DU-SUD','Corse-du-Sud',1),(22,'2B',94,'2B033',3,'HAUTE-CORSE','Haute-Corse',1),(23,'21',26,'21231',3,'COTE-D\'OR','Côte-d\'Or',1),(24,'22',53,'22278',4,'COTES-D\'ARMOR','Côtes-d\'Armor',1),(25,'23',74,'23096',3,'CREUSE','Creuse',1),(26,'24',72,'24322',3,'DORDOGNE','Dordogne',1),(27,'25',43,'25056',2,'DOUBS','Doubs',1),(28,'26',82,'26362',3,'DROME','Drôme',1),(29,'27',23,'27229',5,'EURE','Eure',1),(30,'28',24,'28085',1,'EURE-ET-LOIR','Eure-et-Loir',1),(31,'29',53,'29232',2,'FINISTERE','Finistère',1),(32,'30',91,'30189',2,'GARD','Gard',1),(33,'31',73,'31555',3,'HAUTE-GARONNE','Haute-Garonne',1),(34,'32',73,'32013',2,'GERS','Gers',1),(35,'33',72,'33063',3,'GIRONDE','Gironde',1),(36,'34',91,'34172',5,'HERAULT','Hérault',1),(37,'35',53,'35238',1,'ILLE-ET-VILAINE','Ille-et-Vilaine',1),(38,'36',24,'36044',5,'INDRE','Indre',1),(39,'37',24,'37261',1,'INDRE-ET-LOIRE','Indre-et-Loire',1),(40,'38',82,'38185',5,'ISERE','Isère',1),(41,'39',43,'39300',2,'JURA','Jura',1),(42,'40',72,'40192',4,'LANDES','Landes',1),(43,'41',24,'41018',0,'LOIR-ET-CHER','Loir-et-Cher',1),(44,'42',82,'42218',3,'LOIRE','Loire',1),(45,'43',83,'43157',3,'HAUTE-LOIRE','Haute-Loire',1),(46,'44',52,'44109',3,'LOIRE-ATLANTIQUE','Loire-Atlantique',1),(47,'45',24,'45234',2,'LOIRET','Loiret',1),(48,'46',73,'46042',2,'LOT','Lot',1),(49,'47',72,'47001',0,'LOT-ET-GARONNE','Lot-et-Garonne',1),(50,'48',91,'48095',3,'LOZERE','Lozère',1),(51,'49',52,'49007',0,'MAINE-ET-LOIRE','Maine-et-Loire',1),(52,'50',25,'50502',3,'MANCHE','Manche',1),(53,'51',21,'51108',3,'MARNE','Marne',1),(54,'52',21,'52121',3,'HAUTE-MARNE','Haute-Marne',1),(55,'53',52,'53130',3,'MAYENNE','Mayenne',1),(56,'54',41,'54395',0,'MEURTHE-ET-MOSELLE','Meurthe-et-Moselle',1),(57,'55',41,'55029',3,'MEUSE','Meuse',1),(58,'56',53,'56260',2,'MORBIHAN','Morbihan',1),(59,'57',41,'57463',3,'MOSELLE','Moselle',1),(60,'58',26,'58194',3,'NIEVRE','Nièvre',1),(61,'59',31,'59350',2,'NORD','Nord',1),(62,'60',22,'60057',5,'OISE','Oise',1),(63,'61',25,'61001',5,'ORNE','Orne',1),(64,'62',31,'62041',2,'PAS-DE-CALAIS','Pas-de-Calais',1),(65,'63',83,'63113',2,'PUY-DE-DOME','Puy-de-Dôme',1),(66,'64',72,'64445',4,'PYRENEES-ATLANTIQUES','Pyrénées-Atlantiques',1),(67,'65',73,'65440',4,'HAUTES-PYRENEES','Hautes-Pyrénées',1),(68,'66',91,'66136',4,'PYRENEES-ORIENTALES','Pyrénées-Orientales',1),(69,'67',42,'67482',2,'BAS-RHIN','Bas-Rhin',1),(70,'68',42,'68066',2,'HAUT-RHIN','Haut-Rhin',1),(71,'69',82,'69123',2,'RHONE','Rhône',1),(72,'70',43,'70550',3,'HAUTE-SAONE','Haute-Saône',1),(73,'71',26,'71270',0,'SAONE-ET-LOIRE','Saône-et-Loire',1),(74,'72',52,'72181',3,'SARTHE','Sarthe',1),(75,'73',82,'73065',3,'SAVOIE','Savoie',1),(76,'74',82,'74010',3,'HAUTE-SAVOIE','Haute-Savoie',1),(77,'75',11,'75056',0,'PARIS','Paris',1),(78,'76',23,'76540',3,'SEINE-MARITIME','Seine-Maritime',1),(79,'77',11,'77288',0,'SEINE-ET-MARNE','Seine-et-Marne',1),(80,'78',11,'78646',4,'YVELINES','Yvelines',1),(81,'79',54,'79191',4,'DEUX-SEVRES','Deux-Sèvres',1),(82,'80',22,'80021',3,'SOMME','Somme',1),(83,'81',73,'81004',2,'TARN','Tarn',1),(84,'82',73,'82121',0,'TARN-ET-GARONNE','Tarn-et-Garonne',1),(85,'83',93,'83137',2,'VAR','Var',1),(86,'84',93,'84007',0,'VAUCLUSE','Vaucluse',1),(87,'85',52,'85191',3,'VENDEE','Vendée',1),(88,'86',54,'86194',3,'VIENNE','Vienne',1),(89,'87',74,'87085',3,'HAUTE-VIENNE','Haute-Vienne',1),(90,'88',41,'88160',4,'VOSGES','Vosges',1),(91,'89',26,'89024',5,'YONNE','Yonne',1),(92,'90',43,'90010',0,'TERRITOIRE DE BELFORT','Territoire de Belfort',1),(93,'91',11,'91228',5,'ESSONNE','Essonne',1),(94,'92',11,'92050',4,'HAUTS-DE-SEINE','Hauts-de-Seine',1),(95,'93',11,'93008',3,'SEINE-SAINT-DENIS','Seine-Saint-Denis',1),(96,'94',11,'94028',2,'VAL-DE-MARNE','Val-de-Marne',1),(97,'95',11,'95500',2,'VAL-D\'OISE','Val-d\'Oise',1),(98,'971',1,'97105',3,'GUADELOUPE','Guadeloupe',1),(99,'972',2,'97209',3,'MARTINIQUE','Martinique',1),(100,'973',3,'97302',3,'GUYANE','Guyane',1),(101,'974',4,'97411',3,'REUNION','Réunion',1),(102,'01',201,'',1,'ANVERS','Anvers',1),(103,'02',203,'',3,'BRUXELLES-CAPITALE','Bruxelles-Capitale',1),(104,'03',202,'',2,'BRABANT-WALLON','Brabant-Wallon',1),(105,'04',201,'',1,'BRABANT-FLAMAND','Brabant-Flamand',1),(106,'05',201,'',1,'FLANDRE-OCCIDENTALE','Flandre-Occidentale',1),(107,'06',201,'',1,'FLANDRE-ORIENTALE','Flandre-Orientale',1),(108,'07',202,'',2,'HAINAUT','Hainaut',1),(109,'08',201,'',2,'LIEGE','Liège',1),(110,'09',202,'',1,'LIMBOURG','Limbourg',1),(111,'10',202,'',2,'LUXEMBOURG','Luxembourg',1),(112,'11',201,'',2,'NAMUR','Namur',1),(113,'NSW',2801,'',1,'','New South Wales',1),(114,'VIC',2801,'',1,'','Victoria',1),(115,'QLD',2801,'',1,'','Queensland',1),(116,'SA',2801,'',1,'','South Australia',1),(117,'ACT',2801,'',1,'','Australia Capital Territory',1),(118,'TAS',2801,'',1,'','Tasmania',1),(119,'WA',2801,'',1,'','Western Australia',1),(120,'NT',2801,'',1,'','Northern Territory',1),(121,'01',419,'',19,'ALAVA','Álava',1),(122,'02',404,'',4,'ALBACETE','Albacete',1),(123,'03',411,'',11,'ALICANTE','Alicante',1),(124,'04',401,'',1,'ALMERIA','Almería',1),(125,'05',403,'',3,'AVILA','Avila',1),(126,'06',412,'',12,'BADAJOZ','Badajoz',1),(127,'07',414,'',14,'ISLAS BALEARES','Islas Baleares',1),(128,'08',406,'',6,'BARCELONA','Barcelona',1),(129,'09',403,'',8,'BURGOS','Burgos',1),(130,'10',412,'',12,'CACERES','Cáceres',1),(131,'11',401,'',1,'CADIz','Cádiz',1),(132,'12',411,'',11,'CASTELLON','Castellón',1),(133,'13',404,'',4,'CIUDAD REAL','Ciudad Real',1),(134,'14',401,'',1,'CORDOBA','Córdoba',1),(135,'15',413,'',13,'LA CORUÑA','La Coruña',1),(136,'16',404,'',4,'CUENCA','Cuenca',1),(137,'17',406,'',6,'GERONA','Gerona',1),(138,'18',401,'',1,'GRANADA','Granada',1),(139,'19',404,'',4,'GUADALAJARA','Guadalajara',1),(140,'20',419,'',19,'GUIPUZCOA','Guipúzcoa',1),(141,'21',401,'',1,'HUELVA','Huelva',1),(142,'22',402,'',2,'HUESCA','Huesca',1),(143,'23',401,'',1,'JAEN','Jaén',1),(144,'24',403,'',3,'LEON','León',1),(145,'25',406,'',6,'LERIDA','Lérida',1),(146,'26',415,'',15,'LA RIOJA','La Rioja',1),(147,'27',413,'',13,'LUGO','Lugo',1),(148,'28',416,'',16,'MADRID','Madrid',1),(149,'29',401,'',1,'MALAGA','Málaga',1),(150,'30',417,'',17,'MURCIA','Murcia',1),(151,'31',408,'',8,'NAVARRA','Navarra',1),(152,'32',413,'',13,'ORENSE','Orense',1),(153,'33',418,'',18,'ASTURIAS','Asturias',1),(154,'34',403,'',3,'PALENCIA','Palencia',1),(155,'35',405,'',5,'LAS PALMAS','Las Palmas',1),(156,'36',413,'',13,'PONTEVEDRA','Pontevedra',1),(157,'37',403,'',3,'SALAMANCA','Salamanca',1),(158,'38',405,'',5,'STA. CRUZ DE TENERIFE','Sta. Cruz de Tenerife',1),(159,'39',410,'',10,'CANTABRIA','Cantabria',1),(160,'40',403,'',3,'SEGOVIA','Segovia',1),(161,'41',401,'',1,'SEVILLA','Sevilla',1),(162,'42',403,'',3,'SORIA','Soria',1),(163,'43',406,'',6,'TARRAGONA','Tarragona',1),(164,'44',402,'',2,'TERUEL','Teruel',1),(165,'45',404,'',5,'TOLEDO','Toledo',1),(166,'46',411,'',11,'VALENCIA','Valencia',1),(167,'47',403,'',3,'VALLADOLID','Valladolid',1),(168,'48',419,'',19,'VIZCAYA','Vizcaya',1),(169,'49',403,'',3,'ZAMORA','Zamora',1),(170,'50',402,'',1,'ZARAGOZA','Zaragoza',1),(171,'51',407,'',7,'CEUTA','Ceuta',1),(172,'52',409,'',9,'MELILLA','Melilla',1),(173,'53',420,'',20,'OTROS','Otros',1),(174,'AG',601,NULL,NULL,'ARGOVIE','Argovie',1),(175,'AI',601,NULL,NULL,'APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1),(176,'AR',601,NULL,NULL,'APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1),(177,'BE',601,NULL,NULL,'BERNE','Berne',1),(178,'BL',601,NULL,NULL,'BALE CAMPAGNE','Bâle Campagne',1),(179,'BS',601,NULL,NULL,'BALE VILLE','Bâle Ville',1),(180,'FR',601,NULL,NULL,'FRIBOURG','Fribourg',1),(181,'GE',601,NULL,NULL,'GENEVE','Genève',1),(182,'GL',601,NULL,NULL,'GLARIS','Glaris',1),(183,'GR',601,NULL,NULL,'GRISONS','Grisons',1),(184,'JU',601,NULL,NULL,'JURA','Jura',1),(185,'LU',601,NULL,NULL,'LUCERNE','Lucerne',1),(186,'NE',601,NULL,NULL,'NEUCHATEL','Neuchâtel',1),(187,'NW',601,NULL,NULL,'NIDWALD','Nidwald',1),(188,'OW',601,NULL,NULL,'OBWALD','Obwald',1),(189,'SG',601,NULL,NULL,'SAINT-GALL','Saint-Gall',1),(190,'SH',601,NULL,NULL,'SCHAFFHOUSE','Schaffhouse',1),(191,'SO',601,NULL,NULL,'SOLEURE','Soleure',1),(192,'SZ',601,NULL,NULL,'SCHWYZ','Schwyz',1),(193,'TG',601,NULL,NULL,'THURGOVIE','Thurgovie',1),(194,'TI',601,NULL,NULL,'TESSIN','Tessin',1),(195,'UR',601,NULL,NULL,'URI','Uri',1),(196,'VD',601,NULL,NULL,'VAUD','Vaud',1),(197,'VS',601,NULL,NULL,'VALAIS','Valais',1),(198,'ZG',601,NULL,NULL,'ZUG','Zug',1),(199,'ZH',601,NULL,NULL,'ZURICH','Zürich',1),(200,'AL',1101,'',0,'ALABAMA','Alabama',1),(201,'AK',1101,'',0,'ALASKA','Alaska',1),(202,'AZ',1101,'',0,'ARIZONA','Arizona',1),(203,'AR',1101,'',0,'ARKANSAS','Arkansas',1),(204,'CA',1101,'',0,'CALIFORNIA','California',1),(205,'CO',1101,'',0,'COLORADO','Colorado',1),(206,'CT',1101,'',0,'CONNECTICUT','Connecticut',1),(207,'DE',1101,'',0,'DELAWARE','Delaware',1),(208,'FL',1101,'',0,'FLORIDA','Florida',1),(209,'GA',1101,'',0,'GEORGIA','Georgia',1),(210,'HI',1101,'',0,'HAWAII','Hawaii',1),(211,'ID',1101,'',0,'IDAHO','Idaho',1),(212,'IL',1101,'',0,'ILLINOIS','Illinois',1),(213,'IN',1101,'',0,'INDIANA','Indiana',1),(214,'IA',1101,'',0,'IOWA','Iowa',1),(215,'KS',1101,'',0,'KANSAS','Kansas',1),(216,'KY',1101,'',0,'KENTUCKY','Kentucky',1),(217,'LA',1101,'',0,'LOUISIANA','Louisiana',1),(218,'ME',1101,'',0,'MAINE','Maine',1),(219,'MD',1101,'',0,'MARYLAND','Maryland',1),(220,'MA',1101,'',0,'MASSACHUSSETTS','Massachusetts',1),(221,'MI',1101,'',0,'MICHIGAN','Michigan',1),(222,'MN',1101,'',0,'MINNESOTA','Minnesota',1),(223,'MS',1101,'',0,'MISSISSIPPI','Mississippi',1),(224,'MO',1101,'',0,'MISSOURI','Missouri',1),(225,'MT',1101,'',0,'MONTANA','Montana',1),(226,'NE',1101,'',0,'NEBRASKA','Nebraska',1),(227,'NV',1101,'',0,'NEVADA','Nevada',1),(228,'NH',1101,'',0,'NEW HAMPSHIRE','New Hampshire',1),(229,'NJ',1101,'',0,'NEW JERSEY','New Jersey',1),(230,'NM',1101,'',0,'NEW MEXICO','New Mexico',1),(231,'NY',1101,'',0,'NEW YORK','New York',1),(232,'NC',1101,'',0,'NORTH CAROLINA','North Carolina',1),(233,'ND',1101,'',0,'NORTH DAKOTA','North Dakota',1),(234,'OH',1101,'',0,'OHIO','Ohio',1),(235,'OK',1101,'',0,'OKLAHOMA','Oklahoma',1),(236,'OR',1101,'',0,'OREGON','Oregon',1),(237,'PA',1101,'',0,'PENNSYLVANIA','Pennsylvania',1),(238,'RI',1101,'',0,'RHODE ISLAND','Rhode Island',1),(239,'SC',1101,'',0,'SOUTH CAROLINA','South Carolina',1),(240,'SD',1101,'',0,'SOUTH DAKOTA','South Dakota',1),(241,'TN',1101,'',0,'TENNESSEE','Tennessee',1),(242,'TX',1101,'',0,'TEXAS','Texas',1),(243,'UT',1101,'',0,'UTAH','Utah',1),(244,'VT',1101,'',0,'VERMONT','Vermont',1),(245,'VA',1101,'',0,'VIRGINIA','Virginia',1),(246,'WA',1101,'',0,'WASHINGTON','Washington',1),(247,'WV',1101,'',0,'WEST VIRGINIA','West Virginia',1),(248,'WI',1101,'',0,'WISCONSIN','Wisconsin',1),(249,'WY',1101,'',0,'WYOMING','Wyoming',1),(250,'SS',8601,NULL,NULL,NULL,'San Salvador',1),(251,'SA',8603,NULL,NULL,NULL,'Santa Ana',1),(252,'AH',8603,NULL,NULL,NULL,'Ahuachapan',1),(253,'SO',8603,NULL,NULL,NULL,'Sonsonate',1),(254,'US',8602,NULL,NULL,NULL,'Usulutan',1),(255,'SM',8602,NULL,NULL,NULL,'San Miguel',1),(256,'MO',8602,NULL,NULL,NULL,'Morazan',1),(257,'LU',8602,NULL,NULL,NULL,'La Union',1),(258,'LL',8601,NULL,NULL,NULL,'La Libertad',1),(259,'CH',8601,NULL,NULL,NULL,'Chalatenango',1),(260,'CA',8601,NULL,NULL,NULL,'Cabañas',1),(261,'LP',8601,NULL,NULL,NULL,'La Paz',1),(262,'SV',8601,NULL,NULL,NULL,'San Vicente',1),(263,'CU',8601,NULL,NULL,NULL,'Cuscatlan',1),(264,'2301',2301,'',0,'CATAMARCA','Catamarca',1),(265,'2302',2301,'',0,'JUJUY','Jujuy',1),(266,'2303',2301,'',0,'TUCAMAN','Tucamán',1),(267,'2304',2301,'',0,'SANTIAGO DEL ESTERO','Santiago del Estero',1),(268,'2305',2301,'',0,'SALTA','Salta',1),(269,'2306',2302,'',0,'CHACO','Chaco',1),(270,'2307',2302,'',0,'CORRIENTES','Corrientes',1),(271,'2308',2302,'',0,'ENTRE RIOS','Entre Ríos',1),(272,'2309',2302,'',0,'FORMOSA MISIONES','Formosa Misiones',1),(273,'2310',2302,'',0,'SANTA FE','Santa Fe',1),(274,'2311',2303,'',0,'LA RIOJA','La Rioja',1),(275,'2312',2303,'',0,'MENDOZA','Mendoza',1),(276,'2313',2303,'',0,'SAN JUAN','San Juan',1),(277,'2314',2303,'',0,'SAN LUIS','San Luis',1),(278,'2315',2304,'',0,'CORDOBA','Córdoba',1),(279,'2316',2304,'',0,'BUENOS AIRES','Buenos Aires',1),(280,'2317',2304,'',0,'CABA','Caba',1),(281,'2318',2305,'',0,'LA PAMPA','La Pampa',1),(282,'2319',2305,'',0,'NEUQUEN','Neuquén',1),(283,'2320',2305,'',0,'RIO NEGRO','Río Negro',1),(284,'2321',2305,'',0,'CHUBUT','Chubut',1),(285,'2322',2305,'',0,'SANTA CRUZ','Santa Cruz',1),(286,'2323',2305,'',0,'TIERRA DEL FUEGO','Tierra del Fuego',1),(287,'2324',2305,'',0,'ISLAS MALVINAS','Islas Malvinas',1),(288,'2325',2305,'',0,'ANTARTIDA','Antártida',1),(289,'AN',11701,NULL,0,'AN','Andaman & Nicobar',1),(290,'AP',11701,NULL,0,'AP','Andhra Pradesh',1),(291,'AR',11701,NULL,0,'AR','Arunachal Pradesh',1),(292,'AS',11701,NULL,0,'AS','Assam',1),(293,'BR',11701,NULL,0,'BR','Bihar',1),(294,'CG',11701,NULL,0,'CG','Chattisgarh',1),(295,'CH',11701,NULL,0,'CH','Chandigarh',1),(296,'DD',11701,NULL,0,'DD','Daman & Diu',1),(297,'DL',11701,NULL,0,'DL','Delhi',1),(298,'DN',11701,NULL,0,'DN','Dadra and Nagar Haveli',1),(299,'GA',11701,NULL,0,'GA','Goa',1),(300,'GJ',11701,NULL,0,'GJ','Gujarat',1),(301,'HP',11701,NULL,0,'HP','Himachal Pradesh',1),(302,'HR',11701,NULL,0,'HR','Haryana',1),(303,'JH',11701,NULL,0,'JH','Jharkhand',1),(304,'JK',11701,NULL,0,'JK','Jammu & Kashmir',1),(305,'KA',11701,NULL,0,'KA','Karnataka',1),(306,'KL',11701,NULL,0,'KL','Kerala',1),(307,'LD',11701,NULL,0,'LD','Lakshadweep',1),(308,'MH',11701,NULL,0,'MH','Maharashtra',1),(309,'ML',11701,NULL,0,'ML','Meghalaya',1),(310,'MN',11701,NULL,0,'MN','Manipur',1),(311,'MP',11701,NULL,0,'MP','Madhya Pradesh',1),(312,'MZ',11701,NULL,0,'MZ','Mizoram',1),(313,'NL',11701,NULL,0,'NL','Nagaland',1),(314,'OR',11701,NULL,0,'OR','Orissa',1),(315,'PB',11701,NULL,0,'PB','Punjab',1),(316,'PY',11701,NULL,0,'PY','Puducherry',1),(317,'RJ',11701,NULL,0,'RJ','Rajasthan',1),(318,'SK',11701,NULL,0,'SK','Sikkim',1),(319,'TN',11701,NULL,0,'TN','Tamil Nadu',1),(320,'TR',11701,NULL,0,'TR','Tripura',1),(321,'UL',11701,NULL,0,'UL','Uttarakhand',1),(322,'UP',11701,NULL,0,'UP','Uttar Pradesh',1),(323,'WB',11701,NULL,0,'WB','West Bengal',1),(374,'151',6715,'',0,'151','Arica',1),(375,'152',6715,'',0,'152','Parinacota',1),(376,'011',6701,'',0,'011','Iquique',1),(377,'014',6701,'',0,'014','Tamarugal',1),(378,'021',6702,'',0,'021','Antofagasa',1),(379,'022',6702,'',0,'022','El Loa',1),(380,'023',6702,'',0,'023','Tocopilla',1),(381,'031',6703,'',0,'031','Copiapó',1),(382,'032',6703,'',0,'032','Chañaral',1),(383,'033',6703,'',0,'033','Huasco',1),(384,'041',6704,'',0,'041','Elqui',1),(385,'042',6704,'',0,'042','Choapa',1),(386,'043',6704,'',0,'043','Limarí',1),(387,'051',6705,'',0,'051','Valparaíso',1),(388,'052',6705,'',0,'052','Isla de Pascua',1),(389,'053',6705,'',0,'053','Los Andes',1),(390,'054',6705,'',0,'054','Petorca',1),(391,'055',6705,'',0,'055','Quillota',1),(392,'056',6705,'',0,'056','San Antonio',1),(393,'057',6705,'',0,'057','San Felipe de Aconcagua',1),(394,'058',6705,'',0,'058','Marga Marga',1),(395,'061',6706,'',0,'061','Cachapoal',1),(396,'062',6706,'',0,'062','Cardenal Caro',1),(397,'063',6706,'',0,'063','Colchagua',1),(398,'071',6707,'',0,'071','Talca',1),(399,'072',6707,'',0,'072','Cauquenes',1),(400,'073',6707,'',0,'073','Curicó',1),(401,'074',6707,'',0,'074','Linares',1),(402,'081',6708,'',0,'081','Concepción',1),(403,'082',6708,'',0,'082','Arauco',1),(404,'083',6708,'',0,'083','Biobío',1),(405,'084',6708,'',0,'084','Ñuble',1),(406,'091',6709,'',0,'091','Cautín',1),(407,'092',6709,'',0,'092','Malleco',1),(408,'141',6714,'',0,'141','Valdivia',1),(409,'142',6714,'',0,'142','Ranco',1),(410,'101',6710,'',0,'101','Llanquihue',1),(411,'102',6710,'',0,'102','Chiloé',1),(412,'103',6710,'',0,'103','Osorno',1),(413,'104',6710,'',0,'104','Palena',1),(414,'111',6711,'',0,'111','Coihaique',1),(415,'112',6711,'',0,'112','Aisén',1),(416,'113',6711,'',0,'113','Capitán Prat',1),(417,'114',6711,'',0,'114','General Carrera',1),(418,'121',6712,'',0,'121','Magallanes',1),(419,'122',6712,'',0,'122','Antártica Chilena',1),(420,'123',6712,'',0,'123','Tierra del Fuego',1),(421,'124',6712,'',0,'124','Última Esperanza',1),(422,'131',6713,'',0,'131','Santiago',1),(423,'132',6713,'',0,'132','Cordillera',1),(424,'133',6713,'',0,'133','Chacabuco',1),(425,'134',6713,'',0,'134','Maipo',1),(426,'135',6713,'',0,'135','Melipilla',1),(427,'136',6713,'',0,'136','Talagante',1),(428,'DIF',15401,'',0,'DIF','Distrito Federal',1),(429,'AGS',15401,'',0,'AGS','Aguascalientes',1),(430,'BCN',15401,'',0,'BCN','Baja California Norte',1),(431,'BCS',15401,'',0,'BCS','Baja California Sur',1),(432,'CAM',15401,'',0,'CAM','Campeche',1),(433,'CHP',15401,'',0,'CHP','Chiapas',1),(434,'CHI',15401,'',0,'CHI','Chihuahua',1),(435,'COA',15401,'',0,'COA','Coahuila',1),(436,'COL',15401,'',0,'COL','Colima',1),(437,'DUR',15401,'',0,'DUR','Durango',1),(438,'GTO',15401,'',0,'GTO','Guanajuato',1),(439,'GRO',15401,'',0,'GRO','Guerrero',1),(440,'HGO',15401,'',0,'HGO','Hidalgo',1),(441,'JAL',15401,'',0,'JAL','Jalisco',1),(442,'MEX',15401,'',0,'MEX','México',1),(443,'MIC',15401,'',0,'MIC','Michoacán de Ocampo',1),(444,'MOR',15401,'',0,'MOR','Morelos',1),(445,'NAY',15401,'',0,'NAY','Nayarit',1),(446,'NLE',15401,'',0,'NLE','Nuevo León',1),(447,'OAX',15401,'',0,'OAX','Oaxaca',1),(448,'PUE',15401,'',0,'PUE','Puebla',1),(449,'QRO',15401,'',0,'QRO','Querétaro',1),(451,'ROO',15401,'',0,'ROO','Quintana Roo',1),(452,'SLP',15401,'',0,'SLP','San Luis Potosí',1),(453,'SIN',15401,'',0,'SIN','Sinaloa',1),(454,'SON',15401,'',0,'SON','Sonora',1),(455,'TAB',15401,'',0,'TAB','Tabasco',1),(456,'TAM',15401,'',0,'TAM','Tamaulipas',1),(457,'TLX',15401,'',0,'TLX','Tlaxcala',1),(458,'VER',15401,'',0,'VER','Veracruz',1),(459,'YUC',15401,'',0,'YUC','Yucatán',1),(460,'ZAC',15401,'',0,'ZAC','Zacatecas',1),(461,'ANT',7001,'',0,'ANT','Antioquia',1),(462,'BOL',7001,'',0,'BOL','Bolívar',1),(463,'BOY',7001,'',0,'BOY','Boyacá',1),(464,'CAL',7001,'',0,'CAL','Caldas',1),(465,'CAU',7001,'',0,'CAU','Cauca',1),(466,'CUN',7001,'',0,'CUN','Cundinamarca',1),(467,'HUI',7001,'',0,'HUI','Huila',1),(468,'LAG',7001,'',0,'LAG','La Guajira',1),(469,'MET',7001,'',0,'MET','Meta',1),(470,'NAR',7001,'',0,'NAR','Nariño',1),(471,'NDS',7001,'',0,'NDS','Norte de Santander',1),(472,'SAN',7001,'',0,'SAN','Santander',1),(473,'SUC',7001,'',0,'SUC','Sucre',1),(474,'TOL',7001,'',0,'TOL','Tolima',1),(475,'VAC',7001,'',0,'VAC','Valle del Cauca',1),(476,'RIS',7001,'',0,'RIS','Risalda',1),(477,'ATL',7001,'',0,'ATL','Atlántico',1),(478,'COR',7001,'',0,'COR','Córdoba',1),(479,'SAP',7001,'',0,'SAP','San Andrés, Providencia y Santa Catalina',1),(480,'ARA',7001,'',0,'ARA','Arauca',1),(481,'CAS',7001,'',0,'CAS','Casanare',1),(482,'AMA',7001,'',0,'AMA','Amazonas',1),(483,'CAQ',7001,'',0,'CAQ','Caquetá',1),(484,'CHO',7001,'',0,'CHO','Chocó',1),(485,'GUA',7001,'',0,'GUA','Guainía',1),(486,'GUV',7001,'',0,'GUV','Guaviare',1),(487,'PUT',7001,'',0,'PUT','Putumayo',1),(488,'QUI',7001,'',0,'QUI','Quindío',1),(489,'VAU',7001,'',0,'VAU','Vaupés',1),(490,'BOG',7001,'',0,'BOG','Bogotá',1),(491,'VID',7001,'',0,'VID','Vichada',1),(492,'CES',7001,'',0,'CES','Cesar',1),(493,'MAG',7001,'',0,'MAG','Magdalena',1),(494,'AT',11401,'',0,'AT','Atlántida',1),(495,'CH',11401,'',0,'CH','Choluteca',1),(496,'CL',11401,'',0,'CL','Colón',1),(497,'CM',11401,'',0,'CM','Comayagua',1),(498,'CO',11401,'',0,'CO','Copán',1),(499,'CR',11401,'',0,'CR','Cortés',1),(500,'EP',11401,'',0,'EP','El Paraíso',1),(501,'FM',11401,'',0,'FM','Francisco Morazán',1),(502,'GD',11401,'',0,'GD','Gracias a Dios',1),(503,'IN',11401,'',0,'IN','Intibucá',1),(504,'IB',11401,'',0,'IB','Islas de la Bahía',1),(505,'LP',11401,'',0,'LP','La Paz',1),(506,'LM',11401,'',0,'LM','Lempira',1),(507,'OC',11401,'',0,'OC','Ocotepeque',1),(508,'OL',11401,'',0,'OL','Olancho',1),(509,'SB',11401,'',0,'SB','Santa Bárbara',1),(510,'VL',11401,'',0,'VL','Valle',1),(511,'YO',11401,'',0,'YO','Yoro',1),(512,'DC',11401,'',0,'DC','Distrito Central',1),(652,'CC',4601,'Oistins',0,'CC','Christ Church',1),(655,'SA',4601,'Greenland',0,'SA','Saint Andrew',1),(656,'SG',4601,'Bulkeley',0,'SG','Saint George',1),(657,'JA',4601,'Holetown',0,'JA','Saint James',1),(658,'SJ',4601,'Four Roads',0,'SJ','Saint John',1),(659,'SB',4601,'Bathsheba',0,'SB','Saint Joseph',1),(660,'SL',4601,'Crab Hill',0,'SL','Saint Lucy',1),(661,'SM',4601,'Bridgetown',0,'SM','Saint Michael',1),(662,'SP',4601,'Speightstown',0,'SP','Saint Peter',1),(663,'SC',4601,'Crane',0,'SC','Saint Philip',1),(664,'ST',4601,'Hillaby',0,'ST','Saint Thomas',1),(777,'AG',315,NULL,NULL,NULL,'AGRIGENTO',1),(778,'AL',312,NULL,NULL,NULL,'ALESSANDRIA',1),(779,'AN',310,NULL,NULL,NULL,'ANCONA',1),(780,'AO',319,NULL,NULL,NULL,'AOSTA',1),(781,'AR',316,NULL,NULL,NULL,'AREZZO',1),(782,'AP',310,NULL,NULL,NULL,'ASCOLI PICENO',1),(783,'AT',312,NULL,NULL,NULL,'ASTI',1),(784,'AV',304,NULL,NULL,NULL,'AVELLINO',1),(785,'BA',313,NULL,NULL,NULL,'BARI',1),(786,'BT',313,NULL,NULL,NULL,'BARLETTA-ANDRIA-TRANI',1),(787,'BL',320,NULL,NULL,NULL,'BELLUNO',1),(788,'BN',304,NULL,NULL,NULL,'BENEVENTO',1),(789,'BG',309,NULL,NULL,NULL,'BERGAMO',1),(790,'BI',312,NULL,NULL,NULL,'BIELLA',1),(791,'BO',305,NULL,NULL,NULL,'BOLOGNA',1),(792,'BZ',317,NULL,NULL,NULL,'BOLZANO',1),(793,'BS',309,NULL,NULL,NULL,'BRESCIA',1),(794,'BR',313,NULL,NULL,NULL,'BRINDISI',1),(795,'CA',314,NULL,NULL,NULL,'CAGLIARI',1),(796,'CL',315,NULL,NULL,NULL,'CALTANISSETTA',1),(797,'CB',311,NULL,NULL,NULL,'CAMPOBASSO',1),(798,'CI',314,NULL,NULL,NULL,'CARBONIA-IGLESIAS',1),(799,'CE',304,NULL,NULL,NULL,'CASERTA',1),(800,'CT',315,NULL,NULL,NULL,'CATANIA',1),(801,'CZ',303,NULL,NULL,NULL,'CATANZARO',1),(802,'CH',301,NULL,NULL,NULL,'CHIETI',1),(803,'CO',309,NULL,NULL,NULL,'COMO',1),(804,'CS',303,NULL,NULL,NULL,'COSENZA',1),(805,'CR',309,NULL,NULL,NULL,'CREMONA',1),(806,'KR',303,NULL,NULL,NULL,'CROTONE',1),(807,'CN',312,NULL,NULL,NULL,'CUNEO',1),(808,'EN',315,NULL,NULL,NULL,'ENNA',1),(809,'FM',310,NULL,NULL,NULL,'FERMO',1),(810,'FE',305,NULL,NULL,NULL,'FERRARA',1),(811,'FI',316,NULL,NULL,NULL,'FIRENZE',1),(812,'FG',313,NULL,NULL,NULL,'FOGGIA',1),(813,'FC',305,NULL,NULL,NULL,'FORLI-CESENA',1),(814,'FR',307,NULL,NULL,NULL,'FROSINONE',1),(815,'GE',308,NULL,NULL,NULL,'GENOVA',1),(816,'GO',306,NULL,NULL,NULL,'GORIZIA',1),(817,'GR',316,NULL,NULL,NULL,'GROSSETO',1),(818,'IM',308,NULL,NULL,NULL,'IMPERIA',1),(819,'IS',311,NULL,NULL,NULL,'ISERNIA',1),(820,'SP',308,NULL,NULL,NULL,'LA SPEZIA',1),(821,'AQ',301,NULL,NULL,NULL,'L AQUILA',1),(822,'LT',307,NULL,NULL,NULL,'LATINA',1),(823,'LE',313,NULL,NULL,NULL,'LECCE',1),(824,'LC',309,NULL,NULL,NULL,'LECCO',1),(825,'LI',314,NULL,NULL,NULL,'LIVORNO',1),(826,'LO',309,NULL,NULL,NULL,'LODI',1),(827,'LU',316,NULL,NULL,NULL,'LUCCA',1),(828,'MC',310,NULL,NULL,NULL,'MACERATA',1),(829,'MN',309,NULL,NULL,NULL,'MANTOVA',1),(830,'MS',316,NULL,NULL,NULL,'MASSA-CARRARA',1),(831,'MT',302,NULL,NULL,NULL,'MATERA',1),(832,'VS',314,NULL,NULL,NULL,'MEDIO CAMPIDANO',1),(833,'ME',315,NULL,NULL,NULL,'MESSINA',1),(834,'MI',309,NULL,NULL,NULL,'MILANO',1),(835,'MB',309,NULL,NULL,NULL,'MONZA e BRIANZA',1),(836,'MO',305,NULL,NULL,NULL,'MODENA',1),(837,'NA',304,NULL,NULL,NULL,'NAPOLI',1),(838,'NO',312,NULL,NULL,NULL,'NOVARA',1),(839,'NU',314,NULL,NULL,NULL,'NUORO',1),(840,'OG',314,NULL,NULL,NULL,'OGLIASTRA',1),(841,'OT',314,NULL,NULL,NULL,'OLBIA-TEMPIO',1),(842,'OR',314,NULL,NULL,NULL,'ORISTANO',1),(843,'PD',320,NULL,NULL,NULL,'PADOVA',1),(844,'PA',315,NULL,NULL,NULL,'PALERMO',1),(845,'PR',305,NULL,NULL,NULL,'PARMA',1),(846,'PV',309,NULL,NULL,NULL,'PAVIA',1),(847,'PG',318,NULL,NULL,NULL,'PERUGIA',1),(848,'PU',310,NULL,NULL,NULL,'PESARO e URBINO',1),(849,'PE',301,NULL,NULL,NULL,'PESCARA',1),(850,'PC',305,NULL,NULL,NULL,'PIACENZA',1),(851,'PI',316,NULL,NULL,NULL,'PISA',1),(852,'PT',316,NULL,NULL,NULL,'PISTOIA',1),(853,'PN',306,NULL,NULL,NULL,'PORDENONE',1),(854,'PZ',302,NULL,NULL,NULL,'POTENZA',1),(855,'PO',316,NULL,NULL,NULL,'PRATO',1),(856,'RG',315,NULL,NULL,NULL,'RAGUSA',1),(857,'RA',305,NULL,NULL,NULL,'RAVENNA',1),(858,'RC',303,NULL,NULL,NULL,'REGGIO CALABRIA',1),(859,'RE',305,NULL,NULL,NULL,'REGGIO NELL EMILIA',1),(860,'RI',307,NULL,NULL,NULL,'RIETI',1),(861,'RN',305,NULL,NULL,NULL,'RIMINI',1),(862,'RM',307,NULL,NULL,NULL,'ROMA',1),(863,'RO',320,NULL,NULL,NULL,'ROVIGO',1),(864,'SA',304,NULL,NULL,NULL,'SALERNO',1),(865,'SS',314,NULL,NULL,NULL,'SASSARI',1),(866,'SV',308,NULL,NULL,NULL,'SAVONA',1),(867,'SI',316,NULL,NULL,NULL,'SIENA',1),(868,'SR',315,NULL,NULL,NULL,'SIRACUSA',1),(869,'SO',309,NULL,NULL,NULL,'SONDRIO',1),(870,'TA',313,NULL,NULL,NULL,'TARANTO',1),(871,'TE',301,NULL,NULL,NULL,'TERAMO',1),(872,'TR',318,NULL,NULL,NULL,'TERNI',1),(873,'TO',312,NULL,NULL,NULL,'TORINO',1),(874,'TP',315,NULL,NULL,NULL,'TRAPANI',1),(875,'TN',317,NULL,NULL,NULL,'TRENTO',1),(876,'TV',320,NULL,NULL,NULL,'TREVISO',1),(877,'TS',306,NULL,NULL,NULL,'TRIESTE',1),(878,'UD',306,NULL,NULL,NULL,'UDINE',1),(879,'VA',309,NULL,NULL,NULL,'VARESE',1),(880,'VE',320,NULL,NULL,NULL,'VENEZIA',1),(881,'VB',312,NULL,NULL,NULL,'VERBANO-CUSIO-OSSOLA',1),(882,'VC',312,NULL,NULL,NULL,'VERCELLI',1),(883,'VR',320,NULL,NULL,NULL,'VERONA',1),(884,'VV',303,NULL,NULL,NULL,'VIBO VALENTIA',1),(885,'VI',320,NULL,NULL,NULL,'VICENZA',1),(886,'VT',307,NULL,NULL,NULL,'VITERBO',1),(1036,'VE-L',23201,'',0,'VE-L','Mérida',1),(1037,'VE-T',23201,'',0,'VE-T','Trujillo',1),(1038,'VE-E',23201,'',0,'VE-E','Barinas',1),(1039,'VE-M',23202,'',0,'VE-M','Miranda',1),(1040,'VE-W',23202,'',0,'VE-W','Vargas',1),(1041,'VE-A',23202,'',0,'VE-A','Distrito Capital',1),(1042,'VE-D',23203,'',0,'VE-D','Aragua',1),(1043,'VE-G',23203,'',0,'VE-G','Carabobo',1),(1044,'VE-I',23204,'',0,'VE-I','Falcón',1),(1045,'VE-K',23204,'',0,'VE-K','Lara',1),(1046,'VE-U',23204,'',0,'VE-U','Yaracuy',1),(1047,'VE-F',23205,'',0,'VE-F','Bolívar',1),(1048,'VE-X',23205,'',0,'VE-X','Amazonas',1),(1049,'VE-Y',23205,'',0,'VE-Y','Delta Amacuro',1),(1050,'VE-O',23206,'',0,'VE-O','Nueva Esparta',1),(1051,'VE-Z',23206,'',0,'VE-Z','Dependencias Federales',1),(1052,'VE-C',23207,'',0,'VE-C','Apure',1),(1053,'VE-J',23207,'',0,'VE-J','Guárico',1),(1054,'VE-H',23207,'',0,'VE-H','Cojedes',1),(1055,'VE-P',23207,'',0,'VE-P','Portuguesa',1),(1056,'VE-B',23208,'',0,'VE-B','Anzoátegui',1),(1057,'VE-N',23208,'',0,'VE-N','Monagas',1),(1058,'VE-R',23208,'',0,'VE-R','Sucre',1),(1059,'VE-V',23209,'',0,'VE-V','Zulia',1),(1060,'VE-S',23209,'',0,'VE-S','Táchira',1),(1061,'66',10201,NULL,NULL,NULL,'?????',1),(1062,'00',10205,NULL,NULL,NULL,'?????',1),(1063,'01',10205,NULL,NULL,NULL,'?????',1),(1064,'02',10205,NULL,NULL,NULL,'?????',1),(1065,'03',10205,NULL,NULL,NULL,'??????',1),(1066,'04',10205,NULL,NULL,NULL,'?????',1),(1067,'05',10205,NULL,NULL,NULL,'??????',1),(1068,'06',10203,NULL,NULL,NULL,'??????',1),(1069,'07',10203,NULL,NULL,NULL,'???????????',1),(1070,'08',10203,NULL,NULL,NULL,'??????',1),(1071,'09',10203,NULL,NULL,NULL,'?????',1),(1072,'10',10203,NULL,NULL,NULL,'??????',1),(1073,'11',10203,NULL,NULL,NULL,'??????',1),(1074,'12',10203,NULL,NULL,NULL,'?????????',1),(1075,'13',10206,NULL,NULL,NULL,'????',1),(1076,'14',10206,NULL,NULL,NULL,'?????????',1),(1077,'15',10206,NULL,NULL,NULL,'????????',1),(1078,'16',10206,NULL,NULL,NULL,'???????',1),(1079,'17',10213,NULL,NULL,NULL,'???????',1),(1080,'18',10213,NULL,NULL,NULL,'????????',1),(1081,'19',10213,NULL,NULL,NULL,'??????',1),(1082,'20',10213,NULL,NULL,NULL,'???????',1),(1083,'21',10212,NULL,NULL,NULL,'????????',1),(1084,'22',10212,NULL,NULL,NULL,'??????',1),(1085,'23',10212,NULL,NULL,NULL,'????????',1),(1086,'24',10212,NULL,NULL,NULL,'???????',1),(1087,'25',10212,NULL,NULL,NULL,'????????',1),(1088,'26',10212,NULL,NULL,NULL,'???????',1),(1089,'27',10202,NULL,NULL,NULL,'??????',1),(1090,'28',10202,NULL,NULL,NULL,'?????????',1),(1091,'29',10202,NULL,NULL,NULL,'????????',1),(1092,'30',10202,NULL,NULL,NULL,'??????',1),(1093,'31',10209,NULL,NULL,NULL,'????????',1),(1094,'32',10209,NULL,NULL,NULL,'???????',1),(1095,'33',10209,NULL,NULL,NULL,'????????',1),(1096,'34',10209,NULL,NULL,NULL,'???????',1),(1097,'35',10209,NULL,NULL,NULL,'????????',1),(1098,'36',10211,NULL,NULL,NULL,'???????????????',1),(1099,'37',10211,NULL,NULL,NULL,'?????',1),(1100,'38',10211,NULL,NULL,NULL,'?????',1),(1101,'39',10207,NULL,NULL,NULL,'????????',1),(1102,'40',10207,NULL,NULL,NULL,'???????',1),(1103,'41',10207,NULL,NULL,NULL,'??????????',1),(1104,'42',10207,NULL,NULL,NULL,'?????',1),(1105,'43',10207,NULL,NULL,NULL,'???????',1),(1106,'44',10208,NULL,NULL,NULL,'??????',1),(1107,'45',10208,NULL,NULL,NULL,'??????',1),(1108,'46',10208,NULL,NULL,NULL,'??????',1),(1109,'47',10208,NULL,NULL,NULL,'?????',1),(1110,'48',10208,NULL,NULL,NULL,'????',1),(1111,'49',10210,NULL,NULL,NULL,'??????',1),(1112,'50',10210,NULL,NULL,NULL,'????',1),(1113,'51',10210,NULL,NULL,NULL,'????????',1),(1114,'52',10210,NULL,NULL,NULL,'????????',1),(1115,'53',10210,NULL,NULL,NULL,'???-??????',1),(1116,'54',10210,NULL,NULL,NULL,'??',1),(1117,'55',10210,NULL,NULL,NULL,'?????',1),(1118,'56',10210,NULL,NULL,NULL,'???????',1),(1119,'57',10210,NULL,NULL,NULL,'?????',1),(1120,'58',10210,NULL,NULL,NULL,'?????',1),(1121,'59',10210,NULL,NULL,NULL,'?????',1),(1122,'60',10210,NULL,NULL,NULL,'?????',1),(1123,'61',10210,NULL,NULL,NULL,'?????',1),(1124,'62',10204,NULL,NULL,NULL,'????????',1),(1125,'63',10204,NULL,NULL,NULL,'??????',1),(1126,'64',10204,NULL,NULL,NULL,'???????',1),(1127,'65',10204,NULL,NULL,NULL,'?????',1),(1128,'AL01',1301,'',0,'','Wilaya d\'Adrar',1),(1129,'AL02',1301,'',0,'','Wilaya de Chlef',1),(1130,'AL03',1301,'',0,'','Wilaya de Laghouat',1),(1131,'AL04',1301,'',0,'','Wilaya d\'Oum El Bouaghi',1),(1132,'AL05',1301,'',0,'','Wilaya de Batna',1),(1133,'AL06',1301,'',0,'','Wilaya de Béjaïa',1),(1134,'AL07',1301,'',0,'','Wilaya de Biskra',1),(1135,'AL08',1301,'',0,'','Wilaya de Béchar',1),(1136,'AL09',1301,'',0,'','Wilaya de Blida',1),(1137,'AL11',1301,'',0,'','Wilaya de Bouira',1),(1138,'AL12',1301,'',0,'','Wilaya de Tamanrasset',1),(1139,'AL13',1301,'',0,'','Wilaya de Tébessa',1),(1140,'AL14',1301,'',0,'','Wilaya de Tlemcen',1),(1141,'AL15',1301,'',0,'','Wilaya de Tiaret',1),(1142,'AL16',1301,'',0,'','Wilaya de Tizi Ouzou',1),(1143,'AL17',1301,'',0,'','Wilaya d\'Alger',1),(1144,'AL18',1301,'',0,'','Wilaya de Djelfa',1),(1145,'AL19',1301,'',0,'','Wilaya de Jijel',1),(1146,'AL20',1301,'',0,'','Wilaya de Sétif	',1),(1147,'AL21',1301,'',0,'','Wilaya de Saïda',1),(1148,'AL22',1301,'',0,'','Wilaya de Skikda',1),(1149,'AL23',1301,'',0,'','Wilaya de Sidi Bel Abbès',1),(1150,'AL24',1301,'',0,'','Wilaya d\'Annaba',1),(1151,'AL25',1301,'',0,'','Wilaya de Guelma',1),(1152,'AL26',1301,'',0,'','Wilaya de Constantine',1),(1153,'AL27',1301,'',0,'','Wilaya de Médéa',1),(1154,'AL28',1301,'',0,'','Wilaya de Mostaganem',1),(1155,'AL29',1301,'',0,'','Wilaya de M\'Sila',1),(1156,'AL30',1301,'',0,'','Wilaya de Mascara',1),(1157,'AL31',1301,'',0,'','Wilaya d\'Ouargla',1),(1158,'AL32',1301,'',0,'','Wilaya d\'Oran',1),(1159,'AL33',1301,'',0,'','Wilaya d\'El Bayadh',1),(1160,'AL34',1301,'',0,'','Wilaya d\'Illizi',1),(1161,'AL35',1301,'',0,'','Wilaya de Bordj Bou Arreridj',1),(1162,'AL36',1301,'',0,'','Wilaya de Boumerdès',1),(1163,'AL37',1301,'',0,'','Wilaya d\'El Tarf',1),(1164,'AL38',1301,'',0,'','Wilaya de Tindouf',1),(1165,'AL39',1301,'',0,'','Wilaya de Tissemsilt',1),(1166,'AL40',1301,'',0,'','Wilaya d\'El Oued',1),(1167,'AL41',1301,'',0,'','Wilaya de Khenchela',1),(1168,'AL42',1301,'',0,'','Wilaya de Souk Ahras',1),(1169,'AL43',1301,'',0,'','Wilaya de Tipaza',1),(1170,'AL44',1301,'',0,'','Wilaya de Mila',1),(1171,'AL45',1301,'',0,'','Wilaya d\'Aïn Defla',1),(1172,'AL46',1301,'',0,'','Wilaya de Naâma',1),(1173,'AL47',1301,'',0,'','Wilaya d\'Aïn Témouchent',1),(1174,'AL48',1301,'',0,'','Wilaya de Ghardaia',1),(1175,'AL49',1301,'',0,'','Wilaya de Relizane',1),(1176,'MA',1209,'',0,'','Province de Benslimane',1),(1177,'MA1',1209,'',0,'','Province de Berrechid',1),(1178,'MA2',1209,'',0,'','Province de Khouribga',1),(1179,'MA3',1209,'',0,'','Province de Settat',1),(1180,'MA4',1210,'',0,'','Province d\'El Jadida',1),(1181,'MA5',1210,'',0,'','Province de Safi',1),(1182,'MA6',1210,'',0,'','Province de Sidi Bennour',1),(1183,'MA7',1210,'',0,'','Province de Youssoufia',1),(1184,'MA6B',1205,'',0,'','Préfecture de Fès',1),(1185,'MA7B',1205,'',0,'','Province de Boulemane',1),(1186,'MA8',1205,'',0,'','Province de Moulay Yacoub',1),(1187,'MA9',1205,'',0,'','Province de Sefrou',1),(1188,'MA8A',1202,'',0,'','Province de Kénitra',1),(1189,'MA9A',1202,'',0,'','Province de Sidi Kacem',1),(1190,'MA10',1202,'',0,'','Province de Sidi Slimane',1),(1191,'MA11',1208,'',0,'','Préfecture de Casablanca',1),(1192,'MA12',1208,'',0,'','Préfecture de Mohammédia',1),(1193,'MA13',1208,'',0,'','Province de Médiouna',1),(1194,'MA14',1208,'',0,'','Province de Nouaceur',1),(1195,'MA15',1214,'',0,'','Province d\'Assa-Zag',1),(1196,'MA16',1214,'',0,'','Province d\'Es-Semara',1),(1197,'MA17A',1214,'',0,'','Province de Guelmim',1),(1198,'MA18',1214,'',0,'','Province de Tata',1),(1199,'MA19',1214,'',0,'','Province de Tan-Tan',1),(1200,'MA15',1215,'',0,'','Province de Boujdour',1),(1201,'MA16',1215,'',0,'','Province de Lâayoune',1),(1202,'MA17',1215,'',0,'','Province de Tarfaya',1),(1203,'MA18',1211,'',0,'','Préfecture de Marrakech',1),(1204,'MA19',1211,'',0,'','Province d\'Al Haouz',1),(1205,'MA20',1211,'',0,'','Province de Chichaoua',1),(1206,'MA21',1211,'',0,'','Province d\'El Kelâa des Sraghna',1),(1207,'MA22',1211,'',0,'','Province d\'Essaouira',1),(1208,'MA23',1211,'',0,'','Province de Rehamna',1),(1209,'MA24',1206,'',0,'','Préfecture de Meknès',1),(1210,'MA25',1206,'',0,'','Province d’El Hajeb',1),(1211,'MA26',1206,'',0,'','Province d\'Errachidia',1),(1212,'MA27',1206,'',0,'','Province d’Ifrane',1),(1213,'MA28',1206,'',0,'','Province de Khénifra',1),(1214,'MA29',1206,'',0,'','Province de Midelt',1),(1215,'MA30',1204,'',0,'','Préfecture d\'Oujda-Angad',1),(1216,'MA31',1204,'',0,'','Province de Berkane',1),(1217,'MA32',1204,'',0,'','Province de Driouch',1),(1218,'MA33',1204,'',0,'','Province de Figuig',1),(1219,'MA34',1204,'',0,'','Province de Jerada',1),(1220,'MA35',1204,'',0,'','Province de Nadorgg',1),(1221,'MA36',1204,'',0,'','Province de Taourirt',1),(1222,'MA37',1216,'',0,'','Province d\'Aousserd',1),(1223,'MA38',1216,'',0,'','Province d\'Oued Ed-Dahab',1),(1224,'MA39',1207,'',0,'','Préfecture de Rabat',1),(1225,'MA40',1207,'',0,'','Préfecture de Skhirat-Témara',1),(1226,'MA41',1207,'',0,'','Préfecture de Salé',1),(1227,'MA42',1207,'',0,'','Province de Khémisset',1),(1228,'MA43',1213,'',0,'','Préfecture d\'Agadir Ida-Outanane',1),(1229,'MA44',1213,'',0,'','Préfecture d\'Inezgane-Aït Melloul',1),(1230,'MA45',1213,'',0,'','Province de Chtouka-Aït Baha',1),(1231,'MA46',1213,'',0,'','Province d\'Ouarzazate',1),(1232,'MA47',1213,'',0,'','Province de Sidi Ifni',1),(1233,'MA48',1213,'',0,'','Province de Taroudant',1),(1234,'MA49',1213,'',0,'','Province de Tinghir',1),(1235,'MA50',1213,'',0,'','Province de Tiznit',1),(1236,'MA51',1213,'',0,'','Province de Zagora',1),(1237,'MA52',1212,'',0,'','Province d\'Azilal',1),(1238,'MA53',1212,'',0,'','Province de Beni Mellal',1),(1239,'MA54',1212,'',0,'','Province de Fquih Ben Salah',1),(1240,'MA55',1201,'',0,'','Préfecture de M\'diq-Fnideq',1),(1241,'MA56',1201,'',0,'','Préfecture de Tanger-Asilah',1),(1242,'MA57',1201,'',0,'','Province de Chefchaouen',1),(1243,'MA58',1201,'',0,'','Province de Fahs-Anjra',1),(1244,'MA59',1201,'',0,'','Province de Larache',1),(1245,'MA60',1201,'',0,'','Province d\'Ouezzane',1),(1246,'MA61',1201,'',0,'','Province de Tétouan',1),(1247,'MA62',1203,'',0,'','Province de Guercif',1),(1248,'MA63',1203,'',0,'','Province d\'Al Hoceïma',1),(1249,'MA64',1203,'',0,'','Province de Taounate',1),(1250,'MA65',1203,'',0,'','Province de Taza',1),(1251,'MA6A',1205,'',0,'','Préfecture de Fès',1),(1252,'MA7A',1205,'',0,'','Province de Boulemane',1),(1253,'MA15A',1214,'',0,'','Province d\'Assa-Zag',1),(1254,'MA16A',1214,'',0,'','Province d\'Es-Semara',1),(1255,'MA18A',1211,'',0,'','Préfecture de Marrakech',1),(1256,'MA19A',1214,'',0,'','Province de Tan-Tan',1),(1257,'MA19B',1214,'',0,'','Province de Tan-Tan',1),(1258,'TN01',1001,'',0,'','Ariana',1),(1259,'TN02',1001,'',0,'','Béja',1),(1260,'TN03',1001,'',0,'','Ben Arous',1),(1261,'TN04',1001,'',0,'','Bizerte',1),(1262,'TN05',1001,'',0,'','Gabès',1),(1263,'TN06',1001,'',0,'','Gafsa',1),(1264,'TN07',1001,'',0,'','Jendouba',1),(1265,'TN08',1001,'',0,'','Kairouan',1),(1266,'TN09',1001,'',0,'','Kasserine',1),(1267,'TN10',1001,'',0,'','Kébili',1),(1268,'TN11',1001,'',0,'','La Manouba',1),(1269,'TN12',1001,'',0,'','Le Kef',1),(1270,'TN13',1001,'',0,'','Mahdia',1),(1271,'TN14',1001,'',0,'','Médenine',1),(1272,'TN15',1001,'',0,'','Monastir',1),(1273,'TN16',1001,'',0,'','Nabeul',1),(1274,'TN17',1001,'',0,'','Sfax',1),(1275,'TN18',1001,'',0,'','Sidi Bouzid',1),(1276,'TN19',1001,'',0,'','Siliana',1),(1277,'TN20',1001,'',0,'','Sousse',1),(1278,'TN21',1001,'',0,'','Tataouine',1),(1279,'TN22',1001,'',0,'','Tozeur',1),(1280,'TN23',1001,'',0,'','Tunis',1),(1281,'TN24',1001,'',0,'','Zaghouan',1);
+/*!40000 ALTER TABLE `llx_c_departements` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ecotaxe`
+--
+
+DROP TABLE IF EXISTS `llx_c_ecotaxe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ecotaxe` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(64) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `price` double(24,8) DEFAULT NULL,
+  `organization` varchar(255) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ecotaxe` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ecotaxe`
+--
+
+LOCK TABLES `llx_c_ecotaxe` WRITE;
+/*!40000 ALTER TABLE `llx_c_ecotaxe` DISABLE KEYS */;
+INSERT INTO `llx_c_ecotaxe` VALUES (1,'ER-A-A','Materiels electriques < 0,2kg',0.01000000,'ERP',1,1),(2,'ER-A-B','Materiels electriques >= 0,2 kg et < 0,5 kg',0.03000000,'ERP',1,1),(3,'ER-A-C','Materiels electriques >= 0,5 kg et < 1 kg',0.04000000,'ERP',1,1),(4,'ER-A-D','Materiels electriques >= 1 kg et < 2 kg',0.13000000,'ERP',1,1),(5,'ER-A-E','Materiels electriques >= 2 kg et < 4kg',0.21000000,'ERP',1,1),(6,'ER-A-F','Materiels electriques >= 4 kg et < 8 kg',0.42000000,'ERP',1,1),(7,'ER-A-G','Materiels electriques >= 8 kg et < 15 kg',0.84000000,'ERP',1,1),(8,'ER-A-H','Materiels electriques >= 15 kg et < 20 kg',1.25000000,'ERP',1,1),(9,'ER-A-I','Materiels electriques >= 20 kg et < 30 kg',1.88000000,'ERP',1,1),(10,'ER-A-J','Materiels electriques >= 30 kg',3.34000000,'ERP',1,1),(11,'ER-M-1','TV, Moniteurs < 9kg',0.84000000,'ERP',1,1),(12,'ER-M-2','TV, Moniteurs >= 9kg et < 15kg',1.67000000,'ERP',1,1),(13,'ER-M-3','TV, Moniteurs >= 15kg et < 30kg',3.34000000,'ERP',1,1),(14,'ER-M-4','TV, Moniteurs >= 30 kg',6.69000000,'ERP',1,1),(15,'EC-A-A','Materiels electriques  0,2 kg max',0.00840000,'Ecologic',1,1),(16,'EC-A-B','Materiels electriques 0,21 kg min - 0,50 kg max',0.02500000,'Ecologic',1,1),(17,'EC-A-C','Materiels electriques  0,51 kg min - 1 kg max',0.04000000,'Ecologic',1,1),(18,'EC-A-D','Materiels electriques  1,01 kg min - 2,5 kg max',0.13000000,'Ecologic',1,1),(19,'EC-A-E','Materiels electriques  2,51 kg min - 4 kg max',0.21000000,'Ecologic',1,1),(20,'EC-A-F','Materiels electriques 4,01 kg min - 8 kg max',0.42000000,'Ecologic',1,1),(21,'EC-A-G','Materiels electriques  8,01 kg min - 12 kg max',0.63000000,'Ecologic',1,1),(22,'EC-A-H','Materiels electriques 12,01 kg min - 20 kg max',1.05000000,'Ecologic',1,1),(23,'EC-A-I','Materiels electriques  20,01 kg min',1.88000000,'Ecologic',1,1),(24,'EC-M-1','TV, Moniteurs 9 kg max',0.84000000,'Ecologic',1,1),(25,'EC-M-2','TV, Moniteurs 9,01 kg min - 18 kg max',1.67000000,'Ecologic',1,1),(26,'EC-M-3','TV, Moniteurs 18,01 kg min - 36 kg max',3.34000000,'Ecologic',1,1),(27,'EC-M-4','TV, Moniteurs 36,01 kg min',6.69000000,'Ecologic',1,1),(28,'ES-M-1','TV, Moniteurs <= 20 pouces',0.84000000,'Eco-systemes',1,1),(29,'ES-M-2','TV, Moniteurs > 20 pouces et <= 32 pouces',3.34000000,'Eco-systemes',1,1),(30,'ES-M-3','TV, Moniteurs > 32 pouces et autres grands ecrans',6.69000000,'Eco-systemes',1,1),(31,'ES-A-A','Ordinateur fixe, Audio home systems (HIFI), elements hifi separes',0.84000000,'Eco-systemes',1,1),(32,'ES-A-B','Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD, instruments de musique et caisses de resonance, haut parleurs...',0.25000000,'Eco-systemes',1,1),(33,'ES-A-C','Imprimante, photocopieur, telecopieur',0.42000000,'Eco-systemes',1,1),(34,'ES-A-D','Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, telephone, repondeur, telephone sans fil, modem, telecommande, casque, camescope, baladeur mp3, radio portable, radio K7 et CD portable, radio reveil',0.08400000,'Eco-systemes',1,1),(35,'ES-A-E','GSM',0.00840000,'Eco-systemes',1,1),(36,'ES-A-F','Jouets et equipements de loisirs et de sports < 0,5 kg',0.04200000,'Eco-systemes',1,1),(37,'ES-A-G','Jouets et equipements de loisirs et de sports > 0,5 kg',0.17000000,'Eco-systemes',1,1),(38,'ES-A-H','Jouets et equipements de loisirs et de sports > 10 kg',1.25000000,'Eco-systemes',1,1);
+/*!40000 ALTER TABLE `llx_c_ecotaxe` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_effectif`
+--
+
+DROP TABLE IF EXISTS `llx_c_effectif`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_effectif` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_effectif` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_effectif`
+--
+
+LOCK TABLES `llx_c_effectif` WRITE;
+/*!40000 ALTER TABLE `llx_c_effectif` DISABLE KEYS */;
+INSERT INTO `llx_c_effectif` VALUES (0,'EF0','-',1,NULL),(1,'EF1-5','1 - 5',1,NULL),(2,'EF6-10','6 - 10',1,NULL),(3,'EF11-50','11 - 50',1,NULL),(4,'EF51-100','51 - 100',1,NULL),(5,'EF100-500','100 - 500',1,NULL),(6,'EF500-','> 500',1,NULL);
+/*!40000 ALTER TABLE `llx_c_effectif` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_email_templates`
+--
+
+DROP TABLE IF EXISTS `llx_c_email_templates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_email_templates` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  `type_template` varchar(32) DEFAULT NULL,
+  `lang` varchar(6) DEFAULT NULL,
+  `private` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) DEFAULT NULL,
+  `position` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `topic` text,
+  `content` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
+  KEY `idx_type` (`type_template`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_email_templates`
+--
+
+LOCK TABLES `llx_c_email_templates` WRITE;
+/*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_field_list`
+--
+
+DROP TABLE IF EXISTS `llx_c_field_list`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_field_list` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `element` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `name` varchar(32) NOT NULL,
+  `alias` varchar(32) NOT NULL,
+  `title` varchar(32) NOT NULL,
+  `align` varchar(6) DEFAULT 'left',
+  `sort` tinyint(4) NOT NULL DEFAULT '1',
+  `search` tinyint(4) NOT NULL DEFAULT '0',
+  `enabled` varchar(255) DEFAULT '1',
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_field_list`
+--
+
+LOCK TABLES `llx_c_field_list` WRITE;
+/*!40000 ALTER TABLE `llx_c_field_list` DISABLE KEYS */;
+INSERT INTO `llx_c_field_list` VALUES (1,'2011-02-06 11:18:30','product_default',1,'p.ref','ref','Ref','left',1,1,'1',1),(2,'2011-02-06 11:18:30','product_default',1,'p.label','label','Label','left',1,1,'1',2),(3,'2011-02-06 11:18:30','product_default',1,'p.barcode','barcode','BarCode','center',1,1,'$conf->barcode->enabled',3),(4,'2011-02-06 11:18:30','product_default',1,'p.tms','datem','DateModification','center',1,0,'1',4),(5,'2011-02-06 11:18:30','product_default',1,'p.price','price','SellingPriceHT','right',1,0,'1',5),(6,'2011-02-06 11:18:30','product_default',1,'p.price_ttc','price_ttc','SellingPriceTTC','right',1,0,'1',6),(7,'2011-02-06 11:18:30','product_default',1,'p.stock','stock','Stock','right',0,0,'$conf->stock->enabled',7),(8,'2011-02-06 11:18:30','product_default',1,'p.envente','status','Status','right',1,0,'1',8);
+/*!40000 ALTER TABLE `llx_c_field_list` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_forme_juridique`
+--
+
+DROP TABLE IF EXISTS `llx_c_forme_juridique`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_forme_juridique` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` int(11) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `isvatexempted` tinyint(4) NOT NULL DEFAULT '0',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_forme_juridique` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=100009 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_forme_juridique`
+--
+
+LOCK TABLES `llx_c_forme_juridique` WRITE;
+/*!40000 ALTER TABLE `llx_c_forme_juridique` DISABLE KEYS */;
+INSERT INTO `llx_c_forme_juridique` VALUES (399,0,0,'-',0,1,NULL),(400,2301,23,'Monotributista',0,1,NULL),(401,2302,23,'Sociedad Civil',0,1,NULL),(402,2303,23,'Sociedades Comerciales',0,1,NULL),(403,2304,23,'Sociedades de Hecho',0,1,NULL),(404,2305,23,'Sociedades Irregulares',0,1,NULL),(405,2306,23,'Sociedad Colectiva',0,1,NULL),(406,2307,23,'Sociedad en Comandita Simple',0,1,NULL),(407,2308,23,'Sociedad de Capital e Industria',0,1,NULL),(408,2309,23,'Sociedad Accidental o en participación',0,1,NULL),(409,2310,23,'Sociedad de Responsabilidad Limitada',0,1,NULL),(410,2311,23,'Sociedad Anónima',0,1,NULL),(411,2312,23,'Sociedad Anónima con Participación Estatal Mayoritaria',0,1,NULL),(412,2313,23,'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)',0,1,NULL),(413,11,1,'Artisan Commerçant (EI)',0,1,NULL),(414,12,1,'Commerçant (EI)',0,1,NULL),(415,13,1,'Artisan (EI)',0,1,NULL),(416,14,1,'Officier public ou ministériel',0,1,NULL),(417,15,1,'Profession libérale (EI)',0,1,NULL),(418,16,1,'Exploitant agricole',0,1,NULL),(419,17,1,'Agent commercial',0,1,NULL),(420,18,1,'Associé Gérant de société',0,1,NULL),(421,19,1,'Personne physique',0,1,NULL),(422,21,1,'Indivision',0,1,NULL),(423,22,1,'Société créée de fait',0,1,NULL),(424,23,1,'Société en participation',0,1,NULL),(425,27,1,'Paroisse hors zone concordataire',0,1,NULL),(426,29,1,'Groupement de droit privé non doté de la personnalité morale',0,1,NULL),(427,31,1,'Personne morale de droit étranger, immatriculée au RCS',0,1,NULL),(428,32,1,'Personne morale de droit étranger, non immatriculée au RCS',0,1,NULL),(429,35,1,'Régime auto-entrepreneur',0,1,NULL),(430,41,1,'Établissement public ou régie à caractère industriel ou commercial',0,1,NULL),(431,51,1,'Société coopérative commerciale particulière',0,1,NULL),(432,52,1,'Société en nom collectif',0,1,NULL),(433,53,1,'Société en commandite',0,1,NULL),(434,54,1,'Société à responsabilité limitée (SARL)',0,1,NULL),(435,55,1,'Société anonyme à conseil d administration',0,1,NULL),(436,56,1,'Société anonyme à directoire',0,1,NULL),(437,57,1,'Société par actions simplifiée',0,1,NULL),(438,58,1,'Entreprise Unipersonnelle à Responsabilité Limitée (EURL)',0,1,NULL),(439,61,1,'Caisse d\'épargne et de prévoyance',0,1,NULL),(440,62,1,'Groupement d\'intérêt économique (GIE)',0,1,NULL),(441,63,1,'Société coopérative agricole',0,1,NULL),(442,64,1,'Société non commerciale d assurances',0,1,NULL),(443,65,1,'Société civile',0,1,NULL),(444,69,1,'Personnes de droit privé inscrites au RCS',0,1,NULL),(445,71,1,'Administration de l état',0,1,NULL),(446,72,1,'Collectivité territoriale',0,1,NULL),(447,73,1,'Établissement public administratif',0,1,NULL),(448,74,1,'Personne morale de droit public administratif',0,1,NULL),(449,81,1,'Organisme gérant régime de protection social à adhésion obligatoire',0,1,NULL),(450,82,1,'Organisme mutualiste',0,1,NULL),(451,83,1,'Comité d entreprise',0,1,NULL),(452,84,1,'Organisme professionnel',0,1,NULL),(453,85,1,'Organisme de retraite à adhésion non obligatoire',0,1,NULL),(454,91,1,'Syndicat de propriétaires',0,1,NULL),(455,92,1,'Association loi 1901 ou assimilé',0,1,NULL),(456,93,1,'Fondation',0,1,NULL),(457,99,1,'Personne morale de droit privé',0,1,NULL),(458,200,2,'Indépendant',0,1,NULL),(459,201,2,'SPRL - Société à responsabilité limitée',0,1,NULL),(460,202,2,'SA   - Société Anonyme',0,1,NULL),(461,203,2,'SCRL - Société coopérative à responsabilité limitée',0,1,NULL),(462,204,2,'ASBL - Association sans but Lucratif',0,1,NULL),(463,205,2,'SCRI - Société coopérative à responsabilité illimitée',0,1,NULL),(464,206,2,'SCS  - Société en commandite simple',0,1,NULL),(465,207,2,'SCA  - Société en commandite par action',0,1,NULL),(466,208,2,'SNC  - Société en nom collectif',0,1,NULL),(467,209,2,'GIE  - Groupement d intérêt économique',0,1,NULL),(468,210,2,'GEIE - Groupement européen d intérêt économique',0,1,NULL),(469,500,5,'Limited liability corporation (GmbH)',0,1,NULL),(470,501,5,'Stock corporation (AG)',0,1,NULL),(471,502,5,'Partnerships general or limited (GmbH & CO. KG)',0,1,NULL),(472,503,5,'Sole proprietor / Private business',0,1,NULL),(473,301,3,'Società semplice',0,1,NULL),(474,302,3,'Società in nome collettivo s.n.c.',0,1,NULL),(475,303,3,'Società in accomandita semplice s.a.s.',0,1,NULL),(476,304,3,'Società per azioni s.p.a.',0,1,NULL),(477,305,3,'Società a responsabilità limitata s.r.l.',0,1,NULL),(478,306,3,'Società in accomandita per azioni s.a.p.a.',0,1,NULL),(479,307,3,'Società cooperativa',0,1,NULL),(480,308,3,'Società consortile',0,1,NULL),(481,309,3,'Società europea',0,1,NULL),(482,310,3,'Società cooperativa europea',0,1,NULL),(483,311,3,'Società unipersonale',0,1,NULL),(484,312,3,'Società di professionisti',0,1,NULL),(485,313,3,'Società di fatto',0,1,NULL),(486,314,3,'Società occulta',0,1,NULL),(487,315,3,'Società apparente',0,1,NULL),(488,316,3,'Impresa individuale ',0,1,NULL),(489,317,3,'Impresa coniugale',0,1,NULL),(490,318,3,'Impresa familiare',0,1,NULL),(491,600,6,'Raison Individuelle',0,1,NULL),(492,601,6,'Société Simple',0,1,NULL),(493,602,6,'Société en nom collectif',0,1,NULL),(494,603,6,'Société en commandite',0,1,NULL),(495,604,6,'Société anonyme (SA)',0,1,NULL),(496,605,6,'Société en commandite par actions',0,1,NULL),(497,606,6,'Société à responsabilité limitée (SARL)',0,1,NULL),(498,607,6,'Société coopérative',0,1,NULL),(499,608,6,'Association',0,1,NULL),(500,609,6,'Fondation',0,1,NULL),(501,700,7,'Sole Trader',0,1,NULL),(502,701,7,'Partnership',0,1,NULL),(503,702,7,'Private Limited Company by shares (LTD)',0,1,NULL),(504,703,7,'Public Limited Company',0,1,NULL),(505,704,7,'Workers Cooperative',0,1,NULL),(506,705,7,'Limited Liability Partnership',0,1,NULL),(507,706,7,'Franchise',0,1,NULL),(508,1000,10,'Société à responsabilité limitée (SARL)',0,1,NULL),(509,1001,10,'Société en Nom Collectif (SNC)',0,1,NULL),(510,1002,10,'Société en Commandite Simple (SCS)',0,1,NULL),(511,1003,10,'société en participation',0,1,NULL),(512,1004,10,'Société Anonyme (SA)',0,1,NULL),(513,1005,10,'Société Unipersonnelle à Responsabilité Limitée (SUARL)',0,1,NULL),(514,1006,10,'Groupement d\'intérêt économique (GEI)',0,1,NULL),(515,1007,10,'Groupe de sociétés',0,1,NULL),(516,401,4,'Empresario Individual',0,1,NULL),(517,402,4,'Comunidad de Bienes',0,1,NULL),(518,403,4,'Sociedad Civil',0,1,NULL),(519,404,4,'Sociedad Colectiva',0,1,NULL),(520,405,4,'Sociedad Limitada',0,1,NULL),(521,406,4,'Sociedad Anónima',0,1,NULL),(522,407,4,'Sociedad Comandataria por Acciones',0,1,NULL),(523,408,4,'Sociedad Comandataria Simple',0,1,NULL),(524,409,4,'Sociedad Laboral',0,1,NULL),(525,410,4,'Sociedad Cooperativa',0,1,NULL),(526,411,4,'Sociedad de Garantía Recíproca',0,1,NULL),(527,412,4,'Entidad de Capital-Riesgo',0,1,NULL),(528,413,4,'Agrupación de Interés Económico',0,1,NULL),(529,414,4,'Sociedad de Inversión Mobiliaria',0,1,NULL),(530,415,4,'Agrupación sin Ánimo de Lucro',0,1,NULL),(531,15201,152,'Mauritius Private Company Limited By Shares',0,1,NULL),(532,15202,152,'Mauritius Company Limited By Guarantee',0,1,NULL),(533,15203,152,'Mauritius Public Company Limited By Shares',0,1,NULL),(534,15204,152,'Mauritius Foreign Company',0,1,NULL),(535,15205,152,'Mauritius GBC1 (Offshore Company)',0,1,NULL),(536,15206,152,'Mauritius GBC2 (International Company)',0,1,NULL),(537,15207,152,'Mauritius General Partnership',0,1,NULL),(538,15208,152,'Mauritius Limited Partnership',0,1,NULL),(539,15209,152,'Mauritius Sole Proprietorship',0,1,NULL),(540,15210,152,'Mauritius Trusts',0,1,NULL),(541,15401,154,'Sociedad en nombre colectivo',0,1,NULL),(542,15402,154,'Sociedad en comandita simple',0,1,NULL),(543,15403,154,'Sociedad de responsabilidad limitada',0,1,NULL),(544,15404,154,'Sociedad anónima',0,1,NULL),(545,15405,154,'Sociedad en comandita por acciones',0,1,NULL),(546,15406,154,'Sociedad cooperativa',0,1,NULL),(100001,100001,1,'Etudiant',0,0,'cabinetmed'),(100002,100002,1,'Retraité',0,0,'cabinetmed'),(100003,100003,1,'Artisan',0,0,'cabinetmed'),(100004,100004,1,'Femme de ménage',0,0,'cabinetmed'),(100005,100005,1,'Professeur',0,0,'cabinetmed'),(100006,100006,1,'Profession libérale',0,0,'cabinetmed'),(100007,100007,1,'Informaticien',0,0,'cabinetmed'),(100008,60,1,'Entreprise Individuelle à Responsabilité Limitée (EIRL)',0,1,NULL);
+/*!40000 ALTER TABLE `llx_c_forme_juridique` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_input_method`
+--
+
+DROP TABLE IF EXISTS `llx_c_input_method`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_input_method` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) DEFAULT NULL,
+  `libelle` varchar(60) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`),
+  UNIQUE KEY `uk_c_input_method` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_input_method`
+--
+
+LOCK TABLES `llx_c_input_method` WRITE;
+/*!40000 ALTER TABLE `llx_c_input_method` DISABLE KEYS */;
+INSERT INTO `llx_c_input_method` VALUES (1,'OrderByMail','Courrier',1,NULL),(2,'OrderByFax','Fax',1,NULL),(3,'OrderByEMail','EMail',1,NULL),(4,'OrderByPhone','Téléphone',1,NULL),(5,'OrderByWWW','En ligne',1,NULL);
+/*!40000 ALTER TABLE `llx_c_input_method` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_input_reason`
+--
+
+DROP TABLE IF EXISTS `llx_c_input_reason`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_input_reason` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_input_reason` (`code`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_input_reason`
+--
+
+LOCK TABLES `llx_c_input_reason` WRITE;
+/*!40000 ALTER TABLE `llx_c_input_reason` DISABLE KEYS */;
+INSERT INTO `llx_c_input_reason` VALUES (1,'SRC_INTE','Web site',1,NULL),(2,'SRC_CAMP_MAIL','Mailing campaign',1,NULL),(3,'SRC_CAMP_PHO','Phone campaign',1,NULL),(4,'SRC_CAMP_FAX','Fax campaign',1,NULL),(5,'SRC_COMM','Commercial contact',1,NULL),(6,'SRC_SHOP','Shop contact',1,NULL),(7,'SRC_CAMP_EMAIL','EMailing campaign',1,NULL),(8,'SRC_WOM','Word of mouth',1,NULL),(9,'SRC_PARTNER','Partner',1,NULL),(10,'SRC_EMPLOYEE','Employee',1,NULL),(11,'SRC_SPONSORING','Sponsoring',1,NULL);
+/*!40000 ALTER TABLE `llx_c_input_reason` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_methode_commande_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_c_methode_commande_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_methode_commande_fournisseur` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) DEFAULT NULL,
+  `libelle` varchar(60) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_methode_commande_fournisseur`
+--
+
+LOCK TABLES `llx_c_methode_commande_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_c_methode_commande_fournisseur` VALUES (1,'OrderByMail','Courrier',1),(2,'OrderByFax','Fax',1),(3,'OrderByEMail','EMail',1),(4,'OrderByPhone','Téléphone',1),(5,'OrderByWWW','En ligne',1);
+/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_paiement`
+--
+
+DROP TABLE IF EXISTS `llx_c_paiement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_paiement` (
+  `id` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `type` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_paiement` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_paiement`
+--
+
+LOCK TABLES `llx_c_paiement` WRITE;
+/*!40000 ALTER TABLE `llx_c_paiement` DISABLE KEYS */;
+INSERT INTO `llx_c_paiement` VALUES (0,'','-',3,1,NULL,NULL),(1,'TIP','TIP',2,1,NULL,NULL),(2,'VIR','Virement',2,1,NULL,NULL),(3,'PRE','Prélèvement',2,1,NULL,NULL),(4,'LIQ','Espèces',2,1,NULL,NULL),(6,'CB','Carte Bancaire',2,1,NULL,NULL),(7,'CHQ','Chèque',2,1,NULL,NULL),(50,'VAD','Paiement en ligne',2,0,NULL,NULL),(51,'TRA','Traite',2,0,NULL,NULL),(52,'LCR','LCR',2,0,NULL,NULL),(53,'FAC','Factor',2,0,NULL,NULL),(54,'PRO','Proforma',2,0,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_paiement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_paper_format`
+--
+
+DROP TABLE IF EXISTS `llx_c_paper_format`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_paper_format` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(16) NOT NULL,
+  `label` varchar(50) NOT NULL,
+  `width` float(6,2) DEFAULT '0.00',
+  `height` float(6,2) DEFAULT '0.00',
+  `unit` varchar(5) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=226 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_paper_format`
+--
+
+LOCK TABLES `llx_c_paper_format` WRITE;
+/*!40000 ALTER TABLE `llx_c_paper_format` DISABLE KEYS */;
+INSERT INTO `llx_c_paper_format` VALUES (1,'EU4A0','Format 4A0',1682.00,2378.00,'mm',1,NULL),(2,'EU2A0','Format 2A0',1189.00,1682.00,'mm',1,NULL),(3,'EUA0','Format A0',840.00,1189.00,'mm',1,NULL),(4,'EUA1','Format A1',594.00,840.00,'mm',1,NULL),(5,'EUA2','Format A2',420.00,594.00,'mm',1,NULL),(6,'EUA3','Format A3',297.00,420.00,'mm',1,NULL),(7,'EUA4','Format A4',210.00,297.00,'mm',1,NULL),(8,'EUA5','Format A5',148.00,210.00,'mm',1,NULL),(9,'EUA6','Format A6',105.00,148.00,'mm',1,NULL),(100,'USLetter','Format Letter (A)',216.00,279.00,'mm',1,NULL),(105,'USLegal','Format Legal',216.00,356.00,'mm',1,NULL),(110,'USExecutive','Format Executive',190.00,254.00,'mm',1,NULL),(115,'USLedger','Format Ledger/Tabloid (B)',279.00,432.00,'mm',1,NULL),(200,'CAP1','Format Canadian P1',560.00,860.00,'mm',1,NULL),(205,'CAP2','Format Canadian P2',430.00,560.00,'mm',1,NULL),(210,'CAP3','Format Canadian P3',280.00,430.00,'mm',1,NULL),(215,'CAP4','Format Canadian P4',215.00,280.00,'mm',1,NULL),(220,'CAP5','Format Canadian P5',140.00,215.00,'mm',1,NULL),(225,'CAP6','Format Canadian P6',107.00,140.00,'mm',1,NULL);
+/*!40000 ALTER TABLE `llx_c_paper_format` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_payment_term`
+--
+
+DROP TABLE IF EXISTS `llx_c_payment_term`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_payment_term` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(16) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) DEFAULT '1',
+  `libelle` varchar(255) DEFAULT NULL,
+  `libelle_facture` text,
+  `fdm` tinyint(4) DEFAULT NULL,
+  `nbjour` smallint(6) DEFAULT NULL,
+  `decalage` smallint(6) DEFAULT NULL,
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_payment_term`
+--
+
+LOCK TABLES `llx_c_payment_term` WRITE;
+/*!40000 ALTER TABLE `llx_c_payment_term` DISABLE KEYS */;
+INSERT INTO `llx_c_payment_term` VALUES (1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL,NULL),(2,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL,NULL),(3,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL,NULL),(4,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL,NULL),(5,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_payment_term` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_pays`
+--
+
+DROP TABLE IF EXISTS `llx_c_pays`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_pays` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(2) NOT NULL,
+  `code_iso` varchar(3) DEFAULT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_c_pays_code` (`code`),
+  UNIQUE KEY `idx_c_pays_libelle` (`libelle`),
+  UNIQUE KEY `idx_c_pays_code_iso` (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_pays`
+--
+
+LOCK TABLES `llx_c_pays` WRITE;
+/*!40000 ALTER TABLE `llx_c_pays` DISABLE KEYS */;
+INSERT INTO `llx_c_pays` VALUES (0,'',NULL,'-',1),(1,'FR',NULL,'France',1),(2,'BE',NULL,'Belgium',1),(3,'IT',NULL,'Italy',1),(4,'ES',NULL,'Spain',1),(5,'DE',NULL,'Germany',1),(6,'CH',NULL,'Suisse',1),(7,'GB',NULL,'United Kingdow',1),(8,'IE',NULL,'Irland',1),(9,'CN',NULL,'China',1),(10,'TN',NULL,'Tunisie',1),(11,'US',NULL,'United States',1),(12,'MA',NULL,'Maroc',1),(13,'DZ',NULL,'Algérie',1),(14,'CA',NULL,'Canada',1),(15,'TG',NULL,'Togo',1),(16,'GA',NULL,'Gabon',1),(17,'NL',NULL,'Nerderland',1),(18,'HU',NULL,'Hongrie',1),(19,'RU',NULL,'Russia',1),(20,'SE',NULL,'Sweden',1),(21,'CI',NULL,'Côte d\'Ivoire',1),(22,'SN',NULL,'Sénégal',1),(23,'AR',NULL,'Argentine',1),(24,'CM',NULL,'Cameroun',1),(25,'PT',NULL,'Portugal',1),(26,'SA',NULL,'Arabie Saoudite',1),(27,'MC',NULL,'Monaco',1),(28,'AU',NULL,'Australia',1),(29,'SG',NULL,'Singapour',1),(30,'AF',NULL,'Afghanistan',1),(31,'AX',NULL,'Iles Aland',1),(32,'AL',NULL,'Albanie',1),(33,'AS',NULL,'Samoa américaines',1),(34,'AD',NULL,'Andorre',1),(35,'AO',NULL,'Angola',1),(36,'AI',NULL,'Anguilla',1),(37,'AQ',NULL,'Antarctique',1),(38,'AG',NULL,'Antigua-et-Barbuda',1),(39,'AM',NULL,'Arménie',1),(40,'AW',NULL,'Aruba',1),(41,'AT',NULL,'Autriche',1),(42,'AZ',NULL,'Azerbaïdjan',1),(43,'BS',NULL,'Bahamas',1),(44,'BH',NULL,'Bahreïn',1),(45,'BD',NULL,'Bangladesh',1),(46,'BB',NULL,'Barbade',1),(47,'BY',NULL,'Biélorussie',1),(48,'BZ',NULL,'Belize',1),(49,'BJ',NULL,'Bénin',1),(50,'BM',NULL,'Bermudes',1),(51,'BT',NULL,'Bhoutan',1),(52,'BO',NULL,'Bolivie',1),(53,'BA',NULL,'Bosnie-Herzégovine',1),(54,'BW',NULL,'Botswana',1),(55,'BV',NULL,'Ile Bouvet',1),(56,'BR',NULL,'Brésil',1),(57,'IO',NULL,'Territoire britannique de l\'Océan Indien',1),(58,'BN',NULL,'Brunei',1),(59,'BG',NULL,'Bulgarie',1),(60,'BF',NULL,'Burkina Faso',1),(61,'BI',NULL,'Burundi',1),(62,'KH',NULL,'Cambodge',1),(63,'CV',NULL,'Cap-Vert',1),(64,'KY',NULL,'Iles Cayman',1),(65,'CF',NULL,'République centrafricaine',1),(66,'TD',NULL,'Tchad',1),(67,'CL',NULL,'Chili',1),(68,'CX',NULL,'Ile Christmas',1),(69,'CC',NULL,'Iles des Cocos (Keeling)',1),(70,'CO',NULL,'Colombie',1),(71,'KM',NULL,'Comores',1),(72,'CG',NULL,'Congo',1),(73,'CD',NULL,'République démocratique du Congo',1),(74,'CK',NULL,'Iles Cook',1),(75,'CR',NULL,'Costa Rica',1),(76,'HR',NULL,'Croatie',1),(77,'CU',NULL,'Cuba',1),(78,'CY',NULL,'Chypre',1),(79,'CZ',NULL,'République Tchèque',1),(80,'DK',NULL,'Danemark',1),(81,'DJ',NULL,'Djibouti',1),(82,'DM',NULL,'Dominique',1),(83,'DO',NULL,'République Dominicaine',1),(84,'EC',NULL,'Equateur',1),(85,'EG',NULL,'Egypte',1),(86,'SV',NULL,'Salvador',1),(87,'GQ',NULL,'Guinée Equatoriale',1),(88,'ER',NULL,'Erythrée',1),(89,'EE',NULL,'Estonie',1),(90,'ET',NULL,'Ethiopie',1),(91,'FK',NULL,'Iles Falkland',1),(92,'FO',NULL,'Iles Féroé',1),(93,'FJ',NULL,'Iles Fidji',1),(94,'FI',NULL,'Finlande',1),(95,'GF',NULL,'Guyane française',1),(96,'PF',NULL,'Polynésie française',1),(97,'TF',NULL,'Terres australes françaises',1),(98,'GM',NULL,'Gambie',1),(99,'GE',NULL,'Géorgie',1),(100,'GH',NULL,'Ghana',1),(101,'GI',NULL,'Gibraltar',1),(102,'GR',NULL,'Grèce',1),(103,'GL',NULL,'Groenland',1),(104,'GD',NULL,'Grenade',1),(105,'GP',NULL,'Guadeloupe',1),(106,'GU',NULL,'Guam',1),(107,'GT',NULL,'Guatemala',1),(108,'GN',NULL,'Guinée',1),(109,'GW',NULL,'Guinée-Bissao',1),(110,'GY',NULL,'Guyana',1),(111,'HT',NULL,'Haiti',1),(112,'HM',NULL,'Iles Heard et McDonald',1),(113,'VA',NULL,'Saint-Siège (Vatican)',1),(114,'HN',NULL,'Honduras',1),(115,'HK',NULL,'Hong Kong',1),(116,'IS',NULL,'Islande',1),(117,'IN',NULL,'India',1),(118,'ID',NULL,'Indonésie',1),(119,'IR',NULL,'Iran',1),(120,'IQ',NULL,'Iraq',1),(121,'IL',NULL,'Israel',1),(122,'JM',NULL,'Jamaïque',1),(123,'JP',NULL,'Japon',1),(124,'JO',NULL,'Jordanie',1),(125,'KZ',NULL,'Kazakhstan',1),(126,'KE',NULL,'Kenya',1),(127,'KI',NULL,'Kiribati',1),(128,'KP',NULL,'Corée du Nord',1),(129,'KR',NULL,'Corée du Sud',1),(130,'KW',NULL,'Koweït',1),(131,'KG',NULL,'Kirghizistan',1),(132,'LA',NULL,'Laos',1),(133,'LV',NULL,'Lettonie',1),(134,'LB',NULL,'Liban',1),(135,'LS',NULL,'Lesotho',1),(136,'LR',NULL,'Liberia',1),(137,'LY',NULL,'Libye',1),(138,'LI',NULL,'Liechtenstein',1),(139,'LT',NULL,'Lituanie',1),(140,'LU',NULL,'Luxembourg',1),(141,'MO',NULL,'Macao',1),(142,'MK',NULL,'ex-République yougoslave de Macédoine',1),(143,'MG',NULL,'Madagascar',1),(144,'MW',NULL,'Malawi',1),(145,'MY',NULL,'Malaisie',1),(146,'MV',NULL,'Maldives',1),(147,'ML',NULL,'Mali',1),(148,'MT',NULL,'Malte',1),(149,'MH',NULL,'Iles Marshall',1),(150,'MQ',NULL,'Martinique',1),(151,'MR',NULL,'Mauritanie',1),(152,'MU',NULL,'Maurice',1),(153,'YT',NULL,'Mayotte',1),(154,'MX',NULL,'Mexique',1),(155,'FM',NULL,'Micronésie',1),(156,'MD',NULL,'Moldavie',1),(157,'MN',NULL,'Mongolie',1),(158,'MS',NULL,'Monserrat',1),(159,'MZ',NULL,'Mozambique',1),(160,'MM',NULL,'Birmanie (Myanmar)',1),(161,'NA',NULL,'Namibie',1),(162,'NR',NULL,'Nauru',1),(163,'NP',NULL,'Népal',1),(164,'AN',NULL,'Antilles néerlandaises',1),(165,'NC',NULL,'Nouvelle-Calédonie',1),(166,'NZ',NULL,'Nouvelle-Zélande',1),(167,'NI',NULL,'Nicaragua',1),(168,'NE',NULL,'Niger',1),(169,'NG',NULL,'Nigeria',1),(170,'NU',NULL,'Nioué',1),(171,'NF',NULL,'Ile Norfolk',1),(172,'MP',NULL,'Mariannes du Nord',1),(173,'NO',NULL,'Norvège',1),(174,'OM',NULL,'Oman',1),(175,'PK',NULL,'Pakistan',1),(176,'PW',NULL,'Palaos',1),(177,'PS',NULL,'territoire Palestinien Occupé',1),(178,'PA',NULL,'Panama',1),(179,'PG',NULL,'Papouasie-Nouvelle-Guinée',1),(180,'PY',NULL,'Paraguay',1),(181,'PE',NULL,'Pérou',1),(182,'PH',NULL,'Philippines',1),(183,'PN',NULL,'Iles Pitcairn',1),(184,'PL',NULL,'Pologne',1),(185,'PR',NULL,'Porto Rico',1),(186,'QA',NULL,'Qatar',1),(187,'RE',NULL,'Réunion',1),(188,'RO',NULL,'Roumanie',1),(189,'RW',NULL,'Rwanda',1),(190,'SH',NULL,'Sainte-Hélène',1),(191,'KN',NULL,'Saint-Christophe-et-Niévès',1),(192,'LC',NULL,'Sainte-Lucie',1),(193,'PM',NULL,'Saint-Pierre-et-Miquelon',1),(194,'VC',NULL,'Saint-Vincent-et-les-Grenadines',1),(195,'WS',NULL,'Samoa',1),(196,'SM',NULL,'Saint-Marin',1),(197,'ST',NULL,'Sao Tomé-et-Principe',1),(198,'RS',NULL,'Serbie',1),(199,'SC',NULL,'Seychelles',1),(200,'SL',NULL,'Sierra Leone',1),(201,'SK',NULL,'Slovaquie',1),(202,'SI',NULL,'Slovénie',1),(203,'SB',NULL,'Iles Salomon',1),(204,'SO',NULL,'Somalie',1),(205,'ZA',NULL,'Afrique du Sud',1),(206,'GS',NULL,'Iles Géorgie du Sud et Sandwich du Sud',1),(207,'LK',NULL,'Sri Lanka',1),(208,'SD',NULL,'Soudan',1),(209,'SR',NULL,'Suriname',1),(210,'SJ',NULL,'Iles Svalbard et Jan Mayen',1),(211,'SZ',NULL,'Swaziland',1),(212,'SY',NULL,'Syrie',1),(213,'TW',NULL,'Taïwan',1),(214,'TJ',NULL,'Tadjikistan',1),(215,'TZ',NULL,'Tanzanie',1),(216,'TH',NULL,'Thaïlande',1),(217,'TL',NULL,'Timor Oriental',1),(218,'TK',NULL,'Tokélaou',1),(219,'TO',NULL,'Tonga',1),(220,'TT',NULL,'Trinité-et-Tobago',1),(221,'TR',NULL,'Turquie',1),(222,'TM',NULL,'Turkménistan',1),(223,'TC',NULL,'Iles Turks-et-Caicos',1),(224,'TV',NULL,'Tuvalu',1),(225,'UG',NULL,'Ouganda',1),(226,'UA',NULL,'Ukraine',1),(227,'AE',NULL,'Émirats arabes unis',1),(228,'UM',NULL,'Iles mineures éloignées des États-Unis',1),(229,'UY',NULL,'Uruguay',1),(230,'UZ',NULL,'Ouzbékistan',1),(231,'VU',NULL,'Vanuatu',1),(232,'VE',NULL,'Vénézuela',1),(233,'VN',NULL,'Viêt Nam',1),(234,'VG',NULL,'Iles Vierges britanniques',1),(235,'VI',NULL,'Iles Vierges américaines',1),(236,'WF',NULL,'Wallis-et-Futuna',1),(237,'EH',NULL,'Sahara occidental',1),(238,'YE',NULL,'Yémen',1),(239,'ZM',NULL,'Zambie',1),(240,'ZW',NULL,'Zimbabwe',1),(241,'GG',NULL,'Guernesey',1),(242,'IM',NULL,'Ile de Man',1),(243,'JE',NULL,'Jersey',1),(244,'ME',NULL,'Monténégro',1),(245,'BL',NULL,'Saint-Barthélemy',1),(246,'MF',NULL,'Saint-Martin',1);
+/*!40000 ALTER TABLE `llx_c_pays` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_propalst`
+--
+
+DROP TABLE IF EXISTS `llx_c_propalst`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_propalst` (
+  `id` smallint(6) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_propalst` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_propalst`
+--
+
+LOCK TABLES `llx_c_propalst` WRITE;
+/*!40000 ALTER TABLE `llx_c_propalst` DISABLE KEYS */;
+INSERT INTO `llx_c_propalst` VALUES (0,'PR_DRAFT','Brouillon',1),(1,'PR_OPEN','Ouverte',1),(2,'PR_SIGNED','Signée',1),(3,'PR_NOTSIGNED','Non Signée',1),(4,'PR_FAC','Facturée',1);
+/*!40000 ALTER TABLE `llx_c_propalst` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_prospectlevel`
+--
+
+DROP TABLE IF EXISTS `llx_c_prospectlevel`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_prospectlevel` (
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` smallint(6) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_prospectlevel`
+--
+
+LOCK TABLES `llx_c_prospectlevel` WRITE;
+/*!40000 ALTER TABLE `llx_c_prospectlevel` DISABLE KEYS */;
+INSERT INTO `llx_c_prospectlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','Low',2,1,NULL),('PL_MEDIUM','Medium',3,1,NULL),('PL_NONE','None',1,1,NULL);
+/*!40000 ALTER TABLE `llx_c_prospectlevel` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_regions`
+--
+
+DROP TABLE IF EXISTS `llx_c_regions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_regions` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code_region` int(11) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `cheflieu` varchar(50) DEFAULT NULL,
+  `tncc` int(11) DEFAULT NULL,
+  `nom` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `code_region` (`code_region`),
+  UNIQUE KEY `uk_code_region` (`code_region`),
+  KEY `idx_c_regions_fk_pays` (`fk_pays`),
+  CONSTRAINT `fk_c_regions_fk_pays` FOREIGN KEY (`fk_pays`) REFERENCES `llx_c_pays` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=23210 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_regions`
+--
+
+LOCK TABLES `llx_c_regions` WRITE;
+/*!40000 ALTER TABLE `llx_c_regions` DISABLE KEYS */;
+INSERT INTO `llx_c_regions` VALUES (1,0,0,'0',0,'-',1),(101,1,1,'97105',3,'Guadeloupe',1),(102,2,1,'97209',3,'Martinique',1),(103,3,1,'97302',3,'Guyane',1),(104,4,1,'97411',3,'Réunion',1),(105,11,1,'75056',1,'Île-de-France',1),(106,21,1,'51108',0,'Champagne-Ardenne',1),(107,22,1,'80021',0,'Picardie',1),(108,23,1,'76540',0,'Haute-Normandie',1),(109,24,1,'45234',2,'Centre',1),(110,25,1,'14118',0,'Basse-Normandie',1),(111,26,1,'21231',0,'Bourgogne',1),(112,31,1,'59350',2,'Nord-Pas-de-Calais',1),(113,41,1,'57463',0,'Lorraine',1),(114,42,1,'67482',1,'Alsace',1),(115,43,1,'25056',0,'Franche-Comté',1),(116,52,1,'44109',4,'Pays de la Loire',1),(117,53,1,'35238',0,'Bretagne',1),(118,54,1,'86194',2,'Poitou-Charentes',1),(119,72,1,'33063',1,'Aquitaine',1),(120,73,1,'31555',0,'Midi-Pyrénées',1),(121,74,1,'87085',2,'Limousin',1),(122,82,1,'69123',2,'Rhône-Alpes',1),(123,83,1,'63113',1,'Auvergne',1),(124,91,1,'34172',2,'Languedoc-Roussillon',1),(125,93,1,'13055',0,'Provence-Alpes-Côte d\'Azur',1),(126,94,1,'2A004',0,'Corse',1),(201,201,2,'',1,'Flandre',1),(202,202,2,'',2,'Wallonie',1),(203,203,2,'',3,'Bruxelles-Capitale',1),(301,301,3,NULL,1,'Abruzzo',1),(302,302,3,NULL,1,'Basilicata',1),(303,303,3,NULL,1,'Calabria',1),(304,304,3,NULL,1,'Campania',1),(305,305,3,NULL,1,'Emilia-Romagna',1),(306,306,3,NULL,1,'Friuli-Venezia Giulia',1),(307,307,3,NULL,1,'Lazio',1),(308,308,3,NULL,1,'Liguria',1),(309,309,3,NULL,1,'Lombardia',1),(310,310,3,NULL,1,'Marche',1),(311,311,3,NULL,1,'Molise',1),(312,312,3,NULL,1,'Piemonte',1),(313,313,3,NULL,1,'Puglia',1),(314,314,3,NULL,1,'Sardegna',1),(315,315,3,NULL,1,'Sicilia',1),(316,316,3,NULL,1,'Toscana',1),(317,317,3,NULL,1,'Trentino-Alto Adige',1),(318,318,3,NULL,1,'Umbria',1),(319,319,3,NULL,1,'Valle d Aosta',1),(320,320,3,NULL,1,'Veneto',1),(401,401,4,'',0,'Andalucia',1),(402,402,4,'',0,'Aragón',1),(403,403,4,'',0,'Castilla y León',1),(404,404,4,'',0,'Castilla la Mancha',1),(405,405,4,'',0,'Canarias',1),(406,406,4,'',0,'Cataluña',1),(407,407,4,'',0,'Comunidad de Ceuta',1),(408,408,4,'',0,'Comunidad Foral de Navarra',1),(409,409,4,'',0,'Comunidad de Melilla',1),(410,410,4,'',0,'Cantabria',1),(411,411,4,'',0,'Comunidad Valenciana',1),(412,412,4,'',0,'Extemadura',1),(413,413,4,'',0,'Galicia',1),(414,414,4,'',0,'Islas Baleares',1),(415,415,4,'',0,'La Rioja',1),(416,416,4,'',0,'Comunidad de Madrid',1),(417,417,4,'',0,'Región de Murcia',1),(418,418,4,'',0,'Principado de Asturias',1),(419,419,4,'',0,'Pais Vasco',1),(420,420,4,'',0,'Otros',1),(601,601,6,'',1,'Cantons',1),(1001,1001,10,'',0,'Ariana',1),(1002,1002,10,'',0,'Béja',1),(1003,1003,10,'',0,'Ben Arous',1),(1004,1004,10,'',0,'Bizerte',1),(1005,1005,10,'',0,'Gabès',1),(1006,1006,10,'',0,'Gafsa',1),(1007,1007,10,'',0,'Jendouba',1),(1008,1008,10,'',0,'Kairouan',1),(1009,1009,10,'',0,'Kasserine',1),(1010,1010,10,'',0,'Kébili',1),(1011,1011,10,'',0,'La Manouba',1),(1012,1012,10,'',0,'Le Kef',1),(1013,1013,10,'',0,'Mahdia',1),(1014,1014,10,'',0,'Médenine',1),(1015,1015,10,'',0,'Monastir',1),(1016,1016,10,'',0,'Nabeul',1),(1017,1017,10,'',0,'Sfax',1),(1018,1018,10,'',0,'Sidi Bouzid',1),(1019,1019,10,'',0,'Siliana',1),(1020,1020,10,'',0,'Sousse',1),(1021,1021,10,'',0,'Tataouine',1),(1022,1022,10,'',0,'Tozeur',1),(1023,1023,10,'',0,'Tunis',1),(1024,1024,10,'',0,'Zaghouan',1),(1101,1101,11,'',0,'United-States',1),(1201,1201,12,'',0,'Tanger-Tétouan',1),(1202,1202,12,'',0,'Gharb-Chrarda-Beni Hssen',1),(1203,1203,12,'',0,'Taza-Al Hoceima-Taounate',1),(1204,1204,12,'',0,'L\'Oriental',1),(1205,1205,12,'',0,'Fès-Boulemane',1),(1206,1206,12,'',0,'Meknès-Tafialet',1),(1207,1207,12,'',0,'Rabat-Salé-Zemour-Zaër',1),(1208,1208,12,'',0,'Grand Cassablanca',1),(1209,1209,12,'',0,'Chaouia-Ouardigha',1),(1210,1210,12,'',0,'Doukahla-Adba',1),(1211,1211,12,'',0,'Marrakech-Tensift-Al Haouz',1),(1212,1212,12,'',0,'Tadla-Azilal',1),(1213,1213,12,'',0,'Sous-Massa-Drâa',1),(1214,1214,12,'',0,'Guelmim-Es Smara',1),(1215,1215,12,'',0,'Laâyoune-Boujdour-Sakia el Hamra',1),(1216,1216,12,'',0,'Oued Ed-Dahab Lagouira',1),(1301,1301,13,'',0,'Algerie',1),(2301,2301,23,'',0,'Norte',1),(2302,2302,23,'',0,'Litoral',1),(2303,2303,23,'',0,'Cuyana',1),(2304,2304,23,'',0,'Central',1),(2305,2305,23,'',0,'Patagonia',1),(2801,2801,28,'',0,'Australia',1),(4601,4601,46,'',0,'Barbados',1),(6701,6701,67,NULL,NULL,'Tarapacá',1),(6702,6702,67,NULL,NULL,'Antofagasta',1),(6703,6703,67,NULL,NULL,'Atacama',1),(6704,6704,67,NULL,NULL,'Coquimbo',1),(6705,6705,67,NULL,NULL,'Valparaíso',1),(6706,6706,67,NULL,NULL,'General Bernardo O Higgins',1),(6707,6707,67,NULL,NULL,'Maule',1),(6708,6708,67,NULL,NULL,'Biobío',1),(6709,6709,67,NULL,NULL,'Raucanía',1),(6710,6710,67,NULL,NULL,'Los Lagos',1),(6711,6711,67,NULL,NULL,'Aysén General Carlos Ibáñez del Campo',1),(6712,6712,67,NULL,NULL,'Magallanes y Antártica Chilena',1),(6713,6713,67,NULL,NULL,'Santiago',1),(6714,6714,67,NULL,NULL,'Los Ríos',1),(6715,6715,67,NULL,NULL,'Arica y Parinacota',1),(7001,7001,70,'',0,'Colombie',1),(8601,8601,86,NULL,NULL,'Central',1),(8602,8602,86,NULL,NULL,'Oriental',1),(8603,8603,86,NULL,NULL,'Occidental',1),(10201,10201,102,NULL,NULL,'??????',1),(10202,10202,102,NULL,NULL,'?????? ??????',1),(10203,10203,102,NULL,NULL,'???????? ?????????',1),(10204,10204,102,NULL,NULL,'?????',1),(10205,10205,102,NULL,NULL,'????????? ????????? ??? ?????',1),(10206,10206,102,NULL,NULL,'???????',1),(10207,10207,102,NULL,NULL,'????? ?????',1),(10208,10208,102,NULL,NULL,'?????? ??????',1),(10209,10209,102,NULL,NULL,'????????????',1),(10210,10210,102,NULL,NULL,'????? ??????',1),(10211,10211,102,NULL,NULL,'?????? ??????',1),(10212,10212,102,NULL,NULL,'????????',1),(10213,10213,102,NULL,NULL,'?????? ?????????',1),(11401,11401,114,'',0,'Honduras',1),(11701,11701,117,'',0,'India',1),(15201,15201,152,'',0,'Rivière Noire',1),(15202,15202,152,'',0,'Flacq',1),(15203,15203,152,'',0,'Grand Port',1),(15204,15204,152,'',0,'Moka',1),(15205,15205,152,'',0,'Pamplemousses',1),(15206,15206,152,'',0,'Plaines Wilhems',1),(15207,15207,152,'',0,'Port-Louis',1),(15208,15208,152,'',0,'Rivière du Rempart',1),(15209,15209,152,'',0,'Savanne',1),(15210,15210,152,'',0,'Rodrigues',1),(15211,15211,152,'',0,'Les îles Agaléga',1),(15212,15212,152,'',0,'Les écueils des Cargados Carajos',1),(15401,15401,154,'',0,'Mexique',1),(23201,23201,232,'',0,'Los Andes',1),(23202,23202,232,'',0,'Capital',1),(23203,23203,232,'',0,'Central',1),(23204,23204,232,'',0,'Cento Occidental',1),(23205,23205,232,'',0,'Guayana',1),(23206,23206,232,'',0,'Insular',1),(23207,23207,232,'',0,'Los Llanos',1),(23208,23208,232,'',0,'Nor-Oriental',1),(23209,23209,232,'',0,'Zuliana',1);
+/*!40000 ALTER TABLE `llx_c_regions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_revenuestamp`
+--
+
+DROP TABLE IF EXISTS `llx_c_revenuestamp`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_revenuestamp` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_pays` int(11) NOT NULL,
+  `taux` double NOT NULL,
+  `note` varchar(128) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code_sell` varchar(32) DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_revenuestamp`
+--
+
+LOCK TABLES `llx_c_revenuestamp` WRITE;
+/*!40000 ALTER TABLE `llx_c_revenuestamp` DISABLE KEYS */;
+INSERT INTO `llx_c_revenuestamp` VALUES (101,10,0.6,'Timbre fiscal1',1,'aa','bb'),(103,30,10,'111',1,'1111','1111'),(104,10,5,'fdsf',1,'dfd',NULL);
+/*!40000 ALTER TABLE `llx_c_revenuestamp` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_shipment_mode`
+--
+
+DROP TABLE IF EXISTS `llx_c_shipment_mode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_shipment_mode` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `code` varchar(30) NOT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `description` text,
+  `tracking` varchar(256) NOT NULL,
+  `active` tinyint(4) DEFAULT '0',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_shipment_mode`
+--
+
+LOCK TABLES `llx_c_shipment_mode` WRITE;
+/*!40000 ALTER TABLE `llx_c_shipment_mode` DISABLE KEYS */;
+INSERT INTO `llx_c_shipment_mode` VALUES (1,'2010-10-09 23:43:16','CATCH','Catch','Catch by client','',1,NULL),(2,'2010-10-09 23:43:16','TRANS','Transporter','Generic transporter','',1,NULL),(3,'2010-10-09 23:43:16','COLSUI','Colissimo Suivi','Colissimo Suivi','',0,NULL),(4,'2011-07-18 17:28:27','LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0,NULL),(5,'2013-02-24 01:48:17','UPS','UPS','United Parcel Service','',0,NULL),(6,'2013-02-24 01:48:17','KIALA','KIALA','Relais Kiala','',0,NULL),(7,'2013-02-24 01:48:17','GLS','GLS','General Logistics Systems','',0,NULL),(8,'2013-02-24 01:48:17','CHRONO','Chronopost','Chronopost','',0,NULL),(9,'2013-02-24 01:48:18','UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0,NULL),(10,'2013-02-24 01:48:18','KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}',0,NULL),(11,'2013-02-24 01:48:18','GLS','GLS','General Logistics Systems','http://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/FR01/FR/5004.htm?txtAction=71000&txtRefNo={TRACKID}',0,NULL),(12,'2013-02-24 01:48:18','CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}',0,NULL);
+/*!40000 ALTER TABLE `llx_c_shipment_mode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_source`
+--
+
+DROP TABLE IF EXISTS `llx_c_source`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_source` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_source`
+--
+
+LOCK TABLES `llx_c_source` WRITE;
+/*!40000 ALTER TABLE `llx_c_source` DISABLE KEYS */;
+INSERT INTO `llx_c_source` VALUES (1,'SRC_00','Proposition commerciale',1),(2,'SRC_01','Internet',1),(3,'SRC_02','Campagne courrier',1),(4,'SRC_03','Campagne téléphone',1),(5,'SRC_04','Campagne fax',1),(6,'SRC_05','Commercial',1),(7,'SRC_06','Magasin',1);
+/*!40000 ALTER TABLE `llx_c_source` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_stcomm`
+--
+
+DROP TABLE IF EXISTS `llx_c_stcomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_stcomm` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_stcomm` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_stcomm`
+--
+
+LOCK TABLES `llx_c_stcomm` WRITE;
+/*!40000 ALTER TABLE `llx_c_stcomm` DISABLE KEYS */;
+INSERT INTO `llx_c_stcomm` VALUES (-1,'ST_NO','Ne pas contacter',1),(0,'ST_NEVER','Jamais contacté',1),(1,'ST_TODO','A contacter',1),(2,'ST_PEND','Contact en cours',1),(3,'ST_DONE','Contactée',1);
+/*!40000 ALTER TABLE `llx_c_stcomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_tva`
+--
+
+DROP TABLE IF EXISTS `llx_c_tva`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_tva` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_pays` int(11) NOT NULL,
+  `taux` double NOT NULL,
+  `localtax1` varchar(10) DEFAULT NULL,
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2` varchar(10) DEFAULT NULL,
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `note` varchar(128) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code_sell` varchar(32) DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_tva_id` (`fk_pays`,`taux`,`recuperableonly`)
+) ENGINE=InnoDB AUTO_INCREMENT=2463 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_tva`
+--
+
+LOCK TABLES `llx_c_tva` WRITE;
+/*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */;
+INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-21','1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-21','1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-21','1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-21','1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_contact`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_contact` (
+  `rowid` int(11) NOT NULL,
+  `element` varchar(30) NOT NULL,
+  `source` varchar(8) NOT NULL DEFAULT 'external',
+  `code` varchar(32) NOT NULL,
+  `libelle` varchar(64) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_type_contact_id` (`element`,`source`,`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_contact`
+--
+
+LOCK TABLES `llx_c_type_contact` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_contact` DISABLE KEYS */;
+INSERT INTO `llx_c_type_contact` VALUES (10,'contrat','internal','SALESREPSIGN','Commercial signataire du contrat',1,NULL),(11,'contrat','internal','SALESREPFOLL','Commercial suivi du contrat',1,NULL),(20,'contrat','external','BILLING','Contact client facturation contrat',1,NULL),(21,'contrat','external','CUSTOMER','Contact client suivi contrat',1,NULL),(22,'contrat','external','SALESREPSIGN','Contact client signataire contrat',1,NULL),(31,'propal','internal','SALESREPFOLL','Commercial à l\'origine de la propale',1,NULL),(40,'propal','external','BILLING','Contact client facturation propale',1,NULL),(41,'propal','external','CUSTOMER','Contact client suivi propale',1,NULL),(50,'facture','internal','SALESREPFOLL','Responsable suivi du paiement',1,NULL),(60,'facture','external','BILLING','Contact client facturation',1,NULL),(61,'facture','external','SHIPPING','Contact client livraison',1,NULL),(62,'facture','external','SERVICE','Contact client prestation',1,NULL),(70,'invoice_supplier','internal','SALESREPFOLL','Responsable suivi du paiement',1,NULL),(71,'invoice_supplier','external','BILLING','Contact fournisseur facturation',1,NULL),(72,'invoice_supplier','external','SHIPPING','Contact fournisseur livraison',1,NULL),(73,'invoice_supplier','external','SERVICE','Contact fournisseur prestation',1,NULL),(80,'agenda','internal','ACTOR','Responsable',1,NULL),(81,'agenda','internal','GUEST','Guest',1,NULL),(85,'agenda','external','ACTOR','Responsable',1,NULL),(86,'agenda','external','GUEST','Guest',1,NULL),(91,'commande','internal','SALESREPFOLL','Responsable suivi de la commande',1,NULL),(100,'commande','external','BILLING','Contact client facturation commande',1,NULL),(101,'commande','external','CUSTOMER','Contact client suivi commande',1,NULL),(102,'commande','external','SHIPPING','Contact client livraison commande',1,NULL),(120,'fichinter','internal','INTERREPFOLL','Responsable suivi de l\'intervention',1,NULL),(121,'fichinter','internal','INTERVENING','Intervenant',1,NULL),(130,'fichinter','external','BILLING','Contact client facturation intervention',1,NULL),(131,'fichinter','external','CUSTOMER','Contact client suivi de l\'intervention',1,NULL),(140,'order_supplier','internal','SALESREPFOLL','Responsable suivi de la commande',1,NULL),(141,'order_supplier','internal','SHIPPING','Responsable réception de la commande',1,NULL),(142,'order_supplier','external','BILLING','Contact fournisseur facturation commande',1,NULL),(143,'order_supplier','external','CUSTOMER','Contact fournisseur suivi commande',1,NULL),(145,'order_supplier','external','SHIPPING','Contact fournisseur livraison commande',1,NULL),(160,'project','internal','PROJECTLEADER','Chef de Projet',1,NULL),(161,'project','internal','PROJECTCONTRIBUTOR','Intervenant',1,NULL),(170,'project','external','PROJECTLEADER','Chef de Projet',1,NULL),(171,'project','external','PROJECTCONTRIBUTOR','Intervenant',1,NULL),(180,'project_task','internal','TASKEXECUTIVE','Responsable',1,NULL),(181,'project_task','internal','TASKCONTRIBUTOR','Intervenant',1,NULL),(190,'project_task','external','TASKEXECUTIVE','Responsable',1,NULL),(191,'project_task','external','TASKCONTRIBUTOR','Intervenant',1,NULL),(200,'societe','external','GENERALREF','Généraliste (référent)',0,'cabinetmed'),(201,'societe','external','GENERALISTE','Généraliste',0,'cabinetmed'),(210,'societe','external','SPECCHIROR','Chirurgien ortho',0,'cabinetmed'),(211,'societe','external','SPECCHIROT','Chirurgien autre',0,'cabinetmed'),(220,'societe','external','SPECDERMA','Dermatologue',0,'cabinetmed'),(225,'societe','external','SPECENDOC','Endocrinologue',0,'cabinetmed'),(230,'societe','external','SPECGYNECO','Gynécologue',0,'cabinetmed'),(240,'societe','external','SPECGASTRO','Gastroantérologue',0,'cabinetmed'),(245,'societe','external','SPECINTERNE','Interniste',0,'cabinetmed'),(250,'societe','external','SPECCARDIO','Cardiologue',0,'cabinetmed'),(260,'societe','external','SPECNEPHRO','Néphrologue',0,'cabinetmed'),(263,'societe','external','SPECPNEUMO','Pneumologue',0,'cabinetmed'),(265,'societe','external','SPECNEURO','Neurologue',0,'cabinetmed'),(270,'societe','external','SPECRHUMATO','Rhumatologue',0,'cabinetmed'),(280,'societe','external','KINE','Kinésithérapeute',0,'cabinetmed');
+/*!40000 ALTER TABLE `llx_c_type_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_fees`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_fees`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_fees` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_type_fees` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_fees`
+--
+
+LOCK TABLES `llx_c_type_fees` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_fees` DISABLE KEYS */;
+INSERT INTO `llx_c_type_fees` VALUES (1,'TF_OTHER','Other',NULL,1,NULL),(2,'TF_TRIP','Trip',NULL,1,NULL),(3,'TF_LUNCH','Lunch',NULL,1,NULL);
+/*!40000 ALTER TABLE `llx_c_type_fees` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_resource`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_resource`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_resource` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(32) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_type_resource_id` (`label`,`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_resource`
+--
+
+LOCK TABLES `llx_c_type_resource` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_resource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_type_resource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_typent`
+--
+
+DROP TABLE IF EXISTS `llx_c_typent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_typent` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `fk_country` int(11) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_typent` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_typent`
+--
+
+LOCK TABLES `llx_c_typent` WRITE;
+/*!40000 ALTER TABLE `llx_c_typent` DISABLE KEYS */;
+INSERT INTO `llx_c_typent` VALUES (0,'TE_UNKNOWN','-',NULL,1,NULL),(1,'TE_STARTUP','Start-up',NULL,1,NULL),(2,'TE_GROUP','Grand groupe',NULL,1,NULL),(3,'TE_MEDIUM','PME/PMI',NULL,1,NULL),(4,'TE_SMALL','TPE',NULL,1,NULL),(5,'TE_ADMIN','Administration',NULL,1,NULL),(6,'TE_WHOLE','Grossiste',NULL,1,NULL),(7,'TE_RETAIL','Revendeur',NULL,1,NULL),(8,'TE_PRIVATE','Particulier',NULL,1,NULL),(100,'TE_OTHER','Autres',NULL,1,NULL),(101,'TE_HOMME','Homme',NULL,0,'cabinetmed'),(102,'TE_FEMME','Femme',NULL,0,'cabinetmed');
+/*!40000 ALTER TABLE `llx_c_typent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ziptown`
+--
+
+DROP TABLE IF EXISTS `llx_c_ziptown`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ziptown` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(5) DEFAULT NULL,
+  `fk_county` int(11) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL DEFAULT '0',
+  `zip` varchar(10) NOT NULL,
+  `town` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_ziptown_fk_pays` (`zip`,`town`,`fk_pays`),
+  KEY `idx_c_ziptown_fk_county` (`fk_county`),
+  KEY `idx_c_ziptown_fk_pays` (`fk_pays`),
+  KEY `idx_c_ziptown_zip` (`zip`),
+  CONSTRAINT `fk_c_ziptown_fk_county` FOREIGN KEY (`fk_county`) REFERENCES `llx_c_departements` (`rowid`),
+  CONSTRAINT `fk_c_ziptown_fk_pays` FOREIGN KEY (`fk_pays`) REFERENCES `llx_c_pays` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ziptown`
+--
+
+LOCK TABLES `llx_c_ziptown` WRITE;
+/*!40000 ALTER TABLE `llx_c_ziptown` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie`
+--
+
+DROP TABLE IF EXISTS `llx_categorie`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_parent` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(255) NOT NULL,
+  `type` tinyint(4) NOT NULL DEFAULT '1',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `description` text,
+  `fk_soc` int(11) DEFAULT NULL,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_categorie_ref` (`entity`,`fk_parent`,`label`,`type`),
+  KEY `idx_categorie_type` (`type`),
+  KEY `idx_categorie_label` (`label`)
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie`
+--
+
+LOCK TABLES `llx_categorie` WRITE;
+/*!40000 ALTER TABLE `llx_categorie` DISABLE KEYS */;
+INSERT INTO `llx_categorie` VALUES (1,0,'MySupplierCategory',1,1,'This is description of category MyCategory for suppliers<br />',NULL,0,NULL),(2,0,'MyCategory',1,1,'This is description of MyCategory for customer and prospects<br />',NULL,0,NULL),(3,7,'Hot products',1,1,'This is description of hot products<br />',NULL,0,NULL),(4,0,'Cold products',1,1,'This is a description of cold products<br />',NULL,0,NULL),(5,7,'ChildChild 2a x',0,1,'<br />',NULL,0,NULL),(6,7,'ChildChild 2a',0,1,'<br />',NULL,0,NULL),(7,9,'Child 2',0,1,'<br />',NULL,0,NULL),(8,7,'ChildChild 2b',0,1,'<br />',NULL,0,NULL),(9,0,'Parent',0,1,'<br />',NULL,0,NULL),(10,0,'XL Cutomers',0,1,'<br />',NULL,0,NULL),(11,9,'Child 1',0,1,'',NULL,0,NULL),(12,0,'cccc',2,1,'',NULL,0,NULL),(13,0,'ccc2',2,1,'gdfgdfgdf',NULL,0,NULL),(14,0,'ccc3',2,1,'',NULL,0,NULL),(15,13,'ccc2a',2,1,'',NULL,0,NULL),(16,15,'ccc2a1',2,1,'desc,b,nb,fhgfg hf',NULL,0,NULL);
+/*!40000 ALTER TABLE `llx_categorie` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_association`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_association`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_association` (
+  `fk_categorie_mere` int(11) NOT NULL,
+  `fk_categorie_fille` int(11) NOT NULL,
+  UNIQUE KEY `uk_categorie_association` (`fk_categorie_mere`,`fk_categorie_fille`),
+  UNIQUE KEY `uk_categorie_association_fk_categorie_fille` (`fk_categorie_fille`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_association`
+--
+
+LOCK TABLES `llx_categorie_association` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_association` DISABLE KEYS */;
+INSERT INTO `llx_categorie_association` VALUES (3,5),(9,11);
+/*!40000 ALTER TABLE `llx_categorie_association` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_contact`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_contact` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_socpeople` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_socpeople`),
+  KEY `idx_categorie_contact_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_contact_fk_socpeople` (`fk_socpeople`),
+  CONSTRAINT `fk_categorie_contact_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_contact_fk_socpeople` FOREIGN KEY (`fk_socpeople`) REFERENCES `llx_socpeople` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_contact`
+--
+
+LOCK TABLES `llx_categorie_contact` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_contact` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_fournisseur` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_societe` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_societe`),
+  KEY `idx_categorie_fournisseur_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_fournisseur_fk_societe` (`fk_societe`),
+  CONSTRAINT `fk_categorie_fournisseur_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_fournisseur_fk_soc` FOREIGN KEY (`fk_societe`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_fournisseur`
+--
+
+LOCK TABLES `llx_categorie_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_categorie_fournisseur` VALUES (1,2,NULL),(9,2,NULL);
+/*!40000 ALTER TABLE `llx_categorie_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_lang`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_lang`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_lang` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_category` int(11) NOT NULL DEFAULT '0',
+  `lang` varchar(5) NOT NULL DEFAULT '0',
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_category_lang` (`fk_category`,`lang`),
+  CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_lang`
+--
+
+LOCK TABLES `llx_categorie_lang` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_lang` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_lang` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_member`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_member` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_member` int(11) NOT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_member`),
+  KEY `idx_categorie_member_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_member_fk_member` (`fk_member`),
+  CONSTRAINT `fk_categorie_member_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_member_member_rowid` FOREIGN KEY (`fk_member`) REFERENCES `llx_adherent` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_member`
+--
+
+LOCK TABLES `llx_categorie_member` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_member` DISABLE KEYS */;
+INSERT INTO `llx_categorie_member` VALUES (7,2),(8,1);
+/*!40000 ALTER TABLE `llx_categorie_member` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_product`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_product`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_product` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_product` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_product`),
+  KEY `idx_categorie_product_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_product_fk_product` (`fk_product`),
+  CONSTRAINT `fk_categorie_product_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_product_product_rowid` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_product`
+--
+
+LOCK TABLES `llx_categorie_product` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_product` DISABLE KEYS */;
+INSERT INTO `llx_categorie_product` VALUES (5,1,NULL),(5,2,NULL),(5,3,NULL),(6,2,NULL),(6,3,NULL);
+/*!40000 ALTER TABLE `llx_categorie_product` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_societe`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_societe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_societe` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_societe` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_societe`),
+  KEY `idx_categorie_societe_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_societe_fk_societe` (`fk_societe`),
+  CONSTRAINT `fk_categorie_societe_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_societe_fk_soc` FOREIGN KEY (`fk_societe`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_societe`
+--
+
+LOCK TABLES `llx_categorie_societe` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_societe` DISABLE KEYS */;
+INSERT INTO `llx_categorie_societe` VALUES (2,2,NULL),(2,19,NULL),(10,4,NULL);
+/*!40000 ALTER TABLE `llx_categorie_societe` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categories_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_categories_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categories_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_categories_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categories_extrafields`
+--
+
+LOCK TABLES `llx_categories_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_categories_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categories_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_chargesociales`
+--
+
+DROP TABLE IF EXISTS `llx_chargesociales`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_chargesociales` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_ech` datetime NOT NULL,
+  `libelle` varchar(80) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_type` int(11) NOT NULL,
+  `amount` double NOT NULL DEFAULT '0',
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `periode` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_chargesociales`
+--
+
+LOCK TABLES `llx_chargesociales` WRITE;
+/*!40000 ALTER TABLE `llx_chargesociales` DISABLE KEYS */;
+INSERT INTO `llx_chargesociales` VALUES (4,'2011-08-09 00:00:00','fff',1,60,10,1,'2011-08-01','2012-12-08 13:11:10',NULL,NULL);
+/*!40000 ALTER TABLE `llx_chargesociales` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande`
+--
+
+DROP TABLE IF EXISTS `llx_commande`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_int` varchar(255) DEFAULT NULL,
+  `ref_client` varchar(255) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `date_commande` date DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `source` smallint(6) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `amount_ht` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `facture` tinyint(4) DEFAULT '0',
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_currency` varchar(3) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT NULL,
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_livraison` date DEFAULT NULL,
+  `fk_shipping_method` int(11) DEFAULT NULL,
+  `fk_availability` int(11) DEFAULT NULL,
+  `fk_input_reason` int(11) DEFAULT NULL,
+  `fk_delivery_address` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_commande_ref` (`ref`,`entity`),
+  KEY `idx_commande_fk_soc` (`fk_soc`),
+  KEY `idx_commande_fk_user_author` (`fk_user_author`),
+  KEY `idx_commande_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_commande_fk_user_cloture` (`fk_user_cloture`),
+  KEY `idx_commande_fk_projet` (`fk_projet`),
+  KEY `idx_commande_fk_account` (`fk_account`),
+  KEY `idx_commande_fk_currency` (`fk_currency`),
+  CONSTRAINT `fk_commande_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_commande_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande`
+--
+
+LOCK TABLES `llx_commande` WRITE;
+/*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
+INSERT INTO `llx_commande` VALUES (1,'2012-12-08 13:11:07',1,NULL,'CO1107-0002',1,NULL,NULL,'','2011-07-20 15:23:12','2011-08-08 13:59:09',NULL,'2011-07-20',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','',0,NULL,NULL,1,1,NULL,NULL,0,NULL,NULL,NULL,NULL),(2,'2013-02-12 16:06:51',1,NULL,'CO1107-0003',1,NULL,NULL,'','2011-07-20 23:20:12','2013-02-12 17:06:51',NULL,'2011-07-21',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(3,'2013-02-17 17:27:56',1,NULL,'CO1107-0004',1,NULL,NULL,'','2011-07-20 23:22:53','2013-02-17 18:27:56',NULL,'2011-07-21',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2012-12-08 13:11:07',1,NULL,'CO1108-0001',1,NULL,NULL,'','2011-08-08 03:04:11','2011-08-08 03:04:21',NULL,'2011-08-08',1,NULL,1,NULL,NULL,2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-02-17 15:22:14',19,NULL,'(PROV6)',1,NULL,NULL,'','2013-02-17 16:22:14',NULL,NULL,'2013-02-17',1,NULL,NULL,NULL,NULL,0,0,0,NULL,0,11.76000000,0.00000000,0.00000000,60.00000000,71.76000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'2013-02-17 17:38:37',18,NULL,'CO1302-0005',1,NULL,NULL,'gfdf','2013-02-17 16:28:22','2013-02-17 18:38:14',NULL,'2013-02-17',1,NULL,1,NULL,NULL,2,0,0,NULL,0,3.22000000,0.00000000,0.00000000,20.00000000,23.22000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-03-08 09:02:31',23,NULL,'(PROV8)',1,NULL,NULL,'fdfs','2013-03-08 10:02:31',NULL,NULL,'2013-03-08',1,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0.00000000,0.00000000,0.00000000,5.00000000,5.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commande_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commande_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_extrafields`
+--
+
+LOCK TABLES `llx_commande_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commande_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_soc` int(11) NOT NULL,
+  `ref` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_supplier` varchar(255) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_approve` datetime DEFAULT NULL,
+  `date_commande` date DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_user_approve` int(11) DEFAULT NULL,
+  `source` smallint(6) NOT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `amount_ht` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `fk_input_method` int(11) DEFAULT '0',
+  `fk_cond_reglement` int(11) DEFAULT '0',
+  `fk_mode_reglement` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `date_livraison` date DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_commande_fournisseur_ref` (`ref`,`fk_soc`,`entity`),
+  KEY `idx_commande_fournisseur_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_commande_fournisseur_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur`
+--
+
+LOCK TABLES `llx_commande_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2012-12-08 13:11:07',13,'CF1007-0001',1,NULL,NULL,NULL,'2010-07-11 17:13:40','2010-07-11 17:15:42',NULL,'2010-07-11',1,NULL,1,NULL,0,5,0,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL),(2,'2012-12-08 13:11:07',1,'CF1007-0002',1,NULL,NULL,NULL,'2010-07-11 18:46:28','2010-07-11 18:47:33',NULL,'2010-07-11',1,NULL,1,NULL,0,3,0,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL),(3,'2012-12-08 13:11:07',17,'(PROV3)',1,NULL,NULL,NULL,'2011-08-04 23:00:52',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(4,'2012-12-08 13:11:07',17,'(PROV4)',1,NULL,NULL,NULL,'2011-08-04 23:19:32',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(5,'2012-12-08 13:11:07',17,'(PROV5)',1,NULL,NULL,NULL,'2011-08-04 23:22:16',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(6,'2012-12-08 13:11:07',17,'CF1108-0003',1,NULL,NULL,NULL,'2011-08-04 23:22:54','2011-08-08 15:04:37',NULL,NULL,1,NULL,1,NULL,0,2,0,0,0,0.98000000,0.00000000,0.00000000,5.00000000,5.98000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(7,'2012-12-08 13:11:07',17,'(PROV7)',1,NULL,NULL,NULL,'2011-08-04 23:23:29',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(8,'2012-12-08 13:11:07',17,'(PROV8)',1,NULL,NULL,NULL,'2011-08-04 23:36:10',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(13,'2013-03-09 18:39:41',1,'CF1303-0004',1,NULL,NULL,0,'2013-03-09 19:39:18','2013-03-09 19:39:27','2013-03-09 19:39:32','2013-03-09',1,NULL,1,1,0,3,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL),(14,'2013-03-22 09:26:43',16,'(PROV14)',1,NULL,'gdfg',0,'2013-03-22 10:26:38',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','muscadet',0,0,0,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_dispatch`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_dispatch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_dispatch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `qty` float DEFAULT NULL,
+  `fk_entrepot` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commande_fournisseur_dispatch_fk_commande` (`fk_commande`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_dispatch`
+--
+
+LOCK TABLES `llx_commande_fournisseur_dispatch` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur_dispatch` VALUES (1,2,4,2,1,1,'2010-07-11 18:49:44');
+/*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commande_fournisseur_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_extrafields`
+--
+
+LOCK TABLES `llx_commande_fournisseur_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_log`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datelog` datetime NOT NULL,
+  `fk_commande` int(11) NOT NULL,
+  `fk_statut` smallint(6) NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_log`
+--
+
+LOCK TABLES `llx_commande_fournisseur_log` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_log` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur_log` VALUES (1,'2010-07-11 15:13:40','2010-07-11 17:13:40',1,0,1,NULL),(2,'2010-07-11 15:15:42','2010-07-11 17:15:42',1,1,1,NULL),(3,'2010-07-11 15:16:28','2010-07-11 17:16:28',1,2,1,NULL),(4,'2010-07-11 15:19:14','2010-07-11 00:00:00',1,3,1,NULL),(5,'2010-07-11 15:19:36','2010-07-11 00:00:00',1,5,1,NULL),(6,'2010-07-11 16:46:28','2010-07-11 18:46:28',2,0,1,NULL),(7,'2010-07-11 16:47:33','2010-07-11 18:47:33',2,1,1,NULL),(8,'2010-07-11 16:47:41','2010-07-11 18:47:41',2,2,1,NULL),(9,'2010-07-11 16:48:00','2010-07-11 00:00:00',2,3,1,NULL),(10,'2011-08-04 21:00:52','2011-08-04 23:00:52',3,0,1,NULL),(11,'2011-08-04 21:19:32','2011-08-04 23:19:32',4,0,1,NULL),(12,'2011-08-04 21:22:16','2011-08-04 23:22:16',5,0,1,NULL),(13,'2011-08-04 21:22:54','2011-08-04 23:22:54',6,0,1,NULL),(14,'2011-08-04 21:23:29','2011-08-04 23:23:29',7,0,1,NULL),(15,'2011-08-04 21:36:10','2011-08-04 23:36:10',8,0,1,NULL),(19,'2011-08-08 13:04:37','2011-08-08 15:04:37',6,1,1,NULL),(20,'2011-08-08 13:04:38','2011-08-08 15:04:38',6,2,1,NULL),(29,'2013-03-09 18:39:18','2013-03-09 19:39:18',13,0,1,NULL),(30,'2013-03-09 18:39:27','2013-03-09 19:39:27',13,1,1,NULL),(31,'2013-03-09 18:39:32','2013-03-09 19:39:32',13,2,1,NULL),(32,'2013-03-09 18:39:41','2013-03-09 00:00:00',13,3,1,'hf'),(33,'2013-03-22 09:26:38','2013-03-22 10:26:38',14,0,1,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseur_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseurdet`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseurdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseurdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `ref` varchar(50) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseurdet`
+--
+
+LOCK TABLES `llx_commande_fournisseurdet` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseurdet` VALUES (1,1,NULL,'','','Chips',19.600,0.000,'',0.000,'',10,0,0,20.00000000,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL),(2,2,4,'ABCD','Decapsuleur','',0.000,0.000,'',0.000,'',20,0,0,10.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL),(3,6,NULL,'','','ljkljl',19.600,0.000,'',0.000,'',1,0,0,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL),(6,13,NULL,'','','dfgdf',0.000,0.000,'0',0.000,'0',1,0,0,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL),(7,14,NULL,'','','gfdgd',0.000,0.000,'0',0.000,'0',1,0,0,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commandedet`
+--
+
+DROP TABLE IF EXISTS `llx_commandedet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commandedet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) DEFAULT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT NULL,
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT NULL,
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `price` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `fk_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `special_code` int(10) unsigned DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commandedet_fk_commande` (`fk_commande`),
+  KEY `idx_commandedet_fk_product` (`fk_product`),
+  CONSTRAINT `fk_commandedet_fk_commande` FOREIGN KEY (`fk_commande`) REFERENCES `llx_commande` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commandedet`
+--
+
+LOCK TABLES `llx_commandedet` WRITE;
+/*!40000 ALTER TABLE `llx_commandedet` DISABLE KEYS */;
+INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,'Product 1',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(2,1,NULL,2,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(3,1,NULL,5,NULL,'cccc',0.000,0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL),(4,2,NULL,NULL,NULL,'hgf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(10,5,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(11,6,NULL,NULL,NULL,'gdfg',19.600,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(12,6,NULL,NULL,NULL,'gfdgd',19.600,0.000,'',0.000,'',1,0,0,NULL,50,50.00000000,50.00000000,9.80000000,0.00000000,0.00000000,59.80000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(13,7,NULL,NULL,NULL,'gfdg',19.600,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(14,3,NULL,NULL,NULL,'gdfgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(15,3,NULL,NULL,NULL,'fghfgh',0.000,0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(16,7,NULL,4,NULL,'',12.500,0.000,'',0.000,'',1,0,0,NULL,5,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(17,7,NULL,4,NULL,'eeee',12.500,0.000,'',0.000,'',1,0,0,NULL,5,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL),(18,8,NULL,NULL,NULL,'fdsfs',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(19,8,NULL,NULL,NULL,'fsdfsf',0.000,0.000,'',0.000,'',1,0,0,NULL,-5,-5.00000000,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL);
+/*!40000 ALTER TABLE `llx_commandedet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commandedet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commandedet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commandedet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commandedet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commandedet_extrafields`
+--
+
+LOCK TABLES `llx_commandedet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commandedet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commandedet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cond_reglement`
+--
+
+DROP TABLE IF EXISTS `llx_cond_reglement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cond_reglement` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(16) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) DEFAULT '1',
+  `libelle` varchar(255) DEFAULT NULL,
+  `libelle_facture` text,
+  `fdm` tinyint(4) DEFAULT NULL,
+  `nbjour` smallint(6) DEFAULT NULL,
+  `decalage` smallint(6) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cond_reglement`
+--
+
+LOCK TABLES `llx_cond_reglement` WRITE;
+/*!40000 ALTER TABLE `llx_cond_reglement` DISABLE KEYS */;
+INSERT INTO `llx_cond_reglement` VALUES (1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL),(2,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL),(3,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL),(4,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL),(5,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL);
+/*!40000 ALTER TABLE `llx_cond_reglement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `date_create` datetime NOT NULL,
+  `description` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `date_debut` date NOT NULL,
+  `date_fin` date NOT NULL,
+  `statut` int(11) NOT NULL DEFAULT '1',
+  `fk_validator` int(11) NOT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_refuse` datetime DEFAULT NULL,
+  `fk_user_refuse` int(11) DEFAULT NULL,
+  `date_cancel` datetime DEFAULT NULL,
+  `fk_user_cancel` int(11) DEFAULT NULL,
+  `detail_refuse` varchar(250) COLLATE latin1_german2_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes`
+--
+
+LOCK TABLES `llx_congespayes` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_congespayes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_config`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_config` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `value` text COLLATE latin1_german2_ci,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_config`
+--
+
+LOCK TABLES `llx_congespayes_config` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_config` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_config` VALUES (1,'userGroup','2'),(2,'lastUpdate','1331893531'),(3,'nbUser','9'),(4,'delayForRequest','30'),(5,'AlertValidatorDelay','1'),(6,'AlertValidatorSolde','1'),(7,'nbCongesDeducted','1.20'),(8,'nbCongesEveryMonth','2.50');
+/*!40000 ALTER TABLE `llx_congespayes_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_events`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `value` text COLLATE latin1_german2_ci NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_events`
+--
+
+LOCK TABLES `llx_congespayes_events` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_events` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_events` VALUES (1,'Mariage','3.00');
+/*!40000 ALTER TABLE `llx_congespayes_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_logs`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_logs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_logs` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_action` datetime NOT NULL,
+  `fk_user_action` int(11) NOT NULL,
+  `fk_user_update` int(11) NOT NULL,
+  `type_action` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `prev_solde` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `new_solde` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_logs`
+--
+
+LOCK TABLES `llx_congespayes_logs` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_logs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_congespayes_logs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_users`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_users` (
+  `fk_user` int(11) NOT NULL,
+  `nb_conges` float NOT NULL DEFAULT '0',
+  PRIMARY KEY (`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_users`
+--
+
+LOCK TABLES `llx_congespayes_users` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_users` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_users` VALUES (1,0),(2,0),(3,0),(4,0),(5,0),(6,0),(7,0),(8,0),(9,0);
+/*!40000 ALTER TABLE `llx_congespayes_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_const`
+--
+
+DROP TABLE IF EXISTS `llx_const`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_const` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `value` text NOT NULL,
+  `type` varchar(6) DEFAULT NULL,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `note` text,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_const` (`name`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=5278 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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',0,'465','chaine',0,'','2012-12-19 12:58:10'),(2041,'MAIN_MAIL_SMTP_SERVER',0,'smtp.mail.com','chaine',0,'','2012-12-19 12:58:10'),(2044,'MAIN_MAIL_EMAIL_TLS',0,'1','chaine',0,'','2012-12-19 12:58:10'),(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'),(2321,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2013-01-02 20:33:24'),(2322,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-01-02 20:33:24'),(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',0,'mail','chaine',0,'','2013-03-13 17:22:24'),(4700,'MAIN_MAIL_SMTPS_ID',0,'eldy10@mail.com','chaine',0,'','2013-03-13 17:22:24'),(4701,'MAIN_MAIL_SMTPS_PW',0,'bidonge','chaine',0,'','2013-03-13 17:22:24'),(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'),(4986,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2013-03-23 17:24:25'),(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'),(5119,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2013-03-24 18:35:07'),(5120,'MAIN_MULTILANGS',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5121,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2013-03-24 18:35:07'),(5122,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5123,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5124,'MAIN_START_WEEK',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5125,'MAIN_SHOW_LOGO',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5126,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5127,'MAIN_THEME',1,'eldy','chaine',0,'','2013-03-24 18:35:07'),(5128,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5129,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5130,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5131,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5132,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2013-03-24 18:35:07'),(5133,'MAIN_HOME',1,'<span style=\"font-size:11px;\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2013-03-24 18:35:07'),(5134,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2013-03-24 18:35:07'),(5135,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2013-03-24 18:35:07'),(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'),(5236,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2014-03-02 15:37:26'),(5237,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2014-03-02 15:37:37'),(5238,'MAIN_MODULE_LDAP',1,'1',NULL,0,NULL,'2014-03-02 15:38:03'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5240,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2014-03-02 19:05:06'),(5241,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2014-03-02 19:05:06'),(5242,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2014-03-02 19:05:06'),(5243,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2014-03-02 19:05:06'),(5244,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2014-03-02 19:05:06'),(5245,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5246,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2014-03-02 19:05:06'),(5247,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2014-03-02 19:05:06'),(5248,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2014-03-02 19:05:06'),(5249,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2014-03-02 19:05:06'),(5250,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2014-03-02 19:05:06'),(5251,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2014-03-02 19:05:06'),(5252,'MAIN_INFO_SOCIETE_LOGO',1,'logo_nltechno.gif','chaine',0,'','2014-03-02 19:05:06'),(5253,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'logo_nltechno_small.gif','chaine',0,'','2014-03-02 19:05:06'),(5254,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'logo_nltechno_mini.gif','chaine',0,'','2014-03-02 19:05:06'),(5255,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2014-03-02 19:05:06'),(5256,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5257,'MAIN_INFO_TVAINTRA',1,'IN1234567','chaine',0,'','2014-03-02 19:05:06'),(5258,'SOCIETE_FISCAL_MONTH_START',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5259,'FACTURE_TVAOPTION',1,'reel','chaine',0,'','2014-03-02 19:05:06'),(5262,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2014-12-21 12:51:26'),(5263,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2014-12-21 12:51:26'),(5264,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5265,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5266,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5267,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5268,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5269,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5270,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2014-12-21 12:51:28'),(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'),(5275,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2014-12-21 12:51:28'),(5276,'MAIN_VERSION_LAST_UPGRADE',0,'3.7.0-beta','chaine',0,'Dolibarr version for last upgrade','2014-12-21 12:51:32'),(5277,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2014-12-21 19:52:31');
+/*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contrat`
+--
+
+DROP TABLE IF EXISTS `llx_contrat`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contrat` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_supplier` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `date_contrat` datetime DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '0',
+  `mise_en_service` datetime DEFAULT NULL,
+  `fin_validite` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_commercial_signature` int(11) DEFAULT NULL,
+  `fk_commercial_suivi` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL DEFAULT '0',
+  `fk_user_mise_en_service` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_contrat_ref` (`ref`,`entity`),
+  KEY `idx_contrat_fk_soc` (`fk_soc`),
+  KEY `idx_contrat_fk_user_author` (`fk_user_author`),
+  CONSTRAINT `fk_contrat_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_contrat_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contrat`
+--
+
+LOCK TABLES `llx_contrat` WRITE;
+/*!40000 ALTER TABLE `llx_contrat` DISABLE KEYS */;
+INSERT INTO `llx_contrat` VALUES (1,'CONTRACT1',NULL,NULL,1,'2010-07-08 23:53:55','2010-07-09 01:53:25','2010-07-09 00:00:00',1,NULL,NULL,NULL,3,NULL,2,2,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'CONTRAT1',NULL,NULL,1,'2010-07-10 16:18:16','2010-07-10 18:13:37','2010-07-10 00:00:00',1,NULL,NULL,NULL,2,NULL,2,2,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'CT1303-0001',NULL,NULL,1,'2013-03-06 09:05:07','2013-03-06 10:04:57','2013-03-06 00:00:00',1,NULL,NULL,NULL,19,NULL,1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_contrat` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contrat_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_contrat_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contrat_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contrat_extrafields`
+--
+
+LOCK TABLES `llx_contrat_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_contrat_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_contrat_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contratdet`
+--
+
+DROP TABLE IF EXISTS `llx_contratdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contratdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_contrat` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '0',
+  `label` text,
+  `description` text,
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `date_commande` datetime DEFAULT NULL,
+  `date_ouverture_prevue` datetime DEFAULT NULL,
+  `date_ouverture` datetime DEFAULT NULL,
+  `date_fin_validite` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `tva_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double NOT NULL,
+  `remise_percent` double DEFAULT '0',
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `price_ht` double DEFAULT NULL,
+  `remise` double DEFAULT '0',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `product_type` int(11) DEFAULT '1',
+  `info_bits` int(11) DEFAULT '0',
+  `fk_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `fk_user_author` int(11) NOT NULL DEFAULT '0',
+  `fk_user_ouverture` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `commentaire` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_contratdet_fk_contrat` (`fk_contrat`),
+  KEY `idx_contratdet_fk_product` (`fk_product`),
+  KEY `idx_contratdet_date_ouverture_prevue` (`date_ouverture_prevue`),
+  KEY `idx_contratdet_date_ouverture` (`date_ouverture`),
+  KEY `idx_contratdet_date_fin_validite` (`date_fin_validite`),
+  CONSTRAINT `fk_contratdet_fk_contrat` FOREIGN KEY (`fk_contrat`) REFERENCES `llx_contrat` (`rowid`),
+  CONSTRAINT `fk_contratdet_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contratdet`
+--
+
+LOCK TABLES `llx_contratdet` WRITE;
+/*!40000 ALTER TABLE `llx_contratdet` DISABLE KEYS */;
+INSERT INTO `llx_contratdet` VALUES (1,'2013-03-06 09:00:00',1,3,4,'','',NULL,NULL,'2010-07-09 00:00:00','2010-07-09 12:00:00','2013-03-15 00:00:00',NULL,0.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,''),(2,'2010-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2010-07-10 00:00:00',NULL,'2011-07-10 00:00:00',NULL,1.000,0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,NULL,0.00000000,0,NULL,NULL,NULL),(3,'2013-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2010-07-10 00:00:00','2010-07-10 12:00:00','2011-07-09 00:00:00','2013-03-06 12:00:00',4.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,''),(4,'2012-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2010-07-10 00:00:00',NULL,NULL,NULL,0.000,0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,NULL,0.00000000,0,NULL,1,''),(5,'2013-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2013-03-06 12:00:00','2013-03-07 12:00:00',NULL,0.000,0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0.00000000,0,1,1,'');
+/*!40000 ALTER TABLE `llx_contratdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contratdet_log`
+--
+
+DROP TABLE IF EXISTS `llx_contratdet_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contratdet_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_contratdet` int(11) NOT NULL,
+  `date` datetime NOT NULL,
+  `statut` smallint(6) NOT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `commentaire` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_contratdet_log_fk_contratdet` (`fk_contratdet`),
+  KEY `idx_contratdet_log_date` (`date`),
+  CONSTRAINT `fk_contratdet_log_fk_contratdet` FOREIGN KEY (`fk_contratdet`) REFERENCES `llx_contratdet` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contratdet_log`
+--
+
+LOCK TABLES `llx_contratdet_log` WRITE;
+/*!40000 ALTER TABLE `llx_contratdet_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_contratdet_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cotisation`
+--
+
+DROP TABLE IF EXISTS `llx_cotisation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cotisation` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `fk_adherent` int(11) DEFAULT NULL,
+  `dateadh` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `cotisation` double DEFAULT NULL,
+  `fk_bank` int(11) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_cotisation` (`fk_adherent`,`dateadh`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cotisation`
+--
+
+LOCK TABLES `llx_cotisation` WRITE;
+/*!40000 ALTER TABLE `llx_cotisation` DISABLE KEYS */;
+INSERT INTO `llx_cotisation` VALUES (1,'2010-07-10 13:05:30','2010-07-10 15:05:30',2,'2010-07-10 00:00:00','2011-07-10',20,NULL,'Adhésion/cotisation 2010'),(2,'2010-07-11 14:20:00','2010-07-11 16:20:00',2,'2011-07-11 00:00:00','2012-07-10',10,NULL,'Adhésion/cotisation 2011'),(3,'2010-07-18 10:20:33','2010-07-18 12:20:33',2,'2012-07-11 00:00:00','2013-07-17',10,NULL,'Adhésion/cotisation 2012'),(4,'2013-03-06 15:43:37','2013-03-06 16:43:37',2,'2013-07-18 00:00:00','2014-07-17',10,NULL,'Adhésion/cotisation 2013'),(5,'2013-03-06 15:44:12','2013-03-06 16:44:12',2,'2014-07-18 00:00:00','2015-07-17',11,NULL,'Adhésion/cotisation 2014'),(6,'2013-03-06 15:47:48','2013-03-06 16:47:48',2,'2015-07-18 00:00:00','2016-07-17',10,NULL,'Adhésion/cotisation 2015'),(7,'2013-03-06 15:48:16','2013-03-06 16:48:16',2,'2016-07-18 00:00:00','2017-07-17',20,22,'Adhésion/cotisation 2016'),(8,'2013-03-20 13:17:57','2013-03-20 14:17:57',1,'2010-07-10 00:00:00','2011-07-09',10,NULL,'Adhésion/cotisation 2010'),(10,'2013-03-20 13:30:11','2013-03-20 14:30:11',1,'2011-07-10 00:00:00','2012-07-09',10,23,'Adhésion/cotisation 2011');
+/*!40000 ALTER TABLE `llx_cotisation` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cronjob`
+--
+
+DROP TABLE IF EXISTS `llx_cronjob`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cronjob` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `jobtype` varchar(10) NOT NULL,
+  `label` text NOT NULL,
+  `command` varchar(255) DEFAULT NULL,
+  `classesname` varchar(255) DEFAULT NULL,
+  `objectname` varchar(255) DEFAULT NULL,
+  `methodename` varchar(255) DEFAULT NULL,
+  `params` text NOT NULL,
+  `md5params` varchar(32) DEFAULT NULL,
+  `module_name` varchar(255) DEFAULT NULL,
+  `priority` int(11) DEFAULT '0',
+  `datelastrun` datetime DEFAULT NULL,
+  `datenextrun` datetime DEFAULT NULL,
+  `datestart` datetime DEFAULT NULL,
+  `dateend` datetime DEFAULT NULL,
+  `datelastresult` datetime DEFAULT NULL,
+  `lastresult` text,
+  `lastoutput` text,
+  `unitfrequency` int(11) NOT NULL DEFAULT '0',
+  `frequency` int(11) NOT NULL DEFAULT '0',
+  `nbrun` int(11) DEFAULT NULL,
+  `status` int(11) NOT NULL DEFAULT '1',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `note` text,
+  `libname` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cronjob`
+--
+
+LOCK TABLES `llx_cronjob` WRITE;
+/*!40000 ALTER TABLE `llx_cronjob` DISABLE KEYS */;
+INSERT INTO `llx_cronjob` VALUES (1,'2013-03-23 18:18:39','2013-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2013-03-23 19:18:00',NULL,NULL,NULL,NULL,3600,3600,0,0,1,1,'',NULL);
+/*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deplacement`
+--
+
+DROP TABLE IF EXISTS `llx_deplacement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deplacement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `dated` datetime DEFAULT NULL,
+  `fk_user` int(11) NOT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `type` varchar(12) NOT NULL,
+  `fk_statut` int(11) NOT NULL DEFAULT '1',
+  `km` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `note_private` text,
+  `note_public` text,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_deplacement`
+--
+
+LOCK TABLES `llx_deplacement` WRITE;
+/*!40000 ALTER TABLE `llx_deplacement` DISABLE KEYS */;
+INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2010-07-09 01:58:04','2010-07-08 23:58:18','2010-07-09 12:00:00',2,1,NULL,'TF_LUNCH',1,10,2,1,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_document_generator`
+--
+
+DROP TABLE IF EXISTS `llx_document_generator`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_document_generator` (
+  `rowid` int(10) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `classfile` varchar(255) NOT NULL,
+  `class` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_document_generator`
+--
+
+LOCK TABLES `llx_document_generator` WRITE;
+/*!40000 ALTER TABLE `llx_document_generator` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_document_generator` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_document_model`
+--
+
+DROP TABLE IF EXISTS `llx_document_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_document_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(50) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `type` varchar(20) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `description` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=228 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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'),(224,'einstein',1,'order',NULL,NULL),(225,'crabe',1,'invoice',NULL,NULL),(226,'muscadet',1,'order_supplier',NULL,NULL),(227,'html_cerfafr',1,'donation',NULL,NULL);
+/*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_dolicloud_emailstemplates`
+--
+
+DROP TABLE IF EXISTS `llx_dolicloud_emailstemplates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dolicloud_emailstemplates` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `emailtype` varchar(128) NOT NULL,
+  `lang` varchar(12) NOT NULL,
+  `topic` varchar(256) NOT NULL,
+  `content` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_dolicloud_emailstemplates` (`emailtype`,`lang`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dolicloud_emailstemplates`
+--
+
+LOCK TABLES `llx_dolicloud_emailstemplates` WRITE;
+/*!40000 ALTER TABLE `llx_dolicloud_emailstemplates` DISABLE KEYS */;
+INSERT INTO `llx_dolicloud_emailstemplates` VALUES (1,'PasswordAssistance','en_US','DoliCloud (online Dolibarr ERP & CRM) - Password assistance: how to reset your password','<body>\n                <p>Dear ${person.firstName},</p>\n                <p>\n                    To continue the password reset process for the account ${person.email}\n                    click on the link below.<br />\n                </p>\n                <p><a href=\"${resetPasswordLink}\">${resetPasswordLink}</a></p>\n                <p>Note that this process is to reset the password for your dashboard, not for your application login. You may find more information on all different user/password reset process onto <a href=\"http://dolicloud.com/en/faq/139-i-forgot-my-login-or-password\">the following page</a>.\n                </p>\n                <p>If clicking doesn\'t seem to work, you can copy and paste the link into your browser\'s\n                   address window, or retype it there. Once you have returned to our site, we will give instructions for resetting your password.</p>\n                <p>If you did not request to have your password reset you can safely ignore this email.\n                   It is likely another user entered your email address by mistake while trying to reset a password. Rest assured your customer account is safe.</p>\n                <p>We will never e-mail you and ask you to disclose or verify your password, credit card, or banking account number. \n                   If you receive a suspicious e-mail with a link to update your account information,\n                   do not click on the link - instead, report the e-mail to us for investigation.</p>\n                <p>\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n                </p>\n              </body>'),(2,'InstanceDeployed','en_US','Welcome to DoliCloud (online Dolibarr ERP & CRM) - Your instance is ready','               <body>\n                <p>Hello ${person.firstName},</p>\n                <p>\n                   We are delighted to welcome you as a user of DoliCloud, the Ondemand service of Dolibarr ERP & CRM.\n                </p>\n                <p>\n                   Your ${appPackage.name} is installed, setup and ready for you.\n                   Here are the details you need to get started:\n                </p>\n                <br /><strong>Your Dolibarr ERP & CRM :</strong>\n                <ul>\n                    <li>URL: <a href=\"${appInstance.url}?username=${appPackage.defaultUser}\">${appInstance.url}</a></li>\n                    <li>Login: ${appPackage.defaultUser}</li>\n                    <li>Password: ${appInstance.defaultPassword}</li>\n                </ul>\n                <br /><strong>Your Dolicloud dashboard :</strong>\n                <ul>\n                    <li>URL: <a href=\"https://www.on.dolicloud.com/\">https://www.on.dolicloud.com/</a></li>\n                    <li>Login: ${person.email}</li>\n                    <li>Password: ${appInstance.defaultPassword}</li>\n                </ul>                \n            \n            <br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n            '),(3,'InvoiceFailure','en_US','DoliCloud (online Dolibarr ERP & CRM) - Invoice Payment Failure','            <body>\n              <p>Dear DoliCloud Customer,</p>\n              <p>\n                An attempt to take payment for invoice(s) owed has failed. Please update your payment method, or contact your bank or payment method provider.<br />\n                Should failure to take this payment continue, access to our service will be discontinued, and any data you have with us maybe lost.<br />\n<br />\nPlease login to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a> to update and fix your credit card or paypal information as soon as possible to prevent any interuptions in service.<br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n              </p>\n              <p>\n                The error we received from your bank was: <br />\n                ${invoice.notes.collect{ it }.join(\' \')}\n              </p><br />\n\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n          '),(4,'CustomerInstanceClosed','en_US','DoliCloud (online Dolibarr ERP & CRM) - Account Closure','            <body>\n              <p>Dear Customer,</p>\n              <p>\n                 We wish to inform you your account has now been closed. We are sorry to see you got, but thank you for your custom.\n                 We hope you will a customer of ours in the future.<br />\nIf you think this is an error, please contact us at support@dolicloud.com\n              </p><br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n          '),(5,'CustomerInstanceClosureRequested','en_US','DoliCloud (online Dolibarr ERP & CRM) - Customer Account Closure Requested Confirmation','            <body>               <p>Dear Customer,</p>               <p>                 We are sorry to see you go, and appreciate the custom you have given us.               </p>               <p>                The closure of your account will be executed at the end of your current trialing or                 billing period <span class=\"highlight\">(${customerAccount.nextBillingDate.format(\'dd MMM yyyy\')})</span>.                Once the closure is complete your instance and its                related data will be <span class=\"emphasis\">destroyed and unretrievable</span>.<br />                 If you change your mind before that date you can halt the closure process,                and continue being our customer. For this, go to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a>.<br />                Remind: Your DoliCloud dashboard login is ${person.email}<br />                </p><br />             Sincerly, <br />             The DoliCloud Team <br />             ----------------------------------------- <br />             EMail: support@dolicloud.com <br />             Web: http://www.dolicloud.com             </body>           '),(6,'CreditCardExpiring','en_US','DoliCloud (online Dolibarr ERP & CRM) - Urgent: Your credit card is expiring','          <body>\n            <p>Dear Customer,</p>\n            <p>\n              We wish to inform you that your payment method will soon expire.<br />\n              \n              Please login to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a> to update your credit card information as soon as possible to prevent any interuptions in service.<br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n            </p>\n            <p>If you have any questions relating to the above please do not hesitate get in touch.</p>\n<br />\n\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n          </body>\n        '),(7,'GentleTrialExpiringReminder','en_US','DoliCloud (online Dolibarr ERP & CRM) - Your Trial will soon expire','         <body>\n          <p>Hello ${person.firstName},</p>\n          <p>\n            Just a quick reminder that trial of your online Dolibarr ERP & CRM will expire soon. If you wish to continue using this service, please login to your DoliCloud console to add a payment method (credit card or paypal accepted).\n          </p>\n          <p>\nFor this, click to go on your DoliCloud dashboard: <a href=\"https://www.on.dolicloud.com/\">https://www.on.dolicloud.com/</a><br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n</p>\n          <br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       '),(8,'ChannelPartnerCreated','en_US','Channel Partner Created','         <body>\n          <p>Hello ${person.firstName},</p>\n          <p>\n             We are delighted to welcome you as a Channel Partner of ${appProvider.name}.\n          </p>\n          <p>\n             Your account has been setup for you.\n             Here are the details you need to get started:\n          </p>\n          <ul>\n              <li>Login link: ${serverURL}</li>\n              <li>Username: ${person.email}</li>\n              <li>Temporary Password: ${person.tmpPassword}</li>\n          </ul>                \n          <p>\n              Sincerly, <br />\n              The ${appProvider.name} Team\n          </p>\n        </body>\n        '),(9,'CustomerAccountSuspended','en_US','DoliCloud (online Dolibarr ERP & CRM) - Account Suspension','<body>\n <p>Dear Customer,</p> \n <p>We wish to inform you your account has been suspended. This is likely due to a payment problem. If you wish to engage with us in addressing this send an email to support@dolicloud.com </p><br />\n Sincerly, <br /> \n The DoliCloud Team <br />\n ========================================== <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       '),(10,'CustomerInstanceUpdated','en_US','DoliCloud (online Dolibarr ERP & CRM) - Instance upgrade','<body>\n <p>Dear Customer,</p> \n <p>We wish to inform you your instance has been upgraded to last stable version. If you experience problem after this upgrade, you can contact us at support@dolicloud.com </p><br />\n Sincerly, <br /> \n The DoliCloud Team <br />\n ========================================== <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       ');
+/*!40000 ALTER TABLE `llx_dolicloud_emailstemplates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_domain`
+--
+
+DROP TABLE IF EXISTS `llx_domain`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_domain` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_domain`
+--
+
+LOCK TABLES `llx_domain` WRITE;
+/*!40000 ALTER TABLE `llx_domain` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_domain` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_don`
+--
+
+DROP TABLE IF EXISTS `llx_don`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_don` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `datec` datetime DEFAULT NULL,
+  `datedon` datetime DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `fk_paiement` int(11) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `societe` varchar(50) DEFAULT NULL,
+  `address` text,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `country` varchar(50) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `phone` varchar(24) DEFAULT NULL,
+  `phone_mobile` varchar(24) DEFAULT NULL,
+  `public` smallint(6) NOT NULL DEFAULT '1',
+  `fk_don_projet` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_don`
+--
+
+LOCK TABLES `llx_don` WRITE;
+/*!40000 ALTER TABLE `llx_don` DISABLE KEYS */;
+INSERT INTO `llx_don` VALUES (1,NULL,1,'2010-07-08 23:57:17',1,'2010-07-09 01:55:33','2010-07-09 12:00:00',10,1,'Donator','','Guest company','','','','France','',NULL,NULL,1,1,1,1,'',NULL,'html_cerfafr',NULL);
+/*!40000 ALTER TABLE `llx_don` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_ecm_directories`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_directories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_directories` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_parent` int(11) DEFAULT NULL,
+  `description` varchar(255) NOT NULL,
+  `cachenbofdoc` int(11) NOT NULL DEFAULT '0',
+  `fullpath` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `date_c` datetime DEFAULT NULL,
+  `date_m` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_c` int(11) DEFAULT NULL,
+  `fk_user_m` int(11) DEFAULT NULL,
+  `acl` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_ecm_directories` (`label`,`fk_parent`,`entity`),
+  KEY `idx_ecm_directories_fk_user_c` (`fk_user_c`),
+  KEY `idx_ecm_directories_fk_user_m` (`fk_user_m`),
+  CONSTRAINT `fk_ecm_directories_fk_user_c` FOREIGN KEY (`fk_user_c`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_ecm_directories_fk_user_m` FOREIGN KEY (`fk_user_m`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_directories`
+--
+
+LOCK TABLES `llx_ecm_directories` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_directories` DISABLE KEYS */;
+INSERT INTO `llx_ecm_directories` VALUES (1,'Répertoire_1',1,0,'',1,NULL,NULL,'2010-07-11 16:27:26','2010-07-11 14:27:44',1,NULL,NULL),(2,'dddd',1,0,'',3,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(3,'bbb',1,2,'',0,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:06',1,NULL,NULL),(4,'aaa',1,2,'',1,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:06',1,NULL,NULL),(5,'gggggg',1,0,'',2,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(6,'mmm',1,0,'',0,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(7,'aaa',1,0,'',1,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_ecm_directories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_ecm_documents`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_documents`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_documents` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `filename` varchar(255) NOT NULL,
+  `filesize` int(11) NOT NULL,
+  `filemime` varchar(32) NOT NULL,
+  `fullpath_dol` varchar(255) NOT NULL,
+  `fullpath_orig` varchar(255) NOT NULL,
+  `description` text,
+  `manualkeyword` text,
+  `fk_create` int(11) NOT NULL,
+  `fk_update` int(11) DEFAULT NULL,
+  `date_c` datetime NOT NULL,
+  `date_u` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_directory` int(11) DEFAULT NULL,
+  `fk_status` smallint(6) DEFAULT '0',
+  `private` smallint(6) DEFAULT '0',
+  `crc` varchar(32) NOT NULL DEFAULT '',
+  `cryptkey` varchar(50) NOT NULL DEFAULT '',
+  `cipher` varchar(50) NOT NULL DEFAULT 'twofish',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_ecm_documents` (`fullpath_dol`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_documents`
+--
+
+LOCK TABLES `llx_ecm_documents` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_documents` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_documents` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_contact`
+--
+
+DROP TABLE IF EXISTS `llx_element_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_contact` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datecreate` datetime DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '5',
+  `element_id` int(11) NOT NULL,
+  `fk_c_type_contact` int(11) NOT NULL,
+  `fk_socpeople` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_contact_idx1` (`element_id`,`fk_c_type_contact`,`fk_socpeople`),
+  KEY `fk_element_contact_fk_c_type_contact` (`fk_c_type_contact`),
+  KEY `idx_element_contact_fk_socpeople` (`fk_socpeople`),
+  CONSTRAINT `fk_element_contact_fk_c_type_contact` FOREIGN KEY (`fk_c_type_contact`) REFERENCES `llx_c_type_contact` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_contact`
+--
+
+LOCK TABLES `llx_element_contact` WRITE;
+/*!40000 ALTER TABLE `llx_element_contact` DISABLE KEYS */;
+INSERT INTO `llx_element_contact` VALUES (1,'2010-07-09 00:49:43',4,1,160,1),(2,'2010-07-09 00:49:56',4,2,160,1),(3,'2010-07-09 00:50:19',4,3,160,1),(4,'2010-07-09 00:50:42',4,4,160,1),(5,'2010-07-09 01:52:36',4,1,120,1),(6,'2010-07-09 01:53:25',4,1,10,2),(7,'2010-07-09 01:53:25',4,1,11,2),(8,'2010-07-10 18:13:37',4,2,10,2),(9,'2010-07-10 18:13:37',4,2,11,2),(10,'2010-07-11 15:15:55',4,1,180,1),(11,'2010-07-11 16:22:36',4,5,160,1),(12,'2010-07-11 16:23:53',4,2,180,1),(13,'2013-01-23 15:04:27',4,19,200,5),(14,'2013-01-23 16:06:37',4,19,210,2),(15,'2013-01-23 16:12:43',4,19,220,2),(16,'2013-03-06 10:04:57',4,3,10,1),(17,'2013-03-06 10:04:57',4,3,11,1),(18,'2014-12-21 13:52:41',4,3,180,1),(19,'2014-12-21 13:55:39',4,4,180,1),(20,'2014-12-21 14:16:58',4,5,180,1);
+/*!40000 ALTER TABLE `llx_element_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_element`
+--
+
+DROP TABLE IF EXISTS `llx_element_element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_element` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_source` int(11) NOT NULL,
+  `sourcetype` varchar(32) NOT NULL,
+  `fk_target` int(11) NOT NULL,
+  `targettype` varchar(32) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_element_idx1` (`fk_source`,`sourcetype`,`fk_target`,`targettype`),
+  KEY `idx_element_element_fk_target` (`fk_target`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_element`
+--
+
+LOCK TABLES `llx_element_element` WRITE;
+/*!40000 ALTER TABLE `llx_element_element` DISABLE KEYS */;
+INSERT INTO `llx_element_element` VALUES (7,1,'shipping',154,'facture'),(8,1,'shipping',155,'facture'),(9,1,'shipping',156,'facture'),(1,2,'contrat',2,'facture'),(2,2,'propal',1,'commande'),(11,2,'shipping',157,'facture'),(3,5,'commande',1,'shipping'),(6,5,'commande',153,'facture'),(10,7,'commande',2,'shipping'),(4,9,'propal',6,'commande'),(5,11,'propal',7,'commande'),(12,12,'propal',8,'commande'),(13,12,'propal',162,'facture');
+/*!40000 ALTER TABLE `llx_element_element` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_lock`
+--
+
+DROP TABLE IF EXISTS `llx_element_lock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_lock` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_element` int(11) NOT NULL,
+  `elementtype` varchar(32) NOT NULL,
+  `datel` datetime DEFAULT NULL,
+  `datem` datetime DEFAULT NULL,
+  `sessionid` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_lock`
+--
+
+LOCK TABLES `llx_element_lock` WRITE;
+/*!40000 ALTER TABLE `llx_element_lock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_lock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_rang`
+--
+
+DROP TABLE IF EXISTS `llx_element_rang`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_rang` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_parent` int(11) NOT NULL,
+  `parenttype` varchar(16) NOT NULL,
+  `fk_child` int(11) NOT NULL,
+  `childtype` varchar(16) NOT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_rang_idx1` (`fk_parent`,`parenttype`,`fk_child`,`childtype`),
+  KEY `idx_element_rang_fk_parent` (`fk_parent`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_rang`
+--
+
+LOCK TABLES `llx_element_rang` WRITE;
+/*!40000 ALTER TABLE `llx_element_rang` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_rang` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_resources`
+--
+
+DROP TABLE IF EXISTS `llx_element_resources`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_resources` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `element_id` int(11) DEFAULT NULL,
+  `element_type` varchar(64) DEFAULT NULL,
+  `resource_id` int(11) DEFAULT NULL,
+  `resource_type` varchar(64) DEFAULT NULL,
+  `busy` int(11) DEFAULT NULL,
+  `mandatory` int(11) DEFAULT NULL,
+  `fk_user_create` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_resources_idx1` (`resource_id`,`resource_type`,`element_id`,`element_type`),
+  KEY `idx_element_element_element_id` (`element_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_resources`
+--
+
+LOCK TABLES `llx_element_resources` WRITE;
+/*!40000 ALTER TABLE `llx_element_resources` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_resources` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_tag`
+--
+
+DROP TABLE IF EXISTS `llx_element_tag`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_tag` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `lang` varchar(5) NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `element` varchar(64) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_element_tag` (`entity`,`lang`,`tag`,`fk_element`,`element`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_tag`
+--
+
+LOCK TABLES `llx_element_tag` WRITE;
+/*!40000 ALTER TABLE `llx_element_tag` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_tag` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_entity`
+--
+
+DROP TABLE IF EXISTS `llx_entity`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_entity` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  `datec` datetime DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `options` text,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_entity_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `fk_entity_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_entity`
+--
+
+LOCK TABLES `llx_entity` WRITE;
+/*!40000 ALTER TABLE `llx_entity` DISABLE KEYS */;
+INSERT INTO `llx_entity` VALUES (1,'2012-12-08 14:07:29','Master entity','Master entity, can not be deleted','2012-12-08 15:07:29',1,NULL,1,1),(2,'2012-12-08 14:08:27','aaa','','2012-12-08 15:08:14',1,'{\"referent\":null,\"sharings\":{\"product\":null,\"societe\":null,\"category\":null}}',1,1),(3,'2012-12-08 14:08:26','bbb','','2012-12-08 15:08:20',1,'{\"referent\":null,\"sharings\":{\"product\":null,\"societe\":null,\"category\":null}}',1,1);
+/*!40000 ALTER TABLE `llx_entity` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_entrepot`
+--
+
+DROP TABLE IF EXISTS `llx_entrepot`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_entrepot` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `description` text,
+  `lieu` varchar(64) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `fk_departement` int(11) DEFAULT NULL,
+  `fk_pays` int(11) DEFAULT '0',
+  `statut` tinyint(4) DEFAULT '1',
+  `valo_pmp` float(12,4) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_entrepot_label` (`label`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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);
+/*!40000 ALTER TABLE `llx_entrepot` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_event_element`
+--
+
+DROP TABLE IF EXISTS `llx_event_element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_event_element` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_source` int(11) NOT NULL,
+  `fk_target` int(11) NOT NULL,
+  `targettype` varchar(32) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_event_element`
+--
+
+LOCK TABLES `llx_event_element` WRITE;
+/*!40000 ALTER TABLE `llx_event_element` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_event_element` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_events`
+--
+
+DROP TABLE IF EXISTS `llx_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `type` varchar(32) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `dateevent` datetime DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `description` varchar(250) NOT NULL,
+  `ip` varchar(32) NOT NULL,
+  `user_agent` varchar(255) DEFAULT NULL,
+  `fk_object` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_events_dateevent` (`dateevent`)
+) ENGINE=InnoDB AUTO_INCREMENT=564 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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);
+/*!40000 ALTER TABLE `llx_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expedition`
+--
+
+DROP TABLE IF EXISTS `llx_expedition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expedition` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_customer` varchar(30) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_int` varchar(30) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_expedition` datetime DEFAULT NULL,
+  `date_delivery` datetime DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_shipping_method` int(11) DEFAULT NULL,
+  `tracking_number` varchar(50) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `height` float DEFAULT NULL,
+  `height_unit` int(11) DEFAULT NULL,
+  `width` float DEFAULT NULL,
+  `size_units` int(11) DEFAULT NULL,
+  `size` float DEFAULT NULL,
+  `weight_units` int(11) DEFAULT NULL,
+  `weight` float DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_expedition_uk_ref` (`ref`,`entity`),
+  KEY `idx_expedition_fk_soc` (`fk_soc`),
+  KEY `idx_expedition_fk_user_author` (`fk_user_author`),
+  KEY `idx_expedition_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_expedition_fk_shipping_method` (`fk_shipping_method`),
+  CONSTRAINT `fk_expedition_fk_shipping_method` FOREIGN KEY (`fk_shipping_method`) REFERENCES `llx_c_shipment_mode` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expedition`
+--
+
+LOCK TABLES `llx_expedition` WRITE;
+/*!40000 ALTER TABLE `llx_expedition` DISABLE KEYS */;
+INSERT INTO `llx_expedition` VALUES (1,'2013-02-17 17:22:51','SH1302-0001',1,NULL,1,NULL,NULL,'2011-08-08 03:05:34',1,'2013-02-17 18:22:51',1,NULL,'2011-08-09 00:00:00',NULL,NULL,'',1,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(2,'2013-02-17 17:38:47','SH1302-0002',1,'gfdf',18,NULL,NULL,'2013-02-17 18:38:37',1,'2013-02-17 18:38:47',1,NULL,NULL,NULL,NULL,'',1,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_expedition` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expedition_methode`
+--
+
+DROP TABLE IF EXISTS `llx_expedition_methode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expedition_methode` (
+  `rowid` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `code` varchar(30) NOT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `description` text,
+  `active` tinyint(4) DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expedition_methode`
+--
+
+LOCK TABLES `llx_expedition_methode` WRITE;
+/*!40000 ALTER TABLE `llx_expedition_methode` DISABLE KEYS */;
+INSERT INTO `llx_expedition_methode` VALUES (1,'2010-07-08 11:18:00','CATCH','Catch','Catch by client',1),(2,'2010-07-08 11:18:00','TRANS','Transporter','Generic transporter',1),(3,'2010-07-08 11:18:01','COLSUI','Colissimo Suivi','Colissimo Suivi',0);
+/*!40000 ALTER TABLE `llx_expedition_methode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expeditiondet`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_expedition` int(11) NOT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_entrepot` int(11) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_expeditiondet_fk_expedition` (`fk_expedition`),
+  CONSTRAINT `fk_expeditiondet_fk_expedition` FOREIGN KEY (`fk_expedition`) REFERENCES `llx_expedition` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet`
+--
+
+LOCK TABLES `llx_expeditiondet` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet` DISABLE KEYS */;
+INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,13,NULL,1,0),(3,2,16,NULL,1,0),(4,2,17,NULL,1,0);
+/*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expeditiondet_batch`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet_batch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_expeditiondet` int(11) NOT NULL,
+  `eatby` date DEFAULT NULL,
+  `sellby` date DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `fk_origin_stock` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_expeditiondet` (`fk_expeditiondet`),
+  CONSTRAINT `fk_expeditiondet_batch_fk_expeditiondet` FOREIGN KEY (`fk_expeditiondet`) REFERENCES `llx_expeditiondet` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet_batch`
+--
+
+LOCK TABLES `llx_expeditiondet_batch` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet_batch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_expeditiondet_batch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_export_compta`
+--
+
+DROP TABLE IF EXISTS `llx_export_compta`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_export_compta` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(12) NOT NULL,
+  `date_export` datetime NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_export_compta`
+--
+
+LOCK TABLES `llx_export_compta` WRITE;
+/*!40000 ALTER TABLE `llx_export_compta` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_export_compta` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_export_model`
+--
+
+DROP TABLE IF EXISTS `llx_export_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_export_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(50) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `field` text NOT NULL,
+  `filter` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_export_model` (`label`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_export_model`
+--
+
+LOCK TABLES `llx_export_model` WRITE;
+/*!40000 ALTER TABLE `llx_export_model` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_export_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `elementtype` varchar(64) NOT NULL DEFAULT 'member',
+  `name` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `type` varchar(8) DEFAULT NULL,
+  `size` varchar(8) DEFAULT NULL,
+  `pos` int(11) DEFAULT '0',
+  `alwayseditable` int(11) DEFAULT '0',
+  `param` text,
+  `fieldunique` int(11) DEFAULT '0',
+  `fieldrequired` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_extrafields_name` (`name`,`entity`,`elementtype`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_extrafields`
+--
+
+LOCK TABLES `llx_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_extrafields` VALUES (2,'adherent','zzz',1,'2013-09-08 23:04:20','zzz','varchar','255',0,0,NULL,0,0),(22,'societe','jjjj',1,'2013-09-08 23:04:20','jjj','varchar','255',0,0,NULL,0,0);
+/*!40000 ALTER TABLE `llx_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture`
+--
+
+DROP TABLE IF EXISTS `llx_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `facnumber` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_int` varchar(255) DEFAULT NULL,
+  `type` smallint(6) NOT NULL DEFAULT '0',
+  `ref_client` varchar(255) DEFAULT NULL,
+  `increment` varchar(10) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `date_valid` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `close_code` varchar(16) DEFAULT NULL,
+  `close_note` varchar(128) DEFAULT NULL,
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `revenuestamp` double(24,8) DEFAULT '0.00000000',
+  `total` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_facture_source` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_currency` varchar(3) DEFAULT NULL,
+  `fk_cond_reglement` int(11) NOT NULL DEFAULT '1',
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_facture_uk_facnumber` (`facnumber`,`entity`),
+  KEY `idx_facture_fk_soc` (`fk_soc`),
+  KEY `idx_facture_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_facture_fk_facture_source` (`fk_facture_source`),
+  KEY `idx_facture_fk_projet` (`fk_projet`),
+  KEY `idx_facture_fk_account` (`fk_account`),
+  KEY `idx_facture_fk_currency` (`fk_currency`),
+  CONSTRAINT `fk_facture_fk_facture_source` FOREIGN KEY (`fk_facture_source`) REFERENCES `llx_facture` (`rowid`),
+  CONSTRAINT `fk_facture_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_facture_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture`
+--
+
+LOCK TABLES `llx_facture` WRITE;
+/*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
+INSERT INTO `llx_facture` VALUES (1,'FA1007-0001',1,NULL,NULL,0,NULL,NULL,9,'2010-07-10 14:55:26','2010-07-10',NULL,'2011-07-20 11:18:39',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.02000000,0.02000000,1,1,NULL,1,NULL,1,NULL,NULL,1,0,'2010-07-10',NULL,NULL,'crabe',NULL,NULL),(2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2010-07-10 18:20:13','2010-07-10',NULL,'2011-08-08 00:54:05',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2010-07-10',NULL,NULL,'crabe',NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2011-07-18 20:33:35','2011-07-18',NULL,'2012-12-08 16:39:01',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,1,NULL,NULL,1,0,'2011-07-18',NULL,NULL,'crabe',NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2011-08-01 03:34:11','2011-08-01',NULL,'2011-08-01 01:34:11',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,6,'2011-08-01',NULL,NULL,'',NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2011-08-06 20:33:53','2011-08-06',NULL,'2011-08-06 18:35:13',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,4,'2011-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2011-08-08 02:41:44','2011-08-08',NULL,'2011-08-08 00:53:40',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-08-08',NULL,NULL,'crabe',NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2011-08-08 02:55:14','2011-08-08',NULL,'2011-08-08 00:55:26',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-08-08',NULL,NULL,'crabe',NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2012-12-08 17:45:20','2012-12-08','2012-12-08','2012-12-08 16:57:11',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,3,NULL,NULL,NULL,0,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(11,'FA1212-0008',1,NULL,NULL,0,NULL,NULL,10,'2012-12-08 17:58:13','2012-12-08','2012-12-08','2012-12-08 16:58:27',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2012-12-08 18:20:14','2012-12-08','2012-12-08','2012-12-09 17:35:07',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,3,NULL,NULL,NULL,0,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2012-12-09 20:04:19','2012-12-09','2013-02-12','2013-02-12 14:54:37',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-09',NULL,NULL,'crabe',NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:34:23','2012-12-11','2013-03-24','2013-03-24 14:54:00',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:34:23','2012-12-11','2014-03-03','2014-03-03 18:20:25',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:35:51','2012-12-11','2012-12-12','2012-12-12 17:54:19',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(56,'(PROV56)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:35:52','2012-12-11',NULL,'2012-12-11 08:35:52',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(78,'(PROV78)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:36:41','2012-12-11',NULL,'2012-12-11 08:36:41',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(79,'(PROV79)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:36:41','2012-12-11',NULL,'2012-12-19 16:56:16',0,0.00000000,NULL,NULL,0,NULL,NULL,7.60000000,0.66000000,-3.00000000,0.00000000,50.00000000,55.26000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(121,'(PROV121)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:39:38','2012-12-19',NULL,'2012-12-19 17:39:38',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(122,'(PROV122)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:39:38','2012-12-19',NULL,'2012-12-19 17:39:38',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(146,'(PROV146)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:48:41','2012-12-19',NULL,'2013-01-18 14:51:01',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL),(147,'(PROV147)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:48:42','2012-12-19',NULL,'2012-12-19 17:48:42',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:22:48','2013-01-19','2013-01-19','2013-01-19 17:22:48',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(149,'(PROV149)',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:30:05','2013-01-19',NULL,'2013-02-13 14:02:53',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2013-01-19',NULL,NULL,'crabe',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:31:10','2013-01-19','2013-01-19','2013-01-19 17:31:10',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:31:58','2013-01-19','2013-01-19','2013-01-19 17:31:58',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(152,'FA1302-0012',1,NULL,NULL,0,NULL,NULL,18,'2013-02-17 16:26:53','2013-02-17','2013-02-17','2013-02-17 15:27:00',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(153,'(PROV153)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:22:24','2013-02-17',NULL,'2013-02-17 17:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(154,'(PROV154)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:24:21','2013-02-17',NULL,'2013-02-17 17:24:21',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(155,'(PROV155)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:30:30','2013-02-17',NULL,'2013-02-17 17:30:30',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(156,'(PROV156)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:37:01','2013-02-17',NULL,'2013-02-17 17:37:01',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(157,'FA1302-0022',1,NULL,NULL,0,NULL,NULL,18,'2013-02-17 18:39:23','2013-02-17','2014-03-02','2014-03-02 16:24:04',0,0.00000000,NULL,NULL,0,NULL,NULL,3.22000000,0.00000000,0.00000000,0.00000000,20.00000000,23.22000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(158,'FA1307-0013',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:43:37','2013-07-18','2013-03-23','2013-03-23 17:23:03',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-07-18',NULL,NULL,'crabe',NULL,NULL),(159,'FA1407-0014',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:44:12','2014-07-18','2013-03-06','2013-03-06 15:44:12',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,11.00000000,11.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2014-07-18',NULL,NULL,'',NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:47:48','2015-07-18','2013-03-06','2013-03-06 15:47:48',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2015-07-18',NULL,NULL,'',NULL,NULL),(161,'FA1607-0016',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:48:16','2016-07-18','2013-03-06','2013-03-06 15:48:16',0,0.00000000,NULL,NULL,0,NULL,NULL,2.22000000,0.00000000,0.00000000,0.00000000,17.78000000,20.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2016-07-18',NULL,NULL,'',NULL,NULL),(162,'(PROV162)',1,NULL,NULL,0,'fdfs',NULL,23,'2013-03-08 10:02:54','2013-03-08',NULL,'2013-03-08 09:02:54',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,5.00000000,5.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-08',NULL,NULL,'crabe',NULL,NULL),(184,'(PROV184)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:19:36','2013-03-09',NULL,'2013-03-09 17:19:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(185,'(PROV185)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:19:36','2013-03-09',NULL,'2013-03-09 17:19:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(186,'(PROV186)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:26:56','2013-03-09',NULL,'2013-03-09 17:26:56',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(187,'(PROV187)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:26:56','2013-03-09',NULL,'2013-03-09 17:26:56',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(206,'(PROV206)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:34:05','2013-03-09',NULL,'2013-03-09 17:34:05',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(207,'(PROV207)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:34:05','2013-03-09',NULL,'2013-03-10 14:45:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/var/www/dolibarrnew/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL),(208,'FA1303-0017',1,NULL,NULL,0,NULL,NULL,26,'2013-03-10 15:58:11','2013-03-10','2013-03-10','2013-03-10 14:58:34',0,0.00000000,NULL,NULL,0,NULL,NULL,1.25000000,0.00000000,0.00000000,0.00000000,10.00000000,11.25000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-10',NULL,NULL,'generic_invoice_odt:/var/www/dolibarrnew/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL),(209,'FA1303-0018',1,NULL,NULL,0,NULL,NULL,19,'2013-03-19 09:37:51','2013-03-19','2013-03-19','2013-03-19 08:38:10',0,0.00000000,NULL,NULL,0,NULL,NULL,-1.25000000,0.00000000,0.00000000,0.00000000,10.00000000,8.75000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-19',NULL,NULL,'crabe',NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2013-03-20 14:30:11','2011-07-10','2013-03-20','2013-03-20 13:30:11',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-07-10',NULL,NULL,'',NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2013-03-22 09:40:10','2013-03-22','2014-03-02','2014-03-02 19:13:39',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-22',NULL,NULL,'crabe',NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2014-03-03 19:22:03','2013-03-03','2014-03-03','2014-03-03 18:22:16',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,32,NULL,NULL,NULL,0,0,'2013-03-03',NULL,NULL,'crabe',NULL,NULL);
+/*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facture_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_extrafields`
+--
+
+LOCK TABLES `llx_facture_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(255) DEFAULT NULL,
+  `ref_supplier` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `type` smallint(6) NOT NULL DEFAULT '0',
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `libelle` varchar(255) DEFAULT NULL,
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise` double(24,8) DEFAULT '0.00000000',
+  `close_code` varchar(16) DEFAULT NULL,
+  `close_note` varchar(128) DEFAULT NULL,
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_facture_source` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT NULL,
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_facture_fourn_ref_supplier` (`ref_supplier`,`fk_soc`,`entity`),
+  UNIQUE KEY `uk_facture_fourn_ref` (`ref`,`entity`),
+  KEY `idx_facture_fourn_date_lim_reglement` (`date_lim_reglement`),
+  KEY `idx_facture_fourn_fk_soc` (`fk_soc`),
+  KEY `idx_facture_fourn_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_fourn_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_facture_fourn_fk_projet` (`fk_projet`),
+  CONSTRAINT `fk_facture_fourn_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn`
+--
+
+LOCK TABLES `llx_facture_fourn` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn` DISABLE KEYS */;
+INSERT INTO `llx_facture_fourn` VALUES (1,NULL,'aaa',1,NULL,0,17,'2011-08-04 22:21:18','2011-08-04','2012-12-09 19:03:52','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,16.00000000,3.14000000,19.14000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL),(16,NULL,'FR70813',1,NULL,0,1,'2012-12-19 15:24:11','2003-04-11','2013-02-10 20:55:42','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,1,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL),(17,NULL,'FR81385',1,NULL,0,1,'2013-02-13 17:19:35','2003-06-04','2013-02-13 16:19:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL),(18,NULL,'FR81385',1,NULL,0,2,'2013-02-13 17:20:25','2003-06-04','2013-02-13 16:20:25','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL),(19,NULL,'FR813852',1,NULL,0,2,'2013-03-16 17:59:02','2013-03-16','2013-03-16 16:59:11','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_det`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_det`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_det` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture_fourn` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `ref` varchar(50) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `pu_ht` double(24,8) DEFAULT NULL,
+  `pu_ttc` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `total_ht` double(24,8) DEFAULT NULL,
+  `tva` double(24,8) DEFAULT NULL,
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT NULL,
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  `fk_code_ventilation` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facture_fourn_det_fk_facture` (`fk_facture_fourn`),
+  CONSTRAINT `fk_facture_fourn_det_fk_facture` FOREIGN KEY (`fk_facture_fourn`) REFERENCES `llx_facture_fourn` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_det`
+--
+
+LOCK TABLES `llx_facture_fourn_det` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_det` DISABLE KEYS */;
+INSERT INTO `llx_facture_fourn_det` VALUES (1,1,NULL,NULL,NULL,'aaa',10.00000000,11.96000000,1.6,0,19.600,0.000,'',0.000,'',16.00000000,3.14000000,0.00000000,0.00000000,19.14000000,0,NULL,NULL,0,NULL,0),(44,16,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,19.600,0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,0),(45,16,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,19.600,0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,0),(46,16,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(47,17,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(48,17,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0),(49,18,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(50,18,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0),(51,19,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(52,19,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0);
+/*!40000 ALTER TABLE `llx_facture_fourn_det` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facture_fourn_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_extrafields`
+--
+
+LOCK TABLES `llx_facture_fourn_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facture_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `titre` varchar(50) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT '0',
+  `fk_mode_reglement` int(11) DEFAULT '0',
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `last_gen` varchar(7) DEFAULT NULL,
+  `unit_frequency` varchar(2) DEFAULT 'd',
+  `date_when` datetime DEFAULT NULL,
+  `date_last_gen` datetime DEFAULT NULL,
+  `nb_gen_done` int(11) DEFAULT NULL,
+  `nb_gen_max` int(11) DEFAULT NULL,
+  `frequency` int(11) DEFAULT NULL,
+  `usenewprice` int(11) DEFAULT '0',
+  `revenuestamp` double(24,8) DEFAULT '0.00000000',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_facture_rec_uk_titre` (`titre`,`entity`),
+  KEY `idx_facture_rec_fk_soc` (`fk_soc`),
+  KEY `idx_facture_rec_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_rec_fk_projet` (`fk_projet`),
+  CONSTRAINT `fk_facture_rec_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_rec_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_rec_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_rec`
+--
+
+LOCK TABLES `llx_facture_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facture_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT NULL,
+  `price` double(24,8) DEFAULT NULL,
+  `total_ht` double(24,8) DEFAULT NULL,
+  `total_tva` double(24,8) DEFAULT NULL,
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT NULL,
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `fk_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `fk_code_ventilation` int(11) NOT NULL DEFAULT '0',
+  `special_code` int(10) unsigned DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture`),
+  KEY `idx_facturedet_fk_facture` (`fk_facture`),
+  KEY `idx_facturedet_fk_product` (`fk_product`),
+  CONSTRAINT `fk_facturedet_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1027 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturedet`
+--
+
+LOCK TABLES `llx_facturedet` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet` DISABLE KEYS */;
+INSERT INTO `llx_facturedet` VALUES (1,1,NULL,4,NULL,'',0.000,0.000,'',0.000,'',2,0,0,NULL,0.01000000,0.01000000,0.02000000,0.00000000,0.00000000,0.00000000,0.02000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(3,2,NULL,3,NULL,'Service S1',0.000,0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2010-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2010-07-10 00:00:00','2011-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(23,10,NULL,4,NULL,'',12.500,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(25,11,NULL,4,NULL,'jljk',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(258,56,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(259,56,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(377,78,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(378,78,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(385,79,NULL,NULL,NULL,'hfghfg',10.000,1.400,'',-15.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.00000000,0.14000000,-1.50000000,9.64000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(386,79,NULL,NULL,NULL,'gdfg',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(387,79,NULL,NULL,NULL,'fdsf',21.000,5.200,'',-15.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,2.10000000,0.52000000,-1.50000000,11.12000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(388,79,NULL,NULL,NULL,'ghfgh',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL),(389,79,NULL,NULL,NULL,'ghfgh',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL),(618,121,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(619,121,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(620,122,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(621,122,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(749,146,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(750,146,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(751,147,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(752,147,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(756,149,NULL,5,NULL,'aaaa',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(759,152,NULL,NULL,NULL,'gdfgfd',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(760,153,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(761,154,NULL,NULL,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(762,155,NULL,NULL,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(763,156,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(764,157,NULL,NULL,NULL,'gfdg',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(765,157,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(766,157,NULL,4,NULL,'eeee',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL),(770,158,NULL,NULL,NULL,'Adhésion/cotisation 2013',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-18 00:00:00','2014-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(771,159,NULL,NULL,NULL,'Adhésion/cotisation 2014',0.000,0.000,'',0.000,'',1,0,0,NULL,11.00000000,NULL,11.00000000,0.00000000,0.00000000,0.00000000,11.00000000,1,'2014-07-18 00:00:00','2015-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2015-07-18 00:00:00','2016-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(773,161,NULL,NULL,NULL,'Adhésion/cotisation 2016',12.500,0.000,'',0.000,'',1,0,0,NULL,17.77778000,NULL,17.78000000,2.22000000,0.00000000,0.00000000,20.00000000,1,'2016-07-18 00:00:00','2017-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(774,162,NULL,NULL,NULL,'fdsfs',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(775,162,NULL,NULL,NULL,'fsdfsf',0.000,0.000,'',0.000,'',1,0,0,1,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,2,NULL,0.00000000,0,0,1,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL),(781,162,NULL,NULL,NULL,'hh',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,2,NULL),(899,184,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(900,184,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(901,185,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(902,185,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(903,186,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(904,186,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(905,187,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(906,187,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1014,206,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1015,206,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1016,207,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1017,207,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1018,208,NULL,NULL,NULL,'ggdfg',12.500,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.25000000,0.00000000,0.00000000,11.25000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1019,209,NULL,NULL,NULL,'hfghgf',12.500,0.000,'0',0.000,'0',1,0,0,2,-10.00000000,NULL,-10.00000000,-1.25000000,0.00000000,0.00000000,-11.25000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL),(1020,209,NULL,NULL,NULL,'fsdfsd',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(1021,209,NULL,NULL,NULL,'hfg',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2011-07-10 00:00:00','2012-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL);
+/*!40000 ALTER TABLE `llx_facturedet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facturedet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturedet_extrafields`
+--
+
+LOCK TABLES `llx_facturedet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturedet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `product_type` int(11) DEFAULT '0',
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `subprice` double(24,8) DEFAULT NULL,
+  `price` double(24,8) DEFAULT NULL,
+  `total_ht` double(24,8) DEFAULT NULL,
+  `total_tva` double(24,8) DEFAULT NULL,
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `special_code` int(10) unsigned DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  `fk_contract_line` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturedet_rec`
+--
+
+LOCK TABLES `llx_facturedet_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturedet_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinter`
+--
+
+DROP TABLE IF EXISTS `llx_fichinter`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinter` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `fk_contrat` int(11) DEFAULT '0',
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `datei` date DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `duree` double DEFAULT NULL,
+  `description` text,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `ref_ext` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fichinter_ref` (`ref`,`entity`),
+  KEY `idx_fichinter_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_fichinter_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinter`
+--
+
+LOCK TABLES `llx_fichinter` WRITE;
+/*!40000 ALTER TABLE `llx_fichinter` DISABLE KEYS */;
+INSERT INTO `llx_fichinter` VALUES (1,2,1,0,'FI1007-0001',1,'2010-07-08 23:51:54','2010-07-09 01:42:41','2010-07-09 01:51:54',NULL,1,NULL,1,1,51000,NULL,NULL,NULL,'soleil',NULL,NULL),(2,1,NULL,0,'FI1007-0002',1,'2012-12-08 13:11:07','2010-07-11 16:07:51',NULL,NULL,1,NULL,NULL,0,3600,'ferfrefeferf',NULL,NULL,'soleil',NULL,NULL);
+/*!40000 ALTER TABLE `llx_fichinter` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinter_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_fichinter_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinter_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ficheinter_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinter_extrafields`
+--
+
+LOCK TABLES `llx_fichinter_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_fichinter_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_fichinter_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinterdet`
+--
+
+DROP TABLE IF EXISTS `llx_fichinterdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinterdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_fichinter` int(11) DEFAULT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `date` datetime DEFAULT NULL,
+  `description` text,
+  `duree` int(11) DEFAULT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fichinterdet_fk_fichinter` (`fk_fichinter`),
+  CONSTRAINT `fk_fichinterdet_fk_fichinter` FOREIGN KEY (`fk_fichinter`) REFERENCES `llx_fichinter` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinterdet`
+--
+
+LOCK TABLES `llx_fichinterdet` WRITE;
+/*!40000 ALTER TABLE `llx_fichinterdet` DISABLE KEYS */;
+INSERT INTO `llx_fichinterdet` VALUES (1,1,NULL,'2010-07-07 04:00:00','Intervention sur site',3600,0),(2,1,NULL,'2010-07-08 11:00:00','Autre',47400,0),(3,2,NULL,'2010-07-11 05:00:00','Pres',3600,0);
+/*!40000 ALTER TABLE `llx_fichinterdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinterdet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_fichinterdet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinterdet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_ficheinterdet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinterdet_extrafields`
+--
+
+LOCK TABLES `llx_fichinterdet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_fichinterdet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_fichinterdet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_filemanager_roots`
+--
+
+DROP TABLE IF EXISTS `llx_filemanager_roots`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_filemanager_roots` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `rootlabel` varchar(64) DEFAULT NULL,
+  `rootpath` text,
+  `note` text,
+  `position` int(11) DEFAULT NULL,
+  `entity` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_filemanager_root` (`rootlabel`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_filemanager_roots`
+--
+
+LOCK TABLES `llx_filemanager_roots` WRITE;
+/*!40000 ALTER TABLE `llx_filemanager_roots` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_filemanager_roots` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday`
+--
+
+DROP TABLE IF EXISTS `llx_holiday`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `date_create` datetime NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `date_debut` date NOT NULL,
+  `date_fin` date NOT NULL,
+  `halfday` int(11) DEFAULT '0',
+  `statut` int(11) NOT NULL DEFAULT '1',
+  `fk_validator` int(11) NOT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_refuse` datetime DEFAULT NULL,
+  `fk_user_refuse` int(11) DEFAULT NULL,
+  `date_cancel` datetime DEFAULT NULL,
+  `fk_user_cancel` int(11) DEFAULT NULL,
+  `detail_refuse` varchar(250) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `note` text,
+  `fk_user_create` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_holiday_fk_user` (`fk_user`),
+  KEY `idx_holiday_date_debut` (`date_debut`),
+  KEY `idx_holiday_date_fin` (`date_fin`),
+  KEY `idx_holiday_fk_user_create` (`fk_user_create`),
+  KEY `idx_holiday_date_create` (`date_create`),
+  KEY `idx_holiday_fk_validator` (`fk_validator`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday`
+--
+
+LOCK TABLES `llx_holiday` WRITE;
+/*!40000 ALTER TABLE `llx_holiday` DISABLE KEYS */;
+INSERT INTO `llx_holiday` VALUES (1,1,'2013-02-17 19:06:35','gdf','2013-02-10','2013-02-11',0,3,1,'2013-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_holiday` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_config`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_config` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `value` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_config`
+--
+
+LOCK TABLES `llx_holiday_config` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_config` DISABLE KEYS */;
+INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20130301231231'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
+/*!40000 ALTER TABLE `llx_holiday_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_events`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `name` varchar(255) NOT NULL,
+  `value` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_holiday_name` (`name`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_events`
+--
+
+LOCK TABLES `llx_holiday_events` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_events` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_holiday_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_logs`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_logs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_logs` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_action` datetime NOT NULL,
+  `fk_user_action` int(11) NOT NULL,
+  `fk_user_update` int(11) NOT NULL,
+  `type_action` varchar(255) NOT NULL,
+  `prev_solde` varchar(255) NOT NULL,
+  `new_solde` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=145 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_logs`
+--
+
+LOCK TABLES `llx_holiday_logs` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_logs` DISABLE KEYS */;
+INSERT INTO `llx_holiday_logs` VALUES (1,'2013-01-17 21:03:15',1,1,'Event : Mise à jour mensuelle','0.00','2.08'),(2,'2013-01-17 21:03:15',1,2,'Event : Mise à jour mensuelle','0.00','2.08'),(3,'2013-01-17 21:03:15',1,3,'Event : Mise à jour mensuelle','0.00','2.08'),(4,'2013-02-01 09:53:26',1,1,'Event : Mise à jour mensuelle','2.08','4.16'),(5,'2013-02-01 09:53:26',1,2,'Event : Mise à jour mensuelle','2.08','4.16'),(6,'2013-02-01 09:53:26',1,3,'Event : Mise à jour mensuelle','2.08','4.16'),(7,'2013-02-01 09:53:26',1,1,'Event : Mise à jour mensuelle','4.17','6.25'),(8,'2013-02-01 09:53:26',1,2,'Event : Mise à jour mensuelle','4.17','6.25'),(9,'2013-02-01 09:53:26',1,3,'Event : Mise à jour mensuelle','4.17','6.25'),(10,'2013-02-01 09:53:26',1,4,'Event : Mise à jour mensuelle','0.00','2.08'),(11,'2013-02-01 09:53:31',1,1,'Event : Mise à jour mensuelle','6.25','8.33'),(12,'2013-02-01 09:53:31',1,2,'Event : Mise à jour mensuelle','6.25','8.33'),(13,'2013-02-01 09:53:31',1,3,'Event : Mise à jour mensuelle','6.25','8.33'),(14,'2013-02-01 09:53:31',1,4,'Event : Mise à jour mensuelle','2.08','4.16'),(15,'2013-02-01 09:53:31',1,1,'Event : Mise à jour mensuelle','8.33','10.41'),(16,'2013-02-01 09:53:31',1,2,'Event : Mise à jour mensuelle','8.33','10.41'),(17,'2013-02-01 09:53:31',1,3,'Event : Mise à jour mensuelle','8.33','10.41'),(18,'2013-02-01 09:53:31',1,4,'Event : Mise à jour mensuelle','4.17','6.25'),(19,'2013-02-01 09:53:33',1,1,'Event : Mise à jour mensuelle','10.42','12.50'),(20,'2013-02-01 09:53:33',1,2,'Event : Mise à jour mensuelle','10.42','12.50'),(21,'2013-02-01 09:53:33',1,3,'Event : Mise à jour mensuelle','10.42','12.50'),(22,'2013-02-01 09:53:33',1,4,'Event : Mise à jour mensuelle','6.25','8.33'),(23,'2013-02-01 09:53:34',1,1,'Event : Mise à jour mensuelle','12.50','14.58'),(24,'2013-02-01 09:53:34',1,2,'Event : Mise à jour mensuelle','12.50','14.58'),(25,'2013-02-01 09:53:34',1,3,'Event : Mise à jour mensuelle','12.50','14.58'),(26,'2013-02-01 09:53:34',1,4,'Event : Mise à jour mensuelle','8.33','10.41'),(27,'2013-02-01 09:53:34',1,1,'Event : Mise à jour mensuelle','14.58','16.66'),(28,'2013-02-01 09:53:34',1,2,'Event : Mise à jour mensuelle','14.58','16.66'),(29,'2013-02-01 09:53:34',1,3,'Event : Mise à jour mensuelle','14.58','16.66'),(30,'2013-02-01 09:53:34',1,4,'Event : Mise à jour mensuelle','10.42','12.50'),(31,'2013-02-01 09:53:36',1,1,'Event : Mise à jour mensuelle','16.67','18.75'),(32,'2013-02-01 09:53:36',1,2,'Event : Mise à jour mensuelle','16.67','18.75'),(33,'2013-02-01 09:53:36',1,3,'Event : Mise à jour mensuelle','16.67','18.75'),(34,'2013-02-01 09:53:36',1,4,'Event : Mise à jour mensuelle','12.50','14.58'),(35,'2013-02-01 09:53:36',1,1,'Event : Mise à jour mensuelle','18.75','20.83'),(36,'2013-02-01 09:53:36',1,2,'Event : Mise à jour mensuelle','18.75','20.83'),(37,'2013-02-01 09:53:36',1,3,'Event : Mise à jour mensuelle','18.75','20.83'),(38,'2013-02-01 09:53:36',1,4,'Event : Mise à jour mensuelle','14.58','16.66'),(39,'2013-02-01 09:53:37',1,1,'Event : Mise à jour mensuelle','20.83','22.91'),(40,'2013-02-01 09:53:37',1,2,'Event : Mise à jour mensuelle','20.83','22.91'),(41,'2013-02-01 09:53:37',1,3,'Event : Mise à jour mensuelle','20.83','22.91'),(42,'2013-02-01 09:53:37',1,4,'Event : Mise à jour mensuelle','16.67','18.75'),(43,'2013-02-01 09:53:37',1,1,'Event : Mise à jour mensuelle','22.92','25.00'),(44,'2013-02-01 09:53:37',1,2,'Event : Mise à jour mensuelle','22.92','25.00'),(45,'2013-02-01 09:53:37',1,3,'Event : Mise à jour mensuelle','22.92','25.00'),(46,'2013-02-01 09:53:37',1,4,'Event : Mise à jour mensuelle','18.75','20.83'),(47,'2013-02-01 09:53:44',1,1,'Event : Mise à jour mensuelle','25.00','27.08'),(48,'2013-02-01 09:53:44',1,2,'Event : Mise à jour mensuelle','25.00','27.08'),(49,'2013-02-01 09:53:44',1,3,'Event : Mise à jour mensuelle','25.00','27.08'),(50,'2013-02-01 09:53:44',1,4,'Event : Mise à jour mensuelle','20.83','22.91'),(51,'2013-02-01 09:53:47',1,1,'Event : Mise à jour mensuelle','27.08','29.16'),(52,'2013-02-01 09:53:47',1,2,'Event : Mise à jour mensuelle','27.08','29.16'),(53,'2013-02-01 09:53:47',1,3,'Event : Mise à jour mensuelle','27.08','29.16'),(54,'2013-02-01 09:53:47',1,4,'Event : Mise à jour mensuelle','22.92','25.00'),(55,'2013-02-01 09:53:47',1,1,'Event : Mise à jour mensuelle','29.17','31.25'),(56,'2013-02-01 09:53:47',1,2,'Event : Mise à jour mensuelle','29.17','31.25'),(57,'2013-02-01 09:53:47',1,3,'Event : Mise à jour mensuelle','29.17','31.25'),(58,'2013-02-01 09:53:47',1,4,'Event : Mise à jour mensuelle','25.00','27.08'),(59,'2013-02-01 09:53:49',1,1,'Event : Mise à jour mensuelle','31.25','33.33'),(60,'2013-02-01 09:53:49',1,2,'Event : Mise à jour mensuelle','31.25','33.33'),(61,'2013-02-01 09:53:49',1,3,'Event : Mise à jour mensuelle','31.25','33.33'),(62,'2013-02-01 09:53:49',1,4,'Event : Mise à jour mensuelle','27.08','29.16'),(63,'2013-02-01 09:53:52',1,1,'Event : Mise à jour mensuelle','33.33','35.41'),(64,'2013-02-01 09:53:52',1,2,'Event : Mise à jour mensuelle','33.33','35.41'),(65,'2013-02-01 09:53:52',1,3,'Event : Mise à jour mensuelle','33.33','35.41'),(66,'2013-02-01 09:53:52',1,4,'Event : Mise à jour mensuelle','29.17','31.25'),(67,'2013-02-01 09:53:52',1,1,'Event : Mise à jour mensuelle','35.42','37.50'),(68,'2013-02-01 09:53:52',1,2,'Event : Mise à jour mensuelle','35.42','37.50'),(69,'2013-02-01 09:53:52',1,3,'Event : Mise à jour mensuelle','35.42','37.50'),(70,'2013-02-01 09:53:52',1,4,'Event : Mise à jour mensuelle','31.25','33.33'),(71,'2013-02-01 09:53:53',1,1,'Event : Mise à jour mensuelle','37.50','39.58'),(72,'2013-02-01 09:53:53',1,2,'Event : Mise à jour mensuelle','37.50','39.58'),(73,'2013-02-01 09:53:53',1,3,'Event : Mise à jour mensuelle','37.50','39.58'),(74,'2013-02-01 09:53:53',1,4,'Event : Mise à jour mensuelle','33.33','35.41'),(75,'2013-02-01 09:53:54',1,1,'Event : Mise à jour mensuelle','39.58','41.66'),(76,'2013-02-01 09:53:54',1,2,'Event : Mise à jour mensuelle','39.58','41.66'),(77,'2013-02-01 09:53:54',1,3,'Event : Mise à jour mensuelle','39.58','41.66'),(78,'2013-02-01 09:53:54',1,4,'Event : Mise à jour mensuelle','35.42','37.50'),(79,'2013-02-01 09:53:54',1,1,'Event : Mise à jour mensuelle','41.67','43.75'),(80,'2013-02-01 09:53:54',1,2,'Event : Mise à jour mensuelle','41.67','43.75'),(81,'2013-02-01 09:53:54',1,3,'Event : Mise à jour mensuelle','41.67','43.75'),(82,'2013-02-01 09:53:54',1,4,'Event : Mise à jour mensuelle','37.50','39.58'),(83,'2013-02-01 09:55:49',1,1,'Event : Mise à jour mensuelle','43.75','45.83'),(84,'2013-02-01 09:55:49',1,2,'Event : Mise à jour mensuelle','43.75','45.83'),(85,'2013-02-01 09:55:49',1,3,'Event : Mise à jour mensuelle','43.75','45.83'),(86,'2013-02-01 09:55:49',1,4,'Event : Mise à jour mensuelle','39.58','41.66'),(87,'2013-02-01 09:55:56',1,1,'Event : Mise à jour mensuelle','45.83','47.91'),(88,'2013-02-01 09:55:56',1,2,'Event : Mise à jour mensuelle','45.83','47.91'),(89,'2013-02-01 09:55:56',1,3,'Event : Mise à jour mensuelle','45.83','47.91'),(90,'2013-02-01 09:55:56',1,4,'Event : Mise à jour mensuelle','41.67','43.75'),(91,'2013-02-01 09:56:01',1,1,'Event : Mise à jour mensuelle','47.92','50.00'),(92,'2013-02-01 09:56:01',1,2,'Event : Mise à jour mensuelle','47.92','50.00'),(93,'2013-02-01 09:56:01',1,3,'Event : Mise à jour mensuelle','47.92','50.00'),(94,'2013-02-01 09:56:01',1,4,'Event : Mise à jour mensuelle','43.75','45.83'),(95,'2013-02-01 09:56:01',1,1,'Event : Mise à jour mensuelle','50.00','52.08'),(96,'2013-02-01 09:56:01',1,2,'Event : Mise à jour mensuelle','50.00','52.08'),(97,'2013-02-01 09:56:01',1,3,'Event : Mise à jour mensuelle','50.00','52.08'),(98,'2013-02-01 09:56:01',1,4,'Event : Mise à jour mensuelle','45.83','47.91'),(99,'2013-02-01 09:56:03',1,1,'Event : Mise à jour mensuelle','52.08','54.16'),(100,'2013-02-01 09:56:03',1,2,'Event : Mise à jour mensuelle','52.08','54.16'),(101,'2013-02-01 09:56:03',1,3,'Event : Mise à jour mensuelle','52.08','54.16'),(102,'2013-02-01 09:56:03',1,4,'Event : Mise à jour mensuelle','47.92','50.00'),(103,'2013-02-01 09:56:03',1,1,'Event : Mise à jour mensuelle','54.17','56.25'),(104,'2013-02-01 09:56:03',1,2,'Event : Mise à jour mensuelle','54.17','56.25'),(105,'2013-02-01 09:56:03',1,3,'Event : Mise à jour mensuelle','54.17','56.25'),(106,'2013-02-01 09:56:03',1,4,'Event : Mise à jour mensuelle','50.00','52.08'),(107,'2013-02-01 09:56:05',1,1,'Event : Mise à jour mensuelle','56.25','58.33'),(108,'2013-02-01 09:56:05',1,2,'Event : Mise à jour mensuelle','56.25','58.33'),(109,'2013-02-01 09:56:05',1,3,'Event : Mise à jour mensuelle','56.25','58.33'),(110,'2013-02-01 09:56:05',1,4,'Event : Mise à jour mensuelle','52.08','54.16'),(111,'2013-02-01 09:56:06',1,1,'Event : Mise à jour mensuelle','58.33','60.41'),(112,'2013-02-01 09:56:06',1,2,'Event : Mise à jour mensuelle','58.33','60.41'),(113,'2013-02-01 09:56:06',1,3,'Event : Mise à jour mensuelle','58.33','60.41'),(114,'2013-02-01 09:56:06',1,4,'Event : Mise à jour mensuelle','54.17','56.25'),(115,'2013-02-01 09:56:06',1,1,'Event : Mise à jour mensuelle','60.42','62.50'),(116,'2013-02-01 09:56:06',1,2,'Event : Mise à jour mensuelle','60.42','62.50'),(117,'2013-02-01 09:56:06',1,3,'Event : Mise à jour mensuelle','60.42','62.50'),(118,'2013-02-01 09:56:06',1,4,'Event : Mise à jour mensuelle','56.25','58.33'),(119,'2013-02-01 09:56:07',1,1,'Event : Mise à jour mensuelle','62.50','64.58'),(120,'2013-02-01 09:56:07',1,2,'Event : Mise à jour mensuelle','62.50','64.58'),(121,'2013-02-01 09:56:07',1,3,'Event : Mise à jour mensuelle','62.50','64.58'),(122,'2013-02-01 09:56:07',1,4,'Event : Mise à jour mensuelle','58.33','60.41'),(123,'2013-02-01 09:56:07',1,1,'Event : Mise à jour mensuelle','64.58','66.66'),(124,'2013-02-01 09:56:07',1,2,'Event : Mise à jour mensuelle','64.58','66.66'),(125,'2013-02-01 09:56:07',1,3,'Event : Mise à jour mensuelle','64.58','66.66'),(126,'2013-02-01 09:56:07',1,4,'Event : Mise à jour mensuelle','60.42','62.50'),(127,'2013-02-01 09:56:50',1,1,'Event : Mise à jour mensuelle','66.67','68.75'),(128,'2013-02-01 09:56:50',1,2,'Event : Mise à jour mensuelle','66.67','68.75'),(129,'2013-02-01 09:56:50',1,3,'Event : Mise à jour mensuelle','66.67','68.75'),(130,'2013-02-01 09:56:50',1,4,'Event : Mise à jour mensuelle','62.50','64.58'),(131,'2013-02-01 09:56:50',1,1,'Event : Mise à jour mensuelle','68.75','70.83'),(132,'2013-02-01 09:56:50',1,2,'Event : Mise à jour mensuelle','68.75','70.83'),(133,'2013-02-01 09:56:50',1,3,'Event : Mise à jour mensuelle','68.75','70.83'),(134,'2013-02-01 09:56:50',1,4,'Event : Mise à jour mensuelle','64.58','66.66'),(135,'2013-02-17 18:49:21',1,1,'Event : Mise à jour mensuelle','70.83','72.91'),(136,'2013-02-17 18:49:21',1,2,'Event : Mise à jour mensuelle','70.83','72.91'),(137,'2013-02-17 18:49:21',1,3,'Event : Mise à jour mensuelle','70.83','72.91'),(138,'2013-02-17 18:49:21',1,4,'Event : Mise à jour mensuelle','66.67','68.75'),(139,'2013-02-17 19:06:57',1,1,'Event : Holiday','72.92','71.92'),(140,'2013-03-01 23:12:31',1,1,'Event : Mise à jour mensuelle','71.92','74.00'),(141,'2013-03-01 23:12:31',1,2,'Event : Mise à jour mensuelle','72.92','75.00'),(142,'2013-03-01 23:12:31',1,3,'Event : Mise à jour mensuelle','72.92','75.00'),(143,'2013-03-01 23:12:31',1,4,'Event : Mise à jour mensuelle','68.75','70.83'),(144,'2013-03-01 23:12:31',1,5,'Event : Mise à jour mensuelle','0.00','2.08');
+/*!40000 ALTER TABLE `llx_holiday_logs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_types`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_types` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(45) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `affect` int(11) NOT NULL,
+  `delay` int(11) NOT NULL,
+  `insertAt` datetime NOT NULL,
+  `updateAt` datetime DEFAULT NULL,
+  `deleteAt` datetime DEFAULT NULL,
+  `nbCongesDeducted` varchar(255) NOT NULL,
+  `nbCongesEveryMonth` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_types`
+--
+
+LOCK TABLES `llx_holiday_types` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_holiday_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_users`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_users` (
+  `fk_user` int(11) NOT NULL,
+  `nb_holiday` double NOT NULL DEFAULT '0',
+  PRIMARY KEY (`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_users`
+--
+
+LOCK TABLES `llx_holiday_users` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_users` DISABLE KEYS */;
+INSERT INTO `llx_holiday_users` VALUES (0,0),(1,74.00334000000001),(2,75.00024000000003),(3,75.00024000000003),(4,70.83356000000002),(5,2.08334),(6,0);
+/*!40000 ALTER TABLE `llx_holiday_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_import_model`
+--
+
+DROP TABLE IF EXISTS `llx_import_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_import_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(50) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `field` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_import_model` (`label`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_import_model`
+--
+
+LOCK TABLES `llx_import_model` WRITE;
+/*!40000 ALTER TABLE `llx_import_model` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_import_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_links`
+--
+
+DROP TABLE IF EXISTS `llx_links`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_links` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datea` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `objecttype` varchar(255) NOT NULL,
+  `objectid` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_links`
+--
+
+LOCK TABLES `llx_links` WRITE;
+/*!40000 ALTER TABLE `llx_links` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_livraison`
+--
+
+DROP TABLE IF EXISTS `llx_livraison`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_livraison` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_customer` varchar(30) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_int` varchar(30) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_delivery` date DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_livraison_uk_ref` (`ref`,`entity`),
+  KEY `idx_livraison_fk_soc` (`fk_soc`),
+  KEY `idx_livraison_fk_user_author` (`fk_user_author`),
+  KEY `idx_livraison_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_livraison_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_livraison_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_livraison_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_livraison`
+--
+
+LOCK TABLES `llx_livraison` WRITE;
+/*!40000 ALTER TABLE `llx_livraison` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_livraison` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_livraisondet`
+--
+
+DROP TABLE IF EXISTS `llx_livraisondet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_livraisondet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_livraison` int(11) DEFAULT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `description` text,
+  `qty` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_livraisondet_fk_expedition` (`fk_livraison`),
+  CONSTRAINT `fk_livraisondet_fk_livraison` FOREIGN KEY (`fk_livraison`) REFERENCES `llx_livraison` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_livraisondet`
+--
+
+LOCK TABLES `llx_livraisondet` WRITE;
+/*!40000 ALTER TABLE `llx_livraisondet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_livraisondet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_localtax`
+--
+
+DROP TABLE IF EXISTS `llx_localtax`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_localtax` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `localtaxtype` tinyint(4) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datep` date DEFAULT NULL,
+  `datev` date DEFAULT NULL,
+  `amount` double NOT NULL DEFAULT '0',
+  `label` varchar(255) DEFAULT NULL,
+  `note` text,
+  `fk_bank` int(11) DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_localtax`
+--
+
+LOCK TABLES `llx_localtax` WRITE;
+/*!40000 ALTER TABLE `llx_localtax` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_localtax` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_mailing`
+--
+
+DROP TABLE IF EXISTS `llx_mailing`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_mailing` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `statut` smallint(6) DEFAULT '0',
+  `titre` varchar(60) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `sujet` varchar(60) DEFAULT NULL,
+  `body` mediumtext,
+  `bgcolor` varchar(8) DEFAULT NULL,
+  `bgimage` varchar(255) DEFAULT NULL,
+  `cible` varchar(60) DEFAULT NULL,
+  `nbemail` int(11) DEFAULT NULL,
+  `email_from` varchar(160) DEFAULT NULL,
+  `email_replyto` varchar(160) DEFAULT NULL,
+  `email_errorsto` varchar(160) DEFAULT NULL,
+  `tag` varchar(128) DEFAULT NULL,
+  `date_creat` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_appro` datetime DEFAULT NULL,
+  `date_envoi` datetime DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_user_appro` int(11) DEFAULT NULL,
+  `joined_file1` varchar(255) DEFAULT NULL,
+  `joined_file2` varchar(255) DEFAULT NULL,
+  `joined_file3` varchar(255) DEFAULT NULL,
+  `joined_file4` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_mailing`
+--
+
+LOCK TABLES `llx_mailing` WRITE;
+/*!40000 ALTER TABLE `llx_mailing` DISABLE KEYS */;
+INSERT INTO `llx_mailing` VALUES (3,1,'My commercial emailing',1,'Buy my product','Please buy my product','','',NULL,2,'dolibarr@domain.com','','',NULL,'2010-07-11 13:15:59','2010-07-11 13:46:20',NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL),(4,0,'Copy of My commercial emailing',1,'Buy my product','This is a new &eacute;E&eacute;&eacute;&quot;Mailing content<br />\r\n<br />\r\n<style type=\"text/css\">\r\n<!--\r\na:link {\r\n	color: #E2017A;\r\n}\r\n--></style>\r\n<span style=\"color:#800080;\"><strong>You can adit it with the WYSIWYG editor.</strong></span><br />\r\nIt is\r\n<ul>\r\n	<li>\r\n		Fast</li>\r\n	<li>\r\n		Easy to use</li>\r\n	<li>\r\n		Pretty</li>\r\n</ul>','','',NULL,NULL,'dolibarr@domain.com','','',NULL,'2011-07-18 20:44:33',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_mailing` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_mailing_cibles`
+--
+
+DROP TABLE IF EXISTS `llx_mailing_cibles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_mailing_cibles` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_mailing` int(11) NOT NULL,
+  `fk_contact` int(11) NOT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `email` varchar(160) NOT NULL,
+  `other` varchar(255) DEFAULT NULL,
+  `tag` varchar(128) DEFAULT NULL,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `source_url` varchar(160) DEFAULT NULL,
+  `source_id` int(11) DEFAULT NULL,
+  `source_type` varchar(16) DEFAULT NULL,
+  `date_envoi` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_mailing_cibles` (`fk_mailing`,`email`),
+  KEY `idx_mailing_cibles_email` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_mailing_cibles`
+--
+
+LOCK TABLES `llx_mailing_cibles` WRITE;
+/*!40000 ALTER TABLE `llx_mailing_cibles` DISABLE KEYS */;
+INSERT INTO `llx_mailing_cibles` VALUES (1,1,0,'Dupont','Alain','toto@aa.com','Date fin=10/07/2011',NULL,0,'0',NULL,NULL,NULL),(2,2,0,'Swiss customer supplier','','abademail@aa.com','',NULL,0,'0',NULL,NULL,NULL),(3,2,0,'Smith Vick','','vsmith@email.com','',NULL,0,'0',NULL,NULL,NULL),(4,3,0,'Swiss customer supplier','','abademail@aa.com','',NULL,0,'0',NULL,NULL,NULL),(5,3,0,'Smith Vick','','vsmith@email.com','',NULL,0,'0',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_mailing_cibles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_menu`
+--
+
+DROP TABLE IF EXISTS `llx_menu`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_menu` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `menu_handler` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(64) DEFAULT NULL,
+  `type` varchar(4) NOT NULL,
+  `mainmenu` varchar(100) NOT NULL,
+  `fk_menu` int(11) NOT NULL,
+  `fk_leftmenu` varchar(24) DEFAULT NULL,
+  `fk_mainmenu` varchar(24) DEFAULT NULL,
+  `position` int(11) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `target` varchar(100) DEFAULT NULL,
+  `titre` varchar(255) NOT NULL,
+  `langs` varchar(100) DEFAULT NULL,
+  `level` smallint(6) DEFAULT NULL,
+  `leftmenu` varchar(100) DEFAULT NULL,
+  `perms` varchar(255) DEFAULT NULL,
+  `enabled` varchar(255) DEFAULT '1',
+  `usertype` int(11) NOT NULL DEFAULT '0',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  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=108480 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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/fiche.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/fiche.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/liste.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/fiche.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/fiche.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/fiche.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/fiche.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/fiche.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/fiche.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/liste.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/fiche.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/liste.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/liste.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/fiche.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/liste.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/fiche.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/fiche.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/liste.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/liste.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/fiche.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/liste.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/liste.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/fiche.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/fiche.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/liste.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/fiche.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/liste.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/fiche.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/liste.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/fiche.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/fiche.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/liste.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/fiche.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/liste.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/fiche.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/liste.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/fiche.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/fiche.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/fiche.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/liste.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/liste.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/liste.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/liste.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/liste.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/liste.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/fiche.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'),(103160,'all',1,'cron','left','home',-1,'modulesadmintools','home',200,'/cron/list.php?status=1','','CronListActive','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2013-03-23 17:24:25'),(103161,'all',1,'cron','left','home',-1,'modulesadmintools','home',201,'/cron/list.php?status=0','','CronListInactive','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2013-03-23 17:24:25'),(103162,'auguria',1,'','top','home',0,NULL,NULL,1,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2013-03-24 02:31:47'),(103163,'auguria',1,'societe|fournisseur','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-03-24 02:31:47'),(103164,'auguria',1,'product|service','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-03-24 02:31:47'),(103166,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','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->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled  || $conf->tax->enabled',2,'2013-03-24 02:31:47'),(103167,'auguria',1,'comptabilite|accounting|facture|deplacement|don|tax','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->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled  || $conf->tax->enabled',2,'2013-03-24 02:31:47'),(103168,'auguria',1,'projet','top','project',0,NULL,NULL,7,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(103169,'auguria',1,'mailing|export|import','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-03-24 02:31:47'),(103174,'auguria',1,'adherent','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-03-24 02:31:47'),(103175,'auguria',1,'banque|prelevement','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',0,'2013-03-24 02:31:47'),(103261,'auguria',1,'','left','home',103162,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2013-03-24 02:31:47'),(103262,'auguria',1,'','left','home',103261,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103263,'auguria',1,'','left','home',103261,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103264,'auguria',1,'','left','home',103261,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103265,'auguria',1,'','left','home',103261,NULL,NULL,5,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103266,'auguria',1,'','left','home',103261,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103267,'auguria',1,'','left','home',103261,NULL,NULL,6,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103268,'auguria',1,'','left','home',103261,NULL,NULL,9,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103269,'auguria',1,'','left','home',103261,NULL,NULL,7,'/admin/proxy.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103270,'auguria',1,'','left','home',103261,NULL,NULL,10,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103271,'auguria',1,'','left','home',103261,NULL,NULL,8,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103272,'auguria',1,'','left','home',103261,NULL,NULL,12,'/admin/dict.php?leftmenu=setup','','DictionnarySetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103273,'auguria',1,'','left','home',103261,NULL,NULL,13,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103274,'auguria',1,'','left','home',103261,NULL,NULL,11,'/admin/sms.php?leftmenu=setup','','Sms','admin',1,'','','$leftmenu==\'setup\'',2,'2013-03-24 02:31:47'),(103362,'auguria',1,'','left','home',103461,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103364,'auguria',1,'','left','home',103461,NULL,NULL,13,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103365,'auguria',1,'','left','home',103461,NULL,NULL,1,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103366,'auguria',1,'','left','home',103461,NULL,NULL,2,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103367,'auguria',1,'','left','home',103461,NULL,NULL,3,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103368,'auguria',1,'','left','home',103362,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103369,'auguria',1,'','left','home',103362,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103371,'auguria',1,'','left','home',103461,NULL,NULL,4,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103461,'auguria',1,'','left','home',103162,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'admintools','','$user->admin',2,'2013-03-24 02:31:47'),(103462,'auguria',1,'','left','home',103461,NULL,NULL,5,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103463,'auguria',1,'','left','home',103461,NULL,NULL,6,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103464,'auguria',1,'','left','home',103461,NULL,NULL,11,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103465,'auguria',1,'','left','home',103461,NULL,NULL,8,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\'admintools\' && function_exists(\'eaccelerator_info\')',2,'2013-03-24 02:31:47'),(103466,'auguria',1,'','left','home',103461,NULL,NULL,7,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103467,'auguria',1,'','left','home',103461,NULL,NULL,9,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103468,'auguria',1,'','left','home',103461,NULL,NULL,12,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103469,'auguria',1,'','left','home',103461,NULL,NULL,10,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\'admintools\'',2,'2013-03-24 02:31:47'),(103561,'auguria',1,'','left','home',103162,NULL,NULL,3,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2013-03-24 02:31:47'),(103562,'auguria',1,'','left','home',103561,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103563,'auguria',1,'','left','home',103562,NULL,NULL,0,'/user/fiche.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\'users\'',2,'2013-03-24 02:31:47'),(103564,'auguria',1,'','left','home',103561,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,'2013-03-24 02:31:47'),(103565,'auguria',1,'','left','home',103564,NULL,NULL,0,'/user/group/fiche.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,'2013-03-24 02:31:47'),(103661,'auguria',1,'','left','companies',103163,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103662,'auguria',1,'','left','companies',103661,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103664,'auguria',1,'','left','companies',103661,NULL,NULL,5,'/fourn/liste.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(103665,'auguria',1,'','left','companies',103664,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-03-24 02:31:47'),(103667,'auguria',1,'','left','companies',103661,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103668,'auguria',1,'','left','companies',103667,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-03-24 02:31:47'),(103670,'auguria',1,'','left','companies',103661,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103671,'auguria',1,'','left','companies',103670,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-03-24 02:31:47'),(103761,'auguria',1,'','left','companies',103163,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103762,'auguria',1,'','left','companies',103761,NULL,NULL,0,'/contact/fiche.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103763,'auguria',1,'','left','companies',103761,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103765,'auguria',1,'','left','companies',103763,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','Prospects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103766,'auguria',1,'','left','companies',103763,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','Customers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103767,'auguria',1,'','left','companies',103763,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-03-24 02:31:47'),(103768,'auguria',1,'','left','companies',103763,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-03-24 02:31:47'),(103811,'auguria',1,'','left','companies',103163,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,'2013-03-24 02:31:47'),(103812,'auguria',1,'','left','companies',103811,NULL,NULL,0,'/categories/fiche.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(103821,'auguria',1,'','left','companies',103163,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,'2013-03-24 02:31:47'),(103822,'auguria',1,'','left','companies',103821,NULL,NULL,0,'/categories/fiche.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:47'),(104261,'auguria',1,'','left','commercial',103166,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104262,'auguria',1,'','left','commercial',104261,NULL,NULL,0,'/societe/societe.php?leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104263,'auguria',1,'','left','commercial',104261,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104264,'auguria',1,'','left','commercial',104263,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,'2013-03-24 02:31:47'),(104265,'auguria',1,'','left','commercial',104263,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,'2013-03-24 02:31:47'),(104266,'auguria',1,'','left','commercial',104263,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,'2013-03-24 02:31:47'),(104267,'auguria',1,'','left','commercial',104263,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,'2013-03-24 02:31:47'),(104268,'auguria',1,'','left','commercial',104263,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,'2013-03-24 02:31:47'),(104271,'auguria',1,'','left','commercial',104261,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(104361,'auguria',1,'','left','commercial',103166,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104362,'auguria',1,'','left','commercial',104361,NULL,NULL,0,'/societe/societe.php?leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104363,'auguria',1,'','left','commercial',104361,NULL,NULL,1,'/commande/liste.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104364,'auguria',1,'','left','commercial',104363,NULL,NULL,2,'/commande/liste.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104365,'auguria',1,'','left','commercial',104363,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104366,'auguria',1,'','left','commercial',104363,NULL,NULL,4,'/commande/liste.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104367,'auguria',1,'','left','commercial',104363,NULL,NULL,5,'/commande/liste.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104368,'auguria',1,'','left','commercial',104363,NULL,NULL,6,'/commande/liste.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104369,'auguria',1,'','left','commercial',104363,NULL,NULL,7,'/commande/liste.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-03-24 02:31:47'),(104370,'auguria',1,'','left','commercial',104361,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-03-24 02:31:47'),(104461,'auguria',1,'','left','commercial',103164,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2013-03-24 02:31:47'),(104462,'auguria',1,'','left','commercial',104461,NULL,NULL,0,'/expedition/fiche.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104463,'auguria',1,'','left','commercial',104461,NULL,NULL,1,'/expedition/liste.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104464,'auguria',1,'','left','commercial',104461,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-03-24 02:31:47'),(104561,'auguria',1,'','left','commercial',103166,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104562,'auguria',1,'','left','commercial',104561,NULL,NULL,0,'/societe/societe.php?leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104563,'auguria',1,'','left','commercial',104561,NULL,NULL,1,'/contrat/liste.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104564,'auguria',1,'','left','commercial',104561,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-03-24 02:31:47'),(104565,'auguria',1,'','left','commercial',104564,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-03-24 02:31:47'),(104566,'auguria',1,'','left','commercial',104564,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-03-24 02:31:47'),(104567,'auguria',1,'','left','commercial',104564,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-03-24 02:31:47'),(104568,'auguria',1,'','left','commercial',104564,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-03-24 02:31:47'),(104661,'auguria',1,'','left','commercial',103166,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104662,'auguria',1,'','left','commercial',104661,NULL,NULL,0,'/fichinter/fiche.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104663,'auguria',1,'','left','commercial',104661,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-03-24 02:31:47'),(104761,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/fourn/facture/index.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104762,'auguria',1,'','left','accountancy',104761,NULL,NULL,0,'/fourn/facture/fiche.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104763,'auguria',1,'','left','accountancy',104761,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104764,'auguria',1,'','left','accountancy',104761,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(104765,'auguria',1,'','left','accountancy',104761,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,'2013-03-24 02:31:47'),(104861,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104862,'auguria',1,'','left','accountancy',104861,NULL,NULL,3,'/compta/clients.php?action=facturer&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104863,'auguria',1,'','left','accountancy',104861,NULL,NULL,4,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','Repeatable','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104864,'auguria',1,'','left','accountancy',104861,NULL,NULL,5,'/compta/facture/impayees.php?action=facturer&amp;leftmenu=customers_bills','','Unpaid','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104865,'auguria',1,'','left','accountancy',104861,NULL,NULL,6,'/compta/paiement/liste.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104871,'auguria',1,'','left','accountancy',104865,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(104872,'auguria',1,'','left','accountancy',103175,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104873,'auguria',1,'','left','accountancy',104872,NULL,NULL,0,'/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104874,'auguria',1,'','left','accountancy',104872,NULL,NULL,1,'/compta/paiement/cheque/liste.php?leftmenu=checks','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-03-24 02:31:47'),(104875,'auguria',1,'','left','accountancy',104861,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2013-03-24 02:31:47'),(105061,'auguria',1,'','left','accountancy',103167,NULL,NULL,3,'/commande/liste.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2013-03-24 02:31:47'),(105161,'auguria',1,'','left','accountancy',103167,NULL,NULL,4,'/compta/dons/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2013-03-24 02:31:47'),(105162,'auguria',1,'','left','accountancy',105161,NULL,NULL,0,'/compta/dons/fiche.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-03-24 02:31:47'),(105163,'auguria',1,'','left','accountancy',105161,NULL,NULL,1,'/compta/dons/liste.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-03-24 02:31:47'),(105261,'auguria',1,'','left','accountancy',103167,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2013-03-24 02:31:47'),(105262,'auguria',1,'','left','accountancy',105261,NULL,NULL,1,'/compta/deplacement/fiche.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105263,'auguria',1,'','left','accountancy',105261,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105264,'auguria',1,'','left','accountancy',105261,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-03-24 02:31:47'),(105361,'auguria',1,'','left','accountancy',103167,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuTaxAndDividends','compta',0,'tax','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-03-24 02:31:47'),(105362,'auguria',1,'','left','accountancy',105361,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-03-24 02:31:47'),(105363,'auguria',1,'','left','accountancy',105362,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-03-24 02:31:47'),(105364,'auguria',1,'','left','accountancy',105362,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-03-24 02:31:47'),(105461,'auguria',1,'','left','accountancy',105361,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,'2013-03-24 02:31:47'),(105462,'auguria',1,'','left','accountancy',105461,NULL,NULL,0,'/compta/tva/fiche.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-03-24 02:31:47'),(105463,'auguria',1,'','left','accountancy',105461,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-03-24 02:31:47'),(105464,'auguria',1,'','left','accountancy',105461,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-03-24 02:31:47'),(105465,'auguria',1,'','left','accountancy',105461,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-03-24 02:31:47'),(105561,'auguria',1,'','left','accountancy',103167,NULL,NULL,8,'/compta/ventilation/index.php?leftmenu=ventil','','Ventilation','companies',0,'ventil','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105562,'auguria',1,'','left','accountancy',105561,NULL,NULL,0,'/compta/ventilation/liste.php','','ToDispatch','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105563,'auguria',1,'','left','accountancy',105561,NULL,NULL,1,'/compta/ventilation/lignes.php','','Dispatched','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105564,'auguria',1,'','left','accountancy',105561,NULL,NULL,2,'/compta/param/','','Setup','companies',1,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105565,'auguria',1,'','left','accountancy',105564,NULL,NULL,0,'/compta/param/comptes/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105566,'auguria',1,'','left','accountancy',105564,NULL,NULL,1,'/compta/param/comptes/fiche.php?action=create','','New','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105567,'auguria',1,'','left','accountancy',105561,NULL,NULL,3,'/compta/export/','','Export','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105568,'auguria',1,'','left','accountancy',105567,NULL,NULL,0,'/compta/export/index.php','','New','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105569,'auguria',1,'','left','accountancy',105567,NULL,NULL,1,'/compta/export/liste.php','','List','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-03-24 02:31:47'),(105661,'auguria',1,'','left','accountancy',103175,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,'2013-03-24 02:31:47'),(105663,'auguria',1,'','left','accountancy',105661,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105664,'auguria',1,'','left','accountancy',105661,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105665,'auguria',1,'','left','accountancy',105661,NULL,NULL,3,'/compta/prelevement/liste.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105667,'auguria',1,'','left','accountancy',105661,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105668,'auguria',1,'','left','accountancy',105661,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-03-24 02:31:47'),(105761,'auguria',1,'','left','accountancy',103175,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2013-03-24 02:31:47'),(105762,'auguria',1,'','left','accountancy',105761,NULL,NULL,0,'/compta/bank/fiche.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2013-03-24 02:31:47'),(105763,'auguria',1,'','left','accountancy',105761,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,'2013-03-24 02:31:47'),(105764,'auguria',1,'','left','accountancy',105761,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,'2013-03-24 02:31:47'),(105765,'auguria',1,'','left','accountancy',105761,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,'2013-03-24 02:31:47'),(105767,'auguria',1,'','left','accountancy',105761,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,'2013-03-24 02:31:47'),(105861,'auguria',1,'','left','accountancy',103167,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,'2013-03-24 02:31:47'),(105862,'auguria',1,'','left','accountancy',105861,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-03-24 02:31:47'),(105863,'auguria',1,'','left','accountancy',105862,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-03-24 02:31:47'),(105864,'auguria',1,'','left','accountancy',105861,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-03-24 02:31:47'),(105865,'auguria',1,'','left','accountancy',105864,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-03-24 02:31:47'),(105866,'auguria',1,'','left','accountancy',105864,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-03-24 02:31:47'),(105867,'auguria',1,'','left','accountancy',105861,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 || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105868,'auguria',1,'','left','accountancy',105861,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 || $conf->accounting->enabled',0,'2013-03-24 02:31:47'),(105961,'auguria',1,'','left','products',103164,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105962,'auguria',1,'','left','products',105961,NULL,NULL,0,'/product/fiche.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105963,'auguria',1,'','left','products',105961,NULL,NULL,1,'/product/liste.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105964,'auguria',1,'','left','products',105961,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2013-03-24 02:31:47'),(105965,'auguria',1,'','left','products',105961,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(106061,'auguria',1,'','left','products',103164,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106062,'auguria',1,'','left','products',106061,NULL,NULL,0,'/product/fiche.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106063,'auguria',1,'','left','products',106061,NULL,NULL,1,'/product/liste.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-03-24 02:31:47'),(106064,'auguria',1,'','left','products',106061,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2013-03-24 02:31:47'),(106261,'auguria',1,'','left','products',103164,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106262,'auguria',1,'','left','products',106261,NULL,NULL,0,'/product/stock/fiche.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106263,'auguria',1,'','left','products',106261,NULL,NULL,1,'/product/stock/liste.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106264,'auguria',1,'','left','products',106261,NULL,NULL,2,'/product/stock/valo.php','','EnhancedValue','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106265,'auguria',1,'','left','products',106261,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2013-03-24 02:31:47'),(106361,'auguria',1,'','left','products',103164,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2013-03-24 02:31:47'),(106362,'auguria',1,'','left','products',106361,NULL,NULL,0,'/categories/fiche.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2013-03-24 02:31:47'),(106761,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106762,'auguria',1,'','left','project',106761,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106763,'auguria',1,'','left','project',106761,NULL,NULL,2,'/projet/liste.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106771,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106772,'auguria',1,'','left','project',106771,NULL,NULL,1,'/projet/fiche.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106773,'auguria',1,'','left','project',106771,NULL,NULL,2,'/projet/liste.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106861,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106862,'auguria',1,'','left','project',106861,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106863,'auguria',1,'','left','project',106861,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106864,'auguria',1,'','left','project',106861,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106961,'auguria',1,'','left','project',103168,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106962,'auguria',1,'','left','project',106961,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-03-24 02:31:47'),(106963,'auguria',1,'','left','project',106961,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(106964,'auguria',1,'','left','project',106961,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-03-24 02:31:47'),(107061,'auguria',1,'','left','tools',103169,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107062,'auguria',1,'','left','tools',107061,NULL,NULL,0,'/comm/mailing/fiche.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107063,'auguria',1,'','left','tools',107061,NULL,NULL,1,'/comm/mailing/liste.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-03-24 02:31:47'),(107261,'auguria',1,'','left','tools',103169,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2013-03-24 02:31:47'),(107262,'auguria',1,'','left','tools',107261,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2013-03-24 02:31:47'),(107291,'auguria',1,'','left','tools',103169,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2013-03-24 02:31:47'),(107292,'auguria',1,'','left','tools',107291,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2013-03-24 02:31:47'),(107361,'auguria',1,'','left','members',103174,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107362,'auguria',1,'','left','members',107361,NULL,NULL,0,'/adherents/fiche.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107363,'auguria',1,'','left','members',107361,NULL,NULL,1,'/adherents/liste.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107364,'auguria',1,'','left','members',107363,NULL,NULL,2,'/adherents/liste.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107365,'auguria',1,'','left','members',107363,NULL,NULL,3,'/adherents/liste.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107366,'auguria',1,'','left','members',107363,NULL,NULL,4,'/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107367,'auguria',1,'','left','members',107363,NULL,NULL,5,'/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107368,'auguria',1,'','left','members',107363,NULL,NULL,6,'/adherents/liste.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107369,'auguria',1,'','left','members',107361,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107461,'auguria',1,'','left','members',103174,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107462,'auguria',1,'','left','members',107461,NULL,NULL,0,'/adherents/liste.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107463,'auguria',1,'','left','members',107461,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107464,'auguria',1,'','left','members',107461,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107661,'auguria',1,'','left','members',103174,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107662,'auguria',1,'','left','members',107661,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2013-03-24 02:31:48'),(107663,'auguria',1,'','left','members',107661,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107664,'auguria',1,'','left','members',107661,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107861,'auguria',1,'','left','members',103174,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(107862,'auguria',1,'','left','members',107861,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,'2013-03-24 02:31:48'),(107863,'auguria',1,'','left','members',107861,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-03-24 02:31:48'),(108261,'auguria',1,'','left','commercial',103166,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108262,'auguria',1,'','left','commercial',108261,NULL,NULL,0,'/societe/societe.php?leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108263,'auguria',1,'','left','commercial',108261,NULL,NULL,1,'/fourn/commande/liste.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2013-03-24 02:31:47'),(108269,'auguria',1,'','left','commercial',108261,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,'2013-03-24 02:31:47'),(108361,'auguria',1,'','left','members',103174,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,'2013-03-24 02:31:48'),(108362,'auguria',1,'','left','members',108361,NULL,NULL,0,'/categories/fiche.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-03-24 02:31:48'),(108457,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=home&amp;leftmenu=modulesadmintools','','BarCodePrintsheet','products',NULL,'barcodeprint','1','$conf->barcode->enabled',2,'2014-03-02 15:37:26'),(108458,'all',1,'barcode','left','home',-1,'modulesadmintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools','','MassBarcodeInit','products',NULL,NULL,'1','$conf->barcode->enabled && $leftmenu==\"modulesadmintools\"',0,'2014-03-02 15:37:26'),(108459,'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,'2014-12-21 12:51:26'),(108460,'all',1,'agenda','left','agenda',108459,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,'2014-12-21 12:51:26'),(108461,'all',1,'agenda','left','agenda',108460,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,'2014-12-21 12:51:26'),(108462,'all',1,'agenda','left','agenda',108460,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,'2014-12-21 12:51:26'),(108463,'all',1,'agenda','left','agenda',108462,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,'2014-12-21 12:51:26'),(108464,'all',1,'agenda','left','agenda',108462,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,'2014-12-21 12:51:26'),(108465,'all',1,'agenda','left','agenda',108462,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,'2014-12-21 12:51:26'),(108466,'all',1,'agenda','left','agenda',108462,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,'2014-12-21 12:51:26'),(108467,'all',1,'agenda','left','agenda',108460,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,'2014-12-21 12:51:26'),(108468,'all',1,'agenda','left','agenda',108467,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,'2014-12-21 12:51:26'),(108469,'all',1,'agenda','left','agenda',108467,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,'2014-12-21 12:51:26'),(108470,'all',1,'agenda','left','agenda',108467,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,'2014-12-21 12:51:26'),(108471,'all',1,'agenda','left','agenda',108467,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,'2014-12-21 12:51:26'),(108472,'all',1,'agenda','left','agenda',108460,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,'2014-12-21 12:51:26'),(108473,'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,'2014-12-21 12:51:28'),(108474,'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,'2014-12-21 12:51:28'),(108475,'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,'2014-12-21 12:51:28'),(108476,'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,'2014-12-21 12:51:28'),(108477,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2014-12-21 19:52:31'),(108478,'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,'2014-12-21 19:52:31'),(108479,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2014-12-21 19:52:31');
+/*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_milestone`
+--
+
+DROP TABLE IF EXISTS `llx_milestone`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_milestone` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_element` int(11) NOT NULL,
+  `elementtype` varchar(16) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `options` varchar(255) DEFAULT NULL,
+  `priority` int(11) DEFAULT '0',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_milestone_fk_element` (`fk_element`,`elementtype`),
+  KEY `idx_milestone_fk_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_milestone_fk_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_milestone`
+--
+
+LOCK TABLES `llx_milestone` WRITE;
+/*!40000 ALTER TABLE `llx_milestone` DISABLE KEYS */;
+INSERT INTO `llx_milestone` VALUES (2,779,'facture','azerty',NULL,0,'2013-03-09 12:19:30',NULL),(3,780,'facture','fsdf',NULL,0,'2013-03-09 13:01:08',NULL),(4,781,'facture','hhh',NULL,0,'2013-03-09 14:06:37',NULL);
+/*!40000 ALTER TABLE `llx_milestone` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_monitoring_probes`
+--
+
+DROP TABLE IF EXISTS `llx_monitoring_probes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_monitoring_probes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `title` varchar(64) NOT NULL,
+  `groupname` varchar(64) DEFAULT NULL,
+  `url` varchar(250) NOT NULL,
+  `useproxy` int(11) DEFAULT '0',
+  `checkkey` varchar(250) DEFAULT NULL,
+  `maxval` int(11) DEFAULT NULL,
+  `frequency` int(11) DEFAULT '60',
+  `active` int(11) DEFAULT '1',
+  `status` int(11) DEFAULT '0',
+  `lastreset` datetime DEFAULT NULL,
+  `oldesterrortext` text,
+  `oldesterrordate` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_monitoring_probes` (`title`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_monitoring_probes`
+--
+
+LOCK TABLES `llx_monitoring_probes` WRITE;
+/*!40000 ALTER TABLE `llx_monitoring_probes` DISABLE KEYS */;
+INSERT INTO `llx_monitoring_probes` VALUES (1,'aaa',NULL,'http://www.chiensderace.com',0,'chiens',1000,10,1,1,'2011-04-20 23:46:41',NULL,NULL),(2,'ChatsDeRace',NULL,'http://www.chatsderace.com',0,'chats',1000,5,1,1,'2011-04-20 23:46:41',NULL,NULL);
+/*!40000 ALTER TABLE `llx_monitoring_probes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_notify`
+--
+
+DROP TABLE IF EXISTS `llx_notify`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_notify` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `daten` datetime DEFAULT NULL,
+  `fk_action` int(11) NOT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_contact` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `objet_type` varchar(24) NOT NULL,
+  `objet_id` int(11) NOT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `type` varchar(16) DEFAULT 'email',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_notify`
+--
+
+LOCK TABLES `llx_notify` WRITE;
+/*!40000 ALTER TABLE `llx_notify` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_notify` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_notify_def`
+--
+
+DROP TABLE IF EXISTS `llx_notify_def`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_notify_def` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` date DEFAULT NULL,
+  `fk_action` int(11) NOT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `fk_contact` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `type` varchar(16) DEFAULT 'email',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_notify_def`
+--
+
+LOCK TABLES `llx_notify_def` WRITE;
+/*!40000 ALTER TABLE `llx_notify_def` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_notify_def` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_opensurvey_comments`
+--
+
+DROP TABLE IF EXISTS `llx_opensurvey_comments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_opensurvey_comments` (
+  `id_comment` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id_sondage` char(16) NOT NULL,
+  `comment` text NOT NULL,
+  `usercomment` text,
+  PRIMARY KEY (`id_comment`),
+  KEY `idx_id_comment` (`id_comment`),
+  KEY `idx_id_sondage` (`id_sondage`)
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_opensurvey_comments`
+--
+
+LOCK TABLES `llx_opensurvey_comments` WRITE;
+/*!40000 ALTER TABLE `llx_opensurvey_comments` DISABLE KEYS */;
+INSERT INTO `llx_opensurvey_comments` VALUES (2,'434dio8rxfljs3p1','aaa','aaa'),(5,'434dio8rxfljs3p1','aaa','aaa'),(6,'434dio8rxfljs3p1','gfh','jj'),(11,'434dio8rxfljs3p1','fsdf','fdsf'),(12,'3imby4hf7joiilsu','fsdf','aa'),(16,'3imby4hf7joiilsu','gdfg','gfdg'),(17,'3imby4hf7joiilsu','gfdgd','gdfgd'),(18,'om4e7azfiurnjtqe','fds','fdsf'),(26,'qgsfrgb922rqzocy','gfdg','gfdg'),(27,'qgsfrgb922rqzocy','gfdg','gfd'),(28,'m4467s2mtk6khmxc','hgf','hgfh'),(29,'m4467s2mtk6khmxc','fgh','hgf'),(30,'ckanvbe7kt3rdb3h','hfgh','fdfds'),(31,'m4467s2mtk6khmxc','hgfh','hgf');
+/*!40000 ALTER TABLE `llx_opensurvey_comments` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_opensurvey_sondage`
+--
+
+DROP TABLE IF EXISTS `llx_opensurvey_sondage`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_opensurvey_sondage` (
+  `id_sondage` varchar(16) NOT NULL,
+  `id_sondage_admin` char(24) DEFAULT NULL,
+  `commentaires` text,
+  `mail_admin` varchar(128) DEFAULT NULL,
+  `nom_admin` varchar(64) DEFAULT NULL,
+  `fk_user_creat` int(11) NOT NULL,
+  `titre` text NOT NULL,
+  `date_fin` datetime NOT NULL,
+  `format` varchar(2) NOT NULL,
+  `mailsonde` tinyint(4) NOT NULL DEFAULT '0',
+  `survey_link_visible` int(11) DEFAULT '1',
+  `origin` varchar(64) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `allow_comments` tinyint(4) NOT NULL DEFAULT '1',
+  `allow_spy` tinyint(4) NOT NULL DEFAULT '1',
+  `sujet` text,
+  PRIMARY KEY (`id_sondage`),
+  KEY `idx_id_sondage_admin` (`id_sondage_admin`),
+  KEY `idx_date_fin` (`date_fin`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_opensurvey_sondage`
+--
+
+LOCK TABLES `llx_opensurvey_sondage` WRITE;
+/*!40000 ALTER TABLE `llx_opensurvey_sondage` DISABLE KEYS */;
+INSERT INTO `llx_opensurvey_sondage` VALUES ('m4467s2mtk6khmxc','m4467s2mtk6khmxci2ysw682','fdffdshfghfj jhgjgh','aaa@aaa.com','fdfds',0,'fdffds','2013-03-07 00:00:00','D+',1,1,'dolibarr','0000-00-00 00:00:00',1,1,1,NULL);
+/*!40000 ALTER TABLE `llx_opensurvey_sondage` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_opensurvey_sujet_studs`
+--
+
+DROP TABLE IF EXISTS `llx_opensurvey_sujet_studs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_opensurvey_sujet_studs` (
+  `id_sondage` char(16) NOT NULL,
+  `sujet` text
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_opensurvey_sujet_studs`
+--
+
+LOCK TABLES `llx_opensurvey_sujet_studs` WRITE;
+/*!40000 ALTER TABLE `llx_opensurvey_sujet_studs` DISABLE KEYS */;
+INSERT INTO `llx_opensurvey_sujet_studs` VALUES ('434dio8rxfljs3p1','1362697200,1363734000'),('3eyn2drokozf3j4s','1362438000@10h,1363129200@10h'),('z2qcqjh5pm1q4p99','r&eacute;solution 1,r&eacute;solution 2,aaa,fdsfsdfsd@checkbox'),('xfwtrseu3ok1c4m6','gdfgfd@yesno,gfdgd@pourcontre,llll@pourcontre'),('om4e7azfiurnjtqe','g dfgdfdfg dfg dg dfg g fdg dfgd fg fg d@pourcontre,mmlml@checkbox'),('fubmr7n293akha5j','check@checkbox,yesno@yesno,pc@pourcontre'),('icaanayi59qto4fl','check@checkbox,yesno@yesno,pc@pourcontre'),('ipbkufzz4lr2vbpx','pc@pourcontre,fdsffd@checkbox'),('3imby4hf7joiilsu','fsdf@yesno,fsdfsd@checkbox,fsdf@pourcontre'),('q41jpgfd4ii3g9vx','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('xm6hysvkspo7gbx6','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('99sbps3ba3s8pq7b','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('6wstlvu2z9kxqweh','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('783p7f377offci4v','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('u4umbl5yb6lpydci','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('dn2euwlf2d4wyy6m','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('t896ed7af3ujdprx','fdfsd@pourcontre,fdsfs@pourcontre,fdsfsdf@checkbox'),('q5c4kucbbkuxjz8g','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('8mcdnf2hgcntfibe','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('7shynoad2x4zl8sw','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('x82rfs19p8fa21et','fdsfsd@pourcontre,fdsfs@pourcontre,fdsfsd@pourcontre'),('qgsfrgb922rqzocy','1364338800@20H-21H,1364338800@21H-22H,1364425200@20H-21H,1364425200@21H-22H,1364511600@20H-21H,1364511600@21H-22H'),('ah9xvaqu1ajjrqse','1391295600@2h-5h,1391295600@2h-5h,1364338800@20H-21H,1364338800@21H-22H,1364425200@20H-21H,1391295600@2h-5h'),('ckanvbe7kt3rdb3h','1363734000,1363820400'),('6v9xq6f9lemjiuba','1363734000,1363820400,1363906800,1363993200'),('m4467s2mtk6khmxc','1398981600,1357081200,1363734000,1363820400,1363993200,1398981600');
+/*!40000 ALTER TABLE `llx_opensurvey_sujet_studs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_opensurvey_user_studs`
+--
+
+DROP TABLE IF EXISTS `llx_opensurvey_user_studs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_opensurvey_user_studs` (
+  `id_users` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(64) NOT NULL,
+  `id_sondage` varchar(16) NOT NULL,
+  `reponses` varchar(100) NOT NULL,
+  PRIMARY KEY (`id_users`),
+  KEY `idx_id_users` (`id_users`),
+  KEY `idx_nom` (`nom`),
+  KEY `idx_id_sondage` (`id_sondage`),
+  KEY `idx_opensurvey_user_studs_id_users` (`id_users`),
+  KEY `idx_opensurvey_user_studs_nom` (`nom`),
+  KEY `idx_opensurvey_user_studs_id_sondage` (`id_sondage`)
+) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_opensurvey_user_studs`
+--
+
+LOCK TABLES `llx_opensurvey_user_studs` WRITE;
+/*!40000 ALTER TABLE `llx_opensurvey_user_studs` DISABLE KEYS */;
+INSERT INTO `llx_opensurvey_user_studs` VALUES (1,'gfdgdf','om4e7azfiurnjtqe','01'),(2,'aa','3imby4hf7joiilsu','210'),(3,'fsdf','z2qcqjh5pm1q4p99','0110'),(5,'hfghf','z2qcqjh5pm1q4p99','1110'),(6,'qqqq','ah9xvaqu1ajjrqse','000111'),(7,'hjgh','ah9xvaqu1ajjrqse','000010'),(8,'bcvb','qgsfrgb922rqzocy','011000'),(9,'gdfg','ah9xvaqu1ajjrqse','001000'),(10,'ggg','ah9xvaqu1ajjrqse','000100'),(11,'gfdgd','ah9xvaqu1ajjrqse','001000'),(12,'hhhh','ah9xvaqu1ajjrqse','010000'),(13,'iii','ah9xvaqu1ajjrqse','000100'),(14,'kkk','ah9xvaqu1ajjrqse','001000'),(15,'lllll','ah9xvaqu1ajjrqse','000001'),(16,'kk','ah9xvaqu1ajjrqse','000001'),(17,'gggg','ah9xvaqu1ajjrqse','001000'),(18,'mmmm','ah9xvaqu1ajjrqse','000000'),(19,'jkjkj','ah9xvaqu1ajjrqse','000001'),(20,'azerty','8mcdnf2hgcntfibe','012'),(21,'hfghfg','8mcdnf2hgcntfibe','012'),(22,'fd','ckanvbe7kt3rdb3h','10'),(23,'gfdgdf','m4467s2mtk6khmxc','00011'),(24,'hgfh','m4467s2mtk6khmxc','000111');
+/*!40000 ALTER TABLE `llx_opensurvey_user_studs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_paiement`
+--
+
+DROP TABLE IF EXISTS `llx_paiement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_paiement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datep` datetime DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `fk_paiement` int(11) NOT NULL,
+  `num_paiement` varchar(50) DEFAULT NULL,
+  `note` text,
+  `fk_bank` int(11) NOT NULL DEFAULT '0',
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `fk_export_compta` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_paiement`
+--
+
+LOCK TABLES `llx_paiement` WRITE;
+/*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */;
+INSERT INTO `llx_paiement` VALUES (1,1,'2010-07-10 14:59:41','2010-07-10 12:59:41','2010-07-10 12:00:00',0.02000000,4,'','',4,1,NULL,0,0),(2,1,'2011-07-18 20:50:24','2011-07-18 18:50:24','2011-07-08 12:00:00',20.00000000,6,'','',5,1,NULL,0,0),(3,1,'2011-07-18 20:50:47','2011-07-18 18:50:47','2011-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0),(5,1,'2011-08-01 03:34:11','2011-08-01 01:34:11','2011-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0),(6,1,'2011-08-06 20:33:54','2011-08-06 18:33:54','2011-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0),(8,1,'2011-08-08 02:53:40','2011-08-08 00:53:40','2011-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0),(9,1,'2011-08-08 02:55:58','2011-08-08 00:55:58','2011-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0),(17,1,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0),(18,1,'2012-12-09 15:28:53','2012-12-09 14:28:53','2012-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0),(19,1,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0),(20,1,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0),(21,1,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0),(23,1,'2012-12-12 18:54:33','2012-12-12 17:54:33','2012-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0),(24,1,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0),(25,1,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0),(26,1,'2014-03-02 19:57:58','2014-03-02 18:57:58','2013-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0),(27,1,'2014-03-02 19:59:48','2014-03-02 18:59:48','2013-03-22 12:00:00',30.00000000,4,'','',25,1,NULL,0,0),(29,1,'2014-03-02 20:01:39','2014-03-02 19:01:39','2013-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0),(30,1,'2014-03-02 20:02:06','2014-03-02 19:02:06','2013-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0),(32,1,'2014-03-03 19:22:32','2014-03-03 18:22:32','2013-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0),(33,1,'2014-03-03 19:23:16','2014-03-03 18:23:16','2013-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0);
+/*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_paiement_facture`
+--
+
+DROP TABLE IF EXISTS `llx_paiement_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_paiement_facture` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_paiement` int(11) DEFAULT NULL,
+  `fk_facture` int(11) DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_paiement_facture` (`fk_paiement`,`fk_facture`),
+  KEY `idx_paiement_facture_fk_facture` (`fk_facture`),
+  KEY `idx_paiement_facture_fk_paiement` (`fk_paiement`),
+  CONSTRAINT `fk_paiement_facture_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`),
+  CONSTRAINT `fk_paiement_facture_fk_paiement` FOREIGN KEY (`fk_paiement`) REFERENCES `llx_paiement` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_paiement_facture`
+--
+
+LOCK TABLES `llx_paiement_facture` WRITE;
+/*!40000 ALTER TABLE `llx_paiement_facture` DISABLE KEYS */;
+INSERT INTO `llx_paiement_facture` VALUES (1,1,1,0.02000000),(2,2,2,20.00000000),(3,3,2,10.00000000),(5,5,5,5.63000000),(6,6,6,5.98000000),(9,8,2,16.10000000),(10,8,8,10.00000000),(11,9,3,15.00000000),(12,9,9,11.96000000),(20,17,11,2.00000000),(21,18,12,-2.00000000),(22,19,10,-1.00000000),(23,19,12,-1.00000000),(24,20,9,1.00000000),(25,20,11,1.00000000),(26,21,12,-2.00000000),(28,23,55,1.00000000),(29,24,161,20.00000000),(30,25,210,10.00000000),(31,26,32,600.00000000),(32,26,148,5.00000000),(33,27,152,10.00000000),(34,27,157,20.00000000),(36,29,32,500.00000000),(37,30,32,400.00000000),(39,32,213,-400.00000000),(40,33,213,-300.00000000);
+/*!40000 ALTER TABLE `llx_paiement_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_paiementcharge`
+--
+
+DROP TABLE IF EXISTS `llx_paiementcharge`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_paiementcharge` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_charge` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datep` datetime DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `fk_typepaiement` int(11) NOT NULL,
+  `num_paiement` varchar(50) DEFAULT NULL,
+  `note` text,
+  `fk_bank` int(11) NOT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_paiementcharge`
+--
+
+LOCK TABLES `llx_paiementcharge` WRITE;
+/*!40000 ALTER TABLE `llx_paiementcharge` DISABLE KEYS */;
+INSERT INTO `llx_paiementcharge` VALUES (4,4,'2011-08-05 23:11:37','2011-08-05 21:11:37','2011-08-05 12:00:00',10,2,'','',12,1,NULL);
+/*!40000 ALTER TABLE `llx_paiementcharge` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_paiementfourn`
+--
+
+DROP TABLE IF EXISTS `llx_paiementfourn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_paiementfourn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `datep` datetime DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_paiement` int(11) NOT NULL,
+  `num_paiement` varchar(50) DEFAULT NULL,
+  `note` text,
+  `fk_bank` int(11) NOT NULL,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_paiementfourn`
+--
+
+LOCK TABLES `llx_paiementfourn` WRITE;
+/*!40000 ALTER TABLE `llx_paiementfourn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_paiementfourn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_paiementfourn_facturefourn`
+--
+
+DROP TABLE IF EXISTS `llx_paiementfourn_facturefourn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_paiementfourn_facturefourn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_paiementfourn` int(11) DEFAULT NULL,
+  `fk_facturefourn` int(11) DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_paiementfourn_facturefourn` (`fk_paiementfourn`,`fk_facturefourn`),
+  KEY `idx_paiementfourn_facturefourn_fk_facture` (`fk_facturefourn`),
+  KEY `idx_paiementfourn_facturefourn_fk_paiement` (`fk_paiementfourn`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_paiementfourn_facturefourn`
+--
+
+LOCK TABLES `llx_paiementfourn_facturefourn` WRITE;
+/*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_payment_salary`
+--
+
+DROP TABLE IF EXISTS `llx_payment_salary`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_payment_salary` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user` int(11) NOT NULL,
+  `datep` date DEFAULT NULL,
+  `datev` date DEFAULT NULL,
+  `amount` double NOT NULL DEFAULT '0',
+  `fk_typepayment` int(11) NOT NULL,
+  `num_payment` varchar(50) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `datesp` date DEFAULT NULL,
+  `dateep` date DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `note` text,
+  `fk_bank` int(11) DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_payment_salary`
+--
+
+LOCK TABLES `llx_payment_salary` WRITE;
+/*!40000 ALTER TABLE `llx_payment_salary` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_payment_salary` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_pos_cash`
+--
+
+DROP TABLE IF EXISTS `llx_pos_cash`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_pos_cash` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `code` varchar(3) DEFAULT NULL,
+  `name` varchar(30) DEFAULT NULL,
+  `tactil` tinyint(4) NOT NULL DEFAULT '0',
+  `fk_paycash` int(11) DEFAULT NULL,
+  `fk_modepaycash` int(11) DEFAULT NULL,
+  `fk_paybank` int(11) DEFAULT NULL,
+  `fk_modepaybank` int(11) DEFAULT NULL,
+  `fk_warehouse` int(11) DEFAULT NULL,
+  `fk_device` int(11) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `is_used` tinyint(4) DEFAULT '0',
+  `fk_user_u` int(11) DEFAULT NULL,
+  `fk_user_c` int(11) DEFAULT NULL,
+  `fk_user_m` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datea` datetime DEFAULT NULL,
+  `is_closed` tinyint(4) DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_pos_cash`
+--
+
+LOCK TABLES `llx_pos_cash` WRITE;
+/*!40000 ALTER TABLE `llx_pos_cash` DISABLE KEYS */;
+INSERT INTO `llx_pos_cash` VALUES (1,1,'aaa','aaa',0,3,1,1,1,1,NULL,1,0,0,1,NULL,'2013-01-19 18:18:39','2013-01-19 18:18:39',0);
+/*!40000 ALTER TABLE `llx_pos_cash` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_pos_control_cash`
+--
+
+DROP TABLE IF EXISTS `llx_pos_control_cash`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_pos_control_cash` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_cash` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `date_c` datetime DEFAULT NULL,
+  `type_control` tinyint(4) DEFAULT '0',
+  `amount_teor` double(24,8) DEFAULT NULL,
+  `amount_real` double(24,8) DEFAULT NULL,
+  `amount_diff` double(24,8) DEFAULT NULL,
+  `amount_mov_out` double(24,8) DEFAULT NULL,
+  `amount_mov_int` double(24,8) DEFAULT NULL,
+  `amount_next_day` double(24,8) DEFAULT NULL,
+  `comment` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_pos_control_cash`
+--
+
+LOCK TABLES `llx_pos_control_cash` WRITE;
+/*!40000 ALTER TABLE `llx_pos_control_cash` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_pos_control_cash` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_pos_facture`
+--
+
+DROP TABLE IF EXISTS `llx_pos_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_pos_facture` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_cash` int(11) NOT NULL,
+  `fk_facture` int(11) NOT NULL,
+  `fk_control_cash` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_pos_facture`
+--
+
+LOCK TABLES `llx_pos_facture` WRITE;
+/*!40000 ALTER TABLE `llx_pos_facture` DISABLE KEYS */;
+INSERT INTO `llx_pos_facture` VALUES (1,1,148,NULL),(2,1,149,NULL),(3,1,150,NULL),(4,1,151,NULL);
+/*!40000 ALTER TABLE `llx_pos_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_pos_moviments`
+--
+
+DROP TABLE IF EXISTS `llx_pos_moviments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_pos_moviments` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_cash` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `date_m` datetime DEFAULT NULL,
+  `amount` double(24,8) DEFAULT NULL,
+  `type` tinyint(4) DEFAULT NULL,
+  `comment` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_pos_moviments`
+--
+
+LOCK TABLES `llx_pos_moviments` WRITE;
+/*!40000 ALTER TABLE `llx_pos_moviments` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_pos_moviments` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_pos_ticketdet`
+--
+
+DROP TABLE IF EXISTS `llx_pos_ticketdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_pos_ticketdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_ticket` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT NULL,
+  `price` double(24,8) DEFAULT NULL,
+  `total_ht` double(24,8) DEFAULT NULL,
+  `total_tva` double(24,8) DEFAULT NULL,
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT NULL,
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `fk_code_ventilation` int(11) NOT NULL DEFAULT '0',
+  `fk_export_compta` int(11) NOT NULL DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_ticket`),
+  KEY `idx_ticketdet_fk_ticket` (`fk_ticket`),
+  KEY `idx_ticketdet_fk_product` (`fk_product`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_pos_ticketdet`
+--
+
+LOCK TABLES `llx_pos_ticketdet` WRITE;
+/*!40000 ALTER TABLE `llx_pos_ticketdet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_pos_ticketdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prelevement_bons`
+--
+
+DROP TABLE IF EXISTS `llx_prelevement_bons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prelevement_bons` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(12) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `statut` smallint(6) DEFAULT '0',
+  `credite` smallint(6) DEFAULT '0',
+  `note` text,
+  `date_trans` datetime DEFAULT NULL,
+  `method_trans` smallint(6) DEFAULT NULL,
+  `fk_user_trans` int(11) DEFAULT NULL,
+  `date_credit` datetime DEFAULT NULL,
+  `fk_user_credit` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_prelevement_bons_ref` (`ref`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prelevement_bons`
+--
+
+LOCK TABLES `llx_prelevement_bons` WRITE;
+/*!40000 ALTER TABLE `llx_prelevement_bons` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prelevement_bons` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prelevement_facture`
+--
+
+DROP TABLE IF EXISTS `llx_prelevement_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prelevement_facture` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `fk_prelevement_lignes` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_prelevement_facture_fk_prelevement_lignes` (`fk_prelevement_lignes`),
+  CONSTRAINT `fk_prelevement_facture_fk_prelevement_lignes` FOREIGN KEY (`fk_prelevement_lignes`) REFERENCES `llx_prelevement_lignes` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prelevement_facture`
+--
+
+LOCK TABLES `llx_prelevement_facture` WRITE;
+/*!40000 ALTER TABLE `llx_prelevement_facture` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prelevement_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prelevement_facture_demande`
+--
+
+DROP TABLE IF EXISTS `llx_prelevement_facture_demande`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prelevement_facture_demande` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `amount` double NOT NULL,
+  `date_demande` datetime NOT NULL,
+  `traite` smallint(6) DEFAULT '0',
+  `date_traite` datetime DEFAULT NULL,
+  `fk_prelevement_bons` int(11) DEFAULT NULL,
+  `fk_user_demande` int(11) NOT NULL,
+  `code_banque` varchar(7) DEFAULT NULL,
+  `code_guichet` varchar(6) DEFAULT NULL,
+  `number` varchar(255) DEFAULT NULL,
+  `cle_rib` varchar(5) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prelevement_facture_demande`
+--
+
+LOCK TABLES `llx_prelevement_facture_demande` WRITE;
+/*!40000 ALTER TABLE `llx_prelevement_facture_demande` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prelevement_facture_demande` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prelevement_lignes`
+--
+
+DROP TABLE IF EXISTS `llx_prelevement_lignes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prelevement_lignes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_prelevement_bons` int(11) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `statut` smallint(6) DEFAULT '0',
+  `client_nom` varchar(255) DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `code_banque` varchar(7) DEFAULT NULL,
+  `code_guichet` varchar(6) DEFAULT NULL,
+  `number` varchar(255) DEFAULT NULL,
+  `cle_rib` varchar(5) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_prelevement_lignes_fk_prelevement_bons` (`fk_prelevement_bons`),
+  CONSTRAINT `fk_prelevement_lignes_fk_prelevement_bons` FOREIGN KEY (`fk_prelevement_bons`) REFERENCES `llx_prelevement_bons` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prelevement_lignes`
+--
+
+LOCK TABLES `llx_prelevement_lignes` WRITE;
+/*!40000 ALTER TABLE `llx_prelevement_lignes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prelevement_lignes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_prelevement_rejet`
+--
+
+DROP TABLE IF EXISTS `llx_prelevement_rejet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_prelevement_rejet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_prelevement_lignes` int(11) DEFAULT NULL,
+  `date_rejet` datetime DEFAULT NULL,
+  `motif` int(11) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_creation` int(11) DEFAULT NULL,
+  `note` text,
+  `afacturer` tinyint(4) DEFAULT '0',
+  `fk_facture` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_prelevement_rejet`
+--
+
+LOCK TABLES `llx_prelevement_rejet` WRITE;
+/*!40000 ALTER TABLE `llx_prelevement_rejet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_prelevement_rejet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_printer_ipp`
+--
+
+DROP TABLE IF EXISTS `llx_printer_ipp`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_printer_ipp` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `printer_name` text NOT NULL,
+  `printer_location` text NOT NULL,
+  `printer_uri` varchar(256) NOT NULL,
+  `copy` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(16) NOT NULL,
+  `login` varchar(32) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_printer_ipp`
+--
+
+LOCK TABLES `llx_printer_ipp` WRITE;
+/*!40000 ALTER TABLE `llx_printer_ipp` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_printer_ipp` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product`
+--
+
+DROP TABLE IF EXISTS `llx_product`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `virtual` tinyint(4) NOT NULL DEFAULT '0',
+  `fk_parent` int(11) DEFAULT '0',
+  `ref` varchar(128) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  `note` text,
+  `customcode` varchar(32) DEFAULT NULL,
+  `fk_country` int(11) DEFAULT NULL,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `price_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_min` double(24,8) DEFAULT '0.00000000',
+  `price_min_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_base_type` varchar(3) DEFAULT 'HT',
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `tosell` tinyint(4) DEFAULT '1',
+  `tobuy` tinyint(4) DEFAULT '1',
+  `tobatch` tinyint(4) NOT NULL DEFAULT '0',
+  `fk_product_type` int(11) DEFAULT '0',
+  `duration` varchar(6) DEFAULT NULL,
+  `seuil_stock_alerte` int(11) DEFAULT '0',
+  `url` varchar(255) DEFAULT NULL,
+  `barcode` varchar(255) DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) DEFAULT NULL,
+  `partnumber` varchar(32) DEFAULT NULL,
+  `weight` float DEFAULT NULL,
+  `weight_units` tinyint(4) DEFAULT NULL,
+  `length` float DEFAULT NULL,
+  `length_units` tinyint(4) DEFAULT NULL,
+  `surface` float DEFAULT NULL,
+  `surface_units` tinyint(4) DEFAULT NULL,
+  `volume` float DEFAULT NULL,
+  `volume_units` tinyint(4) DEFAULT NULL,
+  `stock` int(11) DEFAULT NULL,
+  `pmp` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `canvas` varchar(32) DEFAULT 'default@product',
+  `finished` tinyint(4) DEFAULT NULL,
+  `hidden` tinyint(4) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  `desiredstock` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
+  UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
+  KEY `idx_product_label` (`label`),
+  KEY `idx_product_barcode` (`barcode`),
+  KEY `idx_product_import_key` (`import_key`),
+  KEY `idx_product_fk_country` (`fk_country`),
+  KEY `idx_product_fk_user_author` (`fk_user_author`),
+  KEY `idx_product_fk_barcode_type` (`fk_barcode_type`),
+  CONSTRAINT `fk_product_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product`
+--
+
+LOCK TABLES `llx_product` WRITE;
+/*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
+INSERT INTO `llx_product` VALUES (1,'2010-07-08 14:33:17','2014-12-21 12:51:04',0,0,'PIDRESS',1,NULL,'Pink dress','A beatifull pink dress','',NULL,NULL,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',20,NULL,NULL,NULL,'','',NULL,100,0,NULL,0,NULL,0,NULL,0,2,0.00000000,NULL,1,0,NULL,0),(2,'2010-07-09 00:30:01','2014-12-21 12:51:04',0,0,'Product_P1',1,NULL,'Product P1','','','',32,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,0,0,NULL,0),(3,'2010-07-09 00:30:25','2014-12-21 12:51:04',0,0,'Service_S1',1,NULL,'Service S1','','',NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,1,'1m',NULL,NULL,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,0,0,NULL,0),(4,'2010-07-10 14:44:06','2014-12-21 12:51:04',0,0,'DECAP',1,NULL,'Decapsuleur','','',NULL,NULL,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,2,-3,NULL,0,NULL,0,NULL,0,1001,10.00000000,NULL,1,0,NULL,0),(5,'2011-07-20 23:11:38','2014-12-21 12:51:04',0,0,'aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(6,'2011-07-29 22:16:44','2014-12-21 12:51:04',0,0,'Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(7,'2011-07-29 22:31:21','2014-12-21 12:51:04',0,0,'Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,0,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(8,'2011-07-29 22:46:54','2014-12-21 12:51:04',0,0,'Copy_of_Copy_of_Copy_of_aaaa',1,NULL,'aaaa','cccc','bbbb','',NULL,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,NULL,0,0,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,'',1,0,NULL,0),(10,'2008-12-31 00:00:00','2014-12-21 12:51:04',0,0,'PR123456',1,NULL,'My product','This is a description example for record','Some note',NULL,NULL,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,0.000,NULL,NULL,0,0,0,0,'1y',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,0,'20110729232310',0),(11,'2013-01-13 20:24:42','2014-12-21 12:51:04',0,0,'gh',1,NULL,'hfghf','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,NULL,1,1,0,0,'',NULL,NULL,NULL,NULL,'','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,-1,0.00000000,'',1,0,NULL,0);
+/*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_association`
+--
+
+DROP TABLE IF EXISTS `llx_product_association`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_association` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product_pere` int(11) NOT NULL DEFAULT '0',
+  `fk_product_fils` int(11) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_association` (`fk_product_pere`,`fk_product_fils`),
+  KEY `idx_product_association` (`fk_product_fils`),
+  KEY `idx_product_association_fils` (`fk_product_fils`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_association`
+--
+
+LOCK TABLES `llx_product_association` WRITE;
+/*!40000 ALTER TABLE `llx_product_association` DISABLE KEYS */;
+INSERT INTO `llx_product_association` VALUES (1,4,1,2),(2,5,1,1);
+/*!40000 ALTER TABLE `llx_product_association` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_batch`
+--
+
+DROP TABLE IF EXISTS `llx_product_batch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product_stock` int(11) NOT NULL,
+  `eatby` datetime DEFAULT NULL,
+  `sellby` datetime DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_product_stock` (`fk_product_stock`),
+  KEY `ix_fk_product_stock` (`fk_product_stock`),
+  CONSTRAINT `fk_product_batch_fk_product_stock` FOREIGN KEY (`fk_product_stock`) REFERENCES `llx_product_stock` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_batch`
+--
+
+LOCK TABLES `llx_product_batch` WRITE;
+/*!40000 ALTER TABLE `llx_product_batch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_batch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_customer_price`
+--
+
+DROP TABLE IF EXISTS `llx_product_customer_price`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_customer_price` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product` int(11) NOT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `price_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_min` double(24,8) DEFAULT '0.00000000',
+  `price_min_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_base_type` varchar(3) DEFAULT 'HT',
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `fk_user` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_customer_price_fk_product_fk_soc` (`fk_product`,`fk_soc`),
+  KEY `idx_product_customer_price_fk_user` (`fk_user`),
+  KEY `fk_customer_price_fk_soc` (`fk_soc`),
+  KEY `idx_product_customer_price_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_customer_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_customer_price_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_product_customer_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_customer_price`
+--
+
+LOCK TABLES `llx_product_customer_price` WRITE;
+/*!40000 ALTER TABLE `llx_product_customer_price` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_customer_price` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_customer_price_log`
+--
+
+DROP TABLE IF EXISTS `llx_product_customer_price_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_customer_price_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `fk_product` int(11) NOT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `price_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_min` double(24,8) DEFAULT '0.00000000',
+  `price_min_ttc` double(24,8) DEFAULT '0.00000000',
+  `price_base_type` varchar(3) DEFAULT 'HT',
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `fk_user` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_customer_price_log`
+--
+
+LOCK TABLES `llx_product_customer_price_log` WRITE;
+/*!40000 ALTER TABLE `llx_product_customer_price_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_customer_price_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_product_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_product_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_extrafields`
+--
+
+LOCK TABLES `llx_product_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_product_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_fournisseur_price`
+--
+
+DROP TABLE IF EXISTS `llx_product_fournisseur_price`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_fournisseur_price` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product` int(11) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `ref_fourn` varchar(30) DEFAULT NULL,
+  `fk_availability` int(11) DEFAULT NULL,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `quantity` double DEFAULT NULL,
+  `remise_percent` double NOT NULL DEFAULT '0',
+  `remise` double NOT NULL DEFAULT '0',
+  `unitprice` double(24,8) DEFAULT '0.00000000',
+  `charges` double(24,8) DEFAULT '0.00000000',
+  `unitcharges` double(24,8) DEFAULT '0.00000000',
+  `tva_tx` double(6,3) NOT NULL DEFAULT '0.000',
+  `info_bits` int(11) NOT NULL DEFAULT '0',
+  `fk_user` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_fournisseur_price_ref` (`ref_fourn`,`fk_soc`,`quantity`,`entity`),
+  KEY `idx_product_fournisseur_price_fk_user` (`fk_user`),
+  KEY `idx_product_fourn_price_fk_product` (`fk_product`,`entity`),
+  KEY `idx_product_fourn_price_fk_soc` (`fk_soc`,`entity`),
+  CONSTRAINT `fk_product_fournisseur_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
+  CONSTRAINT `fk_product_fournisseur_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_fournisseur_price`
+--
+
+LOCK TABLES `llx_product_fournisseur_price` WRITE;
+/*!40000 ALTER TABLE `llx_product_fournisseur_price` DISABLE KEYS */;
+INSERT INTO `llx_product_fournisseur_price` VALUES (1,'2010-07-11 18:45:42','2012-12-08 13:11:08',4,1,'ABCD',NULL,10.00000000,1,0,0,10.00000000,0.00000000,0.00000000,0.000,0,1,NULL,1);
+/*!40000 ALTER TABLE `llx_product_fournisseur_price` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_fournisseur_price_log`
+--
+
+DROP TABLE IF EXISTS `llx_product_fournisseur_price_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_fournisseur_price_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `fk_product_fournisseur` int(11) NOT NULL,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `quantity` double DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_fournisseur_price_log`
+--
+
+LOCK TABLES `llx_product_fournisseur_price_log` WRITE;
+/*!40000 ALTER TABLE `llx_product_fournisseur_price_log` DISABLE KEYS */;
+INSERT INTO `llx_product_fournisseur_price_log` VALUES (1,'2010-07-11 18:45:42',1,10.00000000,1,1);
+/*!40000 ALTER TABLE `llx_product_fournisseur_price_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_lang`
+--
+
+DROP TABLE IF EXISTS `llx_product_lang`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_lang` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product` int(11) NOT NULL DEFAULT '0',
+  `lang` varchar(5) NOT NULL DEFAULT '0',
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_lang` (`fk_product`,`lang`),
+  CONSTRAINT `fk_product_lang_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_lang`
+--
+
+LOCK TABLES `llx_product_lang` WRITE;
+/*!40000 ALTER TABLE `llx_product_lang` DISABLE KEYS */;
+INSERT INTO `llx_product_lang` VALUES (1,1,'en_US','Pink dress','A beatifull pink dress',''),(2,2,'en_US','Product P1','',''),(3,3,'en_US','Service S1','',''),(4,4,'fr_FR','Decapsuleur','',''),(5,5,'en_US','aaaa','cccc','bbbb'),(6,6,'en_US','aaaa','cccc','bbbb'),(7,7,'en_US','aaaa','cccc','bbbb'),(8,8,'en_US','aaaa','cccc','bbbb'),(9,11,'fr_FR','hfghf','',''),(10,2,'fr_FR','Product P1','','');
+/*!40000 ALTER TABLE `llx_product_lang` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_price`
+--
+
+DROP TABLE IF EXISTS `llx_product_price`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_price` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product` int(11) NOT NULL,
+  `date_price` datetime NOT NULL,
+  `price_level` smallint(6) DEFAULT '1',
+  `price` double(24,8) DEFAULT NULL,
+  `price_ttc` double(24,8) DEFAULT NULL,
+  `price_min` double(24,8) DEFAULT NULL,
+  `price_min_ttc` double(24,8) DEFAULT NULL,
+  `price_base_type` varchar(3) DEFAULT 'HT',
+  `tva_tx` double(6,3) NOT NULL,
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `tosell` tinyint(4) DEFAULT '1',
+  `price_by_qty` int(11) NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_product_price_fk_user_author` (`fk_user_author`),
+  KEY `idx_product_price_fk_product` (`fk_product`),
+  CONSTRAINT `fk_product_price_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
+  CONSTRAINT `fk_product_price_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_price`
+--
+
+LOCK TABLES `llx_product_price` WRITE;
+/*!40000 ALTER TABLE `llx_product_price` DISABLE KEYS */;
+INSERT INTO `llx_product_price` VALUES (1,1,'2010-07-08 12:33:17',1,'2010-07-08 14:33:17',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(2,1,'2010-07-08 22:30:01',2,'2010-07-09 00:30:01',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(3,1,'2010-07-08 22:30:25',3,'2010-07-09 00:30:25',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(4,1,'2010-07-10 12:44:06',4,'2010-07-10 14:44:06',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(5,1,'2011-07-20 21:11:38',5,'2011-07-20 23:11:38',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,0,NULL),(6,1,'2011-07-27 17:02:59',5,'2011-07-27 19:02:59',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,1,0,NULL),(7,1,'2011-07-29 20:16:44',6,'2011-07-29 22:16:44',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(8,1,'2011-07-29 20:31:21',7,'2011-07-29 22:31:21',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(9,1,'2011-07-29 20:46:54',8,'2011-07-29 22:46:54',1,10.00000000,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,0.000,1,0,0,NULL),(10,1,'2011-07-31 22:34:27',4,'2011-08-01 00:34:27',1,5.00000000,5.62500000,0.00000000,0.00000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL),(12,1,'2013-01-13 19:24:59',11,'2013-01-13 20:24:59',1,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,0.000,1,1,0,NULL),(13,1,'2013-03-12 09:30:24',1,'2013-03-12 10:30:24',1,100.00000000,112.50000000,90.00000000,101.25000000,'HT',12.500,0,0.000,0.000,1,1,0,NULL);
+/*!40000 ALTER TABLE `llx_product_price` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_price_by_qty`
+--
+
+DROP TABLE IF EXISTS `llx_product_price_by_qty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_price_by_qty` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product_price` int(11) NOT NULL,
+  `date_price` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `price` double(24,8) DEFAULT '0.00000000',
+  `price_ttc` double(24,8) DEFAULT '0.00000000',
+  `remise_percent` double NOT NULL DEFAULT '0',
+  `remise` double NOT NULL DEFAULT '0',
+  `qty_min` double DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_price_by_qty_level` (`fk_product_price`,`qty_min`),
+  KEY `idx_product_price_by_qty_fk_product_price` (`fk_product_price`),
+  CONSTRAINT `fk_product_price_by_qty_fk_product_price` FOREIGN KEY (`fk_product_price`) REFERENCES `llx_product_price` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_price_by_qty`
+--
+
+LOCK TABLES `llx_product_price_by_qty` WRITE;
+/*!40000 ALTER TABLE `llx_product_price_by_qty` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_price_by_qty` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_stock`
+--
+
+DROP TABLE IF EXISTS `llx_product_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_stock` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_product` int(11) NOT NULL,
+  `fk_entrepot` int(11) NOT NULL,
+  `reel` double DEFAULT NULL,
+  `pmp` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_product_stock` (`fk_product`,`fk_entrepot`),
+  KEY `idx_product_stock_fk_product` (`fk_product`),
+  KEY `idx_product_stock_fk_entrepot` (`fk_entrepot`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_stock`
+--
+
+LOCK TABLES `llx_product_stock` WRITE;
+/*!40000 ALTER TABLE `llx_product_stock` DISABLE KEYS */;
+INSERT INTO `llx_product_stock` VALUES (1,'2010-07-08 22:43:51',2,2,1000,0.00000000,NULL),(3,'2010-07-10 23:02:20',4,2,1000,0.00000000,NULL),(4,'2013-01-19 17:22:48',4,1,1,10.00000000,NULL),(5,'2013-01-19 17:22:48',1,1,2,0.00000000,NULL),(6,'2013-01-19 17:22:48',11,1,-1,0.00000000,NULL),(7,'2013-01-19 17:31:58',2,1,-2,0.00000000,NULL);
+/*!40000 ALTER TABLE `llx_product_stock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_product_subproduct`
+--
+
+DROP TABLE IF EXISTS `llx_product_subproduct`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_subproduct` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_product` int(11) NOT NULL,
+  `fk_product_subproduct` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `fk_product` (`fk_product`,`fk_product_subproduct`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_product_subproduct`
+--
+
+LOCK TABLES `llx_product_subproduct` WRITE;
+/*!40000 ALTER TABLE `llx_product_subproduct` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_subproduct` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_projet`
+--
+
+DROP TABLE IF EXISTS `llx_projet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_projet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `datec` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `dateo` date DEFAULT NULL,
+  `datee` date DEFAULT NULL,
+  `ref` varchar(50) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `title` varchar(255) NOT NULL,
+  `description` text,
+  `fk_user_creat` int(11) NOT NULL,
+  `public` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_projet_ref` (`ref`,`entity`),
+  KEY `idx_projet_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_projet_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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,'gdfgdfg','baleine'),(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),(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),(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),(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);
+/*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_projet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_projet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_projet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_projet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_projet_extrafields`
+--
+
+LOCK TABLES `llx_projet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_projet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_projet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_projet_task`
+--
+
+DROP TABLE IF EXISTS `llx_projet_task`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_projet_task` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(50) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_projet` int(11) NOT NULL,
+  `fk_task_parent` int(11) NOT NULL DEFAULT '0',
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `dateo` datetime DEFAULT NULL,
+  `datee` datetime DEFAULT NULL,
+  `datev` datetime DEFAULT NULL,
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  `duration_effective` double NOT NULL DEFAULT '0',
+  `planned_workload` double NOT NULL DEFAULT '0',
+  `progress` int(11) DEFAULT '0',
+  `priority` int(11) DEFAULT '0',
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `note_private` text,
+  `note_public` text,
+  `rang` int(11) DEFAULT '0',
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_projet_task_fk_projet` (`fk_projet`),
+  KEY `idx_projet_task_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_projet_task_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_projet_task_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_projet_task_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_projet_task_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_projet_task`
+--
+
+LOCK TABLES `llx_projet_task` WRITE;
+/*!40000 ALTER TABLE `llx_projet_task` DISABLE KEYS */;
+INSERT INTO `llx_projet_task` VALUES (1,'1',1,1,0,'2010-07-11 15:15:55','2013-09-08 23:06:14','2010-07-11 12:00:00',NULL,NULL,'Work on module','',25920000,0,0,0,1,NULL,0,NULL,NULL,0,NULL),(2,'2',1,5,0,'2010-07-11 16:23:53','2013-09-08 23:06:14','2010-07-11 12:00:00','2011-07-14 12:00:00',NULL,'Heberger site RMLL','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL),(3,'TK1007-0001',1,1,0,'2014-12-21 13:52:41','2014-12-21 13:55:08','2014-12-21 13:52:00',NULL,NULL,'azerty','',9000,36000,0,0,1,NULL,0,NULL,'gdfgdfgdf',0,NULL),(4,'TK1007-0002',1,1,0,'2014-12-21 13:55:39','2014-12-21 13:22:35','2014-12-21 13:55:00',NULL,NULL,'gdfgdfgfd','',7200,18000,25,0,1,NULL,0,NULL,NULL,0,NULL),(5,'TK1007-0003',1,1,0,'2014-12-21 14:16:58','2014-12-21 13:16:58','2014-12-21 14:16:00',NULL,NULL,'mmmm','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `llx_projet_task` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_projet_task_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_projet_task_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_projet_task_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_projet_task_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_projet_task_extrafields`
+--
+
+LOCK TABLES `llx_projet_task_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_projet_task_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_projet_task_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_projet_task_time`
+--
+
+DROP TABLE IF EXISTS `llx_projet_task_time`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_projet_task_time` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_task` int(11) NOT NULL,
+  `task_date` date DEFAULT NULL,
+  `task_datehour` datetime DEFAULT NULL,
+  `task_duration` double DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `thm` double(24,8) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_projet_task_time_task` (`fk_task`),
+  KEY `idx_projet_task_time_date` (`task_date`),
+  KEY `idx_projet_task_time_datehour` (`task_datehour`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_projet_task_time`
+--
+
+LOCK TABLES `llx_projet_task_time` WRITE;
+/*!40000 ALTER TABLE `llx_projet_task_time` DISABLE KEYS */;
+INSERT INTO `llx_projet_task_time` VALUES (1,1,'2010-07-11',NULL,25920000,1,NULL,''),(2,4,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,''),(3,4,'2014-12-18','2014-12-18 12:00:00',3600,1,NULL,NULL),(4,3,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,NULL),(5,3,'2014-12-21','2014-12-21 12:00:00',1800,1,NULL,NULL),(6,3,'2014-12-21','2014-12-21 12:00:00',3600,1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_propal`
+--
+
+DROP TABLE IF EXISTS `llx_propal`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_propal` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_int` varchar(255) DEFAULT NULL,
+  `ref_client` varchar(255) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datep` date DEFAULT NULL,
+  `fin_validite` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `price` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total` double(24,8) DEFAULT '0.00000000',
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_currency` varchar(3) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT NULL,
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `date_livraison` date DEFAULT NULL,
+  `fk_shipping_method` int(11) DEFAULT NULL,
+  `fk_availability` int(11) DEFAULT NULL,
+  `fk_delivery_address` int(11) DEFAULT NULL,
+  `fk_input_reason` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_propal_ref` (`ref`,`entity`),
+  KEY `idx_propal_fk_soc` (`fk_soc`),
+  KEY `idx_propal_fk_user_author` (`fk_user_author`),
+  KEY `idx_propal_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_propal_fk_user_cloture` (`fk_user_cloture`),
+  KEY `idx_propal_fk_projet` (`fk_projet`),
+  KEY `idx_propal_fk_account` (`fk_account`),
+  KEY `idx_propal_fk_currency` (`fk_currency`),
+  CONSTRAINT `fk_propal_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_propal_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_propal`
+--
+
+LOCK TABLES `llx_propal` WRITE;
+/*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */;
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2012-12-08 13:11:07','PR1007-0001',1,NULL,NULL,'','2010-07-09 01:33:49','2010-07-09','2010-07-24 12:00:00','2011-08-08 14:24:18',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(2,1,NULL,'2012-12-08 13:11:07','PR1007-0002',1,NULL,NULL,'','2010-07-10 02:11:44','2010-07-10','2010-07-25 12:00:00','2010-07-10 02:12:55','2011-07-20 15:23:12',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,1,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(3,4,NULL,'2012-12-08 13:11:07','PR1007-0003',1,NULL,NULL,'','2010-07-18 11:35:11','2010-07-18','2010-08-02 12:00:00','2010-07-18 11:36:18','2011-07-20 15:21:15',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,NULL,NULL,0,NULL,NULL),(4,17,NULL,'2012-12-08 13:11:07','PR1108-0004',1,NULL,NULL,'','2011-08-04 23:36:23','2011-08-05','2011-08-20 12:00:00','2011-08-08 14:24:24',NULL,1,NULL,1,NULL,1,0,NULL,NULL,0,30.00000000,5.88000000,0.00000000,0.00000000,35.88000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(5,19,NULL,'2013-02-17 14:39:56','PR1302-0005',1,NULL,NULL,'','2013-02-17 15:39:56','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(6,19,NULL,'2013-02-17 14:40:12','PR1302-0006',1,NULL,NULL,'','2013-02-17 15:40:12','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(7,19,NULL,'2013-02-17 14:41:15','PR1302-0007',1,NULL,NULL,'','2013-02-17 15:41:15','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(8,19,NULL,'2013-02-17 14:43:39','PR1302-0008',1,NULL,NULL,'','2013-02-17 15:43:39','2013-02-17','2013-03-04 12:00:00',NULL,NULL,1,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(9,19,NULL,'2013-02-17 15:22:14','PR1302-0009',1,NULL,NULL,'','2013-02-17 15:53:01','2013-02-17','2013-03-04 12:00:00','2013-02-17 16:22:10','2013-02-17 16:22:14',1,NULL,1,1,2,0,NULL,NULL,0,60.00000000,11.76000000,0.00000000,0.00000000,71.76000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(11,18,NULL,'2013-02-17 15:28:22','PR1302-0010',1,NULL,NULL,'gfdf','2013-02-17 16:27:18','2013-02-17','2013-03-04 12:00:00','2013-02-17 16:27:29','2013-02-17 16:28:22',1,NULL,1,1,2,0,NULL,NULL,0,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL),(12,23,NULL,'2013-03-08 09:02:31','PR1303-0011',1,NULL,NULL,'fdfs','2013-03-08 10:00:23','2013-03-08','2013-03-23 12:00:00','2013-03-08 10:02:21','2013-03-08 10:02:31',1,NULL,1,1,2,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,1,0,'','','azur',NULL,NULL,0,NULL,0,NULL,NULL);
+/*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_propal_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_propal_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_propal_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_propal_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_propal_extrafields`
+--
+
+LOCK TABLES `llx_propal_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_propal_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_propal_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_propaldet`
+--
+
+DROP TABLE IF EXISTS `llx_propaldet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_propaldet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_propal` int(11) DEFAULT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `tva_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_tx` double(6,3) DEFAULT '0.000',
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT '0.000',
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `price` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_localtax1` double(24,8) DEFAULT '0.00000000',
+  `total_localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `product_type` int(11) DEFAULT '0',
+  `date_start` datetime DEFAULT NULL,
+  `date_end` datetime DEFAULT NULL,
+  `info_bits` int(11) DEFAULT '0',
+  `fk_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `special_code` int(10) unsigned DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_propaldet_fk_propal` (`fk_propal`),
+  KEY `idx_propaldet_fk_product` (`fk_product`),
+  CONSTRAINT `fk_propaldet_fk_propal` FOREIGN KEY (`fk_propal`) REFERENCES `llx_propal` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_propaldet`
+--
+
+LOCK TABLES `llx_propaldet` WRITE;
+/*!40000 ALTER TABLE `llx_propaldet` DISABLE KEYS */;
+INSERT INTO `llx_propaldet` VALUES (1,1,NULL,NULL,NULL,'Une machine à café',NULL,12.500,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.25000000,0.00000000,0.00000000,11.25000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(2,2,NULL,NULL,NULL,'Product 1',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(3,2,NULL,2,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(4,3,NULL,NULL,NULL,'A new marvelous product',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(5,1,NULL,5,NULL,'cccc',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(11,1,NULL,4,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3),(12,1,NULL,4,NULL,'',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,4),(13,1,NULL,4,NULL,'',NULL,12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,5),(19,4,NULL,NULL,NULL,'bvbcvbcvbcbcbcb',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1),(20,4,NULL,NULL,NULL,'ghjhgjghjgh',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,2),(21,4,NULL,NULL,NULL,'ghjghjhgjg',NULL,19.600,0.000,'',0.000,'',2,0,0,10,10.00000000,20.00000000,3.92000000,0.00000000,0.00000000,23.92000000,1,NULL,NULL,0,NULL,0.00000000,0,3),(22,9,NULL,NULL,NULL,'gdfg',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,0,0.00000000,0,1),(23,9,NULL,NULL,NULL,'gfdgd',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,50.00000000,50.00000000,9.80000000,0.00000000,0.00000000,59.80000000,1,NULL,NULL,0,0,0.00000000,0,2),(24,11,NULL,NULL,NULL,'gfdg',NULL,19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,0,0.00000000,0,1),(25,12,NULL,NULL,NULL,'fdsfs',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,0,0.00000000,0,1),(26,12,NULL,NULL,NULL,'fsdfsf',NULL,0.000,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,2);
+/*!40000 ALTER TABLE `llx_propaldet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_propaldet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_propaldet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_propaldet_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_propaldet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_propaldet_extrafields`
+--
+
+LOCK TABLES `llx_propaldet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_propaldet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_propaldet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_residence`
+--
+
+DROP TABLE IF EXISTS `llx_residence`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_residence` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) DEFAULT '1',
+  `ref` varchar(12) NOT NULL,
+  `label` varchar(30) NOT NULL,
+  `address` varchar(254) DEFAULT NULL,
+  `zip` varchar(12) DEFAULT NULL,
+  `town` varchar(36) DEFAULT NULL,
+  `fk_country_id` int(11) DEFAULT NULL,
+  `name_concierge` varchar(64) DEFAULT NULL,
+  `tel_concierge` varchar(32) DEFAULT NULL,
+  `hours_concierge` varchar(64) DEFAULT NULL,
+  `antenne` varchar(64) DEFAULT NULL,
+  `attestation` int(11) DEFAULT NULL,
+  `latitude` float DEFAULT NULL,
+  `longitude` float DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_creation` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_modification` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `fk_thirdparty` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_residence_ref` (`ref`),
+  KEY `idx_residence_label` (`label`),
+  KEY `idx_residence_zip` (`zip`),
+  KEY `idx_residence_town` (`town`),
+  KEY `fk_residence_thirdparty` (`fk_thirdparty`),
+  KEY `fk_country_id` (`fk_country_id`),
+  CONSTRAINT `fk_country_id` FOREIGN KEY (`fk_country_id`) REFERENCES `llx_c_country` (`rowid`),
+  CONSTRAINT `fk_residence_thirdparty` FOREIGN KEY (`fk_thirdparty`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_residence`
+--
+
+LOCK TABLES `llx_residence` WRITE;
+/*!40000 ALTER TABLE `llx_residence` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_residence` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_residence_building`
+--
+
+DROP TABLE IF EXISTS `llx_residence_building`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_residence_building` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(20) NOT NULL,
+  `label` varchar(30) NOT NULL,
+  `access_code` varchar(16) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_creation` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_modification` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `fk_residence` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_residence_building_fk_residence` (`fk_residence`),
+  CONSTRAINT `fk_residence_building_residence` FOREIGN KEY (`fk_residence`) REFERENCES `llx_residence` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_residence_building`
+--
+
+LOCK TABLES `llx_residence_building` WRITE;
+/*!40000 ALTER TABLE `llx_residence_building` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_residence_building` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_residence_building_links`
+--
+
+DROP TABLE IF EXISTS `llx_residence_building_links`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_residence_building_links` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `residenceid` int(11) DEFAULT NULL,
+  `buildingid` int(11) DEFAULT NULL,
+  `parentid` int(11) DEFAULT NULL,
+  `parenttype` varchar(16) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_residence_building_1` (`parentid`,`parenttype`,`residenceid`),
+  UNIQUE KEY `uk_residence_building_2` (`parentid`,`parenttype`,`buildingid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_residence_building_links`
+--
+
+LOCK TABLES `llx_residence_building_links` WRITE;
+/*!40000 ALTER TABLE `llx_residence_building_links` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_residence_building_links` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_resource`
+--
+
+DROP TABLE IF EXISTS `llx_resource`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_resource` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref` varchar(255) DEFAULT NULL,
+  `description` text,
+  `fk_code_type_resource` varchar(32) DEFAULT NULL,
+  `note_public` text,
+  `note_private` text,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  KEY `fk_code_type_resource_idx` (`fk_code_type_resource`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_resource`
+--
+
+LOCK TABLES `llx_resource` WRITE;
+/*!40000 ALTER TABLE `llx_resource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_resource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_rights_def`
+--
+
+DROP TABLE IF EXISTS `llx_rights_def`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_rights_def` (
+  `id` int(11) NOT NULL DEFAULT '0',
+  `libelle` varchar(255) DEFAULT NULL,
+  `module` varchar(64) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `perms` varchar(50) DEFAULT NULL,
+  `subperms` varchar(50) DEFAULT NULL,
+  `type` varchar(1) DEFAULT NULL,
+  `bydefault` tinyint(4) DEFAULT '0',
+  PRIMARY KEY (`id`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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,'valider',NULL,'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,'valider',NULL,'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,'annuler',NULL,'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),(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,'Lire les codes barres','barcode',1,'lire',NULL,'r',1),(301,'Creer/modifier les codes barres','barcode',1,'creer',NULL,'w',0),(302,'Supprimer les codes barres','barcode',1,'supprimer',NULL,'d',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,'commande','valider','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),(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,'facture','valider','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,'Créer / Modifier / Lire ses demandes de congés payés','holiday',1,'write',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',1,'lire_tous',NULL,'w',0),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',1,'define_holiday',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',1,'view_log',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',1,'month_report',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;
+
+--
+-- Table structure for table `llx_societe`
+--
+
+DROP TABLE IF EXISTS `llx_societe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `statut` tinyint(4) DEFAULT '0',
+  `parent` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `nom` varchar(128) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `ref_int` varchar(60) DEFAULT NULL,
+  `code_client` varchar(24) DEFAULT NULL,
+  `code_fournisseur` varchar(24) DEFAULT NULL,
+  `code_compta` varchar(24) DEFAULT NULL,
+  `code_compta_fournisseur` varchar(24) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(25) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `fk_departement` int(11) DEFAULT '0',
+  `fk_pays` int(11) DEFAULT '0',
+  `phone` varchar(20) DEFAULT NULL,
+  `fax` varchar(20) DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `email` varchar(128) DEFAULT NULL,
+  `skype` varchar(255) DEFAULT NULL,
+  `fk_effectif` int(11) DEFAULT '0',
+  `fk_typent` int(11) DEFAULT '0',
+  `fk_forme_juridique` int(11) DEFAULT '0',
+  `fk_currency` varchar(3) DEFAULT NULL,
+  `siren` varchar(128) DEFAULT NULL,
+  `siret` varchar(128) DEFAULT NULL,
+  `ape` varchar(128) DEFAULT NULL,
+  `idprof4` varchar(128) DEFAULT NULL,
+  `tva_intra` varchar(20) DEFAULT NULL,
+  `capital` double DEFAULT NULL,
+  `fk_stcomm` int(11) NOT NULL,
+  `note_private` text,
+  `note_public` text,
+  `prefix_comm` varchar(5) DEFAULT NULL,
+  `client` tinyint(4) DEFAULT '0',
+  `fournisseur` tinyint(4) DEFAULT '0',
+  `supplier_account` varchar(32) DEFAULT NULL,
+  `fk_prospectlevel` varchar(12) DEFAULT NULL,
+  `customer_bad` tinyint(4) DEFAULT '0',
+  `customer_rate` double DEFAULT '0',
+  `supplier_rate` double DEFAULT '0',
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `remise_client` double DEFAULT '0',
+  `mode_reglement` tinyint(4) DEFAULT NULL,
+  `cond_reglement` tinyint(4) DEFAULT NULL,
+  `mode_reglement_supplier` int(11) DEFAULT NULL,
+  `outstanding_limit` double(24,8) DEFAULT NULL,
+  `cond_reglement_supplier` int(11) DEFAULT NULL,
+  `tva_assuj` tinyint(4) DEFAULT '1',
+  `localtax1_assuj` tinyint(4) DEFAULT '0',
+  `localtax1_value` double(6,3) DEFAULT NULL,
+  `localtax2_assuj` tinyint(4) DEFAULT '0',
+  `localtax2_value` double(6,3) DEFAULT NULL,
+  `barcode` varchar(255) DEFAULT NULL,
+  `price_level` int(11) DEFAULT NULL,
+  `default_lang` varchar(6) DEFAULT NULL,
+  `canvas` varchar(32) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `status` tinyint(4) DEFAULT '1',
+  `logo` varchar(255) DEFAULT NULL,
+  `idprof5` varchar(128) DEFAULT NULL,
+  `idprof6` varchar(128) DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT '0',
+  `webservices_url` varchar(255) DEFAULT NULL,
+  `webservices_key` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_societe_prefix_comm` (`prefix_comm`,`entity`),
+  UNIQUE KEY `uk_societe_code_client` (`code_client`,`entity`),
+  UNIQUE KEY `uk_societe_barcode` (`barcode`,`fk_barcode_type`,`entity`),
+  KEY `idx_societe_user_creat` (`fk_user_creat`),
+  KEY `idx_societe_user_modif` (`fk_user_modif`),
+  KEY `idx_societe_barcode` (`barcode`)
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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),(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),(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),(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),(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),(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),(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),(8,0,NULL,'2010-07-10 12:54:27','2010-07-10 14:54:27','Client salon',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,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),(9,0,NULL,'2010-07-10 12:55:11','2010-07-10 14:54:44','Client salon invidivdu',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0,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),(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),(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),(12,0,NULL,'2013-02-20 19:07:21','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'toto@aa.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),(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),(15,0,NULL,'2011-08-01 00:31:24','2011-08-01 02:31:24','mmm',1,NULL,NULL,'CU1108-0002','SU1108-0002',NULL,NULL,'','78180','mmm',0,31,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,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),(16,0,NULL,'2011-08-01 00:42:21','2011-08-01 02:31:43','ppp',1,NULL,NULL,'CU1108-0003','SU1108-0003',NULL,NULL,'','78180','mmm',103,2,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,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),(17,0,NULL,'2011-08-04 21:24:24','2011-08-01 02:41:26','FFF SARL',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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL),(18,0,NULL,'2013-01-12 13:38:32','2012-12-09 20:14:42','doe john',1,NULL,NULL,'CU1212-0006',NULL,NULL,NULL,'',NULL,NULL,0,1,'111','2222',NULL,'johndoe@email.com',NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,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),(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),(20,0,NULL,'2013-01-12 11:52:20','2013-01-12 12:52:20','pppoo',1,NULL,NULL,'CU1301-0009',NULL,NULL,NULL,'pppoo',NULL,NULL,0,4,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',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),(21,0,NULL,'2013-01-23 15:56:58','2013-01-23 16:56:58','pa',1,NULL,NULL,'CU1301-0010',NULL,NULL,NULL,'',NULL,NULL,0,81,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',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),(22,0,NULL,'2013-02-26 21:57:58','2013-02-26 22:57:50','pppp',1,NULL,NULL,'CU1302-0012',NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',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,'fr_FR','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL),(23,0,NULL,'2013-02-26 21:58:13','2013-02-26 22:58:13','ttttt',1,NULL,NULL,'CU1302-0013','SU1302-0006',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,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,'','',0,NULL,NULL),(24,0,NULL,'2013-03-09 15:33:39','2013-03-06 17:13:59','smith smith',1,NULL,NULL,'CU1303-0015',NULL,'411E123',NULL,'',NULL,NULL,0,11,NULL,NULL,NULL,'smith@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),(25,0,NULL,'2013-03-10 14:47:37','2013-03-10 15:47:37','jlmkjlkj',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'',NULL,NULL,0,117,NULL,NULL,NULL,NULL,NULL,NULL,101,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'en_US',NULL,NULL,1,NULL,'','',0,NULL,NULL),(26,0,NULL,'2013-03-10 14:57:32','2013-03-10 15:57:32','iiii',1,NULL,NULL,'CU1303-0017','SU1303-0008',NULL,NULL,'',NULL,NULL,290,117,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'en_US',NULL,NULL,1,NULL,'','',0,NULL,NULL);
+/*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_address`
+--
+
+DROP TABLE IF EXISTS `llx_societe_address`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_address` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(30) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT '0',
+  `name` varchar(60) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `fk_pays` int(11) DEFAULT '0',
+  `phone` varchar(20) DEFAULT NULL,
+  `fax` varchar(20) DEFAULT NULL,
+  `note` text,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_address`
+--
+
+LOCK TABLES `llx_societe_address` WRITE;
+/*!40000 ALTER TABLE `llx_societe_address` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_societe_address` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_commerciaux`
+--
+
+DROP TABLE IF EXISTS `llx_societe_commerciaux`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_commerciaux` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_societe_commerciaux` (`fk_soc`,`fk_user`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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),(3,15,1),(4,16,1),(5,17,1),(6,19,1),(8,19,3),(7,20,1),(9,21,1),(10,23,1),(11,25,1),(12,26,1);
+/*!40000 ALTER TABLE `llx_societe_commerciaux` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_societe_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `jjjj` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_societe_extrafields` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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,'kkkk',NULL),(2,'2011-06-22 16:23:16',41,'jjj',NULL),(4,'2011-06-23 07:40:40',39,'lll',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),(19,'2011-08-01 00:31:24',15,NULL,NULL),(22,'2011-08-01 00:42:21',16,NULL,NULL),(27,'2011-08-04 21:24:24',17,NULL,NULL),(28,'2012-12-08 16:38:30',10,NULL,NULL),(30,'2012-12-19 14:47:50',1,NULL,NULL),(31,'2013-01-12 13:38:32',18,NULL,NULL),(33,'2013-02-12 16:06:20',7,NULL,NULL),(34,'2013-02-20 19:07:21',12,'jjj',NULL),(36,'2013-02-26 21:57:58',22,'jjj',NULL),(37,'2013-02-26 21:58:13',23,NULL,NULL),(44,'2013-03-03 23:08:04',4,'jjj',NULL),(45,'2013-03-09 15:33:39',24,'jjj',NULL),(46,'2013-03-10 14:47:37',25,NULL,NULL),(47,'2013-03-10 14:57:32',26,NULL,NULL),(49,'2014-03-02 19:09:52',19,'jjj',NULL);
+/*!40000 ALTER TABLE `llx_societe_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_log`
+--
+
+DROP TABLE IF EXISTS `llx_societe_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `datel` datetime DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_statut` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `author` varchar(30) DEFAULT NULL,
+  `label` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_log`
+--
+
+LOCK TABLES `llx_societe_log` WRITE;
+/*!40000 ALTER TABLE `llx_societe_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_societe_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_prices`
+--
+
+DROP TABLE IF EXISTS `llx_societe_prices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_prices` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT '0',
+  `tms` timestamp NULL DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `price_level` tinyint(4) DEFAULT '1',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_prices`
+--
+
+LOCK TABLES `llx_societe_prices` WRITE;
+/*!40000 ALTER TABLE `llx_societe_prices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_societe_prices` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_remise`
+--
+
+DROP TABLE IF EXISTS `llx_societe_remise`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_remise` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `remise_client` double(6,3) NOT NULL DEFAULT '0.000',
+  `note` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_remise`
+--
+
+LOCK TABLES `llx_societe_remise` WRITE;
+/*!40000 ALTER TABLE `llx_societe_remise` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_societe_remise` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_remise_except`
+--
+
+DROP TABLE IF EXISTS `llx_societe_remise_except`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_remise_except` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `amount_ht` double(24,8) NOT NULL,
+  `amount_tva` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `amount_ttc` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `tva_tx` double(6,3) NOT NULL DEFAULT '0.000',
+  `fk_user` int(11) NOT NULL,
+  `fk_facture_line` int(11) DEFAULT NULL,
+  `fk_facture` int(11) DEFAULT NULL,
+  `fk_facture_source` int(11) DEFAULT NULL,
+  `description` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_societe_remise_except_fk_user` (`fk_user`),
+  KEY `idx_societe_remise_except_fk_soc` (`fk_soc`),
+  KEY `idx_societe_remise_except_fk_facture_line` (`fk_facture_line`),
+  KEY `idx_societe_remise_except_fk_facture` (`fk_facture`),
+  KEY `idx_societe_remise_except_fk_facture_source` (`fk_facture_source`),
+  CONSTRAINT `fk_societe_remise_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`),
+  CONSTRAINT `fk_societe_remise_fk_facture_line` FOREIGN KEY (`fk_facture_line`) REFERENCES `llx_facturedet` (`rowid`),
+  CONSTRAINT `fk_societe_remise_fk_facture_source` FOREIGN KEY (`fk_facture_source`) REFERENCES `llx_facture` (`rowid`),
+  CONSTRAINT `fk_societe_remise_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_societe_remise_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_remise_except`
+--
+
+LOCK TABLES `llx_societe_remise_except` WRITE;
+/*!40000 ALTER TABLE `llx_societe_remise_except` DISABLE KEYS */;
+INSERT INTO `llx_societe_remise_except` VALUES (1,23,'2013-03-08 10:02:54',5.00000000,0.00000000,5.00000000,0.000,1,775,NULL,NULL,'fsdfsf'),(2,19,'2013-03-19 09:36:15',10.00000000,1.25000000,11.25000000,12.500,1,1019,NULL,NULL,'hfghgf');
+/*!40000 ALTER TABLE `llx_societe_remise_except` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_societe_rib`
+--
+
+DROP TABLE IF EXISTS `llx_societe_rib`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_societe_rib` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(30) DEFAULT NULL,
+  `bank` varchar(255) DEFAULT NULL,
+  `code_banque` varchar(7) DEFAULT NULL,
+  `code_guichet` varchar(6) DEFAULT NULL,
+  `number` varchar(255) DEFAULT NULL,
+  `cle_rib` varchar(5) DEFAULT NULL,
+  `bic` varchar(20) DEFAULT NULL,
+  `iban_prefix` varchar(34) DEFAULT NULL,
+  `domiciliation` varchar(255) DEFAULT NULL,
+  `proprio` varchar(60) DEFAULT NULL,
+  `owner_address` text,
+  `default_rib` tinyint(4) NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_societe_rib`
+--
+
+LOCK TABLES `llx_societe_rib` WRITE;
+/*!40000 ALTER TABLE `llx_societe_rib` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_societe_rib` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_socpeople`
+--
+
+DROP TABLE IF EXISTS `llx_socpeople`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_socpeople` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_soc` int(11) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `civility` varchar(6) DEFAULT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` text,
+  `fk_departement` int(11) DEFAULT NULL,
+  `fk_pays` int(11) DEFAULT '0',
+  `birthday` date DEFAULT NULL,
+  `poste` varchar(80) DEFAULT NULL,
+  `phone` varchar(30) DEFAULT NULL,
+  `phone_perso` varchar(30) DEFAULT NULL,
+  `phone_mobile` varchar(30) DEFAULT NULL,
+  `fax` varchar(30) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `jabberid` varchar(255) DEFAULT NULL,
+  `skype` varchar(255) DEFAULT NULL,
+  `priv` smallint(6) NOT NULL DEFAULT '0',
+  `no_email` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user_creat` int(11) DEFAULT '0',
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `default_lang` varchar(6) DEFAULT NULL,
+  `canvas` varchar(32) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `statut` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_socpeople_fk_soc` (`fk_soc`),
+  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=12 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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','2010-07-08 20:59:35',NULL,1,NULL,'MR','Freeman','Private','','','',NULL,11,NULL,'','','','','','','',NULL,1,0,1,1,'This is a private contact',NULL,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),(5,'2010-07-10 14:54:44','2010-07-10 12:54:44',9,1,NULL,'','Client salon invidivdu','','','','',NULL,NULL,NULL,'','','','','','','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2011-08-01 00:41:26',17,1,NULL,'','aaa','','aaa','','',289,117,NULL,'','','','','','','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(7,'2013-02-12 17:05:57','2013-03-08 01:45:08',7,1,NULL,'','aaa','','','','',289,117,NULL,'','','','','','aaa@aaa.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(8,'2013-03-08 02:45:31','2013-03-08 01:45:31',7,1,NULL,'','kkkk','','','','',290,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(10,'2013-03-08 02:48:23','2013-03-08 01:48:23',7,1,NULL,'','fff','','','','',290,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1),(11,'2013-03-08 02:48:54','2013-03-08 01:48:54',7,1,NULL,'','iii','','','','',294,117,NULL,'','','','','','ttt@ttt.com','',NULL,0,0,1,1,'',NULL,NULL,NULL,NULL,1);
+/*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_socpeople_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_socpeople_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_socpeople_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_socpeople_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_socpeople_extrafields`
+--
+
+LOCK TABLES `llx_socpeople_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_socpeople_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_socpeople_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_stock_mouvement`
+--
+
+DROP TABLE IF EXISTS `llx_stock_mouvement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_stock_mouvement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datem` datetime DEFAULT NULL,
+  `fk_product` int(11) NOT NULL,
+  `fk_entrepot` int(11) NOT NULL,
+  `value` double DEFAULT NULL,
+  `price` float(13,4) DEFAULT '0.0000',
+  `type_mouvement` smallint(6) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `label` varchar(128) DEFAULT NULL,
+  `fk_origin` int(11) DEFAULT NULL,
+  `origintype` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_stock_mouvement_fk_product` (`fk_product`),
+  KEY `idx_stock_mouvement_fk_entrepot` (`fk_entrepot`)
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_stock_mouvement`
+--
+
+LOCK TABLES `llx_stock_mouvement` WRITE;
+/*!40000 ALTER TABLE `llx_stock_mouvement` DISABLE KEYS */;
+INSERT INTO `llx_stock_mouvement` VALUES (1,'2010-07-08 22:43:51','2010-07-09 00:43:51',2,2,1000,0.0000,0,1,'Correct stock',NULL,NULL),(3,'2010-07-10 22:56:18','2010-07-11 00:56:18',4,2,500,0.0000,0,1,'Init',NULL,NULL),(4,'2010-07-10 23:02:20','2010-07-11 01:02:20',4,2,500,0.0000,0,1,'',NULL,NULL),(5,'2010-07-11 16:49:44','2010-07-11 18:49:44',4,1,2,10.0000,3,1,'',NULL,NULL),(6,'2010-07-11 16:49:44','2010-07-11 18:49:44',1,1,4,0.0000,3,1,'',NULL,NULL),(7,'2013-01-19 17:22:48','2013-01-19 18:22:48',11,1,-1,0.0000,2,1,'Facture cr&eacute;&eacute;e dans DoliPOS',NULL,NULL),(8,'2013-01-19 17:22:48','2013-01-19 18:22:48',4,1,-1,5.0000,2,1,'Facture cr&eacute;&eacute;e dans DoliPOS',NULL,NULL),(9,'2013-01-19 17:22:48','2013-01-19 18:22:48',1,1,-2,0.0000,2,1,'Facture cr&eacute;&eacute;e dans DoliPOS',NULL,NULL),(10,'2013-01-19 17:31:10','2013-01-19 18:31:10',2,1,-1,0.0000,2,1,'Facture cr&eacute;&eacute;e dans DoliPOS',NULL,NULL),(11,'2013-01-19 17:31:58','2013-01-19 18:31:58',2,1,-1,0.0000,2,1,'Facture cr&eacute;&eacute;e dans DoliPOS',NULL,NULL);
+/*!40000 ALTER TABLE `llx_stock_mouvement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_tva`
+--
+
+DROP TABLE IF EXISTS `llx_tva`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_tva` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datep` date DEFAULT NULL,
+  `datev` date DEFAULT NULL,
+  `amount` double NOT NULL DEFAULT '0',
+  `label` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `note` text,
+  `fk_bank` int(11) DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_typepayment` int(11) DEFAULT NULL,
+  `num_payment` varchar(50) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_tva`
+--
+
+LOCK TABLES `llx_tva` WRITE;
+/*!40000 ALTER TABLE `llx_tva` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_tva` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_update_modules`
+--
+
+DROP TABLE IF EXISTS `llx_update_modules`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_update_modules` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `modulekey` varchar(24) DEFAULT NULL,
+  `datekey` date DEFAULT NULL,
+  `versionkey` double DEFAULT NULL,
+  `lastrequestdate` datetime DEFAULT NULL,
+  `email` varchar(128) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_update_modules`
+--
+
+LOCK TABLES `llx_update_modules` WRITE;
+/*!40000 ALTER TABLE `llx_update_modules` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_update_modules` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user`
+--
+
+DROP TABLE IF EXISTS `llx_user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `login` varchar(24) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `civility` varchar(6) DEFAULT NULL,
+  `ref_ext` varchar(50) DEFAULT NULL,
+  `ref_int` varchar(50) DEFAULT NULL,
+  `pass` varchar(32) DEFAULT NULL,
+  `pass_crypted` varchar(128) DEFAULT NULL,
+  `pass_temp` varchar(32) DEFAULT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `job` varchar(128) DEFAULT NULL,
+  `skype` varchar(255) DEFAULT NULL,
+  `office_phone` varchar(20) DEFAULT NULL,
+  `office_fax` varchar(20) DEFAULT NULL,
+  `user_mobile` varchar(20) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `signature` text,
+  `admin` smallint(6) DEFAULT '0',
+  `webcal_login` varchar(25) DEFAULT NULL,
+  `phenix_login` varchar(25) DEFAULT NULL,
+  `phenix_pass` varchar(128) DEFAULT NULL,
+  `module_comm` smallint(6) DEFAULT '1',
+  `module_compta` smallint(6) DEFAULT '1',
+  `fk_societe` int(11) DEFAULT NULL,
+  `fk_socpeople` int(11) DEFAULT NULL,
+  `fk_member` int(11) DEFAULT NULL,
+  `note` text,
+  `datelastlogin` datetime DEFAULT NULL,
+  `datepreviouslogin` datetime DEFAULT NULL,
+  `egroupware_id` int(11) DEFAULT NULL,
+  `ldap_sid` varchar(255) DEFAULT NULL,
+  `statut` tinyint(4) DEFAULT '1',
+  `photo` varchar(255) DEFAULT NULL,
+  `lang` varchar(6) DEFAULT NULL,
+  `openid` varchar(255) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `thm` double(24,8) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(25) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `fk_state` int(11) DEFAULT '0',
+  `fk_country` int(11) DEFAULT '0',
+  `color` varchar(6) DEFAULT NULL,
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  `barcode` varchar(255) DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT '0',
+  `nb_holiday` int(11) DEFAULT '0',
+  `salary` double(24,8) DEFAULT NULL,
+  `tjm` double(24,8) DEFAULT NULL,
+  `salaryextra` double(24,8) DEFAULT NULL,
+  `weeklyhours` double(16,8) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_user_login` (`login`,`entity`),
+  UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`),
+  UNIQUE KEY `uk_user_fk_member` (`fk_member`),
+  KEY `uk_user_fk_societe` (`fk_societe`)
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',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),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',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),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',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),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',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);
+/*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user_alert`
+--
+
+DROP TABLE IF EXISTS `llx_user_alert`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_alert` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `type` int(11) DEFAULT NULL,
+  `fk_contact` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_alert`
+--
+
+LOCK TABLES `llx_user_alert` WRITE;
+/*!40000 ALTER TABLE `llx_user_alert` DISABLE KEYS */;
+INSERT INTO `llx_user_alert` VALUES (1,1,1,1);
+/*!40000 ALTER TABLE `llx_user_alert` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user_clicktodial`
+--
+
+DROP TABLE IF EXISTS `llx_user_clicktodial`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_clicktodial` (
+  `fk_user` int(11) NOT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `login` varchar(32) DEFAULT NULL,
+  `pass` varchar(64) DEFAULT NULL,
+  `poste` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_clicktodial`
+--
+
+LOCK TABLES `llx_user_clicktodial` WRITE;
+/*!40000 ALTER TABLE `llx_user_clicktodial` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_user_clicktodial` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_user_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_user_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_extrafields`
+--
+
+LOCK TABLES `llx_user_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_user_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_user_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user_param`
+--
+
+DROP TABLE IF EXISTS `llx_user_param`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_param` (
+  `fk_user` int(11) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `param` varchar(64) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  UNIQUE KEY `uk_user_param` (`fk_user`,`param`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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');
+/*!40000 ALTER TABLE `llx_user_param` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_user_rights`
+--
+
+DROP TABLE IF EXISTS `llx_user_rights`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_user_rights` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `fk_id` int(11) NOT NULL,
+  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=11900 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_user_rights`
+--
+
+LOCK TABLES `llx_user_rights` WRITE;
+/*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
+INSERT INTO `llx_user_rights` VALUES (11746,1,11),(11722,1,12),(11727,1,13),(11732,1,14),(11737,1,15),(11742,1,16),(11748,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),(11710,1,81),(11693,1,82),(11697,1,84),(11700,1,86),(11703,1,87),(11707,1,88),(11711,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),(11644,1,121),(11634,1,122),(11640,1,125),(11646,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),(11862,1,171),(11855,1,172),(11538,1,173),(11859,1,174),(11863,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),(11848,1,251),(11810,1,252),(11813,1,253),(11816,1,254),(11819,1,255),(11823,1,256),(1617,1,258),(11651,1,262),(11670,1,281),(11660,1,282),(11666,1,283),(11672,1,286),(11590,1,300),(11587,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(11826,1,341),(11828,1,342),(11830,1,343),(11832,1,344),(11844,1,351),(11837,1,352),(11841,1,353),(11845,1,354),(11849,1,358),(11686,1,531),(11679,1,532),(11683,1,534),(1625,1,536),(11687,1,538),(11878,1,700),(11868,1,701),(11874,1,702),(11880,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),(11756,1,1181),(11804,1,1182),(11761,1,1183),(11765,1,1184),(11769,1,1185),(11773,1,1186),(11777,1,1187),(11781,1,1188),(1578,1,1201),(1579,1,1202),(11800,1,1231),(11787,1,1232),(11791,1,1233),(11795,1,1234),(11798,1,1235),(11801,1,1236),(11805,1,1237),(1736,1,1251),(11753,1,1321),(11714,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(11604,1,2401),(11600,1,2402),(11606,1,2403),(11620,1,2411),(11616,1,2412),(11622,1,2413),(11626,1,2414),(1618,1,2500),(11890,1,2501),(11887,1,2503),(11891,1,2515),(9610,1,5001),(9611,1,5002),(8155,1,20001),(8159,1,20002),(8163,1,20003),(8167,1,20004),(8171,1,20005),(8175,1,20006),(10345,1,23001),(10338,1,23002),(10342,1,23003),(10346,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(11896,1,55001),(11897,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),(11749,5,11),(11725,5,12),(11729,5,13),(11735,5,14),(11739,5,15),(11745,5,16),(11751,5,19),(9729,5,21),(9703,5,22),(9709,5,24),(9713,5,25),(9719,5,26),(9725,5,27),(9731,5,28),(9981,5,31),(9971,5,32),(9977,5,34),(9983,5,38),(8089,5,41),(8090,5,61),(8091,5,71),(8092,5,72),(8093,5,74),(8094,5,75),(8095,5,78),(8096,5,79),(11712,5,81),(11695,5,82),(11699,5,84),(11701,5,86),(11705,5,87),(11709,5,88),(11713,5,89),(9799,5,91),(9789,5,92),(9795,5,93),(9801,5,94),(10098,5,95),(10100,5,96),(10105,5,97),(10106,5,98),(8101,5,101),(10232,5,111),(10204,5,112),(10210,5,113),(10216,5,114),(10222,5,115),(10228,5,116),(10234,5,117),(11647,5,121),(11637,5,122),(11643,5,125),(11649,5,126),(8104,5,151),(8105,5,161),(11864,5,171),(11857,5,172),(11540,5,173),(11861,5,174),(11865,5,178),(10003,5,221),(9993,5,222),(9999,5,223),(10005,5,229),(10009,5,237),(10013,5,238),(10017,5,239),(8110,5,241),(8111,5,242),(8112,5,243),(11850,5,251),(11811,5,252),(11815,5,253),(11817,5,254),(11821,5,255),(11825,5,256),(11653,5,262),(11673,5,281),(11663,5,282),(11669,5,283),(11675,5,286),(11592,5,300),(11589,5,301),(11593,5,302),(8115,5,331),(11827,5,341),(11829,5,342),(11831,5,343),(11833,5,344),(11846,5,351),(11839,5,352),(11843,5,353),(11847,5,354),(11851,5,358),(11688,5,531),(11681,5,532),(11685,5,534),(11689,5,538),(11881,5,700),(11871,5,701),(11877,5,702),(11883,5,703),(8122,5,1001),(8123,5,1002),(8124,5,1003),(8125,5,1004),(8126,5,1005),(8127,5,1101),(11757,5,1181),(11806,5,1182),(11763,5,1183),(11767,5,1184),(11771,5,1185),(11775,5,1186),(11779,5,1187),(11783,5,1188),(8130,5,1201),(8131,5,1202),(11802,5,1231),(11789,5,1232),(11793,5,1233),(11797,5,1234),(11799,5,1235),(11803,5,1236),(11807,5,1237),(11755,5,1321),(11715,5,1421),(8192,5,1791),(8189,5,1792),(8193,5,1793),(11607,5,2401),(11603,5,2402),(11609,5,2403),(11623,5,2411),(11619,5,2412),(11625,5,2413),(11627,5,2414),(11892,5,2501),(11889,5,2503),(11893,5,2515),(9612,5,5001),(9613,5,5002),(8157,5,20001),(8161,5,20002),(8165,5,20003),(8169,5,20004),(8173,5,20005),(8177,5,20006),(10347,5,23001),(10340,5,23002),(10344,5,23003),(10348,5,23004),(8138,5,50101),(11898,5,55001),(11899,5,55002),(9597,5,101051),(9599,5,101052),(9601,5,101053),(9606,5,101060),(9607,5,101061),(8139,5,101201),(10356,5,101250),(10358,5,101251),(8982,5,101261),(8983,5,101262),(10032,5,101701),(10033,5,101702),(8141,5,102000),(9821,5,400051),(9825,5,400052),(9829,5,400053),(9833,5,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);
+/*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_usergroup`
+--
+
+DROP TABLE IF EXISTS `llx_usergroup`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_usergroup` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(255) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_usergroup_name` (`nom`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_usergroup`
+--
+
+LOCK TABLES `llx_usergroup` WRITE;
+/*!40000 ALTER TABLE `llx_usergroup` DISABLE KEYS */;
+INSERT INTO `llx_usergroup` VALUES (1,'ggg',1,'2013-01-16 20:48:08','2013-01-16 19:48:08','ggg');
+/*!40000 ALTER TABLE `llx_usergroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_usergroup_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_usergroup_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_usergroup_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_usergroup_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_usergroup_extrafields`
+--
+
+LOCK TABLES `llx_usergroup_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_usergroup_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_usergroup_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_usergroup_rights`
+--
+
+DROP TABLE IF EXISTS `llx_usergroup_rights`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_usergroup_rights` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_usergroup` int(11) NOT NULL,
+  `fk_id` int(11) NOT NULL,
+  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;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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);
+/*!40000 ALTER TABLE `llx_usergroup_rights` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_usergroup_user`
+--
+
+DROP TABLE IF EXISTS `llx_usergroup_user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_usergroup_user` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_user` int(11) NOT NULL,
+  `fk_usergroup` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_usergroup_user` (`entity`,`fk_user`,`fk_usergroup`),
+  KEY `fk_usergroup_user_fk_user` (`fk_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=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for 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);
+/*!40000 ALTER TABLE `llx_usergroup_user` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2014-12-21 21:06:14
diff --git a/dev/initdata/savedemo.sh b/dev/initdata/savedemo.sh
index 5426a6e6391..c4de22c5e2f 100755
--- a/dev/initdata/savedemo.sh
+++ b/dev/initdata/savedemo.sh
@@ -193,13 +193,15 @@ export list="
 	--ignore-table=$base.llx_cabinetmed_societe
 	--ignore-table=$base.llx_fournisseur_ca
 	--ignore-table=$base.llx_google_maps
+	--ignore-table=$base.llx_notes
 	--ignore-table=$base.llx_pos_paiement_ticket
 	--ignore-table=$base.llx_pos_places
 	--ignore-table=$base.llx_pos_ticket
 	--ignore-table=$base.llx_publi_c_contact_list 
 	--ignore-table=$base.llx_publi_c_dnd_list
 	--ignore-table=$base.llx_publi_c_method_list
-	--ignore-table=$base.llx_ultimatepdf 
+	--ignore-table=$base.llx_ultimatepdf
+	--ignore-table=$base.llx_ventilation_achat
 	" 
 echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
 mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile

From a519df5d00da565e65054f795d51ec93f9f0575a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 01:43:20 +0100
Subject: [PATCH 181/345] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/theme/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/theme/.gitignore b/htdocs/theme/.gitignore
index bad6db7e4d2..59c154b7d5f 100644
--- a/htdocs/theme/.gitignore
+++ b/htdocs/theme/.gitignore
@@ -1,2 +1,3 @@
 /bootstrap
 /oblyon
+/autre

From c9db04985e475cc9b80aba244ec9f9b77add538c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 02:53:33 +0100
Subject: [PATCH 182/345] Update image for menu

---
 htdocs/theme/eldy/img/menus/agenda.png        | Bin 1586 -> 700 bytes
 htdocs/theme/eldy/img/menus/agenda_over.png   | Bin 0 -> 541 bytes
 htdocs/theme/eldy/img/menus/bank.png          | Bin 719 -> 827 bytes
 htdocs/theme/eldy/img/menus/bank_over.png     | Bin 0 -> 620 bytes
 htdocs/theme/eldy/img/menus/commercial.png    | Bin 1472 -> 845 bytes
 .../theme/eldy/img/menus/commercial_over.png  | Bin 0 -> 638 bytes
 htdocs/theme/eldy/img/menus/company.png       | Bin 2141 -> 572 bytes
 htdocs/theme/eldy/img/menus/company_over.png  | Bin 0 -> 406 bytes
 htdocs/theme/eldy/img/menus/cron.png          | Bin 2165 -> 0 bytes
 htdocs/theme/eldy/img/menus/ecm.png           | Bin 2372 -> 912 bytes
 htdocs/theme/eldy/img/menus/ecm_over.png      | Bin 0 -> 647 bytes
 htdocs/theme/eldy/img/menus/externalsite.png  | Bin 624 -> 531 bytes
 .../eldy/img/menus/externalsite_over.png      | Bin 0 -> 404 bytes
 htdocs/theme/eldy/img/menus/ftp.png           | Bin 0 -> 788 bytes
 htdocs/theme/eldy/img/menus/ftp_over.png      | Bin 0 -> 563 bytes
 htdocs/theme/eldy/img/menus/generic1.png      | Bin 976 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic1_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/generic2.png      | Bin 943 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic2_over.png | Bin 0 -> 548 bytes
 htdocs/theme/eldy/img/menus/generic3.png      | Bin 742 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic3_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/generic4.png      | Bin 992 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic4_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/globe.png         | Bin 2175 -> 1175 bytes
 htdocs/theme/eldy/img/menus/globe_over.png    | Bin 0 -> 844 bytes
 htdocs/theme/eldy/img/menus/holiday.png       | Bin 1723 -> 1086 bytes
 htdocs/theme/eldy/img/menus/home.png          | Bin 1008 -> 679 bytes
 htdocs/theme/eldy/img/menus/home_over.png     | Bin 0 -> 484 bytes
 htdocs/theme/eldy/img/menus/mail.png          | Bin 1041 -> 718 bytes
 htdocs/theme/eldy/img/menus/mail_over.png     | Bin 0 -> 534 bytes
 htdocs/theme/eldy/img/menus/members.png       | Bin 1366 -> 1044 bytes
 htdocs/theme/eldy/img/menus/members_over.png  | Bin 0 -> 720 bytes
 htdocs/theme/eldy/img/menus/money.png         | Bin 1751 -> 1259 bytes
 htdocs/theme/eldy/img/menus/money_over.png    | Bin 0 -> 940 bytes
 htdocs/theme/eldy/img/menus/pointofsale.png   | Bin 1460 -> 542 bytes
 .../theme/eldy/img/menus/pointofsale_over.png | Bin 0 -> 424 bytes
 htdocs/theme/eldy/img/menus/products.png      | Bin 1519 -> 510 bytes
 htdocs/theme/eldy/img/menus/products_over.png | Bin 0 -> 358 bytes
 htdocs/theme/eldy/img/menus/project.png       | Bin 1075 -> 449 bytes
 htdocs/theme/eldy/img/menus/project_over.png  | Bin 0 -> 360 bytes
 htdocs/theme/eldy/img/menus/shop.png          | Bin 0 -> 679 bytes
 htdocs/theme/eldy/img/menus/shop_over.png     | Bin 0 -> 502 bytes
 htdocs/theme/eldy/img/menus/tools.png         | Bin 1404 -> 1052 bytes
 htdocs/theme/eldy/img/menus/tools_over.png    | Bin 0 -> 706 bytes
 htdocs/theme/eldy/style.css.php               |   2 +-
 45 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 htdocs/theme/eldy/img/menus/agenda_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/bank_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/commercial_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/company_over.png
 delete mode 100644 htdocs/theme/eldy/img/menus/cron.png
 create mode 100644 htdocs/theme/eldy/img/menus/ecm_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/externalsite_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/ftp.png
 create mode 100644 htdocs/theme/eldy/img/menus/ftp_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic1_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic2_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic3_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic4_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/globe_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/home_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/mail_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/members_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/money_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/pointofsale_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/products_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/project_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/shop.png
 create mode 100644 htdocs/theme/eldy/img/menus/shop_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/tools_over.png

diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png
index 866037c9b543df97f7e01e4f7873850ba597d030..0798d15f938689a6b894e2da42fd7cbe5d73aea4 100644
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#q{Lk(I000KNoL_t(o!|mC<YZO5k$MH|Zpou7`F(@J?0TEH~rSL5%K?o=oTBZ`Q
zvaztRun_z+Y*P4#*jS`6qA{qYCSDOx<GYdE1!6OS<=DHuOJ;Aga1RW->@)k^_kQ=x
z%rkR6tE;QZYFm`py6|22O#nZZ^6XSu;2&cq0FPk~H}itunnTQ!c-_tU4l4f$2T`qi
zJ{o+@><xb4c{?B26LE$89U;aqT*GXqm9IvKu^kgdz%NINbF_$@j|IP2X83PKz*i&1
z87wpWN}1E9+Eu<F<!eR2Uk%q`jNl4RlqGG}>|<!pa2&TWwAs>TA1>oqxbMe2zT#zQ
z@9+S3acMK8O+Rj6JjFK>+F4XEiBEVEphjcDw_DHm;eJqjInmzYPPnc;8^l9g2=7kf
zMcsR8EjRdk0jgTpY6;cqeG{S1ho|_N(kCreRQPcWWT;hZ;J+38|1i~Q<+tNp3u@IG
z_;=t;=rbKl`Bn$)Q23(NjOlHqNuMKlg@v%|+SaM5av);`txuaYJCL}q;83Tg%H0|8
zYiiHnLyG@=O8@1J?uA>0ueGTB`v(5gDPyfsyuY#GKPRTUG~0#i8NW<&EbMGDHu_@2
ze`%p$+LHlaN%U(L>w9eY3jUyX1GUgxxE{_(!TCIDo7r`ixWcMBmsqG~8;qL;EVUZ6
z-4nBm*t?F+#Z)*Ai)!uGHq&iF<OaST<&&pc!x>{>G0gi*a<YvawDw|uNTdEb=!Lx0
ijs;)1b^lN+%Kig&F4C$|W_i>A0000<MNUMnLSTY3+Cpgn

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

diff --git a/htdocs/theme/eldy/img/menus/agenda_over.png b/htdocs/theme/eldy/img/menus/agenda_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdebed8fa264b115bcbfa4df01a32e5f84793462
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uj0XJcGUf00EszL_t(o!|j;SZG$inhJUKQHye}<LMJGlpo~B^$Ofeov>TLe;1Qe&
z>THk^$OPAyi)0~)ZLr-~^+~({#vk@?-+wNM2&u*$5{?X?;co!Gp14<~0^b2p3|s>^
z0cb+O-v{{S7Qj!|e8iFO0F*Q9pfj{p00sckrNhEwhV}8GGykkgQ8o_%+LSe4r3^o0
z_&<s=dz%cO;lslhd_4i!0XU>M@(MuDY5oPk@fP7rHe8Z@`^8xGnunL1F~5V*6Orq+
zA)-$*ha#d%YuA%qNL!XA;Oa_;a^hL5wHH3&U1cM=QgVqe&1|)7d!uW<TL69uq4}0R
zHv9&_enmfznoo}oUvr_bCK_!kJ;#LiarRP=azV5L+!nr{DWcyTW^V8e4+nV6z>n8Z
zG<XHz)i5)rV+&p9TOY-U3%sf7f40aGHWEDfUa-Q$4k5HeW%HibL#I7}kA>hzZN$4P
zS{E)O?|Nb;E#xt!_1f3=xW*DUj{ZCt_!9Vmr~lnz4IKF0AmB@6Gv2Ek9@%mvEfEsh
f2Yfy~__y%C#jBVt_@Tw}00000NkvXXu0mjfo}S{j

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png
index 9c6300eae328e5ceb9ef00e02da20ceea075711e..fbaee7cc6bd21fb4f562365a376918f52633026f 100644
GIT binary patch
literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjF*gs!;&00O&7L_t(o!|j<nXcSQthQDl-_*i2U72glkLa`79HHBD+Hi9mKh%AUG
zSfvoO2nd!I+6jt<XrZE5s7QPizEM;#D5z+oX#%?;KEO!KY?2w9f8jD@XC^zZUD*Sd
zGxy#zXaD)<+_UH2X>uHgdX)@yEDi7t@D1>FBoln*mjVY;#P?LKYVapg1n-0aZv&+i
z!H<Rs8^;Cy1<(a70rEg=ErYj#VO_rjb{cb6yk2QUVuxkk()Bsl+y{Ygj}iPxRLnaS
zoDbJB^W~WD0A2yV)!zuLi+MqZUa)0mmjgF}N5C{77c=XTELfA-S-@UhCy_!UO_f2U
z06YV_fx{Z>QiyFylX)-s1DpZw8Do2-uc^%gjst6xj(I=n1)lq)x&qJ%TnDCx%{G~U
z%zL$8z(rsYa2m)O_kU3<OI9`|g_fW1(J<hh06%aRxD1>E76M0f?<S?y0x(BoCxIEj
zF+D_Y81P|ZzF(;m=>cF8a2}X#*zE^ysHErzdW;gIquQ7c%lt!^{YNd*>0{XDL`IKc
z|0Yi6{TA#eSAV^LSGp$$yfylRz*k^#8maQAtAEGGey;Qd*LW$7KdINikAOe`{z~66
z#@d0IX)ymzrEysn0NXt5yQS|MW1FjGJ`*tJE49@w`=6>j$Fdy&o&b{#`}sh#hkrXP
z^Onc_N~Ojj=|jpU_f^ZZ$?mhthP)B;LkbxyuFZ&FwrN%dxve9TtU{v*JT?|+(bxm;
zlI;UvjgNmj&X@;S1{@Ugmw-NFZmaZF>G$%v1K1b9cOr$^6y^NB0I$8M3bZAOlGqAZ
zRjvSbi`{P;GatMa*Z{0j--;XjcuHbafNfVed^Z+sURy`T=`Zn}l(}UrOG}l0B0F?S
zLn1qLN<&8eTjra5K4nfM{=-y!3c0~*!Pm4jzDcDe{{W+U8l>_!?qmP}002ovPDHLk
FV1m@oVeJ3_

literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0003FP)t-sXnKrm
zeT{2=kZgXDZh(<)fs=58lyQTVbcU97h?sbYn0Serd5W8QjGTOqo_&y@fsmeok)eW;
zqJxv8g_Wa*n5KxCsEL`Wikhm7oT`qVs*s?ok)f=Tqp*{sv6Q5;m8G+prm~u-vzw{3
zoT;^)tGS-6x}dJRqOiN7vAw0Ryr!|ern11Qw!x~n!>hT(th&XmxyG=&#<RZ2w7|)<
z!ppV8%(leMxWmr5#L&FR(Z0#iz{=9V%hbWj)xyix#n9Nr(b~q++se|~%hB7))85V2
z;Lh0L(AnbA+T+pN<<i>b)!yaS;py1q?Ahh*+2-)n=K0y_`Pu0C>+9?5>+9?5>+9?5
z>+9?5>+6|^M^^v<00DGTPE!Ct=GbNc00D1FL_t(26$QbuZX8t<0MK*qOm@9?BBiiN
zo3vDPNcjSOngR(?@C#{BB)Tmui+DZn&D_g5000000001lU)jJ5FMul$znlYf?Q_mq
zgmAk;nhjlZj4_H3;{Fj*y)}J|F~)2{2p%4hhvT(-A7hN!gb*UUe`I-DYTsj@bM6Qs
zgb1hgbuDZ&=R6RCYAqrjp4RP*;V69s0IBnJ1$OxYVC@4wRsy^LP@SMw0DQU!DI((b
zU9SazS|c(tBO;1g3xK+0W@ctY#7?gT!1=Od=67Ef;Y4KtaK67>E`R>?`H#2ryLF+m
z063jbr*B{TpWpskGMZj@0NyQ2*iWXtYEpT91`w)#{`=pj-@k5S+o;8J-B*>t)1{8%
z^MfzunEyTB-BzwX0(0x`?!Hx3ZRCop_h8(*ySl2Y?O5UJ4z}0s)^zRrk23*0-i;01
zy#ah!o&#|C001&0^A-RhBQqm2=&q_`0ssJj{{cW-!=ga7AUOa4002ovPDHLkV1nI}
Be5wEd

diff --git a/htdocs/theme/eldy/img/menus/bank_over.png b/htdocs/theme/eldy/img/menus/bank_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..d395710a8777d9c9612301f716557ccffc9188f6
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjR=>1v<=00HbtL_t(o!|ho?PJ>VoeKqdO4XP)Q6WAUB6J46(0n~Z|>&|7HxN&3Z
z0Zi}&(i4d8P4EV7To_l+&5-;|3bch5(EpNIOc~%o9`ok^wn(C>*g=C~$y@T4e1ou?
zb9@hgUm?FxVr}x*6~Ex{U&=;f3Lr4#)NTs-DS)1lPXN3&rQ3{D9?1jQR=H{NLjaDE
z_W*R8qWJ@nN+1u>Z(6tM0J!|i<H09@F@PfgZxUAkp6g704&Y2YU?B3ENsIt^0QSr5
zP-T*jg>YVtCl6W+@^b(;@<E5HBSjJk9Aj1~E+djz(PKV*sr4lfB!40qlYA$6EWbr0
zXCz&cjvUXzFpFPN^0BJ-NRCr#r*hmi>ir_*i^^uA@(%zPDYb_HPL+&;DmAZX?Yo?M
zPvtXdrCTv6jh6*Iewmk5%1&2N@{iK~5-hu9yiw<LsvsXI-F^eO&8Yt}hP(uWsx+@P
zd~Xn3gmdKsZjsek8RQ*hKo1MF{{!GeW*pPV28Hfkf=LBpIHmz5=esF=JzDbG8#O7@
ztTb_u3?;CFF>TGH%sD?$29$=VPJ>y3zUbM@*uYA59NKm0^BP@=xx8W57==3}->Y=;
z3EFCLzLCu-yTxtEuYp$1Uzv{a(N%$14Sp+;x3aP17vLAzGvAk&!lohs0000<MNUMn
GLSTZT6b1(X

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/commercial.png b/htdocs/theme/eldy/img/menus/commercial.png
index efc1b3f060822cd3e5ad5867a9ca5f7213549e79..df9b443ceecb364cede57efc36815cf7112e3653 100644
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjeGh88CP00PZPL_t(o!|j>RYg0iG$3H3lwoO%1!D^@?{x;PLS}Z930Hb)3BJ`#n
z1dpPiAove>62z0B7r~PU4<d>n9_&F+VyX3JY+8-P1Z#izBhmHH2`rC&`x5)|HUS5Q
zyxp07`+f7~&CX0>N-3I^T4-WwYVh;wbl)?;0bnig6?iTDAk<xyQepB=rBp`wQ${Iu
zBCP$w1b$j6Rj!ingt2EVq-fI(ysUA}P2kd8HVq5>Advcpb#d3=Q^4~o9&QkLq0M~*
zlE5RE(WVXf<s%yg&I4KC7?1|GYgXR|>=C&W@S{Lc9zv)4z(wE!aMmCPC;>-++pfTm
z0egX7V5`hMmHCIj77eJ0T3sJfr+_uUi1_j$pdaY8fUeL+*Wlj*=YZn|w+NzP*Wlk-
zKH4D4x(5Fdcm?#-xNfS7FdIo$c}v`+7QP2ex;|kmbQHK;rS22pS|g>zkAcPV@!Du;
zuE6V+&vzN3%rvl68z*Hv-AI+xN?^aoudf4FfC+7G0Wi>LW#CB<@EgE0;5~5FBTEAv
zjRL*{=<@*Fq{-8UXw%;)KHq0JsCp$`_#)RP`CVYfrRA3Z2Yq7s6p**X`opf>rd!^k
zANZ^V{BGB7v(J)*Wr2c4-X_)9kPFLq0txYF6OVh6Hxuu2W%(Y9Reu2AwW1~IqqhNA
zB>ItBJ_VG0cudnPSoF%k=BO>-B?j=z<;S(_PXRf9Qd)wMfnOg`Efuxv4*|OCqPG01
z06?ET<ASBp)FP*JJ__&)fn@>UCp_bvq|CM+P$b}2R8hB18s5Zei~jPc+(rdhJ!hE9
z2dw$sDBw+D_-DYHKT*Z`B9O7<EUnD;AuBW=*bz{W7osk}6U?^s5<c=#;Em)z?FM;C
z&VZ3xQ{ynZ2XQ%Q5{7VC63gr3f_xXbDm!a+Z++-45|`h04e*5IIx}Hx68rxrvLpHn
XW+)|<m1bpj00000NkvXXu0mjfLcV=u

literal 1472
zcmV;x1wZ<UP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00007bV*G`2igM_
z4-Fe@fw%|&000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000F~Nkl<Z
zNXNaF+ix7z9mhZCoSEI(OXAou#@J3ujft$J0x71LUQk;KMM9POPy`4NAn}F}0?~>W
zc;PPqiI=KU-y$A)MWR)tLWI)D4sqfHVu&3_i7&Btz2m*ioH-XBb{#FqTRF61q><*~
zocWyZ?{>cMBR}Fc)|L+*9DMi4<m4ZO5J<o{kH_OY+*n;-yuP^b4sZ$3fd5~B3V8X0
zf1LPWt(6ZKzh0zVE;BZMH(p5A*D6f@bb$BXe(jTm%U`_!RDf(ZXs`!RA8;Ia#t?;n
z`}+y3aR{j>9q4Cx>=5PseN6rAZia^LIKFWCtLK1^fR&C?*A4EaFkdJXADMb^`pK!O
z2Od9q?AU?vdyf?R?mQ$u`s@<3XXohK`T}qq7(GHWH_RK)Kf%fKOWrQcW^;4rwl2<J
zIC*LQ{QF6g%y!heUO)j%zVhm8r{4VQTm4Z~AdX{D0a2;MwMvr{pMHamH^>EoC?E0g
zu~CAk#L3wOMjBr-J^c{IdfxiW>lbFuoPG?b?&LM-0W6P>9q!K;_t8u<S_W3HU1jX>
zVTSh?c=lK0)S6>>XBjN#SlQ0_c;+g_)&^;2F<vq-*iW%k9tDPg=1xv`14<wiLLh~}
z1Eq4ABuQ}AqVRlq`d@rKKf~t6O~#KNM@{~ofuR8kE6YsXKh4-r#<5v~wMKMmAm4#H
z*+Zd_QV=LXK2+qxfMS$K>y(QZ&Lf=R#g|^@H@|&^rG<GWf+`0Kf}x=yhDS#69<23v
zj{w5%)CIl!v#rkic8L{AC9W+kQ7o32n7ogFfA%TMOILX4;YZn5EHGHPjtV8Ye1!83
z=RMy0TLSjb7XCZmgM)WaER-mgO02Ek;Mmdo7#$hq`q~!b_uNbWK!qe}QH&ytbyz8O
ztx4GnXPv`ZN1`)QZBb#KeFys4ZZv4dRls60O%!;}o%@2m{sD%DN64(jI=7>aJvY9w
zo<tj3scj#$^MiUbMeCGASh6g`n3QTQrryfB4(sv8V4d4LP-m8AYN$1mc0M{$uEtHU
zjvx$>QlPb_ZknuD>j)tc0)!Ccq{Z6X04ABCR!>-~)^DZL1J$i<2BgC~hcO1{92=Dl
zw(1E=DWrfvDMZ*VoIL}r^=RuzwEgZuQbUUto3_DrT*G9VR14C~5;%}j;5>xF?Rs7G
z1Ulz1nI+ZcR&#nlXBjQiB(79xY;S{9WLXZKS)B7oDe>Nu3D0hI)4OP#LmNw~vs<0%
zJ+xAdY{t~9>*!2VD)o_SO`2s`r;t+My&}ZpoWC7~9%CJ8X1n^ylcp)ExlOgYiM5U}
zjA+Cftt~DPv?r9p+8+S4&XE~MyNBBnD>qlcHQ1_F@d)<!4Um}(<1E5Sycam@aMIsy
z(O8mJ3!Nt9b0L9}C?!bZO_Cs?R;v+)AxbGqQI64rWpcS3N=gd(fGlkx#NKo0&zw5R
zjn$j9k`#~c^u8xvU*^w${2iB#K`Dh0g7dSdSy|gaN{NyZ6)2o_Y_6{W*zP&G8_)rZ
zb2FbmH8=D57*OntKmmxm?izkHiXQ(ZAlo_eetBW;?71_i{t2|YEQJMPpx*6of*w=5
z2K)!O(z(laCUF2vIBS0`I`MMWiXaGTz*%6u%dt5i0XBei$71wSm~=L8b*Tdg<2XKj
zVgBNu#_yTf7pRb>tIM|DXx;#>0@pe!eHT>!H{1CAi&%EO3djM6qA363FQ%s!e*VDy
zl_<)82s{l;0Hw~l?tS8i8sVMw1>jC8<uowjoVx-nb=1`W^Z#<*-Ci{U`a6nDC-n8b
agzj57Ai3o`C5vSM0000<MNUMnLSTZ3tG+@2

diff --git a/htdocs/theme/eldy/img/menus/commercial_over.png b/htdocs/theme/eldy/img/menus/commercial_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc4f661821e26f0bfe1d79c6168b36c47e1ecc3
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uju{RL`#f00I6<L_t(o!_`^saf2`nef0W2-k@{>JOUe(4N5oY2F(Z=AtTTY=md2)
zpc~K$)IZ9d&llT#2pe?gABk=Bc#-5MrywF6)gEwQJ2d#mjh@>Ar~#A!MgWFKC+dZW
zB!?!Vf&4ZQQ6uF~5_n6~?YbxMn&#VOt=~eZR2l%)f_=prrxM^bfbYnfF91D{n~j{%
zUCwHw0&_oHc?JLt4{hzM06g=2mTFTH(HKa|vuFNh?@N74FhB6mUt6qp{QZ<%P`OXo
zcMgfs3X!QvtaG2R2EYe^*M)ntGH+IfT~_b|m&3XCx29A|s><_%Jr~ZCT?n(J`bHW&
zxNgU+m+-YkGon4Q?XFR49Z7>P@080oKEUi3I4#VPO=JG*ghv~Z&E;Og<{s;{a|%mT
zs7;tZ2bzvh606+ID-W}<^iD_@Wlh+Ilh6m=L~a_gtICk>2{He~FP{axj!0i)wSuDT
zOMq`9!fTwMJYSX^T3drRGo){m8hjl{R2RIN@T{cZV{F-M_j_c1PKWgySbLh=&#nQl
zCN$W?%yzL%1%3)kbHVGBVH3OJlWf$Jf>$1?unX`8z-M5-0&sO+<|2B9A|Qop?ny(9
zwjv_qnICygnd^T3mTWDT&+3j$I60qtzO(6;hEuW8|FFtxvb7_Phc&lkDZnSOL;nx^
Y4;<ULa_nLVF8}}l07*qoM6N<$f)wi%9{>OV

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png
index 95e5db620468bcff16d311bd3f0ecb36de03c004..828bf8f2e709d32ecb911377c85b8538f558671d 100644
GIT binary patch
delta 536
zcmV+z0_XkR5WEB-iBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9
z008+zyMK{D9)I2p76BeET{mi)0005JNkl<ZSi|j^ze~h06vscOf`=d?h;WNPKn@fI
z1rY~vIRyU?{{un)2xnJU!9T)51SbbYN5MnT;W$vorgx1?h9fk&w%2P@%!4d>FE8JI
zn&zc#O-e~sZGsA$7w^S;@m_o}HdVkJE2^cnwrWPJ6@O5q+Q4##alh)Kf65duMi_ep
z+?Ba(1n>f!TVgJNt(g9(>@_cdE^u#&=^E~kEL(gC^oGRrRGf3<1A{RA0s~jcH-T$Q
zOw(2J0+<GNGVDsy1@Vu-i6!O=*maeBk_XmV@<|?8ktg|M)zaD<aH)x}1KXA{^}NZS
zW+c6#3V+h`0M#W`MTgPPO?&{ns?r{3i$KfZi?lo);MOu%OXbUL*@VCoaAWXq0*3~l
z)be}{+2_}R`Mk;ZE&j+*730Wft*|4Jw~3b)Q8K5qO=j`}*ay}O{u#?zJ<{?tfHTWn
zjl8!?0nDnF_C-T#F_XY*k;j8k-hiSp<S9(N9AQHqPref5P21pyYPua5h=neZe+M37
z`uD1^=KBfaon7-u#C!7pmVB5}d}ukC6)yf0SV$p07!dnC(BA>(GJfyr*aB+)Kdcv@
a-u?jKF}KY$N0!k50000<MNUMnLSTaJkMZ3A

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

diff --git a/htdocs/theme/eldy/img/menus/company_over.png b/htdocs/theme/eldy/img/menus/company_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bed6b8dcbfbb062a2ff1d6affd40c1b072b2c2dd
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx3@_NH=L1a<^K@|xi8%ar
z`a|9(1A$iip8ti+cO1+F)GrF&ad0nSac|^JVZQ62Zt?%hkp;TjBo;i0E84GDZgc7S
z_1!Km9iqlcZIi-3dBvUl-dxFlKVsI0qgPu*J^A~uh@N12CHHLkd*@SX+-tlWYcg&!
zTsd%WqCMkk!z{VtFR9*fYlGHqYTV;$_H)L`<p-?7ZiYBK>hRKk6QcL#T#LS5yxbDj
z0E;X!#V4_weWx!>|NKnv|EtGu&89A{;LNF4DP%sUyZntkb7zOHi%VZ$jbfQduietc
z{A%~FJy*Vxd(2Aijf~#I#{$hg?2+xMNk)$wv*J!3-_vs=?yfV>6YmEWY@b$Ds;+;c
v?zE5V%};~X54cO)?NVPzt=JU!Nz8^(ebcG0kG<|@f<n~O)z4*}Q$iB}W^JK$

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/cron.png b/htdocs/theme/eldy/img/menus/cron.png
deleted file mode 100644
index ddfe62e7b24f19698ca3b7d8c308865ec2bd4088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png
index a9a975219cdad1addf39baa2d93fd859e7e08d18..542ff5766e1d7df538e04a1c2dffde2c7de8f635 100644
GIT binary patch
delta 905
zcmV;419tqx5|9TWiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29yQleqjmrQ0}x3>
zK~z}7?U~7I6j2bye~}y%H4#Nbqe)y5!GlCxLLd=QuZoBZ5?nwH9t1(~=zrh>dQ$Wf
zJ*kKwxa-9|E<w~RYNF8?2}Y9`f0#^6dHDvO?F^Zo?wQQM6cle>&DY&ue_gNY^-O`8
zk*hX_9JW09Jo!BN%v(8d4rudzq?wJD*O=Ko``60-oFmi9PXcyG<-0(&=lhy$Oq+7x
zh)ACW$`at#XH(i#o7ovNi#mSW%xXQcn0Na*e?gkI2ixUUPOKg{2{dZnf1lvkN(YlM
z<%`X%&deIktViB%W{1tJG!DMU<Bevv&4Z~jvwEH5ziWm;dX|};FtZjj>ykH^*%sYU
z3|A>!rRH9&E5aVdW0*tnu3Z=)HC6(<fwfNTK5!Ix=)^V&w@C8~z)YYUI4wMi9R$_^
z6BUbS9EwLE74jQ_13-!9e^KBPa2)7RtO(dCtcwE}26}b#y}%k_mpj*pdagMflzc6)
z-=j*C;(dyh2;-K#h<BOEH|W?I32?3jR(?J()}zV~5nl?_X^f|wYkPr(z=R~Qp(+1Z
z`AD3{dnyU_Vz$@^HZ<iM;;1y_L%kptSouz%2N)lR{9u~N{|Teoe>_u_@TN`Hl3yV|
z2D|_&azXi3z-C~o=I6EN7|aFbrvSwcu~MbYU@j<s4Ok6~(|m!*zfzrcNk`I5-gl`S
z04^$Z0Oo0Y1I+a(l9i?MmR{8+1Jm>r-a5@HQ#t=V)oODU*y`+ES{$<J&iVJiW#CJy
z<evabfH}ZypcQBbf2OBV`47NNjR`H;CUpbYrHTX4tZEdt@;`w)>L(*wvgAK1UCNxt
zSrMZ05#YKiS<>cbdvFEVC-vJzIH>XwmEWhSlv_XKe*rJGXg_HY1yTMH@H|M5@Vha4
z04#HMnMEm(f2ShQ7j%L6CEo{h>GNlG-DJsk>IJ<otdf+<UkmtajbBwhM<U;)bo&-|
z6A1FtN54v2BJ#hL(;ew*yM+Od?~X%$K>MHeG;bLKlW%p%N7WCS$dDC=be?9l@+cX!
fg8ZMzqhx;pthyQFzv{&m00000NkvXXu0mjf(j=L~

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

diff --git a/htdocs/theme/eldy/img/menus/ecm_over.png b/htdocs/theme/eldy/img/menus/ecm_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..269258a8cfb5302da89828e648105fb0dd32c0b4
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UkNt<nLVo00IX|L_t(o!|j>xZG$in#b2s?4;$2(pmc)J4YEP$28=*9$Oa`7G#i9&
zKsO*8xD#BzoF#fP34e@<B~C($6371ecsB3Miii+uJR#s%;1~D>-hU_n1%SHuKZ$6r
zD<Pti{)g(*hwscs08-BK1;9@Ho;;##6o8zeKLI?qwA(+DY!V_WgfvPbO35C&PybUv
zrxraIL=-pLv_(7zd_+VU5!E7-dCNkSQS+qbojY?MlfWy^s<wbc76~N+UP9ZF;2hp$
zMd~@RNT_PGNqE9qK-rSu96l9UF?v=ad%2~ZfsYz@Wp7y@&fzmlRw^M4W!YWY;Io#=
zb%tN}*i~Zy8}XgyE8%^7*P)-hrLRf7O?l(DOGj{UyNz#SR)*{<YXH9?TjDY__&xjW
zpx}*l{Q~gL&M+8wC9G=<pb7>4C>E$G6uv`%*Ze?{@MS0q_6Xq0pI^9)n*+Wcy4&PJ
z_demj0lYSLyWa3cL+3_1KOUgpc)V)tLn`;A`zwGC9_RiTJuI>D+{S~O;sZ23w50@e
zTEi;g$6dgiYAPC1&Gj{AC%&cHf$k5D^BnENnB_bmMm%j#0JdYGhr-tl=yJdgvTb;#
z@iFqqql@NkCkjrk^@w@bcQSYdkO4S9>iK+iW3N_If&;+H(W^{i2YM8CV$xVU>gT}V
h8XjY{yhNTU{s4BK^m~$Nny>%>002ovPDHLkV1nqy7Iy#u

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png
index 0bf9138d463f9d2254ebd19794bf3e6e944f88dc..01e30553fc569e01123faefa7ef3c019cbb36b5d 100644
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx8D{(n69Jks+0(@_B;xSf
z8MfZcjsk7-S-MSx1RbTD7jcL+xxR5>k<PCE?^!o(YG~Jj4zXLm98DgGH@O(Z*j?B<
zvpIF{om>ymxs9pc?p3FMN--{Y$aT(A&9uv>Kw{59X(ZGyAAIoZy6yR=qdsl%PB8wk
z<d#p{`?z<%=k5A(?)7@ZEsO={erkWbwy}7fScY{M`^m_CvmPmK+W+jJ<@eW5?Dy6(
zePMp<{c(xq>FeP(F5j-(yt?6IQgi%v`O*!-B5m_b(trNyYCrLB*7N-NHB3B3e#hF+
zf8rJ4pZJ&k|GOu<9V{=TDW}&3&iwhZV<!LWF0RAnJT<P<*30rW*7JX9eoz(vlK;b;
zU~_fttekZXQw8T;*golf!&Sjo^Hl6L7Eck+Km5SIq1E9vlW#)o#n+qcnO8YzelTfF
zWqsiBX>rZR561CN*1OzzA5xdfz;$Z(DcuC;w6&}z4dDsW5y4+fo*fMq{L5xBeb%ZM
zx(}Fke0$|}VBVegm3vRe?dM;a`C|cV^~J0YZ21V3e4M`{qNQ%tnJccK==5~;b6Mw<
G&;$T2cj_tt

literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0004iP)t-s6%7a)
z5D6I<6de^179J@k9UCw%DJM2aIZ$>;J~w_+FIG!IR8?1WT1RtROkiMOXJ=<iV~kF1
zp;L3HY=*IFi@|_XFM(7rfK)S<d~K|DRkL|OvwA|henX0adAx-~y@f=*ghs!FO23Fq
zzl}_yf^DONY^sH4tA=Q-jd!<%ZnTblw2yzliA}(YPltwtgN~qtkD-T=qJ@&Ci<P8~
zm!*}Uw49`|rm3&CwzrzH+oZ6?s=eK~zR9=4*1W{gxWw7H%I3Sv=Do}0zRc&o&F8_T
zl+&e*;>)e%#<k<ju;b0J<Ik|;&$8Fh)WOf_!O-Z%((1<3>&DdU$=2-4*X+&M>de{g
z&)V+K+wRib@6z4x)ZOpi-sRZf@7v+*+T!om;PBYt@!R9_-sSV`*vakO%;(+K=;Gnw
z==9_1^yBLE<m&b2>-FaB_37>Q>F)OG?)U2N_v`TZ?eX~T^7-`b<Mi&~@bmfc^!oGl
z`t<hu_W1kx`TY6%{QCR-zl~TL00001bW%=J06^y0W&i*Ho=HSOR4C7#(mM{qFc3x2
zW0H=N-K1yh^pvatL6t<1pDC~);u9I(G#*)3S2K2i%6oQL`H~9d{kSz4)s9Am(b>M*
zeJ33rBoRSCNZo>y7qU>AlqMmYoJh8La>$s-t4Xc-i5zr##8kOtC+d?oq)p|Kg^M=X
zpVqwHc7kr^Y%|G0V<rAEXH<ykAKYv0l1289x5;(}*nGS?Et5B2>O0P9Rtww!0000<
KMNUMnLSTX-L}RJ|

diff --git a/htdocs/theme/eldy/img/menus/externalsite_over.png b/htdocs/theme/eldy/img/menus/externalsite_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e227ddc83f7c92994716cbe7c75cfdb4814feea
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GdxS>{il#0xY<#M8wwB;xSf
z8G*Tn4FuZOUuIx&QebgX6gi|I0ws?fNDkmg`|$Ru(%m)Qua@es{_=m)(;qeE|B~F(
zHQ5iuh30=dB(&!NtA52n?zj(4;(H#<zg}%@*Y^BXF3+~4wBW~^Z?y65-+kVF{>@_h
zQ}Yc&jE$L-x@R?dCtIu8J^MTDzUs$~=l;y>XZ-aHWX6BtA0H1^_y)VLo3|s;IB)T}
z?-?sUZ<pQ3R`aGKdhO@<dYhe>zU=*VPjdU6YcJ2GTL*@hZDU$|yw~oWpW0>3HIb8k
zZkqI7sxrEQ`JCbpHlK%D=ihkGz7r?=>&>^|iq4&k<_QdTjk}-k-=+IZd*46(Yt40A
hxFF63``};ZUxs3rV>T01q(edB>FMg{vd$@?2>`CysPX^+

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9d96f0255b04e220db0fb0549d01c42bb2df960
GIT binary patch
literal 788
zcmV+v1MB>WP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Urkjp2N2Q00NXrL_t(o!|j;AYZO5g$3GD@D2h!KF`&^Xhz4U}W8(#ag(&DBAXWjp
zC@4`uLWqSDEyP05*x4xlC~PbQwG(XAXkwuxK{!Q21mUi@+}=%^R}7E2-MP)~c?&!6
zSY~eCo6miB_RZVvFvgJ8wu%h596pE7;WN}$tNuaYwuj$G;CvJ7^Z*0EDPT<2>9Kwv
zi$!mYv8`Z?2|Vnz@(VK^vmpNV7;#K1Z-6C_|6KLd<^b?m#Wdo-l=QZ#1C<2fF9Dq@
zW?lS!*4Zuw@Ix#VK1t>Gs(9ys&kp5(1Gj*i((eQA0Q*(EN#JTDc$2X5o2_^=z$43F
zuM^1iFz^7_=$LZ`*a{4};NMxdDT!t;-V1yKPB(zB$@Mz0Hble%a1?lzcAl>|%--|1
z1wc2@WsNNY<G_@fJK$2@ZfE6sZw2tK=f{<8P5?iFLu&jf@DTV4+_%QJM8Ve*-ZmxK
zHvb&k=7t=OI@_%Sjsr*3_}@728-U#&&?VrzQgKGI4Zs_fNp=AJzz5~i1&lcE;@c?r
zz%kYfOnAUg0T-28c7}Qh3<A5<ddA_SAKY2-k5qmT*e4E?F%Gdt@Fn1aWR{)Qdi4nS
zIp9j8Jg=4CBvy@i0$;Yq%4$v-7?uL9Pr&paF3MH{m<Qg6ov>Q@Pr$Vm)IQT5bLYj7
zyKKk*1w8YuZ8Ur}<=Tgc__byVvncol;JF9HVodll@Wtx?37gyz^4;bbuty4{OuR`&
zDZdRk=@GXGy!fB+f#c!ql=>r1S<rIjyMa;Zk2jHRf_8wfv^d)&3O@@xN%2i9)jeNL
z`Aw^(*`^5G&B7P6TB{UH13qYX_^=apJ+MaJd@={$_AUR!ox|twIeZQu*_HtjNP5nZ
SfsX6|0000<MNUMnLSTZkJ7>-S

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/ftp_over.png b/htdocs/theme/eldy/img/menus/ftp_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ea742e7c7edd0d0e970ae45c28e464d90fce7e
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uru@FTV-^00FZ}L_t(o!|j;iae_b)g+DX?j~z%VkPf_55KAx>B<X;3U<a`TI}kd+
z3bX{Qfc#l!ZZ_b-sR-uY%+7EF2k&;@?jAQP%aWnui2);!599;+0b#7hF|cYdF9$wb
zd?x}7umBSIPGsFryx5mzX`3mVAyxCvnSQ5{`8M#eTgxT}HeJc)+DL%s3+6|bybfZW
zC2Xw5?~*Tn)T?wK%X52RE4J79cx&=g>v{*Qfx<Dz04Xr5xc6bpP?JxAQ3Ep`3z><B
zU31qCsl7?n>Rp|WRJ4x3mqg9R!j-VeMK!n`UL+Y!MHE(||E*eNr=C9oS&im5HFBB&
z%Zi3r_>{^?MFpusQBhTLi{J*Bt9&>ms+Q4D&0<@Vk5%~UkU0`_EgqeDMDSF#oU&Pp
zH&$1cP$7%kc@Q^EJM2_te_On2ovLvxW@?((!IDz0w;JOM!|y`caEF>(4N8+w{>6UY
zg#+;2@HyXH$eO-qbmrV9kuaJ^@%*j+v^pU_QO%{-Kj3rO3HI_#@S%@BGHVYXJb%xG
zP5TsuaNKt<oa?ZW)b)Ib<b!Mi`9MC959EhW{uhr9_p%*zU)=xz002ovPDHLkV1l-)
B@OJ<J

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic1.png b/htdocs/theme/eldy/img/menus/generic1.png
index 0222dd8c81dcaae46ac0eb81db229a06b9f98f92..39f808bed32f27c7d591d2e68e170ee96468356b 100644
GIT binary patch
delta 561
zcmV-10?z%=2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29}VV9DyaYf0lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf**fc0

delta 970
zcmV;*12z1*1keW|iBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=H96Ike`x>!15ims
zK~y-)?UTK4TtyVce|P5XZr1VIP8{191tTFL5K%B7IS3)X1T|lO0-~V-iJAsFI+_$v
zKt(}G6(~TV!bDL7RzOfh`IHkoe~A;v-hFT1o4JQ#O>huhNXL<`bmxrb=$x55#@`69
zy!L+Q>c-%}_RT9VP3(K{>G9seW1Y_210hUId)m`YIZzL(vg~hO8*Hv$><=#dR+VRe
z>U8e^KE~e0g>xSd0S7RE=U;x~Ad`n)pPahyt%<oKPs*ln32(r&lPZz3e@K;+D@cuK
zDoB+`L&(h*TU$S$91d4MA6DnTUc3C|sy(v!+|tsk?|s%g@aPkYW5^S7DQB5CA~oQR
zNEI}tlZGOdqN$yx63swrN|`qiS4~--Id%Ec(YNE9?|g7<=I{%P?TNsiy;7@d)*cJi
z>KH}ah^;^@Ahy7Q5u%|8e<s@rY=#W?EP1d_XKubIrk*NhraOl_^O4{#7v^bn1*vvY
zDPk#7D_{d3y@Y`jAUiIQM6RJ|nR${VEX3~NVsgw0-2ugT*T|w7ie@0{3Se{?K~903
zoft)m5Tg--Mk(5Y3M`uCdH^IZ+6xCU8)E&6-0gvcFwkv#x5ddjf3zSwJG?M57KE`)
zdn}UD6a|8?Z-(KGKF!)KQVl6ZQXNT^lLjIWHJX4%c;k2y$O(v`hN4JVPZZs8QrQ94
zC;;S+6)i$<AC!)^YveUb8d;PRf(VFMh@vedVJ3_YmiCfMp~lf@j7P$^A&sKN0&7P|
zBDe_dn2V6W5tf~he??A0a->m$kqaCBHvSFT-Dnr5-JAdD??m7p;eX*>!gfz|El>>;
z_Ft+SQc9s7^ta4xXNd0_G7MKe3@gXJ`NVHrhgjI%dySU!Hn%pHkH+=WznoZ@ogHsa
zO&=+G`z_^w*IAw+H!>yg-IaH*C9gq>rW|R?Rc)*<A6>olf9Z#@@1*4)jvt?&pZ{+4
z)N*H<>X1z@1SrgN#B;#2jVcA)1M-M+Kpsqu+u-KueEHnBUk&?b-~D~%qc3u*$~)pO
zJ$|VD@Y1v6E5H8n%<Syki*xf2E>7;Bdnk6MXOfMNHC0wBx3+I=Y_4ytubsKJc7Em7
s^()7x=N3<_AYJ^ifAz}A`Y)|N0qp@5e-SikmH+?%07*qoM6N<$f^G1=qW}N^

diff --git a/htdocs/theme/eldy/img/menus/generic1_over.png b/htdocs/theme/eldy/img/menus/generic1_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..adfa8c1599b9c2b74e15d0b86e5cba6dfbe8587a
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx1wVO}Jp-DO=IP=X5^?zL
z%(uRW4FuZeEBxCoEuf|#J%M+D@Rpnlyf4@euq8Hca@+-kyB%jfc*-uW8Pf3Pif-?Y
z$#GAeH~zh07r&-ht#jcmR%WyI|Ju84g7zja*zmje<(dcH!FgH@fet%OH!x?t4!OI#
zcv4b`*D95_Q?5yQ7JELHn5Ux@5_aIriM&5~n{T$%$Z*-S&-2^DxBXe$$wg=LPAuHS
z6z6C1>if!v#l>^8Umr0u{387!;VsMgq7~=$b(UP6Ti&X<-Ic9C+F;Y{zHhH(ZWm89
z3enS95<2PAi4Rh%W-jU7DjcHrP2JRVZR673pv%RM+l|9#&F@dre(}3~uc2+(y|q>o
zSN=@hJ%Ks=`L^vZfBl~OUQ71gLp0RRbAQf+%&Ag!oIW1&b8c-9S29YA>}TFO(=_0c
za_q<6wLg6p+6d2FexA>UH^(@QHU6@+edKJh%=KRtd(-Qty!`N==O6Q5>Ds50%W@q-
OG34p$=d#Wzp$PyNUC@aD

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png
index 86847858c4af5ccd8bdb4fe19e3c46c8be9a9763..f4dfc5f360a87341fd9e6a59f10bc733c68028ee 100644
GIT binary patch
delta 561
zcmV-10?z%f2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29~Jc{vi|@80lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf5*zFV

delta 936
zcmV;Z16TaI1g{4niBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=HzOLr<dFaX120KL
zK~y-)?UPMwokbXiuV>!(oY#})Bu&#M1htE*2ufQOqPWqDf;$y|g1B+xfAAl;>Bfbw
zUAihRDiuVuXcxhcE);_4SJL*Re`$Ko`!O@m?IMXyQ7U5HdBZdF%nV%f-1A}FRe0^q
zQ`PlRclge&?N?^z=3bZ{&OKFC!$(6H%zNq$Qig7l>U!MVm~3sYjVGg@ntJqYRn2};
z6xHar)w3<&00!{Vt0x{|cJZy*gR}3<EFOJUHib)g1kWNhB4>8`22vEUe}U9MYDJDM
z+uN7FYul}l+h+9H`ql5R*pnxZEib?E@<+qNi_fU&As2EfXUwBW5j=|2K&(Y-A=M&w
zA~qsUq*!Af4OgbFZ(O)~>8p2(x8HmH%#q`dpX|>V4;?_gfmweF>s3bChoWZ`rBU?2
z0)zro7^b}wG(+I-k_W4*f8kPD4xTHI%$LWjr9g1Wg?SPljnqM^ouY=+6E?A34oHG*
zxOVc~LD@6&BuQ8(ddJJzDJKj%%IThwA+{n;plbveE`f}kAZJk&kP4$HL<nHP2z@~V
zR+!~30`6u1=t0a9Hjd;$1u_J%XH|P}AoIssc5nd_hGPMYj{cO9f6{;wL71DS-Ry|#
z?amRTK<bRth%|xR?p$7q!lUpckO+t%rz{;CI_02Gs!L#-5<o7jEC|B^)Sx>Fc}8is
zQtj9dh@ynDFC;Jnqr_4m*FsTf*J{ar?O7`dtREnW;37Dfi;%z(mPN>rlaO{c*=_c|
z27$kl{*>I4{>|ilf4~nw|AY5|?LXmKpo!^0!=;=;H;LP3cK^5Y515AG%57LV^Ye$k
zIflaib=^j=oLg>ht)4D6ez<)8=)!QifAGNb<#5VU4tOVdh8$%|;QJ%*A4}eWWTqU5
z^_E5(tEaDA`uc-n?4)nL{N>!z(#+W_7gnoz($h9S7a*ADet>7Y8_94F$U)hVn<>gB
zx31-@s~10Q$2Z@<xbpcYIi>m@`^zU5`%f%CHofxW`ilz-!&8e(hfdBO8XhaE14oio
zQ?Zd!-Q3w6H5;Ri+rQpe-(0zUbL-sv;=||H*H*{ZudQ`^tlt3;()=DAWrRNf0000<
KMNUMnLSTXf_{0<d

diff --git a/htdocs/theme/eldy/img/menus/generic2_over.png b/htdocs/theme/eldy/img/menus/generic2_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8e58fc222091713ae13ff57f13fef53b96a4511
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UbDk&Ws2E00E>)L_t(o!|j>dO~Wu0hQ9z(ctC0e0}#XjWCOYZY*5&s8_*398)SsC
zLD?YPpnV2J5lH2JcsZ3Kgo>RwH|irDwY3`iv;F(G>jol1TVsP3hlj5#wo0nE3&i?<
zs@W*`o@S&O1093sCcqpRYp2G!J0~JG*%OgOMCRf)QV|)5NY{oZu&~Mm=$9<xN1e^o
z<jbb;1K_fvbvRQQI&+(Oo2@bdt|}V!Q`hj3O6Nd3F>?%k4V-H`#<Ogy`Jr0cI8zpD
zM!LuVjtxe3n#rGacJ*`Y(kh2)X^DtLmiB6zXCgAyc8s2}-K6@O6JVsHl;&K}%bDw`
z&O5dh<lSM9G%qq`HyLM2R~#22V83Z+o2=eX{HfBzui1Hir8^szIfH)(78VV=E-M88
z20S$h+!p@1N#I4`YX{E@-w5!!HDB3+ef666n$HjaZ#Jo-i?Fs$N-A<5ulZJM{;tA<
z*@NqQ8-P9F5ZEpe{8sOCK3u~uV^?njc7RO>&hw(Pdav@NjFJB>LX}>qKPkgMI`gT3
mU;4Tz(s<zi%JlGS2LBDc&h{VBUvw=10000<MNUMnLSTYbPU+tO

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic3.png b/htdocs/theme/eldy/img/menus/generic3.png
index e22f73aa6f9eccb8ab6bf9049d8789d3cc2625b4..00769352daef5a513aa7b39eed513a461d15cb9a 100644
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UsIsk^a;G00Fv5L_t(o!|j<pOG7afhMy~T@vEC4txy-GgCZyj4x)>QgSZP0byDzW
z=znlk2M2#a9qg*8pt#sU1S<#%R*Q?Z9tY2GDPnWm+<wp;cu5G!$$L)T<X#d_L}*p(
zpoPtmZ<KY0=zC7fdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hh
ztdrjbRzsHYJFuw1SR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzb
zumHp?l0F8~z>#k*Yvi|pGvL(MmQ=)mX>FUT;OEhY+#f#sfCD|vDw~LyU{geHL}Xh;
zVuoXaVnsyKI*-v9Q_X+thFwx*ffL{yxCIJTNM%GZ3CsgM+FrE1VM}FBhZHGa+ohHT
z4bE@9z_8W_6y+B9Gz*&f|7_G(pQ+H-%CQ?H^PjEyS6Qm#N2(#RY3j^7**Mv>Q|4P*
z^G-HSHcmD!^G@?lHcmESkbkaY=ATSE2DxY*1SWv)5Q*Ob7pAN1Rq>#f;P;}bABb2W
zoY$4j0v|yJdNsZVMu9FZBUHY#F9L7A@}-u^J@=I9$hR5!AHhKvxC=E9UH||907*qo
IM6N<$f;5xuNdN!<

literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00085Nkl<ZILqyo
z&x=w~6vyv<_L|he{0V^tX^GHijRR2)E^6Vz7E`-c(hxCiq^%oUR4^@qfyy?s=nrVu
zKM*Y|BP}ol2^WFluN;5tQ}6AZ*Spgl7-})?>cR1y$2<3PzvsN`Ih6dmlz2S8&}y~Z
z-EQ}a-EO~Nv)RsAES3|hs=5?KF>}s|rfH+`c--vw``;k$ORv{^XSG^iL(KPFE;j)V
zLm0)MXf%2pUS4-N9JicKX9OSwA&jwoZ9bpxd7e(Eq}gnK7z_q4V53*1QmI0N!QlB=
zEVc~_mrW*<2<EVuA^;cReKwovCSd3r8|bkp5T7B7kA*_vHccjzp8|ovS)&|!kWhh(
zA$8qHgA&NVUEeTBl2f=ytyas@R4T<np%7*80!uSD76>T9<ojqe+M{0f5sqXi%b2Fq
zX%+~FDY4rz7orS@gcyqvg22gSqWkh))LMWg<)qzi59!m)GiLF)C~QRzEgl8%2*5)!
zH&PcM*+-K>0*o2qhldk0q)###<^;v8UMJd4hj0e<gA*YF5hhB3K=jdMu&B8>O}b(P
zJC>Fx>2wK&g=7NC42S^9cT^`7BMd=kLiPS&0CEjK(sZ}RLZJZT>5xky*II1!Td+7@
z|H1zrctjs>ZE43M5taW%F!b~ueYm;VI=Q;)<U1V>V0u8X-r*XJMw4D$Tf28{ef@z|
zRS6#q52V<bFr-*4-lr-dM-m$wkCs<f?z&xWh5!6Za|2BO0Om&H*M|a35DvZgc|M;{
zQKP{x+)N}cYK+}E?f2jC`Fsin$_+>c%S{NCLQUtDO64WA;_YlU`xcassWeQ<DZl@4
zC>&lam&=!6{$2KXJm+9!`ORjt2ga5Kpd2>o!(6LFGye*;{0y7D@p`@QA^kzMTGa&W
Y2db0ZOUWr-FaQ7m07*qoM6N<$f|{aGnE(I)

diff --git a/htdocs/theme/eldy/img/menus/generic3_over.png b/htdocs/theme/eldy/img/menus/generic3_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..0672d20bce4bb1776f71dc8038e32a8382f5ae87
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GdxWqN*dMFUMq^K@|xi8%ar
z=3C#x1_EvK75;6P7En`=p1`|6cuUR&-WO~K*b<vJIqm|&-HtOKJY^Tx3~6|CMYngy
z<hZBK8~@(0i(gZ$*17N&E3;Yqf9>5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8<?|Rhuqy=
zJSi!}Yn95|Dc7Vti#;Dp%+pZ{2|MuRMBbmg%{N<WWVr0v=lN~n+y1QW<f5~ACl+pE
zit{sh^?l{T;^Mj4uaB4+ev$r=@RsF#(Tel>I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql
zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P
zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z
zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^
O81i)Wb6Mw<&;$S`U(e_O

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png
index 29a3d7fed672e0dc6b78eaf38a82e0ac65982262..5f9240240da3f037ca1918367f6b6489b972c260 100644
GIT binary patch
delta 561
zcmV-10?z&52f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2A0VTYcH95}0lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf6mjeQ

delta 986
zcmV<0110>r1mFiDiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=I4BB=A=Ur@17Jx+
zK~y-)?UYMwRaF#*zqR%`y|?9FO1W)q8y<$lpdi6V0F95}z{H_p%FHk}>ez`69XY{7
z2Rbsu5phIJ)YMreXapaG1VuEtf4!8_6x!Q!&pCUq<>0m|14hEkf3hDd`Pcuiz4HtI
zKu^B;a$~i)Il0_he`#uO``E;u)`9kPb9dOT9Urw(mB_xbELLt8%d1QMKYM>{{IYm$
z@a^PW<Lj|jw({wF*Gs?v1mKkuFYcOoOkVBGj=#3=So_H^?l?wG!je;Ze<Tu#mRR#h
z>4`&9;ht!EWPL4h^@sHf%iY1pi`VMUzdW<pm7_20KXUSoBOlG}Z#|KZfknqKk8Tpp
zh(u~PN@@y=RMeCfDJ+txc+_jpEs6)Du8i*0!S`oB=$;C1y?x@`Gsh<nZwn2^yy2so
zOG8FvL^B$a)6js5l1V^Ne=-yiP#Mne7Dz{cWG?Emb0(i{O=M4HJ4PoDJrtTytBWSt
zP@^)V_DDgZB%oFgr=~D4FdPF+jeY`^gi9ulxq~#D*`Z8}aZ)cZn&;x?Y|ksIW=$bA
zXo*_};<zL%837}RpdL_^5rywk;As*FQf?S2x@EgM4azlPfY9D%e|RQ1;9Gx19CybV
zD&49$X{g+QB$O@`>w#v-XpJW_fT@nsk0p1i8tR%-61CRUme?RtS)%WW$`b=KDjyP>
zE3ppb5iXiC(XM&C5n1jrBsOzKa+qi-mcdHxl(kdYrc!g%6@2)34a+bbcOf(df)KnU
z7`P2RWm}HjH!mHse_Uv0iW`V4?uwdWDB_BkkPzIUcEikZ<1Q%ofaAkvf1mGOx5V5F
z$^*jx#1EEOK(wkoZl>pbLrNC4Kd9C=lgjS{r;9+WtkiS!KfZtKjuC?VXW6Pq(Kmix
zxN|yOyu5UNdS*{+aw0#vb1E0jBZav~jOZo_BVm{u^}qI;e|3)}M3ESrem8n=VdeDM
z54-OKQa{drvoJq5H~ZDX`EH}AItOR>sFES3hG`<nFoB~Qt_I?yV3;D&OnR3#(obJ3
zezyEu`TCi6FMm=FQgN64g9na`Joo$~t;<&~K07r%bA0#1(}yRfckF9V>QvsY$BG!e
zzZTb5Z?7)(Fm5dWy7>FbrKR5O`Mrlb=dUc>=wH8Zv)bbN3uVFjIbl|2=>Px#07*qo
IM6N<$f-4)$)Bpeg

diff --git a/htdocs/theme/eldy/img/menus/generic4_over.png b/htdocs/theme/eldy/img/menus/generic4_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4d7b1acce5db322cde66f1e2fad71876449e3f
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdxm96HgrvXh#^K@|xi8%ar
z=3C#x1_EvK75;6P7En`=p1`|6cuUR&-WO~K*b<vJIqm|&-HtOKJY^Tx3~6|CMYngy
z<hZBK8~@(0i(gZ$*17N&E3;Yqf9>5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8<?|Rhuqy=
zJSi!}Yn95|Dc7Vti#;Dp%+pZ{2|MuRMBbmg%{N<WWVr0v=lN~n+y1QW<f5~ACl+pE
zit{sh^?l{T;^Mj4uaB4+ev$r=@RsF#(Tel>I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql
zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P
zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z
zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^
O81i)Wb6Mw<&;$Tu*w1GG

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png
index 073348a5246d824568ec6d9a2f939b5797c05815..8c2380eda131f90b77a1f3792b2afbbcabb5b7b4 100644
GIT binary patch
delta 1144
zcmV-;1c&?o5SIxdiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9
z008+zyMK{D9)I2p76Bh9txx{$000CRNkl<ZSi|j@@oSb<6vscSwlZ;By+az?+caq_
z&9<UeTGXl^5=1aCiXamNe^szQpr{}GB@l{?$cT!_pAtgKtaPxTwyfzK=2kWmYR%N?
zG<@HIr(eDg9`By#*|Ybh>EJzZxz9cKo^!s>_dWOC^MAZmX2x8V>zKn*0bc=M0iP`O
zz!qS`|9~U%y>>=cW|pOOnc0Y4mT@!NlF@cLzl-EAk^|CBYkxzA_v-@o2fE$BufVw4
zZlE6+0S+YiS)|q>pIty5&<#8Wd<e7ykIP?2In39qAtpW$LmSkx2x4+N={K_$Guv)v
zuLN-uF@L53?=!PuGg}|bwMbvc&@i)o8P<hy>dovu&8?p)_#I+7YM;ccS#D<A%&aF^
z>l<daCt+?t_Nz0*e<2QMRZMNO33x5gZ3eyrUI)GaK8?x1mB8&lUgLX!mt=ERy0gF$
zV9@Czc^-I9{&xZ20?nE`2RsR!@CG6HX5dR;fq&Dz54<Xe4@)-z>;=A3U#ctxo&}x;
znw;;In%m{pey^8H1iuY<#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4<fFv((0dFd1
zr_;YEpHsju0D1x^?*Kc1?Z6WyFxw971Rj{7-Cw{e+3j@tAAyb0z@PK0fs28YkAX&D
zMSsj(Rw<TXdkfGiup_{2ZXY%3<*op~JP6XGw0X1);H82Gcmx;%z6RDgeMcPlr9i=r
z54xMNPzLzP675?Yjy1teJtb|f4;UI&pTA1X*SJH&+vnrJhXF2?8N6KZ#RTxhq@!|9
ziD&-ZVD1gz81S-oekro44ExX3+JLQ2-+vFh9fJSOT_!$l26gSvcG^s+Zw%~zk7IrW
z$OXH482IBV<@_Oc>UjI1IPiyoWo~>Yuus3pIB?S}f*%FWC}xwhzbHIYz#j$1^mP;6
za&@Zy27r5K@tlv!lvbe1*$*UbSoFEK%8gg3%Ir?qbSG7&j;Sas=-JC&;6|VpSbwP2
zoC5r$vH;+r;8*KT13#$xp+Vy%dj3b%V!JlXarIdk9Si(NatE+jeT~z9qrOx62z;Li
zBJG^d1%E-D20oLc8sL1ez7e=p>_&Ygdw~1(T#&C*{-SaFt5r42PbnBkV;(u*uat=l
zYZR~u%-0p2R|-rgxtMilfWP&toPW@%7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{N
zW7-sB*4?a>S*&WdPq~g_^eRQ8Jiid<I7@ku6WE+s>euG$1m-z*&bdC4V>*5tWD_TY
zBCA&UKLq?Ma;o)Aso-mY`&{r*y#V@1IF%M4##e)gr~`hMeOqvv^(juO%t53uYg6#i
z@GHJddC+|+P3o7(<o{Z!D)ZV0$MpitCGeI1=PTeV;49#-VfhcZp^40fY9O@$0000<
KMNUMnLSTYs!Xxtl

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

diff --git a/htdocs/theme/eldy/img/menus/globe_over.png b/htdocs/theme/eldy/img/menus/globe_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd1e54f4754189e57bbdb7ff41d7c8e7f2618ff4
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Us+gMz2%=00PWOL_t(o!|hnnaoaEqea`jY+92u#(FBdUfj6kSfksd#s5hwE3DgOq
zPEh*4cU3o#CqRE5TNp=DvSY_dPPoIJMVjCv2tasRi3nb*+~5Vv0)7F%fR9TCpaxJ~
z0Ef4|Ick-N%+XRr2Kg_eh}1LJPT9?A&r8p-$@On$oUa7%V8%KCzW|KX4uAtN0O%uj
za%w@FC4e=69{}C~_y*t(z&-61kMVp)1wGNyLlt$7fS#NZCnC2ZvK5iW>>I_H0`3?p
zm6^*;2%Q7G-6x~7B(VP^_|_Qj0{<!KDR(0Hf$KLj_75Il73ghh0H4j+N5=A&@z_Rk
z!^brkvm34%IW{skoEq~|QN4W!;FfcH+8a_aZ!=%$9qYl7-q}2|+W6bEl`LZ=5>the
zo^JtsP|tf+As!NWzvIn}rrPx8HvI3BHrEk*p8zymf3L>hAJ{iZVx{3+C#T8Wgbn2b
zro6Ag*8w9LLrI<(yfCB?sBHhr=Z#4?E#Dai<&|2Ojd~#>gfj)cS5@O0QWzX|`~bX7
z9(QH%nJTZ7;Ge6Ev5D1dA>d-PR52$f>SNY7Di`&57XrVF9I(G~xD=6GJOJ+^CCOb0
zd^b@A55RYkI@_~NcuLu^3Cj%leG2>^^?b)ZWDFea(y~<!T*n-2t4#&qi+cXbu^hnf
zL__8&;1~$Af*$k@USXQ8kWC-wgKCQb;O#+M9B5Nrq{rAQVp1upcB*a^wbW8_zKJx6
zNitFZ_!;m-MjZl)?dJ>iX7qE-5k#ct|6>?t5%9`Tz|0VqdS<s6>ndG>0$M^e#)x?8
zS}S8bSL|mzV@o`!P|<sj)Z$nIZa)lp0IfQJrEWcMsZoj<B)wKPTjiwe)K4FlXSzTb
zW%N*fBxkK@V@M?DEN*;Eb!b$j!5OtPH#pn=bLlGmyJVYcfnRM)yntW8FW?vOmy^G3
W4#XMf^Qx=>0000<MNUMnLSTZj(`|$R

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/holiday.png b/htdocs/theme/eldy/img/menus/holiday.png
index 42c519aa63d0a6d309d303d8feeb75096cd04ec0..493974477f38e5669668280796e2427499c336f7 100644
GIT binary patch
literal 1086
zcmV-E1i|}>P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U7}1jiONi00X{BL_t(o!|j+$ZyZGwg}*xw;#Y72!E$(t@DPs(P%Hyd#0nPd$Oa@N
z7D$LCEB*sN0g3+rD<n27BAJ~9jv^uw6hwF!8I!RS$Iis#nd!rVGg7PR9*-YA$zrZ_
z)!kLqRp(aSd+JufNJcV}kqkrPFgufU5_k-l0UiRzJ;r@N4cGt{BI3$D0bWuacprEZ
zcm$XL#;jG35kLjl0saC02EGBlj)?W4gO_vyI19WDyat>G>Vy6cTmrrW&I8{@#Kus3
zP13lek0o8w!R04OpGtZ|($p}(zbNT^4v@r}Ez8y?lDe6?i;~`zbYxH*m3`u0^K$=|
z<A!0k7<BAj+n0dPflmenQQIf@2Ji*&CGY_7FmMcb4>;pst-JpKwt)^Xm1C@|0Xzsy
zmkK^2I>4$GNj0;~72s*$xQ&?xUI%^z{si8#u|2J4NaHflDtqShjJX9Y01Gzes15oM
z_yJf1E&{VQt_E!R{e<;*pn1>if|AZjn(I@4zc;tu_p!1Ac2MABK-*d*iDLpulY5!@
zN{PV3Zqw?4E0E@Y&2=2uiHMz{`ur|Ccw#Mzmjt-EpU!Io%;0#cU6P_U0bQUI5k<T{
z*=tkA%nUN~&jY8NA+`*r>$(kZRM!ez@^QPx=G_864}1hXYu`;AfOTL6_zL)}pzr6L
ze65!Oevp9u9{AOq-0`ee{G0*i`uO_{(C*__rO*5Y;41KPPFfp4RZ`U}GVK`HO1YQH
zVuM}5M?@m&GO+9|Kh4kKKHhQJtXFE$dCW3!=dOXb{OlE&&j80qybs*hB+!&}0eA}d
zrL17x3-}v8x@{J@j^7*3D9@Uu7J)HIofNeuUeN=)(?G{SN%O!t;K`h=Ju-QD%WPEh
znYHV(HQ+Dc4^Kn`xDgTEQou`k#>;;icmg<*nf1K)qBCn^&cE&FE$fDjS&oR+1A#Yl
zoHVbW@>RxEpA(WYbw%Ig7~A#UvF=-iHM?j7xE>MBfxtVFn)3C<E5Hi{1Cj$uyR_Y{
zE?w63zH$w?ZnkOx+e=GJ?YX(Rc3!|91zvTajeAqt%b<tRRw>GzO_9Z_W2NC0`XBf+
zz@xT&t3-hP%2w@06W-0Y9TN?^R=bEQubLftXUptuSJlrljcNO=yOLtFPD)h-e#J~M
zkvjEPQaMoXyW;v<%E;b#HDzQa^<OqN(rI;)N+oUsn-OvI(0D$Fkt(UHjqI~pU<f(D
zyD9A*7w-Vgh-eS>mN>&)+5V$nkd~Esj$|Yw8Og!rUk|JSbi{;{RR91007*qoM6N<$
Ef)z6M7XSbN

literal 1723
zcmV;s21NOZP)<h;3K|Lk000e1NJLTq001Na000^Y1^@s6-*Em#000JpNkl<ZNXNaG
z3s6+&6~~ttoz^5~#->hewVK^U631$%cI+f$HItB}O`C_&Dn6n-41y03Q3GOXHIR<+
z0pjr3<+-~&4a5f~7DWMhDuO&B`(SzOg1C{pu&=v&cftGb+0~E`Gff-CZ{|1WySv}{
z&i|bA-MxDSf}b#4F4zCO*7@P{f^i!h$9;D`!Rd4^Ap0iq0nN7)5q7&h+8#Y;2fx>6
zp5Rdo06(L^u|zLnA?(C3amVQzzT>>9;_vL5F)|YKg2ff()5h(7{=IK}*>LZNCxi(S
zPhj4AV$)Dv31_ykFq_S=SS%iFHk$|5IRdUi24}=9ICuN-+)f`jB7I<wm~+*(&3ln`
z>zs-1y#|9t4=%_UBzoBxG8asb8Vu{;89N6f!|((cHv<d?1_!}xTL|Mu5r%@rFolSD
zbEr3O-s}xGrcm!<Q;2AaC&7*42NQH_g~+@2uRcY+elJ1))_n9WTR7aL)!>G%hu8M?
zqSs(RpH{^)0YVsq#Ds`v0!3gvb1{GKGxxmhfvaO!F*Y0hE6<7h7EOJ%Mx&~(Rx7)R
zuL=8wh6a>ftyAB6b0%+CDZ;?}#CkCpe<DE0GkacxF?4><Lpw)$-}`%CqgMU0My>p9
zU5DED<hgTsRek+J{gU5&q<ck}OVsOM7v1jtvj{hry@1=z^<df?RO52D)oN7Vzx%vo
z@|<9aG~G-0n%GP4E1aNvRrokD2?D{y`nKx>`u=|Rc`JS-KL_O%l}}}6Wv_~j`^0N(
zRfTsesZnjdth%v9*MD=`BN3EeaN=3HBKI%vE?a(oHPvIQsk?P^e8n`kv<ehCdDC-p
z^WPYk0OG(Tui5^|^Ji^HSu%ZH(u>p9BrTe{D(Ux6EI+>BY5&ik{UM*y^B4Y@l$^S7
zd{TaHr(j8B#<4YV1tSEvHtvLNb!?$&{l5y$Gd?&`;9l~iU%?ocQ>V{_ZP^<B^tiR*
za&@im(g=xjaabz9I6M`L!zFlWn-u<s|2;B#%h%M5uBVnIj`u_Kv6cH|#@Xu=AS7n3
ziN}nUNBOk}K7-&75>b0?$;^`CycfS&FOw?{xoue3_J=Q~vZ~5sQ}a(H{(5aZX0DFM
z^c6?(i?@&9PoYx0|LG-V@>yl~#*cFh?sZoiTYh)&aJ=WKZmW+Szbds}Zw!7nT8agM
z37EGo9&=YGV6NXWZ2R<cyc3y*s2!WS9nF%rFP_ayxsw0k%V^yHl(lN#Bx}__CfI7@
z#_VOS-v9p#uvY(b%yoNfQ;{U?I3f=mM9}UyEZ-6fU;j9yWGK-1Sq$G+7>4$fQK%?N
z08<(X<Hcy0%3}=Xialq|l`&D4%OAZ#%>I5Hw)Vh}i(%`&&4?+B+1^<c+H$qF!r3U>
zi2BSxRHp^tvNQmdDeF;lMuN(;5Y$Q5;aXN8zLdp6ogc(^6>UcE>8-eZE&@XrcEMO0
z$(hQddr4rEwQ}!KOL_Ft@5Xd=$UKZ0mX_puU&<%4^>NE>HT$hY<$KYRzZs47mHegS
zeke^`i;^RLIC*ddia-7v%Fkred=<Vt@^_q1ScR%oe>BSj(4H5JuA)#3l<vS#*)CY>
zKLOith-a@IhPB}k>}^Tllv1$D^a8s&^L2ZNe6m9$o5ZTK?iNLL*9uHci8Jk*?6bD!
z<K&bK$5+X`u_+1KIt8v3N1;-_9i`F`lpNcDFA~?G;#3MQC2v5L)E`%<dd)eTpgge!
zy3^qpEQ^Bi{2mxe_F(YhJ`C#%;nWp?)5v&dPd@MH$OhM$15PW4U6aMLH>4G;CVMZd
z%KX*0?NVjP?dmMB?P(qyw3zEuz@f>8RU_wz+Ozn9mUI}JBrsf;(BFu3+-^*Qu{8~Y
z*Hd6_lfX`XoH`T3<ZHZ=jK1^nFf~g+BH$vNw4YlDbwc6LD#}Pu2?<KEwWS7AG3MD-
znUhBa*_7!*R+({#%J_v{on1o<8mYIf<g6uO24`n3L)PT#&SSX_nUezW!<6-~uF!+4
zCl4;V_Rv${3GV97g|mz3&I8wVcTVkbCwh|8$S2=-hSk}lVt(|%J38f0vhC?}Xw#)s
z!8H_QC(VzLRS@ThE0nR4KGRcG4P?J2`UxGURj8=q4J4$LYz8H|i_^+}+Uo~Z=)b?G
zX%&xC8-7kqadzcQ<+^j9AraH)`W}jBIBm{UN2g*637yP-C3$RgZ|x87{U0-Hlj%@c
RgpL3J002ovPDHLkV1lcjW)1)V

diff --git a/htdocs/theme/eldy/img/menus/home.png b/htdocs/theme/eldy/img/menus/home.png
index f4d0d917d1fd1c764891dba2d26ee146436ac8ca..2c174340c7696473d43c94ba34399b19fbd6fbac 100644
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Us_zEL+<E00JjTL_t(o!|mBmh|N(H!12$>C^P<)SlA#NHW(?Tq}f<l%tEn{WL9c6
zC<zNTqU>1A!op@03ws+IrLZDduriUbQWEKT^Sd^`sn=`X{Qk`E{@(9tPThL<_s+TZ
z`%dScbMEgAg%Av?tT4c`3|~;TVXTUURu<GB!|es0kLR$R#ChyV=O5E&PfOE>5Q>cP
z5JIxRSj=WJgfQE~E=j*vW)$^&g1<R+58)oRr1M^OchhxeVuwvYD??{DZsA}$Z{=8b
z8nbv78@`tZ*W)HmWO%xl+{Xmo#)9t^HfL}V>q<b+%WB-gQT)hbFjTO@9>Al>sq`g|
z#mMvXVH0!g!?jp3->#vMox%$|sVZ#t;|g}vREdA$G~O=-el4bOvJb7qR~%1&NMZO1
zT)>(>_Fu2kY?d2-Gp=H9LmJ4(xSj|82+m@(VIA-}yw1utQ&_cxViQY}JgM?Cwl@g+
z1D@kenQXHw?OE!Shj>s$kqUhXp}DFmY|;n#q$>Ds&ws+N9ClkVl74=dp*z}fX{prn
z-S9JumFy0=+|f$h$k5%1OLcfYZ!^>`5N_RjM2q<(0(_}G{(H}tg`Zmje5IammxON@
zfNw8{O~zq5j6XT-Ha79VZYWSG8*yM;;!5`(1J&Ckb!D4ap06d_#DcG-NYw#fndiR`
zvgcd)f=x9Z*l&4^^1kjHPA?0?CE>FA|B;T%$nW&RQyF|CWuX6u{Ri8ndc<sIQ~dw{
N002ovPDHLkV1ms5I4J-C

literal 1008
zcmV<M0}uR(P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R000BGNkl<ZNXL~{
z-D?wB6hAkUkA9}nn%Y*(hciv8t+c+B1r=l;R#1FU>K2x=Z;DWgBDUf_`{2J&sURrA
zKJ6c{EXyJdYlR3(Q(CLBSU(>6v9W0;oteyd?wz^uW;&_e1BY|&oipcmf9IZ@36W(P
zxC8=$yTijjPnf1r)^)wCX&SXE_g$)Te|vkoTr3u8Y!1^r0uS*EJ~`B#_~rDe9|K+8
z9YINw!ako5s7j9Av6cudE#zS~lZF4*3XofTxt*PR_7~>*xEs*PWV|QY+}voCN@YJ!
zh=A4Pgb<MYHV9Z2Wd3;$Zx-JHp{GRcN%V$ZExfp)8``8B$j6<AhNe+PNkLzKO2SfD
zr7ab<N+l>c%KfdPt$+VH!`O%t3<MyZJbD$~wt7IpcucvR?o}uQ(%Rb0lB%ULY*9c=
zOo6#(XJ5km<qwP@XT!uIa7;elhK#S(13DLv%lmte+KtiCaR7nJ)x@gfQ@fB`g8Z9h
zuuNAbETs>D8$*qt#8TIBC$s}79FB}8;z__JV4IOh82o;prK)PRY@1(-FhBPimh<oJ
z7d_Zm2u7t}9_T{0zq*?t5{oJ4Q|Y9*PomLw>)+Q|Rvtq$uzW=@D;7IBWkZOYjol!0
zJJQ+)vChP;<xlwsxHO%EkzoXCNT=nRN+>-^vawNs^|cN7QrLt_#j2iuH#ST#^?)*%
zLhoX=bS*96(e?Gu(AgCg4rl>w2t`SJqsX7txf>45<D&bb(0!o0+UCB^&BDW6E;~(X
zYGKRZi9Uz8oxpM>^<qOT`#Ft6Rzv8X;mz>SFpO0e<N`}$7dACD{BJf~4tK_&y{-Lr
zwd)W__nJ?1D)b#s?_dMFu&Lgm6Fb;*;w+j04y4swrXa`qQ#;rYhmFXDxbBk6kwY?R
zX>6Tjv(7Y49hEU~OY~qnB;>=O;tw|958{NE=#)p_&ulR0M-A5aY>ocX+a;L%ZSt{R
z(Q|yLYRHNO^R5#+@WQ2^SSk4QCQfO*)}k#MML>}InC2-TK{^F;*g-v^pzcG|Q!158
zg&FZP!5BFY?9ae=l8bBJvE1h|A`s80uB@y8XSG)rB9MDe05U|NCu3t{_hx2h%-u@%
zJ$1)=F{<D<|IWn3#PHPAR6)EacOowq_0*|Q4G@3vkLl^@q4DwYxk90^=Sz26?t3v3
zWigY<{4g>y^85V!yyxlnT22v&h<~@-5(<TGBH%sz0ZRCiPL+-;w3=gU)-KgnS6B6X
eK7R#MefkQ2K--#Pum^_#0000<MNUMnLSTZGhV0q^

diff --git a/htdocs/theme/eldy/img/menus/home_over.png b/htdocs/theme/eldy/img/menus/home_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0d692307f28e4b34e49314a5c525e8726feffe
GIT binary patch
literal 484
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx4Nt0s=>bhi@pN$vi8%ar
z=KH`F1A(LWEo-Lp?crO{?9F+-u|z?2j;IHFP?Kzj=nB~*d@mCIKDc+bck*Q37Vk%I
zW+(nIW~pmA`%E{dgJb6_Hc9V?wp&>P+IIvztgPc*P%LBKw2ikx%;D(o_?ny<zWy$D
z-HO})WnC7Sxb$?EjijIV#-s`f2HS?+ouB7b-d!&6*|h!8YKA|57=3(xOsak_dmzv4
zxA^@=8LoY-35<92cO28Tuc^%ap}y~DQ0O1FO>>u&iC-!-Gk(L|Q0q~l{C1+lD|Pk_
z2}T;7D;8U9s;O6(X4(AMqtNunq5PeJTCbLV(EPH^`<eOb>;q+uMP(xP`NGM6SU$Yi
za*jLa!z?QgosH8PH-?<)IT-ljbwBfe--P8rmD>;PDz^CiHMq6y;Uic3T8%x2wEx(j
z{5;ovo<HBdOB(_!TEl;YKCmxplV`27*`hKndd~CjKYrGStYgXEdBQHQ`+@l{VarMT
Y7-N_;cAP6*3yMPqPgg&ebxsLQ0D-8=5C8xG

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/mail.png b/htdocs/theme/eldy/img/menus/mail.png
index 39434770f60df1db73f77116c096ece72e45625f..b7ff50e3d9990ba330c6e079d8fa2938b90507eb 100644
GIT binary patch
literal 718
zcmV;<0x|uGP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtEEPNJaz00K@)L_t(o!|mA5i_K9O$MM%N*`SmSjSwXpjr>@kZ2Z`bmE=dHNt03%
z3pO?=Wurv-ogYc5`2%E#g;GkBvN4T8CX&%aGjs2Zac!Pk-@eVApWl0H^nL1d`#$HK
z=e+Ovp7VL0d+SQ2lIdzQOk>O8bNC!ShtJ{1wEA(5TN<sF){fpR;1A$*jp4WAMHcXX
zP^dBd->i<!w1+Q_;D3c?{F)@-23*9V$-vK;0Q>;H$7i`U;yJcW0{kfMVSXZBGJdA;
zMZCpc^u%)!vtsv7VeU9$HJ}wOi5Nw^L{s89Q}_Y~@j7<;arnw@C$3?|C~=zb083JH
zFX14%6TYgz!*86x1^h@XxEQywD>Z)(&f{d<v-0?l*n{hdu~mmJ+anyoyVOp$;7mX-
zk2kVDHRf6Dc1J4axZ&%k2oIe&j(ymX@UOuw%uYZ-A8w$n!diuD>HJ`Y{=T@l>0B_g
zf^T?~wF+5F<!~rKCHTXk*=<ouw5OD$h=<YFfkW6_Ay(#UGZfl8Qle_cIy}Wy^y3`v
z#GIdT{#&E(EZ)Z#*)&4DaqE2j1b2QY<=>CBQ9#{K^*zCx03JyA`{OPgi<~hWnL4@i
zs;xG=u^Jyn054ll3cPGzBC+*`_BYg0DmP*kx^QKZbxk)eN8DyCtOa}{w%`+PPO;kj
z8nRi8Be<ZN@bj=8pK&*%GWlCv?m}edswJuNYwe2jo~3nSS+$Z>QYKec=?6%1jZ#+d
zy-`Hf(#AZJb@^Z1IeZSE!{_ihd=8((|3~ou0IMM4$}o!v+5i9m07*qoM6N<$g1l~1
AHvj+t

literal 1041
zcmV+s1n&EZP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<000BnNkl<ZNK5UO
z-A`L(9LJx3XIW-q_7{K&VB&7{LM}8edST6C<jTw~>JpP>vdt|_MW<5-%Q75q1MST~
zlbHZ|A#EdcZBNfj&*^z-Pw5+lmKMJLeh-usYGM%Z!uTYgP<T$i-{0Hw9EA9P9rc>I
zb0_B5cEWB)VVrG}630<@&|1)2FkIJVQv2~dFZJ`#kSZQ@bf5vC-e_Q>UOyICn>`+M
zc0&AccNmJ51+Qwgb}aBx%q-YTym9GEB+@JJeP2dWSzAM;a&$Brb!0MGD0UvNU-|-~
zBXAWlD~D>W2GcZAt8JiEUOf^vHtM9AmfCUh=m_*foO$O4WwkCdTU)O})pTraZDA!}
zI24<ko6vOw>(%PEHhH|zcLU<v;fE+Els#ooRaMsA&rzv!`2)iND@hfrtCd~NvXaDi
z_Z~t_^!B0{3ZqOVXeAnbiblNwFXO{K09?jcERJHav`4QPj$pF)Wr)!eCs0@n$p=~~
zmCBf#pO^J_+zf2T`&-tjC81DAes{lKAshyKiLukCQJ|U^_>cQ2(idlEf1;>2VA(Fr
zwDXswEL*nV$&+8&G<L}s!CqowU;vu!w>6zvrn2&iClYdkxj&k2LN_dlrdu*I?o~Jv
zq22*$+iufgbjQcUz%7WrD_<j&NVhfKaXpzCAKV)KRCQer6Hj#7_GD%}`j%zk_r*oj
zsoz{u9vBY7&lUFQg_SheOFZ}1RfNeflg+i@%j3aklA~|J<2^b$2D%q%@+ue~AD3n4
zDQrH&<Ig>Gz3d*%2pM*gm*_fo9j2XuM<z_h&rzuiD&$t%L1xM%YCA5hwB5GXq(L{9
zZ97t{smmT+=dMBY4-UgqR5%n7qo+)Ya!ocmUnu@#*wmz9;!IhWJ=jZ(1p;v9=66Rs
zOVMyI_V@Ila3wg~rmi!;fYCPtWO(u<?70OR1Q*GqMv-mqmi92P2G0POpSA6UU%_5t
z?9?e(F-4Aho!(vC;AVLb3*S<Fr)q`?E3SaO#K?OW5Z5eZ>E0|9O7ehnL`Ow#h0D8&
zIGx#%3l|~Y?f(jM5k)qcZ;a!B-}=8TX<#q${M*-L+PtBstR2$OqcP~qF&L_jBt^HZ
zq_C7Qpz&TpmHWn06b3yXOQsOr+1Kg)r$3Ev@Ba~%zZ(RvGku>xe02RY%*@PU^3fDA
zjmdlW5q#-I1iQNM<Jq(LW@rSjeRvzMynh=PZw}$ntxpl`=|Ql&8`I~{<MX@U<JAwg
z_b(6L$JCXN<zBF-TYjFHnwGkcAJ5?O%|Y-#ZqE?U{!6gee|-H3iZZ({qgk(o00000
LNkvXXu0mjfuFLja

diff --git a/htdocs/theme/eldy/img/menus/mail_over.png b/htdocs/theme/eldy/img/menus/mail_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9de32d30029fe43864afaeb341ca2204ee30d83
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtLYNAnv100EXsL_t(o!|j;eQNlnJg+CnM!3v}Uw*x~3+JUhG=|HGJtw5|mtiVu#
zp@Y~#sNnkG%}i#^l9(*vXZFnO19x}WFXW!H2?G(~Sarq`E5HZ%03YB3e67wKt{dy<
zQz?-9fRBO4p5Z4z5_<j=;a9)~Flad@z;|Ep8|(8mkO8+X_MQQsz~z?j_X?ltuT|b;
z2)qN&z^Gwzr4<3N0?e-4CQ*P7tNx&KrY5yg;L57cfk^LSbBRckF_T{<R(&cWx%}1C
zS~n7rWyQKoM2xkzP*lg&6&~F@tpHmpv{6XcJZ<59L}jYC{Kcx@Xd8T0nDSmto*zQa
z=MJ+D8`ky;zX0xlH_iQ3#hSU!t$|lHZ#Q}9`Gw9cD$Fcu=*Ti};gPsY&v%7)ffr-!
zFr_J_RJ;$v7Ok@0(gK;ol!eJRdbpWBdwyC1k2<Cl4GuSN@G<aI0?$3fY^w|SFTByD
z@B!|+0PnAXc19=KIzE-?!L~E_@<Z6synttpgJ+kjZOK9Si#xyv_y8Z^1AKrF@FxWS
Y1FHzBTq2Tb!~g&Q07*qoM6N<$g1TAgVE_OC

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/members.png b/htdocs/theme/eldy/img/menus/members.png
index 4b703f42cd74596250e5122490aa18edd6b9858d..fb72919971c555e17a11bb4ee4d0bdd22e2a9cc5 100644
GIT binary patch
literal 1044
zcmV+v1nc{WP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtVE_K&6j00WdsL_t(o!|j<%Yz<Ku$A6b<JzCY)TY|=;R6Rn_XyTD*D2W9NN+j&;
zShHXu7B*NDEF>a`1nI6+8X-c2qR}AK>o!$Q>k(QUoBt$}=FXfmGi{`CzvRo@oAW>C
z{LeSvYi3f$7zV2hVGv7}e3pEc{J)Xu!0Le}zZy6L+>~AccEuz-1~>?G0<VA@z#pya
zb`WEXi;gkITr|e~2+(`NxURR*7}FB6-VbBUPTM*u$0Bte*l58t0ULlWhxKj)^Br&-
zfySW09ESyJfoh<~f|~?Xh*+%-QmC;mpiV|81R8)chrJI2tAYkyEPn=AXTdxJb_1h<
z6F_+Y?v8NXz*gXx!vU59Z{w100t!OLzW_BNbOD%aS+7}mfPK<1*#_K=n{9>zy&-xM
zc&Ds0(}L|4X0z5l4ScrXO_EgEB!3Um%ffB9;QYEtbGm`Y7VNVm0ec514H<tgx5{$}
zYEKsWe&6l$-!Bj3ma)m71J(oiA(;FK#4{Zv)7-DX(WDjjBXB6>w$2i!CxW*64qcjI
zyc5_1wDd=N&<I=)2q-W38XSVv(+17i0_0{G&kb{zsN`n=YXYpe23P=`b+mdXa7l%)
zHUziBM#{B4IHKwqB;SGKz$jp^1-D=Re9B?p1Il)>19l!T+Y*pDKpJ?havoG+AF6}&
z`kSSey;p^icX6AQ4nABj;^hk9AlxF~!A?7@TLp}ZOMa|+i=P&~DEwLntXH7gb!Z#D
zIxhJY4%WE^d;&_;=GyQxd>!Q#2Yh8*pI_=we6H%cAwr?50iFXLz<p(_AQ`Gc_9zPZ
zDGrtMi3p4U7DpgI4JcMqRu9Z^NE(sImphR0TGb^n+Jh?K8t?*W1BybhWl?>8s>K(-
z08fRjj8I)YE$h>{hGB>5NiCAw^jKPDfQi7!7?vNYxoLHeODy>D>Y=RUCpeI4*0mx*
zM_D2AY2C@Z5Nv^~<#Qbfz45&;ic8+_3a^w#gXFg>`9JctAo-*MGFq9YH^GZ1PtuAr
zLO3~*?*=}o@MMw>U5j;yBr;ihy$yMyYRU9Cm=p3w;Ib?+D}zPabuCI@^}ZJEd$&I;
zjlNMA8o9!@N^=#&Mba*xANC|9Z+v9y^t;VvVk+S`sbRn}rPVmn4%`F2#hIMyrw?j{
z$`liIAe*FtmkRvYk{W=ofhB6CN2m~a?<#+ZY)5}>l*)d}%##1l$o~Z`gD<J?onasV
O0000<MNUMnLSTY=K*~S>

literal 1366
zcmXAoc~lYx9LH(aI;_@8n{BjO$KKwyH@8<y_slJul$K!;mbTK&OiDRa3<Nn9QGvMc
zOF)!E1w@-hYF@QWB{9wLXlCJ4DQg|;(C5&7-{*II|NFh)`xPGrA6&EQ^Hl%<U`=#X
zB*a&N3$en_mqC5O<-W2U9eo6}+`ZJ#f7_nfO{Hp|wGtJTkPQI%uV08It`Xv_&s>@o
zaU=o&u(ADTla~Piet@GfP!JFZ3<~}cxO>m8m}5U3joWkPT*#S}ki?YG6xfLq=i(DC
zAhT$hS#(rZ5gJ_-3d;yTe=+PLJQK|)kw{c3m6Ffpa5(#68BuAled#DrIuewgc^IB~
zJOlYN90@^Yfif`%utdmZ++iH)B$j}}U=I-rVitiA3t~yM6T|`(J`ah*r{XCkS&*X3
zrzp7zOf-a<1LaaKvf1od3JqLP0;VzJ3W{S3S;y%A!%iq-#TBu$>5P*cE}G55;&503
z(I-5aa=EC4T3ASAULml#B}^uZ&F1lV^hF7ULbY0r!SQo&Voa_$_Pia77v&Pfxp;YQ
zo}5UMk@H1Vnv7N~rx&XkES(SL6$P8C^sz89^>VqKC(vHu8u&uJNK!77m$7+9HqXrF
zRB`!6uApiGk&Q303q;itS*27~CzRS3kkpB!*JR2XiQ=lV)Gm=olq#J@qfx7M3Z+4-
z)#?|eP?>aPMy<}I)mioBRpk|x<rUQx2Aj!bs;sQ6T9n0Nv0APFXJ6y<sT>}M$E&tp
zud&zH*4El<8+_R8Ee+S29S(;WcThn-Eu^Lk@)05$LRO46a8O2Wj)IBPa7kr+vO$<v
zCZOtN43mPXSBve$SQ|H`MtaF6!8Ayb4pnZW4Bo8Dt`y;{GNMsdY*XgjR5ZJqZc;I;
zbpnf4T&H39R#2&YE2&%MuvTTpL4mkglhddnG--+T22Pzx-e}-ARY}@P;cc3n_6q7P
zWB!dQS*uOeYiIP@SzUHfcdhtto#<X2v+pYRzC+w$*L2pG-Kp32HYo2l8eFX=cavi9
zM(I$CZn&*{sKY$^SM^Az{qIiec(?tLvwpnK@wo5C{YCZn_q$xKfdRK?pnY=a&eU+%
z)Ns%Ai1XQ)>-qTL<m9B+>wWX)&9b6x6TaVAf`)*P1NM0aFZlYd=*S2t)}3;8>&HQx
z{3xHUZAe|dcJry`0JHaY|3r@}{Q3;}MfCT)_Y*xy4$^Dyvz_nbcd(p^gtw1dXmisW
zllEplY6tE9&Y6gx{b#JdZ74V#_im~K4ow&*(49%4B<%F`edNPt(#uEhb_Rrf;vM~y
zG*b<?j1oV*m}@iRzrj5b%_KOoIyyH5KP1h+{4gYUI5|5y^s8eAfT31TI|K8OI5+#;
zbCa<F^~=glTT*}b+rB-2vooo2{`uHbMwoLQk2ebTxYw?7efx(hob+z0pHcBIqGji@
zoD1=TZnx1a4g0kjGc(zT$EcFrtN8+{QIAN4r=)D><vn(Fr#aOld)?~-*9rwnqahiA
zNFEdKww!-&+Z7gz%y=pd2wa(Cw(tr?QfcBVZ%t=H!j|6%hs-@sCrijtSq2=;lnz@F
z@_J+3Jt$#r-eTAqk_G`n&E)AA3<lGCTTknF68LhS^h4*J+puZ!rBsg?lbP+W=F5-8
zL!q;nhzRh3)1F8PKPZ0i!GqSXCvJJ31P0_yc6CRw4lCACfN%G5yIID49HETE8-;v!
zlfE7~oc#KD1*JvM<V7J~Ep7Q?^^&h5f*`Lx0)UMVx)5Do?)M!T5DfxHR_{Mc{SUNN
B*c|`>

diff --git a/htdocs/theme/eldy/img/menus/members_over.png b/htdocs/theme/eldy/img/menus/members_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c77498c304af9150165b348fc08498d7aa3f11c
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!alBTT*k00K}+L_t(o!|hqoP3$lb91#DP4lotq4#=y3&_POo4z7eN!E|6MczGS<
zRe<RrRA7EKl7&b-Yv%+=St&nYuP5X2?l^Z5W5jQbOZ?*4!SCRA@ZS>#KznZREdU2#
zkjDe)3jsF(jsPYAuK@l6h?19kkr*TMG%-dWmt&MMY(5)f3~@dBTpo5YAM>GkfiZH?
zuH|85(*w9Cb!(G3enDQ1{EdlIt!!A<jmTk*)gjrPo@C$D$Y#nUpJaiCl*5?hKGsNw
zk<EeF+5q4Yz%7yQHj&T?z<Y6l-QaK;a)&<4XU;!l#x^y~=MGnpLwHbdc1Py_Cw-u}
zNikd7RCL#+hV(8{tZq`>%C=e=qlu6-ziFWe*c>j_9(VxH3;&zhc~P+Kleve5A~9`c
z4=hp6EXn#@T61;YZDkJz0#HW)n&n`&um=qAmR!gZFY1+@+tq@1ibYxlo95j1K)Zlf
zHYkReQz`hPf_0-Pl^XV^Qt&~+x+}B?%x-mB@J#9RNwd+0QJfQ}ZBiZ4Y+Q2r(8gop
zZQe3tJ8hF16j}@g%!g$DNl}U^=I_WBZvk8vFn^s~8yzv;vaZr9{7GNoDCfB&;am+1
zzESx6ZX-K9XeXC`G5asB&lE}~y%Hi}e-rRQ0IuDhSb4GRuQC7p)wx&$Zvi|k`1El@
z@N2vK1mH%_M)*A7ia3;B&Oj?*?N^C5h!MaamHrjq7fZfjGB&}Ku3rm2wGvM8`NQWf
z8q9NXhF=3)c}!B9N2yLjNl9FabAaD}*4e@T<oEzRaYKT&*E`Mt0000<MNUMnLSTZ;
C;y5<|

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/money.png b/htdocs/theme/eldy/img/menus/money.png
index 50166e0f74b71cc183956f4c0bd6d31a090f9614..503e5c67519060721c3ab0f5bc146292530e9f7b 100644
GIT binary patch
delta 1255
zcmV<D1Q`3*4eJRZiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2AOy!rxG?|#1Zzn|
zK~z}7?U`Fl9aR*Dzp522wFs2b0)<jAwbmAFm8!MTHi|}V^uflYMtv|L@x>UUZ$9{7
zqEQnyK6r^fc!^2%$(SaMAO-K%e_k}T7ZKZv(n2XHSZJXp`0`CM8Rr~^!^x=_R<g49
z8D{_cpEYa$d(CFn`1m-})y`uY+YI>`@-yUT$j^}ff0Mr;gE95MrS{wY%jA~;cj<LN
zL5ll613uD^=8F8R6tzti@H}v52AJ;wPXL4Gg8WKg8!&GQxI@4VKv%BGfA0Y*vVgrE
zcp#VL7Xx2s5x*jr3-&jlAGjn7*v+}t`EuYnU~G!s54@Rc^4-8G;C^6VhQz;eeA&5B
zn>L^c=m6FLn`{@Q!8s1>20pgkq&MZ7{2RcPzz4uqi3PSg2BX8bg%9`;aJ%DQO2A=t
z3apHF*bjm8fxGoDfxSRye+uw=pcc3aSm(9xfYuo7g}`mzTbG8{56-zA=$TC9UjrTo
zt~Yl}C-EkGfp?w!Vc;pRm%8h&%22glje8?;<hKGROrL$gQs7$Kxj;3L4-5lG1U(FV
zW4jV~(y>oF?it5qYQw-I1}81~Ex<kY_X9hCAAO)ymJh52HUKMte-ZP27w|ezl7;oT
z6L@x_oG$|&b8Ei>xXkM(Ll5w)#T&o^V18))_rTjO+Fe$nV_6_ypJc(V0{#YGkkoo$
zIZzoY)@mbTI)Q`0=SKZeTYx`-IawgTCrQq40X71sRhkx~9@IWzA|sX*_@FndI2QwN
zSto4(?wca<)4(gLe_dMgceuT8mIS~6@Oy}8w3w>^ib4~;0~9Nl8=Z7>C<P~DKP%rA
zibC47xdnJ%#c0sWfy?z&b_8fwWg1*Btw5u7{fnksgKbe7tN~MTr)>jpbrSMjs?BmW
zw%zMBz(tXo<q!Rs5w8IrR34i{^-_~%!zTuY5N6bV3H1wse|s%YzDSbu_1;|V?;fLi
z7&v3OaK^t?`#?+WFZB9e;DC#`-mj|QZwJLY9>GGaMS8UX494sR4owvKTa~&}C$91p
zuSuAn?Gn1tN!MB)F9U8e+BFIDz0X3iSG)<y|E1!z_z(p?K!I`@R}!31`v;ZQYeLG9
zui7*NFB_Cfe=+ln_5#Na0;6Jf*jCD?D{0!S6L`o46DZAS4Ea1KuW@(HGh(gg`+E0|
zJaP7mHIyde^Hi}Fs>~?xX*BYwq_V|H<J6@))Gq-p4E-K+hdrc1w21euc;%6M`(p5;
znB6YcI`Pt`O^Nc>=3&wj6{c7(iTM!eS8<LS;l@x&e^6r0zRhprWiH6#G&N7Kn12$d
zF|Ndji+ru>FlL?|P<JP?BDK9Xbo9{^!Ryomyt#T{r$VJ~kz;Fp6aT91Q=OPCR$YQJ
z_N;n7U_Y?gPEu$;C|}#XKa6)><euSZi5t@P!qD8qmKnWCkNd)Bm1PM(rjLbEC(dS@
z^Hm8;J>)(WtUD60#N@+PAb~mhh<-N1bIJMQg%58B#XC8bgVt$b)B2wa{{TcvYAUe-
R_K^Sp002ovPDHLkV1j>TN4@|6

literal 1751
zcmV;|1}OQ7P)<h;3K|Lk000e1NJLTq001Qb000~a1^@s6=IeH500001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igW1
z6B`hB!M=+C00vh{L_t(o!|j$!Y+P3v$N%5C=iGZ|?mRuV<Jc~Z5}GC^iIs+ghLVbw
zR4R*75K1={u#Q->s6-dA;87$bvOq$B1nL8+kcdic)ixmsp-IzJG!Lbre#G^AJTo49
z?#z9^J{F-BERdXlV3VJ8bT()4(<hz(_XqBBm%IFbpxb%;rLR3M`ihl&DseDps_!Dr
z(mnTXdvX8x-tkIx;K7_}jf8=pb?x@Tdb4#d@crKt<N8xaza8GO)bl_8i8;3Spi)AY
zK^T(~oVMyS$=Q?Vcu8QmTrNG_SE(J{JUIB-!GQ|Ox`u-fKL#^bK$^r@Z#3aL9<n6H
z>S`0cwN)fh{9<?A{?3u3N9!Avk^u0_V?VC$-o5XEYOU{(WtFxW%BV(3ES;_$6w3oE
zTepAO>xVpi-;SNT$M=k5WO$et=ciy5N<;*#EzhB`vWlMFL6)Te5t1<CYOMxCnNMF?
zeD{N|9yomLkC#rl8<KkA*T)9N#`gSl+m78&mMVQkBnce5i^%RkDjim-4_ois4$pDW
zUn#Tex%hBmf*SQ%D5P91R|pV@;}C|apotuErpftyfuyGK!qg0I%uerHSndn}*pL+c
z>5V@;vuD=>Kj<IX0>|#acU@j<w&1uuaF)S$9LmxZhSFIo12fGARW=Qx+gXFXT1P<%
z^w$Pa>)(V*u>vAO;0NffcX)1Yj&9D*V9IVb{3tz{>2$&CIDdWR#H$~`3;wMj9e?Q;
zzd3N=^WP#8ndf*E_yNUHgp3)QkjR@Rq|{+q1=JT8aq8_eY~DLciU_{bMHc$V(il~%
z2t#N{lN3=L!}eUbLC8j_2w~`yqzP=N7YBYY<;Br_5Je45YBOmN*LzNHrPp*Xo_YO^
z768bZ$;lJQ_#1;mL!!TL6LL9|P1A&wilmTi8YaRh!qVIvy>tFASPD8QcMK>J(3J*d
z<v^){9y7cw1`|V=5~fv!B_$CE8H1StT~{hflCdaB#sW?d`eE2z@2=&M{nk{u3m;EP
z8!8Vjtkf5#+pV_MtS^s7fiIPzC=4Tby)IpO|1zC@>rMLeJEwU*^-<Y8NV=wwA_IW|
z2BeZuO22g*2BfY-NeMv&W@a!GGZ6^P00~WFPC;(ZkxtK<Y0kHP^y=?U+#El&Pc-K1
zOaSo6-h*Z?&!b9dTa>1Ms$43Knx>I=Y}<8gXJx(Lda7719k#4I=ZhBAYBl6c69Nn+
zC8Q8AlmQ}wk^%rA=vLZf%*e6~X$EARA&Mgeag62W3Z$;1QYa@~ueUxqG4)*YTI&Tp
zGFtzVQ`?81q++3GWLc^+XF}5?+g&ey{-tMzCZ<0+d1Y#P>uTt722i<D=Du>7^11=3
zX;4x^X$qPEgb<%dF@Q8pk!Aoh!wo#lE-oOKFQQZ`BF$1P%r8vNU0!%LXhfGuU`hV7
z)a3Fj3?TT&`Gm#gy7`&0U8Vi|K8Mq1PhoOph1=~la(gZ|4b)IB6rrR9n2~10Kt}jj
zj2S`*FsJBrZOk?rC>2X=Sq1U~4`C9cuU6gO*<v5^?dIPo5~OV;H->AaAj^`iVd#(T
zynjrN*80fEfNrmg#=4CtP5{oJ>pDwKkR}9^5Cq(sT9U+QuC`I{tfSIbg>D+;dM>9K
zLsyEDI7Mg8zUZ~Q^N6XvA*pxYzaCi{T?kyaw^CoxrBvzYrp=;AAlLVjR>w{q-;+@s
z6TmElATUEo$zd4L-0~87VZc_YL;!Q>g%DCe5K$T>Vb68Ww;JseUfaL=-t}`n-R=h8
zIxx_G=)wKt_mAz^QmqYClddD)ym6IPCI1B@XFicD<f&+yY$zR4)5vi=7P_KbK8Gld
zm{TTb1m+CBAAHnWY97CNb>`)0KKgLT7;(-lz0UMsY8t%n(T9fa*)sCDnah2@Sg`KN
zTY0|q3kB(h&S4Tk15pyEh&freTlVS3Z0qIe_ogomX`7oD>u0<>sxBMhiKoAQs8A{V
zuv{rWR47;wn&2pmAT&XtAF|`RC!6)g@$QWCc6Y*At`1k+b2r|K@3>EGlrJCo%Fcn2
zf$tRx#Unx^NL`|5JJ-4$`)9p*@9fmXMAH&Q|Juz<>3>}EZik)wca^^Q*dxzLrM|h^
tZa?d}?ytP2@0@(?we)VczRUlbzXPO(I8?dK^`8I$002ovPDHLkV1kDtMiT%4

diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a501e762d0d460c396ba28c1631f9ae38b12165
GIT binary patch
literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!n`N7)?!00S&ZL_t(o!|hqUj?+L8{(`7zE)8`o(Zlip=#~~ygo@${jD#p5qC{7O
z8X<)zz`TKZ0`^KOj6{EXZ{RDS9hz^Y(Q52CIVW%^Bdy}wpSj7*H}j1*6A{66l^eLm
zaxng2{K5Ex@dxAoZ{u%namE3d@;Us=#uotQ91g%y$G$TFHAmc=^&(=8LPToWPAU<Z
zcIX{-OpM0N5e`RJ@X00h#C<1heMQ5;^Q&E>Cii>+;CxK|`}BNd$j6W``>yi^fVU&)
zy#(-K-^ND(zX3c1@MBAzX8=5aJAb28wj$#A>{<Han(`RA&+}X<B4O91(juv!0KNnG
z$cj;_HE-;10JI8r6@X_vKSX?ouB|+OA|j3QYAqrQdetHy&vi{|K|~&Okl&K)eG<5@
z=<~ca+0e*x09-8il!~FX(P3=H?!tVd@ayP>ng+B~+Vbz3>pD+bWxP{oww2b3f@S<^
z7QS*__*A5V`e%>07G)f%hx9fzfF+alSj}IkUZr90l9F_mmC9ED-Z0r^XN+xlF@4J^
zL%zxq*pi0(9HZ2zQrYgx^Oo`NRp?h4WE?S_hRc$2rHnn{{L2vxZ>{QOb(OyWJm>Rk
zHfoV@nzJsaF;_1j=iCnfPXOHJ^DO}P38!%xy8|{QVY3(j84VqMPQ%9Ug0U@z{RZF@
zy}DF=x#zp9%X*=xn9(y5#{k|b#{LT6Gxe=w?2t8z-HhGAu)#>ixxuoY^LbKNoZpnO
zryY!4i^$`lB;~TYJye29<a$KLc2>2qVAC>m3x>7GKCQ;A;h9KiEC`<z`lPQQ?7V{E
z6u>>jBQ5pS{Pa8@hQQ{9DtA#qX4=E9J}Z-rDs87~ekfxX24g=R0-HooRSz^m*5~MY
zycCfc&nJD(fMA>H>e3lR<gU`U7W0AMK4G=$DVYt|Q<=0Fc1*_ZHNI4ysWKMr8!n5M
zH}tIxR@RK2v$=+%AJUkCHGZWUu1l4e`b{U*eSH;p!ShX~ugdnsj=RpJZ>IK^LlZWS
zLcKxbRBq5V4=KB4-__w{gWqA(?Qp>nv(mPySd87MQoZqw+2O~9eaRn}6|ZO5h}_r!
O0000<MNUMnLSTZf+QAV3

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/pointofsale.png b/htdocs/theme/eldy/img/menus/pointofsale.png
index 748ec41b1e6cca25544619fd89ca110f11c022a2..6bb68041d19064950fbee0a2c11116f7b4a12578 100644
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!yv_{59=00Ev!L_t(o!|j;8O2j}Eg};>uim)oI7NV<YBX)v~2)=<2uwWw=K7?rH
z1NaWUfZ#K1VdD=Lc7lrvg4$@a`PtY^AS|0@Gk2KTz#IsK1nzvCoVnadElpFZstGDA
z5AWeUyodMj9^S)y_&x;&YRmzbz?!hmwW>3+Y6hmtbKuO7nLEIvP3IFJGz4F_9h(^F
z0&U<xv&Idu2c)()Y@*;JL5)b&=(&Io4Zw#k;A4Z%r>>ljg$9JKV$&6NoKPq8Cc8}o
zIM%Gu(1}f8(D`}bP*BH-^LMJh&j{<h01vjugS=YmDx*{2$<<&sC_-h_(_L(k^ZUSw
zg9-N;xR5%(tKpsrtpiP<BY}?`!2?W5oev$ti(6$h2JlM-<MoFcp9|q*gNKW<%DTr<
zL4=lpH{gDpW77dvf!DtGpBeZl&bKW9H-VKt=QD;YN#<?9C%~e*-&A>@9_8x?Lryie
zls~|4<evXYyUn%*_=Vhhx4@6O|CPdTS#m#H?@Mh;?LPkw%sS{aQ5o=IBXJ#=v<&}k
gVydi+D*c!EAIs5%m<CgzI{*Lx07*qoM6N<$f;!3V9smFU

literal 1460
zcmV;l1xxygP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0000hbVXQnLvm$d
zbZKvHAXI5>WdKcSATcx`O<`#uGB7YRATl#LG&wpjH6SZ6F)%PdC>K`%000McNliru
z+5`g*6c<0I<6i&(010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00RI}
zOjJbx001W^CptPh4kS|zCtDRLO%pC&1SW0;C~FKVW(g~804aSEGinh(e=9OVFFH>#
zKwB<NdpJsGMn*<hSXf3|d0Jp~WMpJ(Yin_BYjSdOes^?xd3Jn!d;l4U02z`2D2D(i
znFlb43^9xkJB0-|lmI%WAwGx<K#m1OnGR5y6iI^wM5O>ovj<eD1X;HeN~aNCs1jMT
z3u3q*XQmous2XRxA91}UQJN@FqBUlWC2FE8Y^)+}w>omG09wQZWyuO{&;@YR4RX~P
zYQh|H$P#qZ6?fPadDR<s(;Ily8GhI(Y{4aU%Orf$F?-HHaGh9blu~w@U3Zp1Y_dmj
zrAK$RKz+ANe7aqDryYXWB!k)|irg%L&@6=8JcG?Jh1M{J+cS#TIEU0aiPJia+dYrq
zIhN)wt@i-`|5k^)dWVl?hpu3YtZ0R;d6K4goVs|FvQ3Q2M~~P=lifp^-c*UsUzfpI
zo!d&7;#QsGSD@cSq32AY<4B|GK&bmurR7tl=vS%bRH^J-qv~3z=Uc1kV4~M~r_W=d
z;bo`lWUJ$0t?O&0;Ap7lY^>~TukdBD?Q65`WwP*WwDNDc^>w!Cb-3<(vEqEU=yA31
zbhz?xx%qm#^L@VggMD~}fqaRAeuIO9jD~`Wh=hxaijI(wjF+E~jft0(j+v8>larH{
znVy=JlAfEDoSU10nX!VQzl))?mZ7ParLvi+xuBk%qoJRpqob*(q^qc<tgEZ2s<N)N
zzp<*Nv#qMSvaPeTw7a;qySuxYufv<O%$vE^gSh2^zV)KE%f7zBgTU{F!S{l~`-#K(
zj>!I<z~h|8?VZW(md5gz%J!4W`<u%0n#}#5()qW;)~e3&uF>tH()_L5{kqfYw%`A{
z-1)rY|G~Sq!oIx2z`Vo5!^y?N%*n#b%gfKw+0)L+)6>)3*wNeD+sfML$K3PR-sRTf
z>)7Y=<K5Te;N9ir<l^V)>*nO^=;rI|>g4S7=<@vW?dtaO?)&@t0000Ny^=@(0004W
zQchC<K<3zH0005=Nkl<Zc-p1XO=#0l00;2UlOJrC29lLVs5%iG2+pD6L<h2)2gQpB
zq8_R!9tFh@?B;f=vSkyrvmhlc$`}C;O`cDX*Bl&yO~j8WR!}kZL5ZODu{_9om{b=R
zR1p00Za@C-TM+&!5CTKjXQoTPlfxNjloCoAqb{x~aZHF(8Mz+ioKvL7u)&pds!Nt6
zQLMPSUX3@Y6oQycCJ?Sxjo8W-DW#-jkVK;47>2pL>98-};-ZVOi*<rb(@Zbl&ZN41
za-#L-GbLUNnkEn<!<--PeU}@!srDYC)C3Ozh^%RG?sGoa|9oVF%>ej#>Jbo5ocvjA
z)$@#paf1OH2X|$&V+-}`$3m>}iP5oQj?O;|9742X)9yV3N3vJ9w2#4u_stc~KAy^X
zoFjxDu3p!@IpCf)`ab)5E^}l2=r`^ns|1zGy)|n$c4yk}L77LW@4w#9f}$pZQde{b
zVB!4U4(*dq2=NH2K}pl3)Djvm>eqTQEAIG|5ZAISP*#)(t54=<i*KK<U$wFmhG>}(
z$xEou%@(H$YW~&xmphxbZ3i63f~w|6a<|%O+m0MfYtP)jt&ZnMhpt@M+H`_gQSZmH
zmC!C7?`t{@T#o&MFw=KWU%oha0AnL9{2`ihX4?mhW#KQ8Q@?idfB6pK1szzSWk^{7
O0000<MNUMnLSTYC3e`gZ

diff --git a/htdocs/theme/eldy/img/menus/pointofsale_over.png b/htdocs/theme/eldy/img/menus/pointofsale_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..4abe721969427e9f5f4e22dc7ac814f9cbc151dc
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbLxWm6KT>vyi!_&nvB;xSf
znFn(Z8Hlv)S71A_wY{rn0x!p86XhwKk8%#M88}_#oaOxfB}44OpmQ>3j(RW(Y92f0
zcj~vQ_s$<bFJI2z|J>qYlySK3jEyXD4_IMn{gy8R%B*D$&m^87J|d~VcI)eaTl0%%
zZ(W`?+hp2vX@#A|CPlY6_8jn@D7BU+fUkJ*q4f<}dE0(6S@9Rv`K)>HVWp<oSJ}_z
zX?g!bq|J7I+`XRVn_z_0f`YR(lA05<qhEW3|CH~V;{TL+`zo=D`Bs0_KUi(hk9uH`
z`Xl}U>yLdCe;&SZ<~pMT_vDM+%6B%1>dgyhd=SdN&*Z>O8S^*M?|;AGTF-Rz*_yQ<
zO%Kf1t`W8Pyw*2;r^E}P<Q1D^ttBhk&*pk>U4BhU{zDOC{T9D#SI@HE%L`is3`Pb|
LS3j3^P6<r_qa?24

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/products.png b/htdocs/theme/eldy/img/menus/products.png
index 1831440b1d3bc99a90fbebd27a2554f47c35c612..a5ecf2ceb78bdb30ca662aa15f9afb81983003d7 100644
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!=1oKY_T00DkUL_t(o!|j-{PQx$|hQFdp3~amtREUL{r4l>511!7%5(5jcF);8X
zs7o1`c>-WSVyKwdkSGgn+{7#%Jfy^&V`^7E$&z)E&tHFCE_dx{tx45ZNZ2xbhR^UB
zKEpR!w}lvcz@_l)5%4CyS!?aP23qS<xGsF|ZbSJspa4#RC(C~g>@=J$7o9dUKmm`y
zgXRA){^;Qgpqk^48eSPlJ;$F!+MEMp%fIE2HdQQXvr+RbnY58uG%swj@G2{xnDPs+
zHlHage+#S%&))l7+{ypjL^_OY182h61G517z_BpS74RZ~?|Hn8o7R5UBTi2WUzsv^
z2MjI$0kHpvN>Z9QH^8gqKQVBka@utOC~8Vt>7b;l>3^y=+vbq)vzo84ZgXH+dgYa=
z7X4q~T$ES9VZ)CMqP(={3EI4cgjb;l7S~egdubV>^IU4>eH5F8p0-@zr!6Tz{cre*
zhhpE>ehjP&<4mORBagQE-P%6`U&1(}JdDI<KPUi19urVPKmY&$07*qoM6N<$f}P;i
AUH||9

literal 1519
zcmV<L1rYj)P)<h;3K|Lk000e1NJLTq001cf000~a1^@s6{MVM~00004XF*Lt006O%
z3;baP000H1Nkl<ZSi{Yj2~5*x7{+P2gy9s)WMk~GW*(V3C(LWvOg1xwF_VelHc{uv
zfWaJU)Om0yf`E7o7%Fm1l%uU|<tUdR6v|O3y#xw{w%nJKs9c%h+5g|Jod_mO0r`?Q
zJ(K?OywCf5-&Y--30ejQCN!Ptx+pqS{T<uAt}12X;h=z+;-yR1IqT?94W|vDp5BZ(
zJ|`pd9`=aQ+K`S8Wd?fMDv+68(B<Ulde+#;bpA^PG%=aGAU-Zt+ILS3vf7(c(WwkZ
zyF3`JiX`-Qi6E;LJwE<R7@J00v5`Wd=uRo1rR9>(3iFHaX#mOUYT>FNHPzY>gWgV&
z>N8U5<OH_Tc7yYAeSM?XCmqn*%4TnkSUB_~pbD~8fDT2_2++31Sp3z&*M6s`U4-kg
zj3L6aGsfff|Ltv}T~von`_6T?h=-pBR73JdL8=sOJcm~KRVeBhL~#*z!LOV6aU)|R
zvsGquXuB;emIW?c^!besmVd>zT4A5N^ZO8yhkKkjJd8W&>2X~+Za^wk&*Y$2D2r^{
zSb$`8H06x~B>mYYk4IN?5%P13aOmJAI68U!ZDafMkmI-KvD+;LK4-Xyh^j_>q73xp
zYH&E6@byWPJ8bd_HJ`ia<8ec7+v<8lUN3wm;Dc@v0TZPKQ_8L(D<cWvk?A<*lY*@~
zW8kzS9-fD@aXO?N*W#o|%j`gf;1L=d`_bGyfV9+x-fy;?NT$(NJB-H;qt=Cxph`|&
z0`hZmK(u=VAn7@&C<%<DF!%>t#y<C0I5}UzwmnRE9m_+|MLyyZ8jzje1EHi3il#vo
z6o=FO*vC7y%+A*3l$qK5PY65dztFI-m{C1ltqh3yNyyH)1wlnQ{$Lj1lz$3#?Tf<Z
zt<l)!#=;TrLR^RtAd#s+e&KyoOZ(B(G6<z|0KD>E<Yo!svNxDLZ{8{g!a}AKx1&&W
zXA*G3JT4uVuiU`?1JT&BJq9kG={V_6`bh#Ns~JTl4^UUHZk=2{fU>gt$Yj?ejU@m*
z;WvmY)jpl~?gIM>3>)f<S+m};UH0LoXt(`|aQ9;4R8SeN#?~M;qaD1ehiFg?sGwxB
zeiRpXBR#DSIXPl*IYJOIrLsdQClPfL_0*HoZ)`Mc$qTARp}zf=mHihsZp^)I%!h%Y
z6^OklLuPId1foZf{|hCR_95?fGXW()dTKsyF|tu#GkTzE#ighbp4CQ^pgeGx?96k)
z>FOGqty#VKkiTC>L&2R6uviL6YSn%sp#;PfW@gqQi_OFBoZBcVOu=2kpAEHiBA^*W
z4l=>xveBjxX#sn?B;c1u5<AaXZ6u{6d-puIf_8R4+~siYsp3FL07XV{2fa_Sc#fNo
zg#YN~moKbj5>w2;{VwK+YF9EL71Pn#L|45Q^HU(HDpf)9%hE=LyT7kT@pD6(n=ky%
z+Ipksn-<G9=<B~id-5>wlgEL?C&5VNnq&+uH2Fv>ssU|jWT5Cy8WBt9MgTU}1PxnS
z($-JPUL715Q1Y~bBq+JfkxFXbBO^-lT)_K%)b6uq*Y=x}cA$v(HB|aEq^3yKl=bvc
zRuJ%_|2t&JgOHbXy4TRa_>D<}G&G!PdGzqHOj5nEKvk+r8QONMAj>1QkhQ`<to&$=
z$CR8Qt*zF%a0_le(D-mHRW<FeDhpQulKFV_uxrJX9(aw7XVd(Ad<#fFlCd+Es%prK
zsy1i*>G#;w)O_XCU%ZIGU%Pg_R|YG(Un-%GsVcuDgbZ%j+kF}FQtvpg&U|gL&k5hM
zs`8`}Q{LG`1bcA+A}$^5(ACwS{qnD~6pG%uPwkFpr^gP}SF2SORVJeNjz1Q>_rCMA
zx_g_>wpbqEe?};&N+$ex9qz6>^QP(F1XP0!Hea8KyLP_M#AME5o$0&?A5M5^{{!y8
VO~+Xfi$4GW002ovPDHLkV1l;z?#ciF

diff --git a/htdocs/theme/eldy/img/menus/products_over.png b/htdocs/theme/eldy/img/menus/products_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a5d9a7951fffbc4b473c79c447a2a8ecd00fb37
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL1XoRoxdjw@=IP=X5^?zL
zjJv$e20ShOtC&lKt(fjE(JpCf<CRcU-r#tfSE5ny#(~;}lctJ?Sg-IbRge7RvC&>>
za)F6bQ&g$LQ6-y)oc<Mu@?XtRbZ1wPI3CA%=GiHwN4<e>xaQrmO#8P*E}ucIw4UL@
zw0maqz6|qTRXyZBeKjrG`I6T2Sr4MO@dCB~h<!Lc{^0WnE%vXqpVuy0UU2xoS?i&4
zh9eS+hO*ae=Ca>=yuqZV&t}=Smy9M_Rmvw+Pkv51FTC%9@2h=n;r!=7PWbV^`MU(K
vZP~rUZ*tatzL;p@Rw^gMFOccxby@n*`5Pxp#TQHj`k2Af)z4*}Q$iB}abJjV

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png
index 882235d2cd3497a1488ddea08af1dfc2b4eeef73..ae4d177c6cdb769943524b09e643971c1382a7e9 100644
GIT binary patch
literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbLL~i|C5ehWL(bL5-B;xSf
z8HV160|buOUlns?pZZEiqmT8VYk{E5UypO|>Ub7z-u>W_#-k-A;#-`jJ6&FK{%K3Q
z#!ha}x2wOmPpB^Vf4u+kq;gN~7Kc?)iiwtc4qNXzeBS-7)c0L%eIk|V-5mFs{esv2
z5t*@sXMW{V*?Y@$Qh(g3{<nXNul7^@m1WJ<@(j{K_J2+POf7t0n-Kdbeew5Ac|V+Y
z?q@FV`lFi=`pEt1fo-=#p5`n4sCNA)wL!fwe&YYM*7#HG-&kH~{n;LPM>KwBT*LK@
z+Jzr@8rgOKY}})(^WpY^ou5?t9-7W;WZicv(=xcKD?ht8Ju7pz*5;o+FE#5dW@fi<
z53|#-{b{2$Kj(G|@1gLOHEE6Ojb^vARoi{v7P(~G&s>`uELL5<_KS8X?=$Ls`s-5P
orcaBP&dU9xzY*j~>zb8zjLrfDE33{4+y(`{r>mdKI;Vst06z-BXaE2J

literal 1075
zcmXxjTTEMZ9Ki8IK!LGkic3t)j59#y!$cAvlo;cx5ZgqM;9iU-!?>^q6SHh2GfJds
zfn^dc^lD)jXt|Zr_Oz#`J=fl$m-SA|>FK?t>$adoUwm;<|2?>GKL7JS|KG#ONlwn~
zk>QU|op|L01VN_+{DD!hpKYwRW^f(cduttRtrLQw!Paa`b4PpEBP;$Y7`0#He|`gk
zIyxJxDOvdODHyg~<qh#5$Smo2`qgs~)C`S$a%r%)w|8o4YHn_BdU{$Sk<84@%+Ai<
z;yS(o6QxqAR;!nnm&IbSRCq-y90yk9H&^CwY8JlJNGCNip++Ins%Nx|x3r75wM%na
z^&GYN3#pTkTML9v4$yiTwJo=EVHk$vI6)93Nm3L=)3k%j<#M^*ZjZ;~^?H3i-!7Nm
z?+<d__<n8Tht-u;QoD|CY?}0XgVAV&Vc2XoBM7pg!?z6>Y{n2PZnF_~jKp!8ARGpB
z#DqjFXw+hhBld(9OJZbFF+ot2gQ8qGwMRHov@`AWFm4~~-DP(Ix!qviA1VaHg;2N{
zj+UeGax76vrmD$QEwx{R^{eLXH2^VeSd5#rLE$hc0jE*rG^zoYY0(WYxy*MwmOEa{
zT`zLK!MXzYP|dL&n|2plwV1Y0Sck%T)MBt9MjHZSRv1Gqq#YqKl)`NQP1ybT+AhBC
z$2S7_`v1ty0JQ~#j?vo>9EPxCJM1uqoefbp9Ccfw9!uP3jrq{zjxFiO_Wbr#080gk
zRESE4XeLZE5hojSvoSA_i+gj4oqWRQl`$R#vm;}C@=QR+HYnJjjEyMRh^is3%*KDs
zCKb7)DwpOk>Re_q59F2#xw{R8d&T0t0*a#G(}lPmaD}-dkqFqMT(M`x<M9O7-m}tN
z48vqHnZlmGm<klrApjg%md$eI^Z5c-u~;mXO6797QmIs{)q{hBTCG;E*Y`7ZHuor-
zf1E2kDU=RN<->C2w@UT*YVD}@@MwA=Ee8Ka)5PfTXVArZW*i)Jf&t#8H)3CpE%&#H
zptI8RlGpmNmsPbtyITJ`^7OQ)?BBfCE11uZe<?kO|IE9BDLY-E&`(1rUn=hlBW+3H
z3upTJ{`d%L7WbTidhWmfg?-X}a=yl#HXU7V75ww>-*5N4{``e@>0y&VR15RKLmpq7
z?;iPf{L>fto!wX4q%BW6PD29GL-|GNx&AljyZM)e@9;Y>oNtx31a+cr_w_Nsq;c&7
Z2<q~Us+{lkT?a1>2?mD;j317P{sXa)mS+F}

diff --git a/htdocs/theme/eldy/img/menus/project_over.png b/htdocs/theme/eldy/img/menus/project_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6c28b6d7ee28267dd5792dd34045956a5d8e92b
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL#7sV%tON?Z@N{tui8%ar
z`dQv42Z2_59`XEX39L@+N$S%QIBzhjMx2V<o5?=Kf&F!=uNlju32W>hRC6YJJoDZ6
zhVSOhGu7u~wk91D+Vg-_|HpX^|A^I$Ue0k}yFaLI2*1q{_n}FA&x2si*`Iy2>XY9J
z-DtT{D_!@>=MsZ!2fy%Mz0%t@!qyM+PTXgFEfCN9({)R5<g2On?d9AtYJM}P#ac7n
z-v2*w?dkyck7hq~{=RX`>dCCwzW2Lx|7WwK^G>~3S#8&SM_{>M#6fPLP4Q-bZg5t2
xwW+MmJN9zp+uCTGyN}YOzk*y=ad7_?=9+hBE5&799f5vk@O1TaS?83{1OO9*jYR+e

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png
new file mode 100644
index 0000000000000000000000000000000000000000..fab7db59040300ef6fbcbd91ced1831ac17c4df1
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#NqPt@oD00JjTL_t(o!|j+qXcR#dhrg(YMUL~(O3WES4E{k8L$I_6DHMxXTE)sz
zw9&#sYnv2yVqq^>*_~ixAdOKYDx!koAy|lsB;cLrJ)7Uc5xmXpFcUX84<2(f^V`RF
zZ|A*TcF4@wthR+sYzaQWC-?-P;1hg;FBAMt;3Hu2C9Tyr5`L)Qi&-6L0>=jIF9K8g
zGo^!{1CI91e`u`rt-S=!0Lx`MHdlc$pbablr-2dq5#X`*#-xpJX6E8GGkarZEi;?V
z(alQJGP8zbY;SkX{1i|DJ^(jzbXS09z)#>@j;;orlpl(n`P*jp%FL!6v=h=k7_dKW
zX7kcy-ZZm=MKkYOuup*%;FM!d9s;|8@ipt?z#aWw0luh4viU{eZODSHst}t6Zs;Rj
zb7IZ<ao`(pONlrSoCW4}EH8y>l^1}SKz-o_a9J_m15f^<xeM%9-8^>*x-DmKuL>`O
zRW#lQRtIRV1NVT*5b)b|>qFQcjjK7DuX=toT!ZGpw*zKAvteK~XTPOdIIQ_=U-(}E
zGoM)lxVDa_-KUxHh2IxA^Sg9xg2i0#*o3s5z`KHR59peI4&U>L+bc`vHw=C>LZ`{z
z`Ips(qrvwgWWK8LbAety0(|m;51sk0#!i9QU7yTXB4obn@%-?DuSbC2q4B%gri*R$
zf$v6u&upnc?5Zz(=riB(h~4plH{f@qK3^nuFXVTdQd#=Yn&AI8_&;Knr+6#HVN?JB
N002ovPDHLkV1jidGt>Y8

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/shop_over.png b/htdocs/theme/eldy/img/menus/shop_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bda5823f8c36729b82f6d310cb6c7e1991821c95
GIT binary patch
literal 502
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL6n=ZfJOG+f=IP=X5^?zL
z%!|1#20U%`0r&Nl3xp>KUgF*5nBSUrfJ647TSD_CPA~Hl93@QO7rOaQWMF5NQi<;J
zWB;!@zql;t9hcIf$hAj0eIJU(K~Zs2K0^h=k>m&2&pdu8Z89`wuwwXn=C40P-`taY
z`{p;)e|-JaUPeRNc_|-*{Lk424C@%~{fs+%>u+y|%3*<v4)$g77w*2iuJ!QF?Dmj~
zWQFs6I+@ki%(Q1ethllFVKmz=&Mkdg{~mJV`Evb_nEDc@N32V$&d;A&oHJ+r{5}0e
z3q<7l87{ajxwN8m^6NhT72@-*vz@GC{4h%^QQ9j#*5LVNuXQ^_5-+Q@yl-}y8@*m=
zPTHdlo{_JP|Jo3;!=}A|s^71I0{zsm2R04Q6~cGTd7#^1-k5hqB)WR`75k;JmCx;y
zs@BK+`q?GDTcY@vL6KU;_TU>W=NXpY`l(g1;NlE@{uS%m58sx(w#iYncjbx5mfo8T
o`CsRpzsU91Jm8_|Kbvp7A39FBd9tU?21W{lr>mdKI;Vst04SH#jQ{`u

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png
index ed5d0326c4324bcbafb60fb6e1fec2653fcab28c..de7f2b7b22164a355844cc2f6c6b738d1e88e4ba 100644
GIT binary patch
literal 1052
zcmV+%1mpXOP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#SnLAAsH00W#!L_t(o!|mBwXq{CM2k>8tu}R#bm1?B1iYq9R7eNXZL0bhE>YE!_
zX%$gis4t4z7eNK9_#i5%wD_hz6hssaic76l5EB$ptV`WWX;Pz6X>N?imkAuc-tCL`
zW`PV0_xt9|%=bUb%$aj;M@q>;r6m?HErMSJzX*O2{QLxe3f5y_K7c>0gzl5LD|;Wt
zMHp*fH-O%F9>Y+}(5IA|<#p*$8cHek7W8^kN_VG}-c8kMETy!qid|{$C|Mq?$JT<Z
zI0FM%R~Y#LtZZP{){&p)!IaX$0$<gH-Rdf~`%+3<W;zS?0`}w@@<~(*d`=VN^gh;L
zTV~gdTkr+WYgM+n2A{@nQGPxq3Oromo3~<j!G0;W<J?w&UlUHZU}MNO#(NR?2wpEa
zXrEQ_vlLIXB2{*WL%1(kCd=uylE9C~2{nA37U}q7{DPnBIjWUyZVzsTe#IwvJGc>T
z$5~DKeg`jx|E9qog%@yU$x+>mSL?Jtgezx|6bH(z`EhKBEHF`pM{CIM#}#!twzi<Z
z2N&Xj8vZ6QSa#V=(~-Cnr=t%a;Fajy%XRD?!5i88O~E<+6~4d8QfW2Xkm;1FZT`f=
zHQIiPz^g|0;17I=OL2YV^&I#neA~d^W3_<)-;(%29H=qXUqu0SNsMl>{m}w&F_XE@
zR=hcrY||{A8bR2T$$p5AEw9oBPem4~M$>uzCG2YS@s1YU+pLUW?7`o-H=Z|F0sbuB
zYgI+u(S}Q>9y}f!T~0gj{9GMI>QR5>?`|xMSju<MkD?$m-@vcH9fgt3Gt2G(z5+Mn
zxklUmY%QCUa2vYnln&3t^CldNgLpdH=Ir*M3pa$1N(~-Hii-4zkS&S#zPSS56-UDE
zI@|gLrf?#TE66)=W3<gW`0L_EV4?wkhkt9d!L@aE>9z#yWdXd>K<`WZ81?&j95xP#
zxhNgPj=K~4+ZC`E<LoB%zAv1vj>pwFyn$UM>iv;cgYU!TP3Rqn(^YY1mW6%ZfxTJb
zbwRZ4saFQiblEJgadgY+H@sD2NsUIQ)}k|HgPHCWR+S0jGT{Gd0Ddy6z{v))@_Ag9
z>@Re3yote?G5CErqYm&L4S?q$D>x?j_pCy#L~+-0@FP*~_E!PEGY%ik(B9Z(JFz;J
zQ%~#}Q?cgTRvz?c9hk(|C4lGGAFHyppP#0N+6lf@)EU9qlg;etT-WonMhp6Ho&Nxd
WZ(6pU8BH(%0000<MNUMnLSTX^^zvo^

literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00004XF*Lt006O%
z3;baP000FuNkl<ZNXNyM2~3k`7{{SyP}<Tmb;2?g9Z@ET8_)p-3REsZ%OMB_3YJR_
zK?!mcMNuFe1;k@G7%I~!G8`UMXgS7J9p?__+%!550+UIcTjpj4<a_qMrFB@D1G8jr
z^5pya9R1~ezW4dR8XEuOvP4Ev^XVb8Ll(|t>ZjA`^lj*!i;Ow1f2PrB_~BP`_RLRw
ze$YAezGg-^WYHUotE{YT+C6#RPd4#`L9{z-QWz1@hhpnJJUr*jdELj?`$|vmRru!G
z5S%>u@hFu_O+<dWDuF~IY2%%~V`?T@&+~y)Q6?0Xl>Ul*{J8+g%BNXaSm*!-4SdlL
z0|R{!6%{E%{?%&vi`H6LwmG`GLrQuEh)YU;LB4>O0sL33T3JRWlXX>~@GXK~1!%CJ
zkjk2VM?RK%5krr$le5khu%%>(pio@=7`J;i07up=d(__121d(`4yr(GJKM^0^|jF3
z*F%(+mfXUvRIAgp=Wy!0eEnc8%NjT?ZVFIte*QR$IjTbz<>chZ@7=o#ZJ)KkvSmw4
z4Gj%5v$M1AHe9|0b)VKks34>s!O3cMZ^k9WN|V#l0Dl{EB`9szZV2KBcc3^`9mMYF
zX#e^4?OTNWN*7%HTn_Rp-O$`3g~lcc`1tTHp&Y}R06}=DWbEN643FF+(lRr_eFG27
zt=`8VA~S36B+7|IW<{gXHJ?>2Sg>H{{o(t7LEm1#Mtu3zAau*SFo=*fHv!L^*ND=V
zVwegr`e1~(eq#u@>zu1Syu3PX*lZcc#dXpVw=P{YC5(!Gq@1m1i!Kxj8!lWt|773(
z?7Mt^V6#9FBJY-WLQAWRXl-kTjT<+}1A{iVVZe_{fECN~2uYKK2aJL`N_}g|l4EQq
zE;zfdC*qQ}6UgtS-Zo?9v@cZ7gK=1x;Ogl!ryxBwnaJ9+3&zF~U~Gi=?xqqzBF*eQ
z&6;i3zxrJZg6r-vMc32Yt3#n^&t-o6?R^ve@XwaQC#?g3cY$|cYP!0XOeU#Ij|P=S
zOSH9jxW&}h-=j;VYRv^;W#gARlzgNMVv8EVJmd(RsBebwEny&x*z!G!+q?jwDmKQ{
z($XT$1z^h#+<hbYgD!|JybSiym0%hm20K9!Y)^`Zv$Zvlo4fB0%5!>E73MgE?*AbL
z0k#%4f<w$lU=|=ISRuvW?CJj}5>R{?;BsRFh>HtHQNG7~0WMDA1;eT3-HH}DZk+~L
z1&d)7%T0>n!h?qnJi>F-(kcZB8rVaJ%N`=X?_2?%+{ls#X-B64PO()O02V<-U~0$f
zL~$c!Uf_on<-Z{ifk6$Di%?N<6zf)S)rqQ?0(@Lz4vlA2bVHoD37q4m0q+GCz*?ux
zJt)3Xl{f)dFEt{ntB*ZZfi6id!0{7RPmn*##Kc5%Hb9_TT=`>BrCb5v#vfMz%mebl
z(k<+3tjg*ID^@Jm)YjHctf@IY@eI^(fjD`p`l*hNP7>0;=S~;Z+B>Ol$Kei$FP6f(
zglWJU|2$xMMdM>?@lRVfFfbr77<!`m`no9$Qb-WeySj6=lT3Z)j^~mobp51&jMEd`
zgkuB-nEB;`jdub*p0@w?5t&TpYl{sQ=Sd_NiGFm!aX1cT+jk@liZU~9;w$HGEzmb0
zQ>cs-=g0$-=KlG>-jqBtpYyM)tE*#Vw5+TH-APf=k>~RZ^6tdMM0LF&_f*D0GKox%
zFk!i#ML%6%VYX<-#&4Gv7Uqv_OH3G??c(}R7LpW_^4?+0^#27+0cn6~76-`y0000<
KMNUMnLSTZA)tP|+

diff --git a/htdocs/theme/eldy/img/menus/tools_over.png b/htdocs/theme/eldy/img/menus/tools_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..80f9a7f553a765bde7599d380459f301d726ef77
GIT binary patch
literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#baD?v*D00KfuL_t(o!|j>jQS2ZP$N%2=T{`eOcy!>Ea3!PzQ$k9xgNGfY1YQTR
zgV;f=VEwY0VURso5<H!EJHx0P<bDgg|15Y%MEI?Cz%RBN{0;sFe}n&-@J9e00Q(c*
z?-gTT06YhOzX3P_STgf00K>m80H)pOiKw)l>8njdWTJ6~h<YOOl(vP4Tw<QO-6_k1
z4#3~2FWvzQ;2f>I1@M@e*L3CAmRiws!Msyq?m|Q_wYzZ0Bxk9WB(Ud|ehvB_IFIHk
z5fHrUcx5`Fzh>pbHVe66HP4Yg7=wrQ+}B@7K<$=~!n3A5;3cI<nNxxrhLmjJ{5aOa
z4+{919ViW*N%8EF9Z|s><(H6<BXM(7XDaxd151SiPS`bbK?v5>SHrIkICf%vGg^*E
z%?=C&>LQt~h1bemN<O<nS)8?DxCP!`2%jkv4yoks6RLw&@R9>7xa3@yQKG3-xwgW`
z4lJAxHQ>#w$`UhNt2{*guUwU0<uH;f%mxNOeg}AMNvug+;!<NBH*1Tp?@riM@|r*j
zm%SV~Y>e$O5h9_DK`s9n)bM_fL;PU_xKAAIq<r`j_3h$7Exb<vN#i8j?m$JXIc1%H
z%;ZH_fZ3J_>lAgkCb6rIf*SBsA^0TR2BaMD{MPM)&&C$;!v=840V5pln@eSE9|f04
z6JHwwz`tnh+){1)M(`N&DN>rAf4;X;8@I!Ki-|(VM+cFiWqHu?7y24`%czgLc1f&x
oOP_;lMV|@HFLq7%|NGxMpPMEXG=2^^yZ`_I07*qoM6N<$g6e)Wq5uE@

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 847f2766d6b..bb5941c8130 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -679,7 +679,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu-17); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }

From 90d275bd2068a568691481a3d2ae2debd9555f81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 02:53:55 +0100
Subject: [PATCH 183/345] Fix comment

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

diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index c1450bc3b27..3a47e6a70e9 100755
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -58,7 +58,7 @@ class modDynamicPrices extends DolibarrModules
 
         // Config pages
         //-------------
-        //$this->config_page_url = array("dynamicprices.php@dynamicprices");
+        //$this->config_page_url = array();
 
         // Dependancies
         //-------------

From 46fdd19389fdea8ce6c5840b4c36da18c720747b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 02:53:33 +0100
Subject: [PATCH 184/345] Update image for menu

---
 htdocs/theme/eldy/img/menus/agenda.png        | Bin 1586 -> 700 bytes
 htdocs/theme/eldy/img/menus/agenda_over.png   | Bin 0 -> 541 bytes
 htdocs/theme/eldy/img/menus/bank.png          | Bin 719 -> 827 bytes
 htdocs/theme/eldy/img/menus/bank_over.png     | Bin 0 -> 620 bytes
 htdocs/theme/eldy/img/menus/commercial.png    | Bin 1472 -> 845 bytes
 .../theme/eldy/img/menus/commercial_over.png  | Bin 0 -> 638 bytes
 htdocs/theme/eldy/img/menus/company.png       | Bin 2141 -> 572 bytes
 htdocs/theme/eldy/img/menus/company_over.png  | Bin 0 -> 406 bytes
 htdocs/theme/eldy/img/menus/cron.png          | Bin 2165 -> 0 bytes
 htdocs/theme/eldy/img/menus/ecm.png           | Bin 2372 -> 912 bytes
 htdocs/theme/eldy/img/menus/ecm_over.png      | Bin 0 -> 647 bytes
 htdocs/theme/eldy/img/menus/externalsite.png  | Bin 624 -> 531 bytes
 .../eldy/img/menus/externalsite_over.png      | Bin 0 -> 404 bytes
 htdocs/theme/eldy/img/menus/ftp.png           | Bin 0 -> 788 bytes
 htdocs/theme/eldy/img/menus/ftp_over.png      | Bin 0 -> 563 bytes
 htdocs/theme/eldy/img/menus/generic1.png      | Bin 976 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic1_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/generic2.png      | Bin 943 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic2_over.png | Bin 0 -> 548 bytes
 htdocs/theme/eldy/img/menus/generic3.png      | Bin 742 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic3_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/generic4.png      | Bin 992 -> 570 bytes
 htdocs/theme/eldy/img/menus/generic4_over.png | Bin 0 -> 486 bytes
 htdocs/theme/eldy/img/menus/globe.png         | Bin 2175 -> 1175 bytes
 htdocs/theme/eldy/img/menus/globe_over.png    | Bin 0 -> 844 bytes
 htdocs/theme/eldy/img/menus/holiday.png       | Bin 1723 -> 1086 bytes
 htdocs/theme/eldy/img/menus/home.png          | Bin 1008 -> 679 bytes
 htdocs/theme/eldy/img/menus/home_over.png     | Bin 0 -> 484 bytes
 htdocs/theme/eldy/img/menus/mail.png          | Bin 1041 -> 718 bytes
 htdocs/theme/eldy/img/menus/mail_over.png     | Bin 0 -> 534 bytes
 htdocs/theme/eldy/img/menus/members.png       | Bin 1366 -> 1044 bytes
 htdocs/theme/eldy/img/menus/members_over.png  | Bin 0 -> 720 bytes
 htdocs/theme/eldy/img/menus/money.png         | Bin 1751 -> 1259 bytes
 htdocs/theme/eldy/img/menus/money_over.png    | Bin 0 -> 940 bytes
 htdocs/theme/eldy/img/menus/pointofsale.png   | Bin 1460 -> 542 bytes
 .../theme/eldy/img/menus/pointofsale_over.png | Bin 0 -> 424 bytes
 htdocs/theme/eldy/img/menus/products.png      | Bin 1519 -> 510 bytes
 htdocs/theme/eldy/img/menus/products_over.png | Bin 0 -> 358 bytes
 htdocs/theme/eldy/img/menus/project.png       | Bin 1075 -> 449 bytes
 htdocs/theme/eldy/img/menus/project_over.png  | Bin 0 -> 360 bytes
 htdocs/theme/eldy/img/menus/shop.png          | Bin 0 -> 679 bytes
 htdocs/theme/eldy/img/menus/shop_over.png     | Bin 0 -> 502 bytes
 htdocs/theme/eldy/img/menus/tools.png         | Bin 1404 -> 1052 bytes
 htdocs/theme/eldy/img/menus/tools_over.png    | Bin 0 -> 706 bytes
 htdocs/theme/eldy/style.css.php               |   2 +-
 45 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 htdocs/theme/eldy/img/menus/agenda_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/bank_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/commercial_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/company_over.png
 delete mode 100644 htdocs/theme/eldy/img/menus/cron.png
 create mode 100644 htdocs/theme/eldy/img/menus/ecm_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/externalsite_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/ftp.png
 create mode 100644 htdocs/theme/eldy/img/menus/ftp_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic1_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic2_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic3_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/generic4_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/globe_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/home_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/mail_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/members_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/money_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/pointofsale_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/products_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/project_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/shop.png
 create mode 100644 htdocs/theme/eldy/img/menus/shop_over.png
 create mode 100644 htdocs/theme/eldy/img/menus/tools_over.png

diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png
index 866037c9b543df97f7e01e4f7873850ba597d030..0798d15f938689a6b894e2da42fd7cbe5d73aea4 100644
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#q{Lk(I000KNoL_t(o!|mC<YZO5k$MH|Zpou7`F(@J?0TEH~rSL5%K?o=oTBZ`Q
zvaztRun_z+Y*P4#*jS`6qA{qYCSDOx<GYdE1!6OS<=DHuOJ;Aga1RW->@)k^_kQ=x
z%rkR6tE;QZYFm`py6|22O#nZZ^6XSu;2&cq0FPk~H}itunnTQ!c-_tU4l4f$2T`qi
zJ{o+@><xb4c{?B26LE$89U;aqT*GXqm9IvKu^kgdz%NINbF_$@j|IP2X83PKz*i&1
z87wpWN}1E9+Eu<F<!eR2Uk%q`jNl4RlqGG}>|<!pa2&TWwAs>TA1>oqxbMe2zT#zQ
z@9+S3acMK8O+Rj6JjFK>+F4XEiBEVEphjcDw_DHm;eJqjInmzYPPnc;8^l9g2=7kf
zMcsR8EjRdk0jgTpY6;cqeG{S1ho|_N(kCreRQPcWWT;hZ;J+38|1i~Q<+tNp3u@IG
z_;=t;=rbKl`Bn$)Q23(NjOlHqNuMKlg@v%|+SaM5av);`txuaYJCL}q;83Tg%H0|8
zYiiHnLyG@=O8@1J?uA>0ueGTB`v(5gDPyfsyuY#GKPRTUG~0#i8NW<&EbMGDHu_@2
ze`%p$+LHlaN%U(L>w9eY3jUyX1GUgxxE{_(!TCIDo7r`ixWcMBmsqG~8;qL;EVUZ6
z-4nBm*t?F+#Z)*Ai)!uGHq&iF<OaST<&&pc!x>{>G0gi*a<YvawDw|uNTdEb=!Lx0
ijs;)1b^lN+%Kig&F4C$|W_i>A0000<MNUMnLSTY3+Cpgn

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

diff --git a/htdocs/theme/eldy/img/menus/agenda_over.png b/htdocs/theme/eldy/img/menus/agenda_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdebed8fa264b115bcbfa4df01a32e5f84793462
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uj0XJcGUf00EszL_t(o!|j;SZG$inhJUKQHye}<LMJGlpo~B^$Ofeov>TLe;1Qe&
z>THk^$OPAyi)0~)ZLr-~^+~({#vk@?-+wNM2&u*$5{?X?;co!Gp14<~0^b2p3|s>^
z0cb+O-v{{S7Qj!|e8iFO0F*Q9pfj{p00sckrNhEwhV}8GGykkgQ8o_%+LSe4r3^o0
z_&<s=dz%cO;lslhd_4i!0XU>M@(MuDY5oPk@fP7rHe8Z@`^8xGnunL1F~5V*6Orq+
zA)-$*ha#d%YuA%qNL!XA;Oa_;a^hL5wHH3&U1cM=QgVqe&1|)7d!uW<TL69uq4}0R
zHv9&_enmfznoo}oUvr_bCK_!kJ;#LiarRP=azV5L+!nr{DWcyTW^V8e4+nV6z>n8Z
zG<XHz)i5)rV+&p9TOY-U3%sf7f40aGHWEDfUa-Q$4k5HeW%HibL#I7}kA>hzZN$4P
zS{E)O?|Nb;E#xt!_1f3=xW*DUj{ZCt_!9Vmr~lnz4IKF0AmB@6Gv2Ek9@%mvEfEsh
f2Yfy~__y%C#jBVt_@Tw}00000NkvXXu0mjfo}S{j

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/bank.png b/htdocs/theme/eldy/img/menus/bank.png
index 9c6300eae328e5ceb9ef00e02da20ceea075711e..fbaee7cc6bd21fb4f562365a376918f52633026f 100644
GIT binary patch
literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjF*gs!;&00O&7L_t(o!|j<nXcSQthQDl-_*i2U72glkLa`79HHBD+Hi9mKh%AUG
zSfvoO2nd!I+6jt<XrZE5s7QPizEM;#D5z+oX#%?;KEO!KY?2w9f8jD@XC^zZUD*Sd
zGxy#zXaD)<+_UH2X>uHgdX)@yEDi7t@D1>FBoln*mjVY;#P?LKYVapg1n-0aZv&+i
z!H<Rs8^;Cy1<(a70rEg=ErYj#VO_rjb{cb6yk2QUVuxkk()Bsl+y{Ygj}iPxRLnaS
zoDbJB^W~WD0A2yV)!zuLi+MqZUa)0mmjgF}N5C{77c=XTELfA-S-@UhCy_!UO_f2U
z06YV_fx{Z>QiyFylX)-s1DpZw8Do2-uc^%gjst6xj(I=n1)lq)x&qJ%TnDCx%{G~U
z%zL$8z(rsYa2m)O_kU3<OI9`|g_fW1(J<hh06%aRxD1>E76M0f?<S?y0x(BoCxIEj
zF+D_Y81P|ZzF(;m=>cF8a2}X#*zE^ysHErzdW;gIquQ7c%lt!^{YNd*>0{XDL`IKc
z|0Yi6{TA#eSAV^LSGp$$yfylRz*k^#8maQAtAEGGey;Qd*LW$7KdINikAOe`{z~66
z#@d0IX)ymzrEysn0NXt5yQS|MW1FjGJ`*tJE49@w`=6>j$Fdy&o&b{#`}sh#hkrXP
z^Onc_N~Ojj=|jpU_f^ZZ$?mhthP)B;LkbxyuFZ&FwrN%dxve9TtU{v*JT?|+(bxm;
zlI;UvjgNmj&X@;S1{@Ugmw-NFZmaZF>G$%v1K1b9cOr$^6y^NB0I$8M3bZAOlGqAZ
zRjvSbi`{P;GatMa*Z{0j--;XjcuHbafNfVed^Z+sURy`T=`Zn}l(}UrOG}l0B0F?S
zLn1qLN<&8eTjra5K4nfM{=-y!3c0~*!Pm4jzDcDe{{W+U8l>_!?qmP}002ovPDHLk
FV1m@oVeJ3_

literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0003FP)t-sXnKrm
zeT{2=kZgXDZh(<)fs=58lyQTVbcU97h?sbYn0Serd5W8QjGTOqo_&y@fsmeok)eW;
zqJxv8g_Wa*n5KxCsEL`Wikhm7oT`qVs*s?ok)f=Tqp*{sv6Q5;m8G+prm~u-vzw{3
zoT;^)tGS-6x}dJRqOiN7vAw0Ryr!|ern11Qw!x~n!>hT(th&XmxyG=&#<RZ2w7|)<
z!ppV8%(leMxWmr5#L&FR(Z0#iz{=9V%hbWj)xyix#n9Nr(b~q++se|~%hB7))85V2
z;Lh0L(AnbA+T+pN<<i>b)!yaS;py1q?Ahh*+2-)n=K0y_`Pu0C>+9?5>+9?5>+9?5
z>+9?5>+6|^M^^v<00DGTPE!Ct=GbNc00D1FL_t(26$QbuZX8t<0MK*qOm@9?BBiiN
zo3vDPNcjSOngR(?@C#{BB)Tmui+DZn&D_g5000000001lU)jJ5FMul$znlYf?Q_mq
zgmAk;nhjlZj4_H3;{Fj*y)}J|F~)2{2p%4hhvT(-A7hN!gb*UUe`I-DYTsj@bM6Qs
zgb1hgbuDZ&=R6RCYAqrjp4RP*;V69s0IBnJ1$OxYVC@4wRsy^LP@SMw0DQU!DI((b
zU9SazS|c(tBO;1g3xK+0W@ctY#7?gT!1=Od=67Ef;Y4KtaK67>E`R>?`H#2ryLF+m
z063jbr*B{TpWpskGMZj@0NyQ2*iWXtYEpT91`w)#{`=pj-@k5S+o;8J-B*>t)1{8%
z^MfzunEyTB-BzwX0(0x`?!Hx3ZRCop_h8(*ySl2Y?O5UJ4z}0s)^zRrk23*0-i;01
zy#ah!o&#|C001&0^A-RhBQqm2=&q_`0ssJj{{cW-!=ga7AUOa4002ovPDHLkV1nI}
Be5wEd

diff --git a/htdocs/theme/eldy/img/menus/bank_over.png b/htdocs/theme/eldy/img/menus/bank_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..d395710a8777d9c9612301f716557ccffc9188f6
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjR=>1v<=00HbtL_t(o!|ho?PJ>VoeKqdO4XP)Q6WAUB6J46(0n~Z|>&|7HxN&3Z
z0Zi}&(i4d8P4EV7To_l+&5-;|3bch5(EpNIOc~%o9`ok^wn(C>*g=C~$y@T4e1ou?
zb9@hgUm?FxVr}x*6~Ex{U&=;f3Lr4#)NTs-DS)1lPXN3&rQ3{D9?1jQR=H{NLjaDE
z_W*R8qWJ@nN+1u>Z(6tM0J!|i<H09@F@PfgZxUAkp6g704&Y2YU?B3ENsIt^0QSr5
zP-T*jg>YVtCl6W+@^b(;@<E5HBSjJk9Aj1~E+djz(PKV*sr4lfB!40qlYA$6EWbr0
zXCz&cjvUXzFpFPN^0BJ-NRCr#r*hmi>ir_*i^^uA@(%zPDYb_HPL+&;DmAZX?Yo?M
zPvtXdrCTv6jh6*Iewmk5%1&2N@{iK~5-hu9yiw<LsvsXI-F^eO&8Yt}hP(uWsx+@P
zd~Xn3gmdKsZjsek8RQ*hKo1MF{{!GeW*pPV28Hfkf=LBpIHmz5=esF=JzDbG8#O7@
ztTb_u3?;CFF>TGH%sD?$29$=VPJ>y3zUbM@*uYA59NKm0^BP@=xx8W57==3}->Y=;
z3EFCLzLCu-yTxtEuYp$1Uzv{a(N%$14Sp+;x3aP17vLAzGvAk&!lohs0000<MNUMn
GLSTZT6b1(X

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/commercial.png b/htdocs/theme/eldy/img/menus/commercial.png
index efc1b3f060822cd3e5ad5867a9ca5f7213549e79..df9b443ceecb364cede57efc36815cf7112e3653 100644
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UjeGh88CP00PZPL_t(o!|j>RYg0iG$3H3lwoO%1!D^@?{x;PLS}Z930Hb)3BJ`#n
z1dpPiAove>62z0B7r~PU4<d>n9_&F+VyX3JY+8-P1Z#izBhmHH2`rC&`x5)|HUS5Q
zyxp07`+f7~&CX0>N-3I^T4-WwYVh;wbl)?;0bnig6?iTDAk<xyQepB=rBp`wQ${Iu
zBCP$w1b$j6Rj!ingt2EVq-fI(ysUA}P2kd8HVq5>Advcpb#d3=Q^4~o9&QkLq0M~*
zlE5RE(WVXf<s%yg&I4KC7?1|GYgXR|>=C&W@S{Lc9zv)4z(wE!aMmCPC;>-++pfTm
z0egX7V5`hMmHCIj77eJ0T3sJfr+_uUi1_j$pdaY8fUeL+*Wlj*=YZn|w+NzP*Wlk-
zKH4D4x(5Fdcm?#-xNfS7FdIo$c}v`+7QP2ex;|kmbQHK;rS22pS|g>zkAcPV@!Du;
zuE6V+&vzN3%rvl68z*Hv-AI+xN?^aoudf4FfC+7G0Wi>LW#CB<@EgE0;5~5FBTEAv
zjRL*{=<@*Fq{-8UXw%;)KHq0JsCp$`_#)RP`CVYfrRA3Z2Yq7s6p**X`opf>rd!^k
zANZ^V{BGB7v(J)*Wr2c4-X_)9kPFLq0txYF6OVh6Hxuu2W%(Y9Reu2AwW1~IqqhNA
zB>ItBJ_VG0cudnPSoF%k=BO>-B?j=z<;S(_PXRf9Qd)wMfnOg`Efuxv4*|OCqPG01
z06?ET<ASBp)FP*JJ__&)fn@>UCp_bvq|CM+P$b}2R8hB18s5Zei~jPc+(rdhJ!hE9
z2dw$sDBw+D_-DYHKT*Z`B9O7<EUnD;AuBW=*bz{W7osk}6U?^s5<c=#;Em)z?FM;C
z&VZ3xQ{ynZ2XQ%Q5{7VC63gr3f_xXbDm!a+Z++-45|`h04e*5IIx}Hx68rxrvLpHn
XW+)|<m1bpj00000NkvXXu0mjfLcV=u

literal 1472
zcmV;x1wZ<UP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00007bV*G`2igM_
z4-Fe@fw%|&000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000F~Nkl<Z
zNXNaF+ix7z9mhZCoSEI(OXAou#@J3ujft$J0x71LUQk;KMM9POPy`4NAn}F}0?~>W
zc;PPqiI=KU-y$A)MWR)tLWI)D4sqfHVu&3_i7&Btz2m*ioH-XBb{#FqTRF61q><*~
zocWyZ?{>cMBR}Fc)|L+*9DMi4<m4ZO5J<o{kH_OY+*n;-yuP^b4sZ$3fd5~B3V8X0
zf1LPWt(6ZKzh0zVE;BZMH(p5A*D6f@bb$BXe(jTm%U`_!RDf(ZXs`!RA8;Ia#t?;n
z`}+y3aR{j>9q4Cx>=5PseN6rAZia^LIKFWCtLK1^fR&C?*A4EaFkdJXADMb^`pK!O
z2Od9q?AU?vdyf?R?mQ$u`s@<3XXohK`T}qq7(GHWH_RK)Kf%fKOWrQcW^;4rwl2<J
zIC*LQ{QF6g%y!heUO)j%zVhm8r{4VQTm4Z~AdX{D0a2;MwMvr{pMHamH^>EoC?E0g
zu~CAk#L3wOMjBr-J^c{IdfxiW>lbFuoPG?b?&LM-0W6P>9q!K;_t8u<S_W3HU1jX>
zVTSh?c=lK0)S6>>XBjN#SlQ0_c;+g_)&^;2F<vq-*iW%k9tDPg=1xv`14<wiLLh~}
z1Eq4ABuQ}AqVRlq`d@rKKf~t6O~#KNM@{~ofuR8kE6YsXKh4-r#<5v~wMKMmAm4#H
z*+Zd_QV=LXK2+qxfMS$K>y(QZ&Lf=R#g|^@H@|&^rG<GWf+`0Kf}x=yhDS#69<23v
zj{w5%)CIl!v#rkic8L{AC9W+kQ7o32n7ogFfA%TMOILX4;YZn5EHGHPjtV8Ye1!83
z=RMy0TLSjb7XCZmgM)WaER-mgO02Ek;Mmdo7#$hq`q~!b_uNbWK!qe}QH&ytbyz8O
ztx4GnXPv`ZN1`)QZBb#KeFys4ZZv4dRls60O%!;}o%@2m{sD%DN64(jI=7>aJvY9w
zo<tj3scj#$^MiUbMeCGASh6g`n3QTQrryfB4(sv8V4d4LP-m8AYN$1mc0M{$uEtHU
zjvx$>QlPb_ZknuD>j)tc0)!Ccq{Z6X04ABCR!>-~)^DZL1J$i<2BgC~hcO1{92=Dl
zw(1E=DWrfvDMZ*VoIL}r^=RuzwEgZuQbUUto3_DrT*G9VR14C~5;%}j;5>xF?Rs7G
z1Ulz1nI+ZcR&#nlXBjQiB(79xY;S{9WLXZKS)B7oDe>Nu3D0hI)4OP#LmNw~vs<0%
zJ+xAdY{t~9>*!2VD)o_SO`2s`r;t+My&}ZpoWC7~9%CJ8X1n^ylcp)ExlOgYiM5U}
zjA+Cftt~DPv?r9p+8+S4&XE~MyNBBnD>qlcHQ1_F@d)<!4Um}(<1E5Sycam@aMIsy
z(O8mJ3!Nt9b0L9}C?!bZO_Cs?R;v+)AxbGqQI64rWpcS3N=gd(fGlkx#NKo0&zw5R
zjn$j9k`#~c^u8xvU*^w${2iB#K`Dh0g7dSdSy|gaN{NyZ6)2o_Y_6{W*zP&G8_)rZ
zb2FbmH8=D57*OntKmmxm?izkHiXQ(ZAlo_eetBW;?71_i{t2|YEQJMPpx*6of*w=5
z2K)!O(z(laCUF2vIBS0`I`MMWiXaGTz*%6u%dt5i0XBei$71wSm~=L8b*Tdg<2XKj
zVgBNu#_yTf7pRb>tIM|DXx;#>0@pe!eHT>!H{1CAi&%EO3djM6qA363FQ%s!e*VDy
zl_<)82s{l;0Hw~l?tS8i8sVMw1>jC8<uowjoVx-nb=1`W^Z#<*-Ci{U`a6nDC-n8b
agzj57Ai3o`C5vSM0000<MNUMnLSTZ3tG+@2

diff --git a/htdocs/theme/eldy/img/menus/commercial_over.png b/htdocs/theme/eldy/img/menus/commercial_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc4f661821e26f0bfe1d79c6168b36c47e1ecc3
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uju{RL`#f00I6<L_t(o!_`^saf2`nef0W2-k@{>JOUe(4N5oY2F(Z=AtTTY=md2)
zpc~K$)IZ9d&llT#2pe?gABk=Bc#-5MrywF6)gEwQJ2d#mjh@>Ar~#A!MgWFKC+dZW
zB!?!Vf&4ZQQ6uF~5_n6~?YbxMn&#VOt=~eZR2l%)f_=prrxM^bfbYnfF91D{n~j{%
zUCwHw0&_oHc?JLt4{hzM06g=2mTFTH(HKa|vuFNh?@N74FhB6mUt6qp{QZ<%P`OXo
zcMgfs3X!QvtaG2R2EYe^*M)ntGH+IfT~_b|m&3XCx29A|s><_%Jr~ZCT?n(J`bHW&
zxNgU+m+-YkGon4Q?XFR49Z7>P@080oKEUi3I4#VPO=JG*ghv~Z&E;Og<{s;{a|%mT
zs7;tZ2bzvh606+ID-W}<^iD_@Wlh+Ilh6m=L~a_gtICk>2{He~FP{axj!0i)wSuDT
zOMq`9!fTwMJYSX^T3drRGo){m8hjl{R2RIN@T{cZV{F-M_j_c1PKWgySbLh=&#nQl
zCN$W?%yzL%1%3)kbHVGBVH3OJlWf$Jf>$1?unX`8z-M5-0&sO+<|2B9A|Qop?ny(9
zwjv_qnICygnd^T3mTWDT&+3j$I60qtzO(6;hEuW8|FFtxvb7_Phc&lkDZnSOL;nx^
Y4;<ULa_nLVF8}}l07*qoM6N<$f)wi%9{>OV

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/company.png b/htdocs/theme/eldy/img/menus/company.png
index 95e5db620468bcff16d311bd3f0ecb36de03c004..828bf8f2e709d32ecb911377c85b8538f558671d 100644
GIT binary patch
delta 536
zcmV+z0_XkR5WEB-iBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9
z008+zyMK{D9)I2p76BeET{mi)0005JNkl<ZSi|j^ze~h06vscOf`=d?h;WNPKn@fI
z1rY~vIRyU?{{un)2xnJU!9T)51SbbYN5MnT;W$vorgx1?h9fk&w%2P@%!4d>FE8JI
zn&zc#O-e~sZGsA$7w^S;@m_o}HdVkJE2^cnwrWPJ6@O5q+Q4##alh)Kf65duMi_ep
z+?Ba(1n>f!TVgJNt(g9(>@_cdE^u#&=^E~kEL(gC^oGRrRGf3<1A{RA0s~jcH-T$Q
zOw(2J0+<GNGVDsy1@Vu-i6!O=*maeBk_XmV@<|?8ktg|M)zaD<aH)x}1KXA{^}NZS
zW+c6#3V+h`0M#W`MTgPPO?&{ns?r{3i$KfZi?lo);MOu%OXbUL*@VCoaAWXq0*3~l
z)be}{+2_}R`Mk;ZE&j+*730Wft*|4Jw~3b)Q8K5qO=j`}*ay}O{u#?zJ<{?tfHTWn
zjl8!?0nDnF_C-T#F_XY*k;j8k-hiSp<S9(N9AQHqPref5P21pyYPua5h=neZe+M37
z`uD1^=KBfaon7-u#C!7pmVB5}d}ukC6)yf0SV$p07!dnC(BA>(GJfyr*aB+)Kdcv@
a-u?jKF}KY$N0!k50000<MNUMnLSTaJkMZ3A

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

diff --git a/htdocs/theme/eldy/img/menus/company_over.png b/htdocs/theme/eldy/img/menus/company_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bed6b8dcbfbb062a2ff1d6affd40c1b072b2c2dd
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx3@_NH=L1a<^K@|xi8%ar
z`a|9(1A$iip8ti+cO1+F)GrF&ad0nSac|^JVZQ62Zt?%hkp;TjBo;i0E84GDZgc7S
z_1!Km9iqlcZIi-3dBvUl-dxFlKVsI0qgPu*J^A~uh@N12CHHLkd*@SX+-tlWYcg&!
zTsd%WqCMkk!z{VtFR9*fYlGHqYTV;$_H)L`<p-?7ZiYBK>hRKk6QcL#T#LS5yxbDj
z0E;X!#V4_weWx!>|NKnv|EtGu&89A{;LNF4DP%sUyZntkb7zOHi%VZ$jbfQduietc
z{A%~FJy*Vxd(2Aijf~#I#{$hg?2+xMNk)$wv*J!3-_vs=?yfV>6YmEWY@b$Ds;+;c
v?zE5V%};~X54cO)?NVPzt=JU!Nz8^(ebcG0kG<|@f<n~O)z4*}Q$iB}W^JK$

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/cron.png b/htdocs/theme/eldy/img/menus/cron.png
deleted file mode 100644
index ddfe62e7b24f19698ca3b7d8c308865ec2bd4088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/htdocs/theme/eldy/img/menus/ecm.png b/htdocs/theme/eldy/img/menus/ecm.png
index a9a975219cdad1addf39baa2d93fd859e7e08d18..542ff5766e1d7df538e04a1c2dffde2c7de8f635 100644
GIT binary patch
delta 905
zcmV;419tqx5|9TWiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29yQleqjmrQ0}x3>
zK~z}7?U~7I6j2bye~}y%H4#Nbqe)y5!GlCxLLd=QuZoBZ5?nwH9t1(~=zrh>dQ$Wf
zJ*kKwxa-9|E<w~RYNF8?2}Y9`f0#^6dHDvO?F^Zo?wQQM6cle>&DY&ue_gNY^-O`8
zk*hX_9JW09Jo!BN%v(8d4rudzq?wJD*O=Ko``60-oFmi9PXcyG<-0(&=lhy$Oq+7x
zh)ACW$`at#XH(i#o7ovNi#mSW%xXQcn0Na*e?gkI2ixUUPOKg{2{dZnf1lvkN(YlM
z<%`X%&deIktViB%W{1tJG!DMU<Bevv&4Z~jvwEH5ziWm;dX|};FtZjj>ykH^*%sYU
z3|A>!rRH9&E5aVdW0*tnu3Z=)HC6(<fwfNTK5!Ix=)^V&w@C8~z)YYUI4wMi9R$_^
z6BUbS9EwLE74jQ_13-!9e^KBPa2)7RtO(dCtcwE}26}b#y}%k_mpj*pdagMflzc6)
z-=j*C;(dyh2;-K#h<BOEH|W?I32?3jR(?J()}zV~5nl?_X^f|wYkPr(z=R~Qp(+1Z
z`AD3{dnyU_Vz$@^HZ<iM;;1y_L%kptSouz%2N)lR{9u~N{|Teoe>_u_@TN`Hl3yV|
z2D|_&azXi3z-C~o=I6EN7|aFbrvSwcu~MbYU@j<s4Ok6~(|m!*zfzrcNk`I5-gl`S
z04^$Z0Oo0Y1I+a(l9i?MmR{8+1Jm>r-a5@HQ#t=V)oODU*y`+ES{$<J&iVJiW#CJy
z<evabfH}ZypcQBbf2OBV`47NNjR`H;CUpbYrHTX4tZEdt@;`w)>L(*wvgAK1UCNxt
zSrMZ05#YKiS<>cbdvFEVC-vJzIH>XwmEWhSlv_XKe*rJGXg_HY1yTMH@H|M5@Vha4
z04#HMnMEm(f2ShQ7j%L6CEo{h>GNlG-DJsk>IJ<otdf+<UkmtajbBwhM<U;)bo&-|
z6A1FtN54v2BJ#hL(;ew*yM+Od?~X%$K>MHeG;bLKlW%p%N7WCS$dDC=be?9l@+cX!
fg8ZMzqhx;pthyQFzv{&m00000NkvXXu0mjf(j=L~

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

diff --git a/htdocs/theme/eldy/img/menus/ecm_over.png b/htdocs/theme/eldy/img/menus/ecm_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..269258a8cfb5302da89828e648105fb0dd32c0b4
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UkNt<nLVo00IX|L_t(o!|j>xZG$in#b2s?4;$2(pmc)J4YEP$28=*9$Oa`7G#i9&
zKsO*8xD#BzoF#fP34e@<B~C($6371ecsB3Miii+uJR#s%;1~D>-hU_n1%SHuKZ$6r
zD<Pti{)g(*hwscs08-BK1;9@Ho;;##6o8zeKLI?qwA(+DY!V_WgfvPbO35C&PybUv
zrxraIL=-pLv_(7zd_+VU5!E7-dCNkSQS+qbojY?MlfWy^s<wbc76~N+UP9ZF;2hp$
zMd~@RNT_PGNqE9qK-rSu96l9UF?v=ad%2~ZfsYz@Wp7y@&fzmlRw^M4W!YWY;Io#=
zb%tN}*i~Zy8}XgyE8%^7*P)-hrLRf7O?l(DOGj{UyNz#SR)*{<YXH9?TjDY__&xjW
zpx}*l{Q~gL&M+8wC9G=<pb7>4C>E$G6uv`%*Ze?{@MS0q_6Xq0pI^9)n*+Wcy4&PJ
z_demj0lYSLyWa3cL+3_1KOUgpc)V)tLn`;A`zwGC9_RiTJuI>D+{S~O;sZ23w50@e
zTEi;g$6dgiYAPC1&Gj{AC%&cHf$k5D^BnENnB_bmMm%j#0JdYGhr-tl=yJdgvTb;#
z@iFqqql@NkCkjrk^@w@bcQSYdkO4S9>iK+iW3N_If&;+H(W^{i2YM8CV$xVU>gT}V
h8XjY{yhNTU{s4BK^m~$Nny>%>002ovPDHLkV1nqy7Iy#u

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/externalsite.png b/htdocs/theme/eldy/img/menus/externalsite.png
index 0bf9138d463f9d2254ebd19794bf3e6e944f88dc..01e30553fc569e01123faefa7ef3c019cbb36b5d 100644
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx8D{(n69Jks+0(@_B;xSf
z8MfZcjsk7-S-MSx1RbTD7jcL+xxR5>k<PCE?^!o(YG~Jj4zXLm98DgGH@O(Z*j?B<
zvpIF{om>ymxs9pc?p3FMN--{Y$aT(A&9uv>Kw{59X(ZGyAAIoZy6yR=qdsl%PB8wk
z<d#p{`?z<%=k5A(?)7@ZEsO={erkWbwy}7fScY{M`^m_CvmPmK+W+jJ<@eW5?Dy6(
zePMp<{c(xq>FeP(F5j-(yt?6IQgi%v`O*!-B5m_b(trNyYCrLB*7N-NHB3B3e#hF+
zf8rJ4pZJ&k|GOu<9V{=TDW}&3&iwhZV<!LWF0RAnJT<P<*30rW*7JX9eoz(vlK;b;
zU~_fttekZXQw8T;*golf!&Sjo^Hl6L7Eck+Km5SIq1E9vlW#)o#n+qcnO8YzelTfF
zWqsiBX>rZR561CN*1OzzA5xdfz;$Z(DcuC;w6&}z4dDsW5y4+fo*fMq{L5xBeb%ZM
zx(}Fke0$|}VBVegm3vRe?dM;a`C|cV^~J0YZ21V3e4M`{qNQ%tnJccK==5~;b6Mw<
G&;$T2cj_tt

literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0004iP)t-s6%7a)
z5D6I<6de^179J@k9UCw%DJM2aIZ$>;J~w_+FIG!IR8?1WT1RtROkiMOXJ=<iV~kF1
zp;L3HY=*IFi@|_XFM(7rfK)S<d~K|DRkL|OvwA|henX0adAx-~y@f=*ghs!FO23Fq
zzl}_yf^DONY^sH4tA=Q-jd!<%ZnTblw2yzliA}(YPltwtgN~qtkD-T=qJ@&Ci<P8~
zm!*}Uw49`|rm3&CwzrzH+oZ6?s=eK~zR9=4*1W{gxWw7H%I3Sv=Do}0zRc&o&F8_T
zl+&e*;>)e%#<k<ju;b0J<Ik|;&$8Fh)WOf_!O-Z%((1<3>&DdU$=2-4*X+&M>de{g
z&)V+K+wRib@6z4x)ZOpi-sRZf@7v+*+T!om;PBYt@!R9_-sSV`*vakO%;(+K=;Gnw
z==9_1^yBLE<m&b2>-FaB_37>Q>F)OG?)U2N_v`TZ?eX~T^7-`b<Mi&~@bmfc^!oGl
z`t<hu_W1kx`TY6%{QCR-zl~TL00001bW%=J06^y0W&i*Ho=HSOR4C7#(mM{qFc3x2
zW0H=N-K1yh^pvatL6t<1pDC~);u9I(G#*)3S2K2i%6oQL`H~9d{kSz4)s9Am(b>M*
zeJ33rBoRSCNZo>y7qU>AlqMmYoJh8La>$s-t4Xc-i5zr##8kOtC+d?oq)p|Kg^M=X
zpVqwHc7kr^Y%|G0V<rAEXH<ykAKYv0l1289x5;(}*nGS?Et5B2>O0P9Rtww!0000<
KMNUMnLSTX-L}RJ|

diff --git a/htdocs/theme/eldy/img/menus/externalsite_over.png b/htdocs/theme/eldy/img/menus/externalsite_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e227ddc83f7c92994716cbe7c75cfdb4814feea
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GdxS>{il#0xY<#M8wwB;xSf
z8G*Tn4FuZOUuIx&QebgX6gi|I0ws?fNDkmg`|$Ru(%m)Qua@es{_=m)(;qeE|B~F(
zHQ5iuh30=dB(&!NtA52n?zj(4;(H#<zg}%@*Y^BXF3+~4wBW~^Z?y65-+kVF{>@_h
zQ}Yc&jE$L-x@R?dCtIu8J^MTDzUs$~=l;y>XZ-aHWX6BtA0H1^_y)VLo3|s;IB)T}
z?-?sUZ<pQ3R`aGKdhO@<dYhe>zU=*VPjdU6YcJ2GTL*@hZDU$|yw~oWpW0>3HIb8k
zZkqI7sxrEQ`JCbpHlK%D=ihkGz7r?=>&>^|iq4&k<_QdTjk}-k-=+IZd*46(Yt40A
hxFF63``};ZUxs3rV>T01q(edB>FMg{vd$@?2>`CysPX^+

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/ftp.png b/htdocs/theme/eldy/img/menus/ftp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9d96f0255b04e220db0fb0549d01c42bb2df960
GIT binary patch
literal 788
zcmV+v1MB>WP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Urkjp2N2Q00NXrL_t(o!|j;AYZO5g$3GD@D2h!KF`&^Xhz4U}W8(#ag(&DBAXWjp
zC@4`uLWqSDEyP05*x4xlC~PbQwG(XAXkwuxK{!Q21mUi@+}=%^R}7E2-MP)~c?&!6
zSY~eCo6miB_RZVvFvgJ8wu%h596pE7;WN}$tNuaYwuj$G;CvJ7^Z*0EDPT<2>9Kwv
zi$!mYv8`Z?2|Vnz@(VK^vmpNV7;#K1Z-6C_|6KLd<^b?m#Wdo-l=QZ#1C<2fF9Dq@
zW?lS!*4Zuw@Ix#VK1t>Gs(9ys&kp5(1Gj*i((eQA0Q*(EN#JTDc$2X5o2_^=z$43F
zuM^1iFz^7_=$LZ`*a{4};NMxdDT!t;-V1yKPB(zB$@Mz0Hble%a1?lzcAl>|%--|1
z1wc2@WsNNY<G_@fJK$2@ZfE6sZw2tK=f{<8P5?iFLu&jf@DTV4+_%QJM8Ve*-ZmxK
zHvb&k=7t=OI@_%Sjsr*3_}@728-U#&&?VrzQgKGI4Zs_fNp=AJzz5~i1&lcE;@c?r
zz%kYfOnAUg0T-28c7}Qh3<A5<ddA_SAKY2-k5qmT*e4E?F%Gdt@Fn1aWR{)Qdi4nS
zIp9j8Jg=4CBvy@i0$;Yq%4$v-7?uL9Pr&paF3MH{m<Qg6ov>Q@Pr$Vm)IQT5bLYj7
zyKKk*1w8YuZ8Ur}<=Tgc__byVvncol;JF9HVodll@Wtx?37gyz^4;bbuty4{OuR`&
zDZdRk=@GXGy!fB+f#c!ql=>r1S<rIjyMa;Zk2jHRf_8wfv^d)&3O@@xN%2i9)jeNL
z`Aw^(*`^5G&B7P6TB{UH13qYX_^=apJ+MaJd@={$_AUR!ox|twIeZQu*_HtjNP5nZ
SfsX6|0000<MNUMnLSTZkJ7>-S

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/ftp_over.png b/htdocs/theme/eldy/img/menus/ftp_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ea742e7c7edd0d0e970ae45c28e464d90fce7e
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Uru@FTV-^00FZ}L_t(o!|j;iae_b)g+DX?j~z%VkPf_55KAx>B<X;3U<a`TI}kd+
z3bX{Qfc#l!ZZ_b-sR-uY%+7EF2k&;@?jAQP%aWnui2);!599;+0b#7hF|cYdF9$wb
zd?x}7umBSIPGsFryx5mzX`3mVAyxCvnSQ5{`8M#eTgxT}HeJc)+DL%s3+6|bybfZW
zC2Xw5?~*Tn)T?wK%X52RE4J79cx&=g>v{*Qfx<Dz04Xr5xc6bpP?JxAQ3Ep`3z><B
zU31qCsl7?n>Rp|WRJ4x3mqg9R!j-VeMK!n`UL+Y!MHE(||E*eNr=C9oS&im5HFBB&
z%Zi3r_>{^?MFpusQBhTLi{J*Bt9&>ms+Q4D&0<@Vk5%~UkU0`_EgqeDMDSF#oU&Pp
zH&$1cP$7%kc@Q^EJM2_te_On2ovLvxW@?((!IDz0w;JOM!|y`caEF>(4N8+w{>6UY
zg#+;2@HyXH$eO-qbmrV9kuaJ^@%*j+v^pU_QO%{-Kj3rO3HI_#@S%@BGHVYXJb%xG
zP5TsuaNKt<oa?ZW)b)Ib<b!Mi`9MC959EhW{uhr9_p%*zU)=xz002ovPDHLkV1l-)
B@OJ<J

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic1.png b/htdocs/theme/eldy/img/menus/generic1.png
index 0222dd8c81dcaae46ac0eb81db229a06b9f98f92..39f808bed32f27c7d591d2e68e170ee96468356b 100644
GIT binary patch
delta 561
zcmV-10?z%=2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29}VV9DyaYf0lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf**fc0

delta 970
zcmV;*12z1*1keW|iBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=H96Ike`x>!15ims
zK~y-)?UTK4TtyVce|P5XZr1VIP8{191tTFL5K%B7IS3)X1T|lO0-~V-iJAsFI+_$v
zKt(}G6(~TV!bDL7RzOfh`IHkoe~A;v-hFT1o4JQ#O>huhNXL<`bmxrb=$x55#@`69
zy!L+Q>c-%}_RT9VP3(K{>G9seW1Y_210hUId)m`YIZzL(vg~hO8*Hv$><=#dR+VRe
z>U8e^KE~e0g>xSd0S7RE=U;x~Ad`n)pPahyt%<oKPs*ln32(r&lPZz3e@K;+D@cuK
zDoB+`L&(h*TU$S$91d4MA6DnTUc3C|sy(v!+|tsk?|s%g@aPkYW5^S7DQB5CA~oQR
zNEI}tlZGOdqN$yx63swrN|`qiS4~--Id%Ec(YNE9?|g7<=I{%P?TNsiy;7@d)*cJi
z>KH}ah^;^@Ahy7Q5u%|8e<s@rY=#W?EP1d_XKubIrk*NhraOl_^O4{#7v^bn1*vvY
zDPk#7D_{d3y@Y`jAUiIQM6RJ|nR${VEX3~NVsgw0-2ugT*T|w7ie@0{3Se{?K~903
zoft)m5Tg--Mk(5Y3M`uCdH^IZ+6xCU8)E&6-0gvcFwkv#x5ddjf3zSwJG?M57KE`)
zdn}UD6a|8?Z-(KGKF!)KQVl6ZQXNT^lLjIWHJX4%c;k2y$O(v`hN4JVPZZs8QrQ94
zC;;S+6)i$<AC!)^YveUb8d;PRf(VFMh@vedVJ3_YmiCfMp~lf@j7P$^A&sKN0&7P|
zBDe_dn2V6W5tf~he??A0a->m$kqaCBHvSFT-Dnr5-JAdD??m7p;eX*>!gfz|El>>;
z_Ft+SQc9s7^ta4xXNd0_G7MKe3@gXJ`NVHrhgjI%dySU!Hn%pHkH+=WznoZ@ogHsa
zO&=+G`z_^w*IAw+H!>yg-IaH*C9gq>rW|R?Rc)*<A6>olf9Z#@@1*4)jvt?&pZ{+4
z)N*H<>X1z@1SrgN#B;#2jVcA)1M-M+Kpsqu+u-KueEHnBUk&?b-~D~%qc3u*$~)pO
zJ$|VD@Y1v6E5H8n%<Syki*xf2E>7;Bdnk6MXOfMNHC0wBx3+I=Y_4ytubsKJc7Em7
s^()7x=N3<_AYJ^ifAz}A`Y)|N0qp@5e-SikmH+?%07*qoM6N<$f^G1=qW}N^

diff --git a/htdocs/theme/eldy/img/menus/generic1_over.png b/htdocs/theme/eldy/img/menus/generic1_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..adfa8c1599b9c2b74e15d0b86e5cba6dfbe8587a
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx1wVO}Jp-DO=IP=X5^?zL
z%(uRW4FuZeEBxCoEuf|#J%M+D@Rpnlyf4@euq8Hca@+-kyB%jfc*-uW8Pf3Pif-?Y
z$#GAeH~zh07r&-ht#jcmR%WyI|Ju84g7zja*zmje<(dcH!FgH@fet%OH!x?t4!OI#
zcv4b`*D95_Q?5yQ7JELHn5Ux@5_aIriM&5~n{T$%$Z*-S&-2^DxBXe$$wg=LPAuHS
z6z6C1>if!v#l>^8Umr0u{387!;VsMgq7~=$b(UP6Ti&X<-Ic9C+F;Y{zHhH(ZWm89
z3enS95<2PAi4Rh%W-jU7DjcHrP2JRVZR673pv%RM+l|9#&F@dre(}3~uc2+(y|q>o
zSN=@hJ%Ks=`L^vZfBl~OUQ71gLp0RRbAQf+%&Ag!oIW1&b8c-9S29YA>}TFO(=_0c
za_q<6wLg6p+6d2FexA>UH^(@QHU6@+edKJh%=KRtd(-Qty!`N==O6Q5>Ds50%W@q-
OG34p$=d#Wzp$PyNUC@aD

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic2.png b/htdocs/theme/eldy/img/menus/generic2.png
index 86847858c4af5ccd8bdb4fe19e3c46c8be9a9763..f4dfc5f360a87341fd9e6a59f10bc733c68028ee 100644
GIT binary patch
delta 561
zcmV-10?z%f2f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E29~Jc{vi|@80lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf5*zFV

delta 936
zcmV;Z16TaI1g{4niBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=HzOLr<dFaX120KL
zK~y-)?UPMwokbXiuV>!(oY#})Bu&#M1htE*2ufQOqPWqDf;$y|g1B+xfAAl;>Bfbw
zUAihRDiuVuXcxhcE);_4SJL*Re`$Ko`!O@m?IMXyQ7U5HdBZdF%nV%f-1A}FRe0^q
zQ`PlRclge&?N?^z=3bZ{&OKFC!$(6H%zNq$Qig7l>U!MVm~3sYjVGg@ntJqYRn2};
z6xHar)w3<&00!{Vt0x{|cJZy*gR}3<EFOJUHib)g1kWNhB4>8`22vEUe}U9MYDJDM
z+uN7FYul}l+h+9H`ql5R*pnxZEib?E@<+qNi_fU&As2EfXUwBW5j=|2K&(Y-A=M&w
zA~qsUq*!Af4OgbFZ(O)~>8p2(x8HmH%#q`dpX|>V4;?_gfmweF>s3bChoWZ`rBU?2
z0)zro7^b}wG(+I-k_W4*f8kPD4xTHI%$LWjr9g1Wg?SPljnqM^ouY=+6E?A34oHG*
zxOVc~LD@6&BuQ8(ddJJzDJKj%%IThwA+{n;plbveE`f}kAZJk&kP4$HL<nHP2z@~V
zR+!~30`6u1=t0a9Hjd;$1u_J%XH|P}AoIssc5nd_hGPMYj{cO9f6{;wL71DS-Ry|#
z?amRTK<bRth%|xR?p$7q!lUpckO+t%rz{;CI_02Gs!L#-5<o7jEC|B^)Sx>Fc}8is
zQtj9dh@ynDFC;Jnqr_4m*FsTf*J{ar?O7`dtREnW;37Dfi;%z(mPN>rlaO{c*=_c|
z27$kl{*>I4{>|ilf4~nw|AY5|?LXmKpo!^0!=;=;H;LP3cK^5Y515AG%57LV^Ye$k
zIflaib=^j=oLg>ht)4D6ez<)8=)!QifAGNb<#5VU4tOVdh8$%|;QJ%*A4}eWWTqU5
z^_E5(tEaDA`uc-n?4)nL{N>!z(#+W_7gnoz($h9S7a*ADet>7Y8_94F$U)hVn<>gB
zx31-@s~10Q$2Z@<xbpcYIi>m@`^zU5`%f%CHofxW`ilz-!&8e(hfdBO8XhaE14oio
zQ?Zd!-Q3w6H5;Ri+rQpe-(0zUbL-sv;=||H*H*{ZudQ`^tlt3;()=DAWrRNf0000<
KMNUMnLSTXf_{0<d

diff --git a/htdocs/theme/eldy/img/menus/generic2_over.png b/htdocs/theme/eldy/img/menus/generic2_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8e58fc222091713ae13ff57f13fef53b96a4511
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UbDk&Ws2E00E>)L_t(o!|j>dO~Wu0hQ9z(ctC0e0}#XjWCOYZY*5&s8_*398)SsC
zLD?YPpnV2J5lH2JcsZ3Kgo>RwH|irDwY3`iv;F(G>jol1TVsP3hlj5#wo0nE3&i?<
zs@W*`o@S&O1093sCcqpRYp2G!J0~JG*%OgOMCRf)QV|)5NY{oZu&~Mm=$9<xN1e^o
z<jbb;1K_fvbvRQQI&+(Oo2@bdt|}V!Q`hj3O6Nd3F>?%k4V-H`#<Ogy`Jr0cI8zpD
zM!LuVjtxe3n#rGacJ*`Y(kh2)X^DtLmiB6zXCgAyc8s2}-K6@O6JVsHl;&K}%bDw`
z&O5dh<lSM9G%qq`HyLM2R~#22V83Z+o2=eX{HfBzui1Hir8^szIfH)(78VV=E-M88
z20S$h+!p@1N#I4`YX{E@-w5!!HDB3+ef666n$HjaZ#Jo-i?Fs$N-A<5ulZJM{;tA<
z*@NqQ8-P9F5ZEpe{8sOCK3u~uV^?njc7RO>&hw(Pdav@NjFJB>LX}>qKPkgMI`gT3
mU;4Tz(s<zi%JlGS2LBDc&h{VBUvw=10000<MNUMnLSTYbPU+tO

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic3.png b/htdocs/theme/eldy/img/menus/generic3.png
index e22f73aa6f9eccb8ab6bf9049d8789d3cc2625b4..00769352daef5a513aa7b39eed513a461d15cb9a 100644
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UsIsk^a;G00Fv5L_t(o!|j<pOG7afhMy~T@vEC4txy-GgCZyj4x)>QgSZP0byDzW
z=znlk2M2#a9qg*8pt#sU1S<#%R*Q?Z9tY2GDPnWm+<wp;cu5G!$$L)T<X#d_L}*p(
zpoPtmZ<KY0=zC7fdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hh
ztdrjbRzsHYJFuw1SR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzb
zumHp?l0F8~z>#k*Yvi|pGvL(MmQ=)mX>FUT;OEhY+#f#sfCD|vDw~LyU{geHL}Xh;
zVuoXaVnsyKI*-v9Q_X+thFwx*ffL{yxCIJTNM%GZ3CsgM+FrE1VM}FBhZHGa+ohHT
z4bE@9z_8W_6y+B9Gz*&f|7_G(pQ+H-%CQ?H^PjEyS6Qm#N2(#RY3j^7**Mv>Q|4P*
z^G-HSHcmD!^G@?lHcmESkbkaY=ATSE2DxY*1SWv)5Q*Ob7pAN1Rq>#f;P;}bABb2W
zoY$4j0v|yJdNsZVMu9FZBUHY#F9L7A@}-u^J@=I9$hR5!AHhKvxC=E9UH||907*qo
IM6N<$f;5xuNdN!<

literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00085Nkl<ZILqyo
z&x=w~6vyv<_L|he{0V^tX^GHijRR2)E^6Vz7E`-c(hxCiq^%oUR4^@qfyy?s=nrVu
zKM*Y|BP}ol2^WFluN;5tQ}6AZ*Spgl7-})?>cR1y$2<3PzvsN`Ih6dmlz2S8&}y~Z
z-EQ}a-EO~Nv)RsAES3|hs=5?KF>}s|rfH+`c--vw``;k$ORv{^XSG^iL(KPFE;j)V
zLm0)MXf%2pUS4-N9JicKX9OSwA&jwoZ9bpxd7e(Eq}gnK7z_q4V53*1QmI0N!QlB=
zEVc~_mrW*<2<EVuA^;cReKwovCSd3r8|bkp5T7B7kA*_vHccjzp8|ovS)&|!kWhh(
zA$8qHgA&NVUEeTBl2f=ytyas@R4T<np%7*80!uSD76>T9<ojqe+M{0f5sqXi%b2Fq
zX%+~FDY4rz7orS@gcyqvg22gSqWkh))LMWg<)qzi59!m)GiLF)C~QRzEgl8%2*5)!
zH&PcM*+-K>0*o2qhldk0q)###<^;v8UMJd4hj0e<gA*YF5hhB3K=jdMu&B8>O}b(P
zJC>Fx>2wK&g=7NC42S^9cT^`7BMd=kLiPS&0CEjK(sZ}RLZJZT>5xky*II1!Td+7@
z|H1zrctjs>ZE43M5taW%F!b~ueYm;VI=Q;)<U1V>V0u8X-r*XJMw4D$Tf28{ef@z|
zRS6#q52V<bFr-*4-lr-dM-m$wkCs<f?z&xWh5!6Za|2BO0Om&H*M|a35DvZgc|M;{
zQKP{x+)N}cYK+}E?f2jC`Fsin$_+>c%S{NCLQUtDO64WA;_YlU`xcassWeQ<DZl@4
zC>&lam&=!6{$2KXJm+9!`ORjt2ga5Kpd2>o!(6LFGye*;{0y7D@p`@QA^kzMTGa&W
Y2db0ZOUWr-FaQ7m07*qoM6N<$f|{aGnE(I)

diff --git a/htdocs/theme/eldy/img/menus/generic3_over.png b/htdocs/theme/eldy/img/menus/generic3_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..0672d20bce4bb1776f71dc8038e32a8382f5ae87
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GdxWqN*dMFUMq^K@|xi8%ar
z=3C#x1_EvK75;6P7En`=p1`|6cuUR&-WO~K*b<vJIqm|&-HtOKJY^Tx3~6|CMYngy
z<hZBK8~@(0i(gZ$*17N&E3;Yqf9>5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8<?|Rhuqy=
zJSi!}Yn95|Dc7Vti#;Dp%+pZ{2|MuRMBbmg%{N<WWVr0v=lN~n+y1QW<f5~ACl+pE
zit{sh^?l{T;^Mj4uaB4+ev$r=@RsF#(Tel>I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql
zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P
zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z
zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^
O81i)Wb6Mw<&;$S`U(e_O

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/generic4.png b/htdocs/theme/eldy/img/menus/generic4.png
index 29a3d7fed672e0dc6b78eaf38a82e0ac65982262..5f9240240da3f037ca1918367f6b6489b972c260 100644
GIT binary patch
delta 561
zcmV-10?z&52f73yiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2A0VTYcH95}0lG;<
zK~z}7?U_AGLopPFpDT9ptD7LLP#2|xA}9(DqKk-wxC;(-Qt)T!e{fX?2Y*2w?5e1s
zxY$7iD+mf!i;J}$2hVURVsqQve}2#$cu5G!$$L)T<X#d_L}*p(poPtmZ<KY0=zC7f
zdqq=`pHn0h<3QA4+!c@qG8$B-+Tgr^r_C&|1}qyAHMMJC57^hhtdrjbRzsHYJFuw1
zSR=my?9^!=J^*7jHUA0}>qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzbumHp?f08~1(!h~#
zE^FksfHUCK*OpYofN5=;s^I6*huj}N`+x&I%_^ISm|#;xZbW2TL}G?xf?`EP(mIdP
z7*oxE>xNxYWPual9JmDvRY+w-F$v5AJ=$Khy<tmbPKOjJU)!aY1r5$`y}+>62NdNN
z_%sWe`TuOxSD&fS*UGUQe<bstt@>A4s^dqhA+l-e%sbgQ*|byUTUzr@HcmE9HZJo{
z^G-HSHerx|u4Cq(Ogjd-XdMJ5fbI~9-vJk<tL#<rpqAkGqNyK<SRkC&mCXVlK?Zs?
zz6M5tE-fQezOyd^Z@%)SmdQQ$l<CN~8TlW<K^M3SH4t6^0000<2SrXqu0mjf6mjeQ

delta 986
zcmV<0110>r1mFiDiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPw4fByjg
z0RN!9r;`8x010qNS#tmY3h)2`3h)6!tTdPa000McNliru+5`a=I4BB=A=Ur@17Jx+
zK~y-)?UYMwRaF#*zqR%`y|?9FO1W)q8y<$lpdi6V0F95}z{H_p%FHk}>ez`69XY{7
z2Rbsu5phIJ)YMreXapaG1VuEtf4!8_6x!Q!&pCUq<>0m|14hEkf3hDd`Pcuiz4HtI
zKu^B;a$~i)Il0_he`#uO``E;u)`9kPb9dOT9Urw(mB_xbELLt8%d1QMKYM>{{IYm$
z@a^PW<Lj|jw({wF*Gs?v1mKkuFYcOoOkVBGj=#3=So_H^?l?wG!je;Ze<Tu#mRR#h
z>4`&9;ht!EWPL4h^@sHf%iY1pi`VMUzdW<pm7_20KXUSoBOlG}Z#|KZfknqKk8Tpp
zh(u~PN@@y=RMeCfDJ+txc+_jpEs6)Du8i*0!S`oB=$;C1y?x@`Gsh<nZwn2^yy2so
zOG8FvL^B$a)6js5l1V^Ne=-yiP#Mne7Dz{cWG?Emb0(i{O=M4HJ4PoDJrtTytBWSt
zP@^)V_DDgZB%oFgr=~D4FdPF+jeY`^gi9ulxq~#D*`Z8}aZ)cZn&;x?Y|ksIW=$bA
zXo*_};<zL%837}RpdL_^5rywk;As*FQf?S2x@EgM4azlPfY9D%e|RQ1;9Gx19CybV
zD&49$X{g+QB$O@`>w#v-XpJW_fT@nsk0p1i8tR%-61CRUme?RtS)%WW$`b=KDjyP>
zE3ppb5iXiC(XM&C5n1jrBsOzKa+qi-mcdHxl(kdYrc!g%6@2)34a+bbcOf(df)KnU
z7`P2RWm}HjH!mHse_Uv0iW`V4?uwdWDB_BkkPzIUcEikZ<1Q%ofaAkvf1mGOx5V5F
z$^*jx#1EEOK(wkoZl>pbLrNC4Kd9C=lgjS{r;9+WtkiS!KfZtKjuC?VXW6Pq(Kmix
zxN|yOyu5UNdS*{+aw0#vb1E0jBZav~jOZo_BVm{u^}qI;e|3)}M3ESrem8n=VdeDM
z54-OKQa{drvoJq5H~ZDX`EH}AItOR>sFES3hG`<nFoB~Qt_I?yV3;D&OnR3#(obJ3
zezyEu`TCi6FMm=FQgN64g9na`Joo$~t;<&~K07r%bA0#1(}yRfckF9V>QvsY$BG!e
zzZTb5Z?7)(Fm5dWy7>FbrKR5O`Mrlb=dUc>=wH8Zv)bbN3uVFjIbl|2=>Px#07*qo
IM6N<$f-4)$)Bpeg

diff --git a/htdocs/theme/eldy/img/menus/generic4_over.png b/htdocs/theme/eldy/img/menus/generic4_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4d7b1acce5db322cde66f1e2fad71876449e3f
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdxm96HgrvXh#^K@|xi8%ar
z=3C#x1_EvK75;6P7En`=p1`|6cuUR&-WO~K*b<vJIqm|&-HtOKJY^Tx3~6|CMYngy
z<hZBK8~@(0i(gZ$*17N&E3;Yqf9>5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8<?|Rhuqy=
zJSi!}Yn95|Dc7Vti#;Dp%+pZ{2|MuRMBbmg%{N<WWVr0v=lN~n+y1QW<f5~ACl+pE
zit{sh^?l{T;^Mj4uaB4+ev$r=@RsF#(Tel>I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql
zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P
zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z
zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^
O81i)Wb6Mw<&;$Tu*w1GG

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/globe.png b/htdocs/theme/eldy/img/menus/globe.png
index 073348a5246d824568ec6d9a2f939b5797c05815..8c2380eda131f90b77a1f3792b2afbbcabb5b7b4 100644
GIT binary patch
delta 1144
zcmV-;1c&?o5SIxdiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Ck2><{9
z008+zyMK{D9)I2p76Bh9txx{$000CRNkl<ZSi|j@@oSb<6vscSwlZ;By+az?+caq_
z&9<UeTGXl^5=1aCiXamNe^szQpr{}GB@l{?$cT!_pAtgKtaPxTwyfzK=2kWmYR%N?
zG<@HIr(eDg9`By#*|Ybh>EJzZxz9cKo^!s>_dWOC^MAZmX2x8V>zKn*0bc=M0iP`O
zz!qS`|9~U%y>>=cW|pOOnc0Y4mT@!NlF@cLzl-EAk^|CBYkxzA_v-@o2fE$BufVw4
zZlE6+0S+YiS)|q>pIty5&<#8Wd<e7ykIP?2In39qAtpW$LmSkx2x4+N={K_$Guv)v
zuLN-uF@L53?=!PuGg}|bwMbvc&@i)o8P<hy>dovu&8?p)_#I+7YM;ccS#D<A%&aF^
z>l<daCt+?t_Nz0*e<2QMRZMNO33x5gZ3eyrUI)GaK8?x1mB8&lUgLX!mt=ERy0gF$
zV9@Czc^-I9{&xZ20?nE`2RsR!@CG6HX5dR;fq&Dz54<Xe4@)-z>;=A3U#ctxo&}x;
znw;;In%m{pey^8H1iuY<#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4<fFv((0dFd1
zr_;YEpHsju0D1x^?*Kc1?Z6WyFxw971Rj{7-Cw{e+3j@tAAyb0z@PK0fs28YkAX&D
zMSsj(Rw<TXdkfGiup_{2ZXY%3<*op~JP6XGw0X1);H82Gcmx;%z6RDgeMcPlr9i=r
z54xMNPzLzP675?Yjy1teJtb|f4;UI&pTA1X*SJH&+vnrJhXF2?8N6KZ#RTxhq@!|9
ziD&-ZVD1gz81S-oekro44ExX3+JLQ2-+vFh9fJSOT_!$l26gSvcG^s+Zw%~zk7IrW
z$OXH482IBV<@_Oc>UjI1IPiyoWo~>Yuus3pIB?S}f*%FWC}xwhzbHIYz#j$1^mP;6
za&@Zy27r5K@tlv!lvbe1*$*UbSoFEK%8gg3%Ir?qbSG7&j;Sas=-JC&;6|VpSbwP2
zoC5r$vH;+r;8*KT13#$xp+Vy%dj3b%V!JlXarIdk9Si(NatE+jeT~z9qrOx62z;Li
zBJG^d1%E-D20oLc8sL1ez7e=p>_&Ygdw~1(T#&C*{-SaFt5r42PbnBkV;(u*uat=l
zYZR~u%-0p2R|-rgxtMilfWP&toPW@%7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{N
zW7-sB*4?a>S*&WdPq~g_^eRQ8Jiid<I7@ku6WE+s>euG$1m-z*&bdC4V>*5tWD_TY
zBCA&UKLq?Ma;o)Aso-mY`&{r*y#V@1IF%M4##e)gr~`hMeOqvv^(juO%t53uYg6#i
z@GHJddC+|+P3o7(<o{Z!D)ZV0$MpitCGeI1=PTeV;49#-VfhcZp^40fY9O@$0000<
KMNUMnLSTYs!Xxtl

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

diff --git a/htdocs/theme/eldy/img/menus/globe_over.png b/htdocs/theme/eldy/img/menus/globe_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd1e54f4754189e57bbdb7ff41d7c8e7f2618ff4
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Us+gMz2%=00PWOL_t(o!|hnnaoaEqea`jY+92u#(FBdUfj6kSfksd#s5hwE3DgOq
zPEh*4cU3o#CqRE5TNp=DvSY_dPPoIJMVjCv2tasRi3nb*+~5Vv0)7F%fR9TCpaxJ~
z0Ef4|Ick-N%+XRr2Kg_eh}1LJPT9?A&r8p-$@On$oUa7%V8%KCzW|KX4uAtN0O%uj
za%w@FC4e=69{}C~_y*t(z&-61kMVp)1wGNyLlt$7fS#NZCnC2ZvK5iW>>I_H0`3?p
zm6^*;2%Q7G-6x~7B(VP^_|_Qj0{<!KDR(0Hf$KLj_75Il73ghh0H4j+N5=A&@z_Rk
z!^brkvm34%IW{skoEq~|QN4W!;FfcH+8a_aZ!=%$9qYl7-q}2|+W6bEl`LZ=5>the
zo^JtsP|tf+As!NWzvIn}rrPx8HvI3BHrEk*p8zymf3L>hAJ{iZVx{3+C#T8Wgbn2b
zro6Ag*8w9LLrI<(yfCB?sBHhr=Z#4?E#Dai<&|2Ojd~#>gfj)cS5@O0QWzX|`~bX7
z9(QH%nJTZ7;Ge6Ev5D1dA>d-PR52$f>SNY7Di`&57XrVF9I(G~xD=6GJOJ+^CCOb0
zd^b@A55RYkI@_~NcuLu^3Cj%leG2>^^?b)ZWDFea(y~<!T*n-2t4#&qi+cXbu^hnf
zL__8&;1~$Af*$k@USXQ8kWC-wgKCQb;O#+M9B5Nrq{rAQVp1upcB*a^wbW8_zKJx6
zNitFZ_!;m-MjZl)?dJ>iX7qE-5k#ct|6>?t5%9`Tz|0VqdS<s6>ndG>0$M^e#)x?8
zS}S8bSL|mzV@o`!P|<sj)Z$nIZa)lp0IfQJrEWcMsZoj<B)wKPTjiwe)K4FlXSzTb
zW%N*fBxkK@V@M?DEN*;Eb!b$j!5OtPH#pn=bLlGmyJVYcfnRM)yntW8FW?vOmy^G3
W4#XMf^Qx=>0000<MNUMnLSTZj(`|$R

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/holiday.png b/htdocs/theme/eldy/img/menus/holiday.png
index 42c519aa63d0a6d309d303d8feeb75096cd04ec0..493974477f38e5669668280796e2427499c336f7 100644
GIT binary patch
literal 1086
zcmV-E1i|}>P)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U7}1jiONi00X{BL_t(o!|j+$ZyZGwg}*xw;#Y72!E$(t@DPs(P%Hyd#0nPd$Oa@N
z7D$LCEB*sN0g3+rD<n27BAJ~9jv^uw6hwF!8I!RS$Iis#nd!rVGg7PR9*-YA$zrZ_
z)!kLqRp(aSd+JufNJcV}kqkrPFgufU5_k-l0UiRzJ;r@N4cGt{BI3$D0bWuacprEZ
zcm$XL#;jG35kLjl0saC02EGBlj)?W4gO_vyI19WDyat>G>Vy6cTmrrW&I8{@#Kus3
zP13lek0o8w!R04OpGtZ|($p}(zbNT^4v@r}Ez8y?lDe6?i;~`zbYxH*m3`u0^K$=|
z<A!0k7<BAj+n0dPflmenQQIf@2Ji*&CGY_7FmMcb4>;pst-JpKwt)^Xm1C@|0Xzsy
zmkK^2I>4$GNj0;~72s*$xQ&?xUI%^z{si8#u|2J4NaHflDtqShjJX9Y01Gzes15oM
z_yJf1E&{VQt_E!R{e<;*pn1>if|AZjn(I@4zc;tu_p!1Ac2MABK-*d*iDLpulY5!@
zN{PV3Zqw?4E0E@Y&2=2uiHMz{`ur|Ccw#Mzmjt-EpU!Io%;0#cU6P_U0bQUI5k<T{
z*=tkA%nUN~&jY8NA+`*r>$(kZRM!ez@^QPx=G_864}1hXYu`;AfOTL6_zL)}pzr6L
ze65!Oevp9u9{AOq-0`ee{G0*i`uO_{(C*__rO*5Y;41KPPFfp4RZ`U}GVK`HO1YQH
zVuM}5M?@m&GO+9|Kh4kKKHhQJtXFE$dCW3!=dOXb{OlE&&j80qybs*hB+!&}0eA}d
zrL17x3-}v8x@{J@j^7*3D9@Uu7J)HIofNeuUeN=)(?G{SN%O!t;K`h=Ju-QD%WPEh
znYHV(HQ+Dc4^Kn`xDgTEQou`k#>;;icmg<*nf1K)qBCn^&cE&FE$fDjS&oR+1A#Yl
zoHVbW@>RxEpA(WYbw%Ig7~A#UvF=-iHM?j7xE>MBfxtVFn)3C<E5Hi{1Cj$uyR_Y{
zE?w63zH$w?ZnkOx+e=GJ?YX(Rc3!|91zvTajeAqt%b<tRRw>GzO_9Z_W2NC0`XBf+
zz@xT&t3-hP%2w@06W-0Y9TN?^R=bEQubLftXUptuSJlrljcNO=yOLtFPD)h-e#J~M
zkvjEPQaMoXyW;v<%E;b#HDzQa^<OqN(rI;)N+oUsn-OvI(0D$Fkt(UHjqI~pU<f(D
zyD9A*7w-Vgh-eS>mN>&)+5V$nkd~Esj$|Yw8Og!rUk|JSbi{;{RR91007*qoM6N<$
Ef)z6M7XSbN

literal 1723
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
RgpL3J002ovPDHLkV1lcjW)1)V

diff --git a/htdocs/theme/eldy/img/menus/home.png b/htdocs/theme/eldy/img/menus/home.png
index f4d0d917d1fd1c764891dba2d26ee146436ac8ca..2c174340c7696473d43c94ba34399b19fbd6fbac 100644
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0Us_zEL+<E00JjTL_t(o!|mBmh|N(H!12$>C^P<)SlA#NHW(?Tq}f<l%tEn{WL9c6
zC<zNTqU>1A!op@03ws+IrLZDduriUbQWEKT^Sd^`sn=`X{Qk`E{@(9tPThL<_s+TZ
z`%dScbMEgAg%Av?tT4c`3|~;TVXTUURu<GB!|es0kLR$R#ChyV=O5E&PfOE>5Q>cP
z5JIxRSj=WJgfQE~E=j*vW)$^&g1<R+58)oRr1M^OchhxeVuwvYD??{DZsA}$Z{=8b
z8nbv78@`tZ*W)HmWO%xl+{Xmo#)9t^HfL}V>q<b+%WB-gQT)hbFjTO@9>Al>sq`g|
z#mMvXVH0!g!?jp3->#vMox%$|sVZ#t;|g}vREdA$G~O=-el4bOvJb7qR~%1&NMZO1
zT)>(>_Fu2kY?d2-Gp=H9LmJ4(xSj|82+m@(VIA-}yw1utQ&_cxViQY}JgM?Cwl@g+
z1D@kenQXHw?OE!Shj>s$kqUhXp}DFmY|;n#q$>Ds&ws+N9ClkVl74=dp*z}fX{prn
z-S9JumFy0=+|f$h$k5%1OLcfYZ!^>`5N_RjM2q<(0(_}G{(H}tg`Zmje5IammxON@
zfNw8{O~zq5j6XT-Ha79VZYWSG8*yM;;!5`(1J&Ckb!D4ap06d_#DcG-NYw#fndiR`
zvgcd)f=x9Z*l&4^^1kjHPA?0?CE>FA|B;T%$nW&RQyF|CWuX6u{Ri8ndc<sIQ~dw{
N002ovPDHLkV1ms5I4J-C

literal 1008
zcmV<M0}uR(P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R000BGNkl<ZNXL~{
z-D?wB6hAkUkA9}nn%Y*(hciv8t+c+B1r=l;R#1FU>K2x=Z;DWgBDUf_`{2J&sURrA
zKJ6c{EXyJdYlR3(Q(CLBSU(>6v9W0;oteyd?wz^uW;&_e1BY|&oipcmf9IZ@36W(P
zxC8=$yTijjPnf1r)^)wCX&SXE_g$)Te|vkoTr3u8Y!1^r0uS*EJ~`B#_~rDe9|K+8
z9YINw!ako5s7j9Av6cudE#zS~lZF4*3XofTxt*PR_7~>*xEs*PWV|QY+}voCN@YJ!
zh=A4Pgb<MYHV9Z2Wd3;$Zx-JHp{GRcN%V$ZExfp)8``8B$j6<AhNe+PNkLzKO2SfD
zr7ab<N+l>c%KfdPt$+VH!`O%t3<MyZJbD$~wt7IpcucvR?o}uQ(%Rb0lB%ULY*9c=
zOo6#(XJ5km<qwP@XT!uIa7;elhK#S(13DLv%lmte+KtiCaR7nJ)x@gfQ@fB`g8Z9h
zuuNAbETs>D8$*qt#8TIBC$s}79FB}8;z__JV4IOh82o;prK)PRY@1(-FhBPimh<oJ
z7d_Zm2u7t}9_T{0zq*?t5{oJ4Q|Y9*PomLw>)+Q|Rvtq$uzW=@D;7IBWkZOYjol!0
zJJQ+)vChP;<xlwsxHO%EkzoXCNT=nRN+>-^vawNs^|cN7QrLt_#j2iuH#ST#^?)*%
zLhoX=bS*96(e?Gu(AgCg4rl>w2t`SJqsX7txf>45<D&bb(0!o0+UCB^&BDW6E;~(X
zYGKRZi9Uz8oxpM>^<qOT`#Ft6Rzv8X;mz>SFpO0e<N`}$7dACD{BJf~4tK_&y{-Lr
zwd)W__nJ?1D)b#s?_dMFu&Lgm6Fb;*;w+j04y4swrXa`qQ#;rYhmFXDxbBk6kwY?R
zX>6Tjv(7Y49hEU~OY~qnB;>=O;tw|958{NE=#)p_&ulR0M-A5aY>ocX+a;L%ZSt{R
z(Q|yLYRHNO^R5#+@WQ2^SSk4QCQfO*)}k#MML>}InC2-TK{^F;*g-v^pzcG|Q!158
zg&FZP!5BFY?9ae=l8bBJvE1h|A`s80uB@y8XSG)rB9MDe05U|NCu3t{_hx2h%-u@%
zJ$1)=F{<D<|IWn3#PHPAR6)EacOowq_0*|Q4G@3vkLl^@q4DwYxk90^=Sz26?t3v3
zWigY<{4g>y^85V!yyxlnT22v&h<~@-5(<TGBH%sz0ZRCiPL+-;w3=gU)-KgnS6B6X
eK7R#MefkQ2K--#Pum^_#0000<MNUMnLSTZGhV0q^

diff --git a/htdocs/theme/eldy/img/menus/home_over.png b/htdocs/theme/eldy/img/menus/home_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0d692307f28e4b34e49314a5c525e8726feffe
GIT binary patch
literal 484
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*Gdx4Nt0s=>bhi@pN$vi8%ar
z=KH`F1A(LWEo-Lp?crO{?9F+-u|z?2j;IHFP?Kzj=nB~*d@mCIKDc+bck*Q37Vk%I
zW+(nIW~pmA`%E{dgJb6_Hc9V?wp&>P+IIvztgPc*P%LBKw2ikx%;D(o_?ny<zWy$D
z-HO})WnC7Sxb$?EjijIV#-s`f2HS?+ouB7b-d!&6*|h!8YKA|57=3(xOsak_dmzv4
zxA^@=8LoY-35<92cO28Tuc^%ap}y~DQ0O1FO>>u&iC-!-Gk(L|Q0q~l{C1+lD|Pk_
z2}T;7D;8U9s;O6(X4(AMqtNunq5PeJTCbLV(EPH^`<eOb>;q+uMP(xP`NGM6SU$Yi
za*jLa!z?QgosH8PH-?<)IT-ljbwBfe--P8rmD>;PDz^CiHMq6y;Uic3T8%x2wEx(j
z{5;ovo<HBdOB(_!TEl;YKCmxplV`27*`hKndd~CjKYrGStYgXEdBQHQ`+@l{VarMT
Y7-N_;cAP6*3yMPqPgg&ebxsLQ0D-8=5C8xG

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/mail.png b/htdocs/theme/eldy/img/menus/mail.png
index 39434770f60df1db73f77116c096ece72e45625f..b7ff50e3d9990ba330c6e079d8fa2938b90507eb 100644
GIT binary patch
literal 718
zcmV;<0x|uGP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtEEPNJaz00K@)L_t(o!|mA5i_K9O$MM%N*`SmSjSwXpjr>@kZ2Z`bmE=dHNt03%
z3pO?=Wurv-ogYc5`2%E#g;GkBvN4T8CX&%aGjs2Zac!Pk-@eVApWl0H^nL1d`#$HK
z=e+Ovp7VL0d+SQ2lIdzQOk>O8bNC!ShtJ{1wEA(5TN<sF){fpR;1A$*jp4WAMHcXX
zP^dBd->i<!w1+Q_;D3c?{F)@-23*9V$-vK;0Q>;H$7i`U;yJcW0{kfMVSXZBGJdA;
zMZCpc^u%)!vtsv7VeU9$HJ}wOi5Nw^L{s89Q}_Y~@j7<;arnw@C$3?|C~=zb083JH
zFX14%6TYgz!*86x1^h@XxEQywD>Z)(&f{d<v-0?l*n{hdu~mmJ+anyoyVOp$;7mX-
zk2kVDHRf6Dc1J4axZ&%k2oIe&j(ymX@UOuw%uYZ-A8w$n!diuD>HJ`Y{=T@l>0B_g
zf^T?~wF+5F<!~rKCHTXk*=<ouw5OD$h=<YFfkW6_Ay(#UGZfl8Qle_cIy}Wy^y3`v
z#GIdT{#&E(EZ)Z#*)&4DaqE2j1b2QY<=>CBQ9#{K^*zCx03JyA`{OPgi<~hWnL4@i
zs;xG=u^Jyn054ll3cPGzBC+*`_BYg0DmP*kx^QKZbxk)eN8DyCtOa}{w%`+PPO;kj
z8nRi8Be<ZN@bj=8pK&*%GWlCv?m}edswJuNYwe2jo~3nSS+$Z>QYKec=?6%1jZ#+d
zy-`Hf(#AZJb@^Z1IeZSE!{_ihd=8((|3~ou0IMM4$}o!v+5i9m07*qoM6N<$g1l~1
AHvj+t

literal 1041
zcmV+s1n&EZP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<000BnNkl<ZNK5UO
z-A`L(9LJx3XIW-q_7{K&VB&7{LM}8edST6C<jTw~>JpP>vdt|_MW<5-%Q75q1MST~
zlbHZ|A#EdcZBNfj&*^z-Pw5+lmKMJLeh-usYGM%Z!uTYgP<T$i-{0Hw9EA9P9rc>I
zb0_B5cEWB)VVrG}630<@&|1)2FkIJVQv2~dFZJ`#kSZQ@bf5vC-e_Q>UOyICn>`+M
zc0&AccNmJ51+Qwgb}aBx%q-YTym9GEB+@JJeP2dWSzAM;a&$Brb!0MGD0UvNU-|-~
zBXAWlD~D>W2GcZAt8JiEUOf^vHtM9AmfCUh=m_*foO$O4WwkCdTU)O})pTraZDA!}
zI24<ko6vOw>(%PEHhH|zcLU<v;fE+Els#ooRaMsA&rzv!`2)iND@hfrtCd~NvXaDi
z_Z~t_^!B0{3ZqOVXeAnbiblNwFXO{K09?jcERJHav`4QPj$pF)Wr)!eCs0@n$p=~~
zmCBf#pO^J_+zf2T`&-tjC81DAes{lKAshyKiLukCQJ|U^_>cQ2(idlEf1;>2VA(Fr
zwDXswEL*nV$&+8&G<L}s!CqowU;vu!w>6zvrn2&iClYdkxj&k2LN_dlrdu*I?o~Jv
zq22*$+iufgbjQcUz%7WrD_<j&NVhfKaXpzCAKV)KRCQer6Hj#7_GD%}`j%zk_r*oj
zsoz{u9vBY7&lUFQg_SheOFZ}1RfNeflg+i@%j3aklA~|J<2^b$2D%q%@+ue~AD3n4
zDQrH&<Ig>Gz3d*%2pM*gm*_fo9j2XuM<z_h&rzuiD&$t%L1xM%YCA5hwB5GXq(L{9
zZ97t{smmT+=dMBY4-UgqR5%n7qo+)Ya!ocmUnu@#*wmz9;!IhWJ=jZ(1p;v9=66Rs
zOVMyI_V@Ila3wg~rmi!;fYCPtWO(u<?70OR1Q*GqMv-mqmi92P2G0POpSA6UU%_5t
z?9?e(F-4Aho!(vC;AVLb3*S<Fr)q`?E3SaO#K?OW5Z5eZ>E0|9O7ehnL`Ow#h0D8&
zIGx#%3l|~Y?f(jM5k)qcZ;a!B-}=8TX<#q${M*-L+PtBstR2$OqcP~qF&L_jBt^HZ
zq_C7Qpz&TpmHWn06b3yXOQsOr+1Kg)r$3Ev@Ba~%zZ(RvGku>xe02RY%*@PU^3fDA
zjmdlW5q#-I1iQNM<Jq(LW@rSjeRvzMynh=PZw}$ntxpl`=|Ql&8`I~{<MX@U<JAwg
z_b(6L$JCXN<zBF-TYjFHnwGkcAJ5?O%|Y-#ZqE?U{!6gee|-H3iZZ({qgk(o00000
LNkvXXu0mjfuFLja

diff --git a/htdocs/theme/eldy/img/menus/mail_over.png b/htdocs/theme/eldy/img/menus/mail_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9de32d30029fe43864afaeb341ca2204ee30d83
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtLYNAnv100EXsL_t(o!|j;eQNlnJg+CnM!3v}Uw*x~3+JUhG=|HGJtw5|mtiVu#
zp@Y~#sNnkG%}i#^l9(*vXZFnO19x}WFXW!H2?G(~Sarq`E5HZ%03YB3e67wKt{dy<
zQz?-9fRBO4p5Z4z5_<j=;a9)~Flad@z;|Ep8|(8mkO8+X_MQQsz~z?j_X?ltuT|b;
z2)qN&z^Gwzr4<3N0?e-4CQ*P7tNx&KrY5yg;L57cfk^LSbBRckF_T{<R(&cWx%}1C
zS~n7rWyQKoM2xkzP*lg&6&~F@tpHmpv{6XcJZ<59L}jYC{Kcx@Xd8T0nDSmto*zQa
z=MJ+D8`ky;zX0xlH_iQ3#hSU!t$|lHZ#Q}9`Gw9cD$Fcu=*Ti};gPsY&v%7)ffr-!
zFr_J_RJ;$v7Ok@0(gK;ol!eJRdbpWBdwyC1k2<Cl4GuSN@G<aI0?$3fY^w|SFTByD
z@B!|+0PnAXc19=KIzE-?!L~E_@<Z6synttpgJ+kjZOK9Si#xyv_y8Z^1AKrF@FxWS
Y1FHzBTq2Tb!~g&Q07*qoM6N<$g1TAgVE_OC

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/members.png b/htdocs/theme/eldy/img/menus/members.png
index 4b703f42cd74596250e5122490aa18edd6b9858d..fb72919971c555e17a11bb4ee4d0bdd22e2a9cc5 100644
GIT binary patch
literal 1044
zcmV+v1nc{WP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0UtVE_K&6j00WdsL_t(o!|j<%Yz<Ku$A6b<JzCY)TY|=;R6Rn_XyTD*D2W9NN+j&;
zShHXu7B*NDEF>a`1nI6+8X-c2qR}AK>o!$Q>k(QUoBt$}=FXfmGi{`CzvRo@oAW>C
z{LeSvYi3f$7zV2hVGv7}e3pEc{J)Xu!0Le}zZy6L+>~AccEuz-1~>?G0<VA@z#pya
zb`WEXi;gkITr|e~2+(`NxURR*7}FB6-VbBUPTM*u$0Bte*l58t0ULlWhxKj)^Br&-
zfySW09ESyJfoh<~f|~?Xh*+%-QmC;mpiV|81R8)chrJI2tAYkyEPn=AXTdxJb_1h<
z6F_+Y?v8NXz*gXx!vU59Z{w100t!OLzW_BNbOD%aS+7}mfPK<1*#_K=n{9>zy&-xM
zc&Ds0(}L|4X0z5l4ScrXO_EgEB!3Um%ffB9;QYEtbGm`Y7VNVm0ec514H<tgx5{$}
zYEKsWe&6l$-!Bj3ma)m71J(oiA(;FK#4{Zv)7-DX(WDjjBXB6>w$2i!CxW*64qcjI
zyc5_1wDd=N&<I=)2q-W38XSVv(+17i0_0{G&kb{zsN`n=YXYpe23P=`b+mdXa7l%)
zHUziBM#{B4IHKwqB;SGKz$jp^1-D=Re9B?p1Il)>19l!T+Y*pDKpJ?havoG+AF6}&
z`kSSey;p^icX6AQ4nABj;^hk9AlxF~!A?7@TLp}ZOMa|+i=P&~DEwLntXH7gb!Z#D
zIxhJY4%WE^d;&_;=GyQxd>!Q#2Yh8*pI_=we6H%cAwr?50iFXLz<p(_AQ`Gc_9zPZ
zDGrtMi3p4U7DpgI4JcMqRu9Z^NE(sImphR0TGb^n+Jh?K8t?*W1BybhWl?>8s>K(-
z08fRjj8I)YE$h>{hGB>5NiCAw^jKPDfQi7!7?vNYxoLHeODy>D>Y=RUCpeI4*0mx*
zM_D2AY2C@Z5Nv^~<#Qbfz45&;ic8+_3a^w#gXFg>`9JctAo-*MGFq9YH^GZ1PtuAr
zLO3~*?*=}o@MMw>U5j;yBr;ihy$yMyYRU9Cm=p3w;Ib?+D}zPabuCI@^}ZJEd$&I;
zjlNMA8o9!@N^=#&Mba*xANC|9Z+v9y^t;VvVk+S`sbRn}rPVmn4%`F2#hIMyrw?j{
z$`liIAe*FtmkRvYk{W=ofhB6CN2m~a?<#+ZY)5}>l*)d}%##1l$o~Z`gD<J?onasV
O0000<MNUMnLSTY=K*~S>

literal 1366
zcmXAoc~lYx9LH(aI;_@8n{BjO$KKwyH@8<y_slJul$K!;mbTK&OiDRa3<Nn9QGvMc
zOF)!E1w@-hYF@QWB{9wLXlCJ4DQg|;(C5&7-{*II|NFh)`xPGrA6&EQ^Hl%<U`=#X
zB*a&N3$en_mqC5O<-W2U9eo6}+`ZJ#f7_nfO{Hp|wGtJTkPQI%uV08It`Xv_&s>@o
zaU=o&u(ADTla~Piet@GfP!JFZ3<~}cxO>m8m}5U3joWkPT*#S}ki?YG6xfLq=i(DC
zAhT$hS#(rZ5gJ_-3d;yTe=+PLJQK|)kw{c3m6Ffpa5(#68BuAled#DrIuewgc^IB~
zJOlYN90@^Yfif`%utdmZ++iH)B$j}}U=I-rVitiA3t~yM6T|`(J`ah*r{XCkS&*X3
zrzp7zOf-a<1LaaKvf1od3JqLP0;VzJ3W{S3S;y%A!%iq-#TBu$>5P*cE}G55;&503
z(I-5aa=EC4T3ASAULml#B}^uZ&F1lV^hF7ULbY0r!SQo&Voa_$_Pia77v&Pfxp;YQ
zo}5UMk@H1Vnv7N~rx&XkES(SL6$P8C^sz89^>VqKC(vHu8u&uJNK!77m$7+9HqXrF
zRB`!6uApiGk&Q303q;itS*27~CzRS3kkpB!*JR2XiQ=lV)Gm=olq#J@qfx7M3Z+4-
z)#?|eP?>aPMy<}I)mioBRpk|x<rUQx2Aj!bs;sQ6T9n0Nv0APFXJ6y<sT>}M$E&tp
zud&zH*4El<8+_R8Ee+S29S(;WcThn-Eu^Lk@)05$LRO46a8O2Wj)IBPa7kr+vO$<v
zCZOtN43mPXSBve$SQ|H`MtaF6!8Ayb4pnZW4Bo8Dt`y;{GNMsdY*XgjR5ZJqZc;I;
zbpnf4T&H39R#2&YE2&%MuvTTpL4mkglhddnG--+T22Pzx-e}-ARY}@P;cc3n_6q7P
zWB!dQS*uOeYiIP@SzUHfcdhtto#<X2v+pYRzC+w$*L2pG-Kp32HYo2l8eFX=cavi9
zM(I$CZn&*{sKY$^SM^Az{qIiec(?tLvwpnK@wo5C{YCZn_q$xKfdRK?pnY=a&eU+%
z)Ns%Ai1XQ)>-qTL<m9B+>wWX)&9b6x6TaVAf`)*P1NM0aFZlYd=*S2t)}3;8>&HQx
z{3xHUZAe|dcJry`0JHaY|3r@}{Q3;}MfCT)_Y*xy4$^Dyvz_nbcd(p^gtw1dXmisW
zllEplY6tE9&Y6gx{b#JdZ74V#_im~K4ow&*(49%4B<%F`edNPt(#uEhb_Rrf;vM~y
zG*b<?j1oV*m}@iRzrj5b%_KOoIyyH5KP1h+{4gYUI5|5y^s8eAfT31TI|K8OI5+#;
zbCa<F^~=glTT*}b+rB-2vooo2{`uHbMwoLQk2ebTxYw?7efx(hob+z0pHcBIqGji@
zoD1=TZnx1a4g0kjGc(zT$EcFrtN8+{QIAN4r=)D><vn(Fr#aOld)?~-*9rwnqahiA
zNFEdKww!-&+Z7gz%y=pd2wa(Cw(tr?QfcBVZ%t=H!j|6%hs-@sCrijtSq2=;lnz@F
z@_J+3Jt$#r-eTAqk_G`n&E)AA3<lGCTTknF68LhS^h4*J+puZ!rBsg?lbP+W=F5-8
zL!q;nhzRh3)1F8PKPZ0i!GqSXCvJJ31P0_yc6CRw4lCACfN%G5yIID49HETE8-;v!
zlfE7~oc#KD1*JvM<V7J~Ep7Q?^^&h5f*`Lx0)UMVx)5Do?)M!T5DfxHR_{Mc{SUNN
B*c|`>

diff --git a/htdocs/theme/eldy/img/menus/members_over.png b/htdocs/theme/eldy/img/menus/members_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c77498c304af9150165b348fc08498d7aa3f11c
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!alBTT*k00K}+L_t(o!|hqoP3$lb91#DP4lotq4#=y3&_POo4z7eN!E|6MczGS<
zRe<RrRA7EKl7&b-Yv%+=St&nYuP5X2?l^Z5W5jQbOZ?*4!SCRA@ZS>#KznZREdU2#
zkjDe)3jsF(jsPYAuK@l6h?19kkr*TMG%-dWmt&MMY(5)f3~@dBTpo5YAM>GkfiZH?
zuH|85(*w9Cb!(G3enDQ1{EdlIt!!A<jmTk*)gjrPo@C$D$Y#nUpJaiCl*5?hKGsNw
zk<EeF+5q4Yz%7yQHj&T?z<Y6l-QaK;a)&<4XU;!l#x^y~=MGnpLwHbdc1Py_Cw-u}
zNikd7RCL#+hV(8{tZq`>%C=e=qlu6-ziFWe*c>j_9(VxH3;&zhc~P+Kleve5A~9`c
z4=hp6EXn#@T61;YZDkJz0#HW)n&n`&um=qAmR!gZFY1+@+tq@1ibYxlo95j1K)Zlf
zHYkReQz`hPf_0-Pl^XV^Qt&~+x+}B?%x-mB@J#9RNwd+0QJfQ}ZBiZ4Y+Q2r(8gop
zZQe3tJ8hF16j}@g%!g$DNl}U^=I_WBZvk8vFn^s~8yzv;vaZr9{7GNoDCfB&;am+1
zzESx6ZX-K9XeXC`G5asB&lE}~y%Hi}e-rRQ0IuDhSb4GRuQC7p)wx&$Zvi|k`1El@
z@N2vK1mH%_M)*A7ia3;B&Oj?*?N^C5h!MaamHrjq7fZfjGB&}Ku3rm2wGvM8`NQWf
z8q9NXhF=3)c}!B9N2yLjNl9FabAaD}*4e@T<oEzRaYKT&*E`Mt0000<MNUMnLSTZ;
C;y5<|

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/money.png b/htdocs/theme/eldy/img/menus/money.png
index 50166e0f74b71cc183956f4c0bd6d31a090f9614..503e5c67519060721c3ab0f5bc146292530e9f7b 100644
GIT binary patch
delta 1255
zcmV<D1Q`3*4eJRZiBL{Q4GJ0x0000DNk~Le0000l0000h2nGNE0O+>Sx{)Cke*gdg
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V7E2AOy!rxG?|#1Zzn|
zK~z}7?U`Fl9aR*Dzp522wFs2b0)<jAwbmAFm8!MTHi|}V^uflYMtv|L@x>UUZ$9{7
zqEQnyK6r^fc!^2%$(SaMAO-K%e_k}T7ZKZv(n2XHSZJXp`0`CM8Rr~^!^x=_R<g49
z8D{_cpEYa$d(CFn`1m-})y`uY+YI>`@-yUT$j^}ff0Mr;gE95MrS{wY%jA~;cj<LN
zL5ll613uD^=8F8R6tzti@H}v52AJ;wPXL4Gg8WKg8!&GQxI@4VKv%BGfA0Y*vVgrE
zcp#VL7Xx2s5x*jr3-&jlAGjn7*v+}t`EuYnU~G!s54@Rc^4-8G;C^6VhQz;eeA&5B
zn>L^c=m6FLn`{@Q!8s1>20pgkq&MZ7{2RcPzz4uqi3PSg2BX8bg%9`;aJ%DQO2A=t
z3apHF*bjm8fxGoDfxSRye+uw=pcc3aSm(9xfYuo7g}`mzTbG8{56-zA=$TC9UjrTo
zt~Yl}C-EkGfp?w!Vc;pRm%8h&%22glje8?;<hKGROrL$gQs7$Kxj;3L4-5lG1U(FV
zW4jV~(y>oF?it5qYQw-I1}81~Ex<kY_X9hCAAO)ymJh52HUKMte-ZP27w|ezl7;oT
z6L@x_oG$|&b8Ei>xXkM(Ll5w)#T&o^V18))_rTjO+Fe$nV_6_ypJc(V0{#YGkkoo$
zIZzoY)@mbTI)Q`0=SKZeTYx`-IawgTCrQq40X71sRhkx~9@IWzA|sX*_@FndI2QwN
zSto4(?wca<)4(gLe_dMgceuT8mIS~6@Oy}8w3w>^ib4~;0~9Nl8=Z7>C<P~DKP%rA
zibC47xdnJ%#c0sWfy?z&b_8fwWg1*Btw5u7{fnksgKbe7tN~MTr)>jpbrSMjs?BmW
zw%zMBz(tXo<q!Rs5w8IrR34i{^-_~%!zTuY5N6bV3H1wse|s%YzDSbu_1;|V?;fLi
z7&v3OaK^t?`#?+WFZB9e;DC#`-mj|QZwJLY9>GGaMS8UX494sR4owvKTa~&}C$91p
zuSuAn?Gn1tN!MB)F9U8e+BFIDz0X3iSG)<y|E1!z_z(p?K!I`@R}!31`v;ZQYeLG9
zui7*NFB_Cfe=+ln_5#Na0;6Jf*jCD?D{0!S6L`o46DZAS4Ea1KuW@(HGh(gg`+E0|
zJaP7mHIyde^Hi}Fs>~?xX*BYwq_V|H<J6@))Gq-p4E-K+hdrc1w21euc;%6M`(p5;
znB6YcI`Pt`O^Nc>=3&wj6{c7(iTM!eS8<LS;l@x&e^6r0zRhprWiH6#G&N7Kn12$d
zF|Ndji+ru>FlL?|P<JP?BDK9Xbo9{^!Ryomyt#T{r$VJ~kz;Fp6aT91Q=OPCR$YQJ
z_N;n7U_Y?gPEu$;C|}#XKa6)><euSZi5t@P!qD8qmKnWCkNd)Bm1PM(rjLbEC(dS@
z^Hm8;J>)(WtUD60#N@+PAb~mhh<-N1bIJMQg%58B#XC8bgVt$b)B2wa{{TcvYAUe-
R_K^Sp002ovPDHLkV1j>TN4@|6

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

diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a501e762d0d460c396ba28c1631f9ae38b12165
GIT binary patch
literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!n`N7)?!00S&ZL_t(o!|hqUj?+L8{(`7zE)8`o(Zlip=#~~ygo@${jD#p5qC{7O
z8X<)zz`TKZ0`^KOj6{EXZ{RDS9hz^Y(Q52CIVW%^Bdy}wpSj7*H}j1*6A{66l^eLm
zaxng2{K5Ex@dxAoZ{u%namE3d@;Us=#uotQ91g%y$G$TFHAmc=^&(=8LPToWPAU<Z
zcIX{-OpM0N5e`RJ@X00h#C<1heMQ5;^Q&E>Cii>+;CxK|`}BNd$j6W``>yi^fVU&)
zy#(-K-^ND(zX3c1@MBAzX8=5aJAb28wj$#A>{<Han(`RA&+}X<B4O91(juv!0KNnG
z$cj;_HE-;10JI8r6@X_vKSX?ouB|+OA|j3QYAqrQdetHy&vi{|K|~&Okl&K)eG<5@
z=<~ca+0e*x09-8il!~FX(P3=H?!tVd@ayP>ng+B~+Vbz3>pD+bWxP{oww2b3f@S<^
z7QS*__*A5V`e%>07G)f%hx9fzfF+alSj}IkUZr90l9F_mmC9ED-Z0r^XN+xlF@4J^
zL%zxq*pi0(9HZ2zQrYgx^Oo`NRp?h4WE?S_hRc$2rHnn{{L2vxZ>{QOb(OyWJm>Rk
zHfoV@nzJsaF;_1j=iCnfPXOHJ^DO}P38!%xy8|{QVY3(j84VqMPQ%9Ug0U@z{RZF@
zy}DF=x#zp9%X*=xn9(y5#{k|b#{LT6Gxe=w?2t8z-HhGAu)#>ixxuoY^LbKNoZpnO
zryY!4i^$`lB;~TYJye29<a$KLc2>2qVAC>m3x>7GKCQ;A;h9KiEC`<z`lPQQ?7V{E
z6u>>jBQ5pS{Pa8@hQQ{9DtA#qX4=E9J}Z-rDs87~ekfxX24g=R0-HooRSz^m*5~MY
zycCfc&nJD(fMA>H>e3lR<gU`U7W0AMK4G=$DVYt|Q<=0Fc1*_ZHNI4ysWKMr8!n5M
zH}tIxR@RK2v$=+%AJUkCHGZWUu1l4e`b{U*eSH;p!ShX~ugdnsj=RpJZ>IK^LlZWS
zLcKxbRBq5V4=KB4-__w{gWqA(?Qp>nv(mPySd87MQoZqw+2O~9eaRn}6|ZO5h}_r!
O0000<MNUMnLSTZf+QAV3

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/pointofsale.png b/htdocs/theme/eldy/img/menus/pointofsale.png
index 748ec41b1e6cca25544619fd89ca110f11c022a2..6bb68041d19064950fbee0a2c11116f7b4a12578 100644
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!yv_{59=00Ev!L_t(o!|j;8O2j}Eg};>uim)oI7NV<YBX)v~2)=<2uwWw=K7?rH
z1NaWUfZ#K1VdD=Lc7lrvg4$@a`PtY^AS|0@Gk2KTz#IsK1nzvCoVnadElpFZstGDA
z5AWeUyodMj9^S)y_&x;&YRmzbz?!hmwW>3+Y6hmtbKuO7nLEIvP3IFJGz4F_9h(^F
z0&U<xv&Idu2c)()Y@*;JL5)b&=(&Io4Zw#k;A4Z%r>>ljg$9JKV$&6NoKPq8Cc8}o
zIM%Gu(1}f8(D`}bP*BH-^LMJh&j{<h01vjugS=YmDx*{2$<<&sC_-h_(_L(k^ZUSw
zg9-N;xR5%(tKpsrtpiP<BY}?`!2?W5oev$ti(6$h2JlM-<MoFcp9|q*gNKW<%DTr<
zL4=lpH{gDpW77dvf!DtGpBeZl&bKW9H-VKt=QD;YN#<?9C%~e*-&A>@9_8x?Lryie
zls~|4<evXYyUn%*_=Vhhx4@6O|CPdTS#m#H?@Mh;?LPkw%sS{aQ5o=IBXJ#=v<&}k
gVydi+D*c!EAIs5%m<CgzI{*Lx07*qoM6N<$f;!3V9smFU

literal 1460
zcmV;l1xxygP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)0000hbVXQnLvm$d
zbZKvHAXI5>WdKcSATcx`O<`#uGB7YRATl#LG&wpjH6SZ6F)%PdC>K`%000McNliru
z+5`g*6c<0I<6i&(010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00RI}
zOjJbx001W^CptPh4kS|zCtDRLO%pC&1SW0;C~FKVW(g~804aSEGinh(e=9OVFFH>#
zKwB<NdpJsGMn*<hSXf3|d0Jp~WMpJ(Yin_BYjSdOes^?xd3Jn!d;l4U02z`2D2D(i
znFlb43^9xkJB0-|lmI%WAwGx<K#m1OnGR5y6iI^wM5O>ovj<eD1X;HeN~aNCs1jMT
z3u3q*XQmous2XRxA91}UQJN@FqBUlWC2FE8Y^)+}w>omG09wQZWyuO{&;@YR4RX~P
zYQh|H$P#qZ6?fPadDR<s(;Ily8GhI(Y{4aU%Orf$F?-HHaGh9blu~w@U3Zp1Y_dmj
zrAK$RKz+ANe7aqDryYXWB!k)|irg%L&@6=8JcG?Jh1M{J+cS#TIEU0aiPJia+dYrq
zIhN)wt@i-`|5k^)dWVl?hpu3YtZ0R;d6K4goVs|FvQ3Q2M~~P=lifp^-c*UsUzfpI
zo!d&7;#QsGSD@cSq32AY<4B|GK&bmurR7tl=vS%bRH^J-qv~3z=Uc1kV4~M~r_W=d
z;bo`lWUJ$0t?O&0;Ap7lY^>~TukdBD?Q65`WwP*WwDNDc^>w!Cb-3<(vEqEU=yA31
zbhz?xx%qm#^L@VggMD~}fqaRAeuIO9jD~`Wh=hxaijI(wjF+E~jft0(j+v8>larH{
znVy=JlAfEDoSU10nX!VQzl))?mZ7ParLvi+xuBk%qoJRpqob*(q^qc<tgEZ2s<N)N
zzp<*Nv#qMSvaPeTw7a;qySuxYufv<O%$vE^gSh2^zV)KE%f7zBgTU{F!S{l~`-#K(
zj>!I<z~h|8?VZW(md5gz%J!4W`<u%0n#}#5()qW;)~e3&uF>tH()_L5{kqfYw%`A{
z-1)rY|G~Sq!oIx2z`Vo5!^y?N%*n#b%gfKw+0)L+)6>)3*wNeD+sfML$K3PR-sRTf
z>)7Y=<K5Te;N9ir<l^V)>*nO^=;rI|>g4S7=<@vW?dtaO?)&@t0000Ny^=@(0004W
zQchC<K<3zH0005=Nkl<Zc-p1XO=#0l00;2UlOJrC29lLVs5%iG2+pD6L<h2)2gQpB
zq8_R!9tFh@?B;f=vSkyrvmhlc$`}C;O`cDX*Bl&yO~j8WR!}kZL5ZODu{_9om{b=R
zR1p00Za@C-TM+&!5CTKjXQoTPlfxNjloCoAqb{x~aZHF(8Mz+ioKvL7u)&pds!Nt6
zQLMPSUX3@Y6oQycCJ?Sxjo8W-DW#-jkVK;47>2pL>98-};-ZVOi*<rb(@Zbl&ZN41
za-#L-GbLUNnkEn<!<--PeU}@!srDYC)C3Ozh^%RG?sGoa|9oVF%>ej#>Jbo5ocvjA
z)$@#paf1OH2X|$&V+-}`$3m>}iP5oQj?O;|9742X)9yV3N3vJ9w2#4u_stc~KAy^X
zoFjxDu3p!@IpCf)`ab)5E^}l2=r`^ns|1zGy)|n$c4yk}L77LW@4w#9f}$pZQde{b
zVB!4U4(*dq2=NH2K}pl3)Djvm>eqTQEAIG|5ZAISP*#)(t54=<i*KK<U$wFmhG>}(
z$xEou%@(H$YW~&xmphxbZ3i63f~w|6a<|%O+m0MfYtP)jt&ZnMhpt@M+H`_gQSZmH
zmC!C7?`t{@T#o&MFw=KWU%oha0AnL9{2`ihX4?mhW#KQ8Q@?idfB6pK1szzSWk^{7
O0000<MNUMnLSTYC3e`gZ

diff --git a/htdocs/theme/eldy/img/menus/pointofsale_over.png b/htdocs/theme/eldy/img/menus/pointofsale_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..4abe721969427e9f5f4e22dc7ac814f9cbc151dc
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbLxWm6KT>vyi!_&nvB;xSf
znFn(Z8Hlv)S71A_wY{rn0x!p86XhwKk8%#M88}_#oaOxfB}44OpmQ>3j(RW(Y92f0
zcj~vQ_s$<bFJI2z|J>qYlySK3jEyXD4_IMn{gy8R%B*D$&m^87J|d~VcI)eaTl0%%
zZ(W`?+hp2vX@#A|CPlY6_8jn@D7BU+fUkJ*q4f<}dE0(6S@9Rv`K)>HVWp<oSJ}_z
zX?g!bq|J7I+`XRVn_z_0f`YR(lA05<qhEW3|CH~V;{TL+`zo=D`Bs0_KUi(hk9uH`
z`Xl}U>yLdCe;&SZ<~pMT_vDM+%6B%1>dgyhd=SdN&*Z>O8S^*M?|;AGTF-Rz*_yQ<
zO%Kf1t`W8Pyw*2;r^E}P<Q1D^ttBhk&*pk>U4BhU{zDOC{T9D#SI@HE%L`is3`Pb|
LS3j3^P6<r_qa?24

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/products.png b/htdocs/theme/eldy/img/menus/products.png
index 1831440b1d3bc99a90fbebd27a2554f47c35c612..a5ecf2ceb78bdb30ca662aa15f9afb81983003d7 100644
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U!=1oKY_T00DkUL_t(o!|j-{PQx$|hQFdp3~amtREUL{r4l>511!7%5(5jcF);8X
zs7o1`c>-WSVyKwdkSGgn+{7#%Jfy^&V`^7E$&z)E&tHFCE_dx{tx45ZNZ2xbhR^UB
zKEpR!w}lvcz@_l)5%4CyS!?aP23qS<xGsF|ZbSJspa4#RC(C~g>@=J$7o9dUKmm`y
zgXRA){^;Qgpqk^48eSPlJ;$F!+MEMp%fIE2HdQQXvr+RbnY58uG%swj@G2{xnDPs+
zHlHage+#S%&))l7+{ypjL^_OY182h61G517z_BpS74RZ~?|Hn8o7R5UBTi2WUzsv^
z2MjI$0kHpvN>Z9QH^8gqKQVBka@utOC~8Vt>7b;l>3^y=+vbq)vzo84ZgXH+dgYa=
z7X4q~T$ES9VZ)CMqP(={3EI4cgjb;l7S~egdubV>^IU4>eH5F8p0-@zr!6Tz{cre*
zhhpE>ehjP&<4mORBagQE-P%6`U&1(}JdDI<KPUi19urVPKmY&$07*qoM6N<$f}P;i
AUH||9

literal 1519
zcmV<L1rYj)P)<h;3K|Lk000e1NJLTq001cf000~a1^@s6{MVM~00004XF*Lt006O%
z3;baP000H1Nkl<ZSi{Yj2~5*x7{+P2gy9s)WMk~GW*(V3C(LWvOg1xwF_VelHc{uv
zfWaJU)Om0yf`E7o7%Fm1l%uU|<tUdR6v|O3y#xw{w%nJKs9c%h+5g|Jod_mO0r`?Q
zJ(K?OywCf5-&Y--30ejQCN!Ptx+pqS{T<uAt}12X;h=z+;-yR1IqT?94W|vDp5BZ(
zJ|`pd9`=aQ+K`S8Wd?fMDv+68(B<Ulde+#;bpA^PG%=aGAU-Zt+ILS3vf7(c(WwkZ
zyF3`JiX`-Qi6E;LJwE<R7@J00v5`Wd=uRo1rR9>(3iFHaX#mOUYT>FNHPzY>gWgV&
z>N8U5<OH_Tc7yYAeSM?XCmqn*%4TnkSUB_~pbD~8fDT2_2++31Sp3z&*M6s`U4-kg
zj3L6aGsfff|Ltv}T~von`_6T?h=-pBR73JdL8=sOJcm~KRVeBhL~#*z!LOV6aU)|R
zvsGquXuB;emIW?c^!besmVd>zT4A5N^ZO8yhkKkjJd8W&>2X~+Za^wk&*Y$2D2r^{
zSb$`8H06x~B>mYYk4IN?5%P13aOmJAI68U!ZDafMkmI-KvD+;LK4-Xyh^j_>q73xp
zYH&E6@byWPJ8bd_HJ`ia<8ec7+v<8lUN3wm;Dc@v0TZPKQ_8L(D<cWvk?A<*lY*@~
zW8kzS9-fD@aXO?N*W#o|%j`gf;1L=d`_bGyfV9+x-fy;?NT$(NJB-H;qt=Cxph`|&
z0`hZmK(u=VAn7@&C<%<DF!%>t#y<C0I5}UzwmnRE9m_+|MLyyZ8jzje1EHi3il#vo
z6o=FO*vC7y%+A*3l$qK5PY65dztFI-m{C1ltqh3yNyyH)1wlnQ{$Lj1lz$3#?Tf<Z
zt<l)!#=;TrLR^RtAd#s+e&KyoOZ(B(G6<z|0KD>E<Yo!svNxDLZ{8{g!a}AKx1&&W
zXA*G3JT4uVuiU`?1JT&BJq9kG={V_6`bh#Ns~JTl4^UUHZk=2{fU>gt$Yj?ejU@m*
z;WvmY)jpl~?gIM>3>)f<S+m};UH0LoXt(`|aQ9;4R8SeN#?~M;qaD1ehiFg?sGwxB
zeiRpXBR#DSIXPl*IYJOIrLsdQClPfL_0*HoZ)`Mc$qTARp}zf=mHihsZp^)I%!h%Y
z6^OklLuPId1foZf{|hCR_95?fGXW()dTKsyF|tu#GkTzE#ighbp4CQ^pgeGx?96k)
z>FOGqty#VKkiTC>L&2R6uviL6YSn%sp#;PfW@gqQi_OFBoZBcVOu=2kpAEHiBA^*W
z4l=>xveBjxX#sn?B;c1u5<AaXZ6u{6d-puIf_8R4+~siYsp3FL07XV{2fa_Sc#fNo
zg#YN~moKbj5>w2;{VwK+YF9EL71Pn#L|45Q^HU(HDpf)9%hE=LyT7kT@pD6(n=ky%
z+Ipksn-<G9=<B~id-5>wlgEL?C&5VNnq&+uH2Fv>ssU|jWT5Cy8WBt9MgTU}1PxnS
z($-JPUL715Q1Y~bBq+JfkxFXbBO^-lT)_K%)b6uq*Y=x}cA$v(HB|aEq^3yKl=bvc
zRuJ%_|2t&JgOHbXy4TRa_>D<}G&G!PdGzqHOj5nEKvk+r8QONMAj>1QkhQ`<to&$=
z$CR8Qt*zF%a0_le(D-mHRW<FeDhpQulKFV_uxrJX9(aw7XVd(Ad<#fFlCd+Es%prK
zsy1i*>G#;w)O_XCU%ZIGU%Pg_R|YG(Un-%GsVcuDgbZ%j+kF}FQtvpg&U|gL&k5hM
zs`8`}Q{LG`1bcA+A}$^5(ACwS{qnD~6pG%uPwkFpr^gP}SF2SORVJeNjz1Q>_rCMA
zx_g_>wpbqEe?};&N+$ex9qz6>^QP(F1XP0!Hea8KyLP_M#AME5o$0&?A5M5^{{!y8
VO~+Xfi$4GW002ovPDHLkV1l;z?#ciF

diff --git a/htdocs/theme/eldy/img/menus/products_over.png b/htdocs/theme/eldy/img/menus/products_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a5d9a7951fffbc4b473c79c447a2a8ecd00fb37
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL1XoRoxdjw@=IP=X5^?zL
zjJv$e20ShOtC&lKt(fjE(JpCf<CRcU-r#tfSE5ny#(~;}lctJ?Sg-IbRge7RvC&>>
za)F6bQ&g$LQ6-y)oc<Mu@?XtRbZ1wPI3CA%=GiHwN4<e>xaQrmO#8P*E}ucIw4UL@
zw0maqz6|qTRXyZBeKjrG`I6T2Sr4MO@dCB~h<!Lc{^0WnE%vXqpVuy0UU2xoS?i&4
zh9eS+hO*ae=Ca>=yuqZV&t}=Smy9M_Rmvw+Pkv51FTC%9@2h=n;r!=7PWbV^`MU(K
vZP~rUZ*tatzL;p@Rw^gMFOccxby@n*`5Pxp#TQHj`k2Af)z4*}Q$iB}abJjV

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png
index 882235d2cd3497a1488ddea08af1dfc2b4eeef73..ae4d177c6cdb769943524b09e643971c1382a7e9 100644
GIT binary patch
literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbLL~i|C5ehWL(bL5-B;xSf
z8HV160|buOUlns?pZZEiqmT8VYk{E5UypO|>Ub7z-u>W_#-k-A;#-`jJ6&FK{%K3Q
z#!ha}x2wOmPpB^Vf4u+kq;gN~7Kc?)iiwtc4qNXzeBS-7)c0L%eIk|V-5mFs{esv2
z5t*@sXMW{V*?Y@$Qh(g3{<nXNul7^@m1WJ<@(j{K_J2+POf7t0n-Kdbeew5Ac|V+Y
z?q@FV`lFi=`pEt1fo-=#p5`n4sCNA)wL!fwe&YYM*7#HG-&kH~{n;LPM>KwBT*LK@
z+Jzr@8rgOKY}})(^WpY^ou5?t9-7W;WZicv(=xcKD?ht8Ju7pz*5;o+FE#5dW@fi<
z53|#-{b{2$Kj(G|@1gLOHEE6Ojb^vARoi{v7P(~G&s>`uELL5<_KS8X?=$Ls`s-5P
orcaBP&dU9xzY*j~>zb8zjLrfDE33{4+y(`{r>mdKI;Vst06z-BXaE2J

literal 1075
zcmXxjTTEMZ9Ki8IK!LGkic3t)j59#y!$cAvlo;cx5ZgqM;9iU-!?>^q6SHh2GfJds
zfn^dc^lD)jXt|Zr_Oz#`J=fl$m-SA|>FK?t>$adoUwm;<|2?>GKL7JS|KG#ONlwn~
zk>QU|op|L01VN_+{DD!hpKYwRW^f(cduttRtrLQw!Paa`b4PpEBP;$Y7`0#He|`gk
zIyxJxDOvdODHyg~<qh#5$Smo2`qgs~)C`S$a%r%)w|8o4YHn_BdU{$Sk<84@%+Ai<
z;yS(o6QxqAR;!nnm&IbSRCq-y90yk9H&^CwY8JlJNGCNip++Ins%Nx|x3r75wM%na
z^&GYN3#pTkTML9v4$yiTwJo=EVHk$vI6)93Nm3L=)3k%j<#M^*ZjZ;~^?H3i-!7Nm
z?+<d__<n8Tht-u;QoD|CY?}0XgVAV&Vc2XoBM7pg!?z6>Y{n2PZnF_~jKp!8ARGpB
z#DqjFXw+hhBld(9OJZbFF+ot2gQ8qGwMRHov@`AWFm4~~-DP(Ix!qviA1VaHg;2N{
zj+UeGax76vrmD$QEwx{R^{eLXH2^VeSd5#rLE$hc0jE*rG^zoYY0(WYxy*MwmOEa{
zT`zLK!MXzYP|dL&n|2plwV1Y0Sck%T)MBt9MjHZSRv1Gqq#YqKl)`NQP1ybT+AhBC
z$2S7_`v1ty0JQ~#j?vo>9EPxCJM1uqoefbp9Ccfw9!uP3jrq{zjxFiO_Wbr#080gk
zRESE4XeLZE5hojSvoSA_i+gj4oqWRQl`$R#vm;}C@=QR+HYnJjjEyMRh^is3%*KDs
zCKb7)DwpOk>Re_q59F2#xw{R8d&T0t0*a#G(}lPmaD}-dkqFqMT(M`x<M9O7-m}tN
z48vqHnZlmGm<klrApjg%md$eI^Z5c-u~;mXO6797QmIs{)q{hBTCG;E*Y`7ZHuor-
zf1E2kDU=RN<->C2w@UT*YVD}@@MwA=Ee8Ka)5PfTXVArZW*i)Jf&t#8H)3CpE%&#H
zptI8RlGpmNmsPbtyITJ`^7OQ)?BBfCE11uZe<?kO|IE9BDLY-E&`(1rUn=hlBW+3H
z3upTJ{`d%L7WbTidhWmfg?-X}a=yl#HXU7V75ww>-*5N4{``e@>0y&VR15RKLmpq7
z?;iPf{L>fto!wX4q%BW6PD29GL-|GNx&AljyZM)e@9;Y>oNtx31a+cr_w_Nsq;c&7
Z2<q~Us+{lkT?a1>2?mD;j317P{sXa)mS+F}

diff --git a/htdocs/theme/eldy/img/menus/project_over.png b/htdocs/theme/eldy/img/menus/project_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6c28b6d7ee28267dd5792dd34045956a5d8e92b
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL#7sV%tON?Z@N{tui8%ar
z`dQv42Z2_59`XEX39L@+N$S%QIBzhjMx2V<o5?=Kf&F!=uNlju32W>hRC6YJJoDZ6
zhVSOhGu7u~wk91D+Vg-_|HpX^|A^I$Ue0k}yFaLI2*1q{_n}FA&x2si*`Iy2>XY9J
z-DtT{D_!@>=MsZ!2fy%Mz0%t@!qyM+PTXgFEfCN9({)R5<g2On?d9AtYJM}P#ac7n
z-v2*w?dkyck7hq~{=RX`>dCCwzW2Lx|7WwK^G>~3S#8&SM_{>M#6fPLP4Q-bZg5t2
xwW+MmJN9zp+uCTGyN}YOzk*y=ad7_?=9+hBE5&799f5vk@O1TaS?83{1OO9*jYR+e

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/shop.png b/htdocs/theme/eldy/img/menus/shop.png
new file mode 100644
index 0000000000000000000000000000000000000000..fab7db59040300ef6fbcbd91ced1831ac17c4df1
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#NqPt@oD00JjTL_t(o!|j+qXcR#dhrg(YMUL~(O3WES4E{k8L$I_6DHMxXTE)sz
zw9&#sYnv2yVqq^>*_~ixAdOKYDx!koAy|lsB;cLrJ)7Uc5xmXpFcUX84<2(f^V`RF
zZ|A*TcF4@wthR+sYzaQWC-?-P;1hg;FBAMt;3Hu2C9Tyr5`L)Qi&-6L0>=jIF9K8g
zGo^!{1CI91e`u`rt-S=!0Lx`MHdlc$pbablr-2dq5#X`*#-xpJX6E8GGkarZEi;?V
z(alQJGP8zbY;SkX{1i|DJ^(jzbXS09z)#>@j;;orlpl(n`P*jp%FL!6v=h=k7_dKW
zX7kcy-ZZm=MKkYOuup*%;FM!d9s;|8@ipt?z#aWw0luh4viU{eZODSHst}t6Zs;Rj
zb7IZ<ao`(pONlrSoCW4}EH8y>l^1}SKz-o_a9J_m15f^<xeM%9-8^>*x-DmKuL>`O
zRW#lQRtIRV1NVT*5b)b|>qFQcjjK7DuX=toT!ZGpw*zKAvteK~XTPOdIIQ_=U-(}E
zGoM)lxVDa_-KUxHh2IxA^Sg9xg2i0#*o3s5z`KHR59peI4&U>L+bc`vHw=C>LZ`{z
z`Ips(qrvwgWWK8LbAety0(|m;51sk0#!i9QU7yTXB4obn@%-?DuSbC2q4B%gri*R$
zf$v6u&upnc?5Zz(=riB(h~4plH{f@qK3^nuFXVTdQd#=Yn&AI8_&;Knr+6#HVN?JB
N002ovPDHLkV1jidGt>Y8

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/shop_over.png b/htdocs/theme/eldy/img/menus/shop_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..bda5823f8c36729b82f6d310cb6c7e1991821c95
GIT binary patch
literal 502
zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N
zK=9LfcRi5eEbxddW?<kJ24O~qS#u<Sg6t)pzOL-|c*GbL6n=ZfJOG+f=IP=X5^?zL
z%!|1#20U%`0r&Nl3xp>KUgF*5nBSUrfJ647TSD_CPA~Hl93@QO7rOaQWMF5NQi<;J
zWB;!@zql;t9hcIf$hAj0eIJU(K~Zs2K0^h=k>m&2&pdu8Z89`wuwwXn=C40P-`taY
z`{p;)e|-JaUPeRNc_|-*{Lk424C@%~{fs+%>u+y|%3*<v4)$g77w*2iuJ!QF?Dmj~
zWQFs6I+@ki%(Q1ethllFVKmz=&Mkdg{~mJV`Evb_nEDc@N32V$&d;A&oHJ+r{5}0e
z3q<7l87{ajxwN8m^6NhT72@-*vz@GC{4h%^QQ9j#*5LVNuXQ^_5-+Q@yl-}y8@*m=
zPTHdlo{_JP|Jo3;!=}A|s^71I0{zsm2R04Q6~cGTd7#^1-k5hqB)WR`75k;JmCx;y
zs@BK+`q?GDTcY@vL6KU;_TU>W=NXpY`l(g1;NlE@{uS%m58sx(w#iYncjbx5mfo8T
o`CsRpzsU91Jm8_|Kbvp7A39FBd9tU?21W{lr>mdKI;Vst04SH#jQ{`u

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menus/tools.png b/htdocs/theme/eldy/img/menus/tools.png
index ed5d0326c4324bcbafb60fb6e1fec2653fcab28c..de7f2b7b22164a355844cc2f6c6b738d1e88e4ba 100644
GIT binary patch
literal 1052
zcmV+%1mpXOP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#SnLAAsH00W#!L_t(o!|mBwXq{CM2k>8tu}R#bm1?B1iYq9R7eNXZL0bhE>YE!_
zX%$gis4t4z7eNK9_#i5%wD_hz6hssaic76l5EB$ptV`WWX;Pz6X>N?imkAuc-tCL`
zW`PV0_xt9|%=bUb%$aj;M@q>;r6m?HErMSJzX*O2{QLxe3f5y_K7c>0gzl5LD|;Wt
zMHp*fH-O%F9>Y+}(5IA|<#p*$8cHek7W8^kN_VG}-c8kMETy!qid|{$C|Mq?$JT<Z
zI0FM%R~Y#LtZZP{){&p)!IaX$0$<gH-Rdf~`%+3<W;zS?0`}w@@<~(*d`=VN^gh;L
zTV~gdTkr+WYgM+n2A{@nQGPxq3Oromo3~<j!G0;W<J?w&UlUHZU}MNO#(NR?2wpEa
zXrEQ_vlLIXB2{*WL%1(kCd=uylE9C~2{nA37U}q7{DPnBIjWUyZVzsTe#IwvJGc>T
z$5~DKeg`jx|E9qog%@yU$x+>mSL?Jtgezx|6bH(z`EhKBEHF`pM{CIM#}#!twzi<Z
z2N&Xj8vZ6QSa#V=(~-Cnr=t%a;Fajy%XRD?!5i88O~E<+6~4d8QfW2Xkm;1FZT`f=
zHQIiPz^g|0;17I=OL2YV^&I#neA~d^W3_<)-;(%29H=qXUqu0SNsMl>{m}w&F_XE@
zR=hcrY||{A8bR2T$$p5AEw9oBPem4~M$>uzCG2YS@s1YU+pLUW?7`o-H=Z|F0sbuB
zYgI+u(S}Q>9y}f!T~0gj{9GMI>QR5>?`|xMSju<MkD?$m-@vcH9fgt3Gt2G(z5+Mn
zxklUmY%QCUa2vYnln&3t^CldNgLpdH=Ir*M3pa$1N(~-Hii-4zkS&S#zPSS56-UDE
zI@|gLrf?#TE66)=W3<gW`0L_EV4?wkhkt9d!L@aE>9z#yWdXd>K<`WZ81?&j95xP#
zxhNgPj=K~4+ZC`E<LoB%zAv1vj>pwFyn$UM>iv;cgYU!TP3Rqn(^YY1mW6%ZfxTJb
zbwRZ4saFQiblEJgadgY+H@sD2NsUIQ)}k|HgPHCWR+S0jGT{Gd0Ddy6z{v))@_Ag9
z>@Re3yote?G5CErqYm&L4S?q$D>x?j_pCy#L~+-0@FP*~_E!PEGY%ik(B9Z(JFz;J
zQ%~#}Q?cgTRvz?c9hk(|C4lGGAFHyppP#0N+6lf@)EU9qlg;etT-WonMhp6Ho&Nxd
WZ(6pU8BH(%0000<MNUMnLSTX^^zvo^

literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00004XF*Lt006O%
z3;baP000FuNkl<ZNXNyM2~3k`7{{SyP}<Tmb;2?g9Z@ET8_)p-3REsZ%OMB_3YJR_
zK?!mcMNuFe1;k@G7%I~!G8`UMXgS7J9p?__+%!550+UIcTjpj4<a_qMrFB@D1G8jr
z^5pya9R1~ezW4dR8XEuOvP4Ev^XVb8Ll(|t>ZjA`^lj*!i;Ow1f2PrB_~BP`_RLRw
ze$YAezGg-^WYHUotE{YT+C6#RPd4#`L9{z-QWz1@hhpnJJUr*jdELj?`$|vmRru!G
z5S%>u@hFu_O+<dWDuF~IY2%%~V`?T@&+~y)Q6?0Xl>Ul*{J8+g%BNXaSm*!-4SdlL
z0|R{!6%{E%{?%&vi`H6LwmG`GLrQuEh)YU;LB4>O0sL33T3JRWlXX>~@GXK~1!%CJ
zkjk2VM?RK%5krr$le5khu%%>(pio@=7`J;i07up=d(__121d(`4yr(GJKM^0^|jF3
z*F%(+mfXUvRIAgp=Wy!0eEnc8%NjT?ZVFIte*QR$IjTbz<>chZ@7=o#ZJ)KkvSmw4
z4Gj%5v$M1AHe9|0b)VKks34>s!O3cMZ^k9WN|V#l0Dl{EB`9szZV2KBcc3^`9mMYF
zX#e^4?OTNWN*7%HTn_Rp-O$`3g~lcc`1tTHp&Y}R06}=DWbEN643FF+(lRr_eFG27
zt=`8VA~S36B+7|IW<{gXHJ?>2Sg>H{{o(t7LEm1#Mtu3zAau*SFo=*fHv!L^*ND=V
zVwegr`e1~(eq#u@>zu1Syu3PX*lZcc#dXpVw=P{YC5(!Gq@1m1i!Kxj8!lWt|773(
z?7Mt^V6#9FBJY-WLQAWRXl-kTjT<+}1A{iVVZe_{fECN~2uYKK2aJL`N_}g|l4EQq
zE;zfdC*qQ}6UgtS-Zo?9v@cZ7gK=1x;Ogl!ryxBwnaJ9+3&zF~U~Gi=?xqqzBF*eQ
z&6;i3zxrJZg6r-vMc32Yt3#n^&t-o6?R^ve@XwaQC#?g3cY$|cYP!0XOeU#Ij|P=S
zOSH9jxW&}h-=j;VYRv^;W#gARlzgNMVv8EVJmd(RsBebwEny&x*z!G!+q?jwDmKQ{
z($XT$1z^h#+<hbYgD!|JybSiym0%hm20K9!Y)^`Zv$Zvlo4fB0%5!>E73MgE?*AbL
z0k#%4f<w$lU=|=ISRuvW?CJj}5>R{?;BsRFh>HtHQNG7~0WMDA1;eT3-HH}DZk+~L
z1&d)7%T0>n!h?qnJi>F-(kcZB8rVaJ%N`=X?_2?%+{ls#X-B64PO()O02V<-U~0$f
zL~$c!Uf_on<-Z{ifk6$Di%?N<6zf)S)rqQ?0(@Lz4vlA2bVHoD37q4m0q+GCz*?ux
zJt)3Xl{f)dFEt{ntB*ZZfi6id!0{7RPmn*##Kc5%Hb9_TT=`>BrCb5v#vfMz%mebl
z(k<+3tjg*ID^@Jm)YjHctf@IY@eI^(fjD`p`l*hNP7>0;=S~;Z+B>Ol$Kei$FP6f(
zglWJU|2$xMMdM>?@lRVfFfbr77<!`m`no9$Qb-WeySj6=lT3Z)j^~mobp51&jMEd`
zgkuB-nEB;`jdub*p0@w?5t&TpYl{sQ=Sd_NiGFm!aX1cT+jk@liZU~9;w$HGEzmb0
zQ>cs-=g0$-=KlG>-jqBtpYyM)tE*#Vw5+TH-APf=k>~RZ^6tdMM0LF&_f*D0GKox%
zFk!i#ML%6%VYX<-#&4Gv7Uqv_OH3G??c(}R7LpW_^4?+0^#27+0cn6~76-`y0000<
KMNUMnLSTZA)tP|+

diff --git a/htdocs/theme/eldy/img/menus/tools_over.png b/htdocs/theme/eldy/img/menus/tools_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..80f9a7f553a765bde7599d380459f301d726ef77
GIT binary patch
literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq001ul001ip1^@s6=(f?i00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8
z0U#baD?v*D00KfuL_t(o!|j>jQS2ZP$N%2=T{`eOcy!>Ea3!PzQ$k9xgNGfY1YQTR
zgV;f=VEwY0VURso5<H!EJHx0P<bDgg|15Y%MEI?Cz%RBN{0;sFe}n&-@J9e00Q(c*
z?-gTT06YhOzX3P_STgf00K>m80H)pOiKw)l>8njdWTJ6~h<YOOl(vP4Tw<QO-6_k1
z4#3~2FWvzQ;2f>I1@M@e*L3CAmRiws!Msyq?m|Q_wYzZ0Bxk9WB(Ud|ehvB_IFIHk
z5fHrUcx5`Fzh>pbHVe66HP4Yg7=wrQ+}B@7K<$=~!n3A5;3cI<nNxxrhLmjJ{5aOa
z4+{919ViW*N%8EF9Z|s><(H6<BXM(7XDaxd151SiPS`bbK?v5>SHrIkICf%vGg^*E
z%?=C&>LQt~h1bemN<O<nS)8?DxCP!`2%jkv4yoks6RLw&@R9>7xa3@yQKG3-xwgW`
z4lJAxHQ>#w$`UhNt2{*guUwU0<uH;f%mxNOeg}AMNvug+;!<NBH*1Tp?@riM@|r*j
zm%SV~Y>e$O5h9_DK`s9n)bM_fL;PU_xKAAIq<r`j_3h$7Exb<vN#i8j?m$JXIc1%H
z%;ZH_fZ3J_>lAgkCb6rIf*SBsA^0TR2BaMD{MPM)&&C$;!v=840V5pln@eSE9|f04
z6JHwwz`tnh+){1)M(`N&DN>rAf4;X;8@I!Ki-|(VM+cFiWqHu?7y24`%czgLc1f&x
oOP_;lMV|@HFLq7%|NGxMpPMEXG=2^^yZ`_I07*qoM6N<$g6e)Wq5uE@

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 143b76b00ed..50b80258ea6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -673,7 +673,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu-17); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }

From 1dc2bbb0f14451558f386a1079db07f1d9d528fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 03:01:31 +0100
Subject: [PATCH 185/345] Fixed: Var no declared

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

diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 2f12976e49f..1debd4e3892 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -32,6 +32,8 @@
 function ecm_prepare_dasboard_head($object)
 {
 	global $langs, $conf, $user;
+	global $helptext1, $helptext2;
+
 	$h = 0;
 	$head = array();
 

From e6d2bc0bff55007f7b642222a7088d39dd70dcf6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Dec 2014 03:12:01 +0100
Subject: [PATCH 186/345] Maj icon

---
 htdocs/theme/eldy/img/object_action.png | Bin 710 -> 528 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/theme/eldy/img/object_action.png b/htdocs/theme/eldy/img/object_action.png
index 001b0cf9b7698a7da6ced443f8402134cf7d12c6..0b02fada4147e31e71f53a800b91839be9b66f07 100644
GIT binary patch
delta 513
zcmV+c0{;ER1&{=g8Gi-<0019IEztk~00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ3>E?l0mBs!jsO4wkV!;AR4C7N
zk}+!=K@f%C+jV0p1l&YOq;R7yAZb;maAADP6?Sh7ap`}cUw@J!U2uLvY`BPv3pFRy
zXk|#{AV?8}I~T$@&FZDui_eZS&9b}So3}Hwbk1Qmn;}UObi3UhlJ7~rBY6M-l5$C3
zC4KhZ-{pCZe!mX_K&R6|nx=;UK9X!j!A}4nxf}OO0B7Uz_;NCtfJu_TId=%)3rR>4
zNrn(!1Aw*mSATgH6C6#a(+duV!yRMHcap6VkOY$35qu~$04Qm>Ua#M5kvy%6@E9gO
zwcIl@Et01OKpKIn=r0^y@r+3g$$e}NjYgw;053?^LI|%Ujbnm+vq?b`A%wSs!C*Vq
z_D^g{x+0l8v65u1&0~`w3D(-`{gnZbm2kz8)y9--g?h=1q;pBjI0oT=1wW2zDe2tS
z>-FEwX7dMt<5K**!`1l$IPu<J+r?sm)oOLqZntLu_DH_m&@9F;camk<MNt&6&N<BI
zbJS|Jn?|GY3Bau+17J6reUtP-(wX=Ex+n_tdOiFB#(~~TqS*w700000NkvXXu0mjf
DeP-P>

literal 710
zcmWlWT}ahn7{}jp{F+~}yOt0*D)eM08IpN0!ZVKK87eZBa9yMg>S7SutebgJx;S`R
z6g47bkO-q2XDO^A8WkJ{6}*}s)66r7tVK5?3U(vBy~6+bKfmX9_wr8n^`5J(s;dG3
z)MmRfJl+TPhbY0__^9|DuZr<(PiMtOJa+IT)iZSZ1y+@#T|+VeSGE0#-ThWr#j^BD
zx+e|5;=Ss<kum^cH~YE=I<W_U03Zbb3xEs=77!dDaTGwR1fdWlN016ZaRkK^lt54_
zK?@{Fk)%pe6iF#0rIHDqWJHpY$dpM@D#e-<Yf+p<Cp4NdXx5}L^ENHuIJD>_QmF)I
zBzQ9+*a>_}F2h@l?51QVrMfK7vx3CRE~`RTgB)*ilEPuoJYKYT)#VLe&^^KML|G9P
zO*DPc3M5&U6h+dYWLT2nN!Zv>f{|=`vgONGAj3$}p<?-p9VjqVbyGDx6$6YkC(v+v
zk**uM33bcX9andtj*X8D%QIZh@FUaqOxrgx1jw>|%MC0qu>8mhknKlyfSe$5aEHhZ
zA~!@Z2w{LAh6s6K<b}wKkRKvHLIDm!Aws{{k8Ah`V&i;oKj`?mbr~OTvYGS%u_+FN
z_+T=bJa(v@SXpEKRMw2HpI<Ne`)?xuyQN>cR(wBk_{q}tc0T{$@zD!o<>jaD?9|ma
zjxk#G#_q_<jpGZYapn5U`sR}Q%_C>tp4b{H?5r)jdM^Fxb3<~O<}!uGbvT(ze_`lk
zLwjpedor~;lS{j8XP?f#nxAiLPO?+CZ>2x9Kbv2gn_Fu8I#{z?Q@lSX%(mqBe$bGA
po`+r2tq;Aa*Fs0PFq11Q#KGdb=8a3mri=I;AluoSSzw1J{{xOVMJNCO


From b45bd06475788d6f4e68f8d6cdcfe946b6523290 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Mon, 22 Dec 2014 12:26:04 +0100
Subject: [PATCH 187/345] Update functions.lib.php

Add feature to limit the number of tabs in a card (based on google menu practice)
function actived with MAXTABS_IN_CARD dictionnary
watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008
or here.
All the code is in one function, need to explode/refactoring it on diferent css
---
 htdocs/core/lib/functions.lib.php | 86 +++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 194fee33bfc..20b7d4369ac 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -683,42 +683,86 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		if (count($keys)) $maxkey=max($keys);
 	}
 
-	// Show tabs
+	// Show tabs 
+	$bactive=false;
+	// if =0 we don't use the feature
+	$limittoshow=($conf->global->MAXTABS_IN_CARD?$conf->global->MAXTABS_IN_CARD:99);
+	$displaytab=0;
+
 	for ($i = 0 ; $i <= $maxkey ; $i++)
 	{
-		$isactive=(is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2]);
 
-		$out.='<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'">';
-		if (isset($links[$i][2]) && $links[$i][2] == 'image')
+		if ((is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2]))
 		{
-			if (!empty($links[$i][0]))
-			{
-				$out.='<a data-role="button" class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-			}
-			else
-			{
-				$out.='<span data-role="button" class="tabspan">'.$links[$i][1].'</span>'."\n";
-			}
+			$isactive=true;
+			$bactive=true;
+			if ($i <=$limittoshow)
+				$limittoshow++;
 		}
-		else if (! empty($links[$i][1]))
+		else
+			$isactive=false;
+
+		if ($i <=$limittoshow || $isactive )
 		{
-			//print "x $i $active ".$links[$i][2]." z";
-			if ($isactive)
+			$out.='<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'">';
+			if (isset($links[$i][2]) && $links[$i][2] == 'image')
 			{
-				$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabactive tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				if (!empty($links[$i][0]))
+				{
+					$out.='<a data-role="button" class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				}
+				else
+				{
+					$out.='<span data-role="button" class="tabspan">'.$links[$i][1].'</span>'."\n";
+				}
 			}
-			else
+			else if (! empty($links[$i][1]))
 			{
-				$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				//print "x $i $active ".$links[$i][2]." z";
+				if ($isactive)
+				{
+					$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tabactive tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				}
+				else
+				{
+					$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				}
 			}
+			$out.='</div>';
 		}
-		$out.='</div>';
+		else
+		{
+			$outmore.='<div class="" style="display:inherit; background-color:#f9f9f9; padding-top:5px; padding-right:15px; padding-left:12px;">';
+			if (isset($links[$i][2]) && $links[$i][2] == 'image')
+			{
+				if (!empty($links[$i][0]))
+					$outmore.='<a  class="tabimage" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+				else
+					$outmore.='<span  class="tabspan">'.$links[$i][1].'</span>'."\n";
+
+			}
+			else if (! empty($links[$i][1]))
+				$outmore.='<a "'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').'  class="inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
+
+			$outmore.='</div>';
+		}
+		$displaytab=$i;
 	}
 
-	$out.="</div>\n";
+	if ($displaytab > $limittoshow)
+	{
+		$out.='<div id=moretabs class="inline-block tabsElem"><a href="" data-role="button" style="background-color: #f0f0f0;" class="tab inline-block">Plus</a>';
+		$out.='<div id=moretabsList style="position: absolute; left: -999em;text-align: left;margin:0px;padding:2px">'.$outmore.'</div></div>';
+		$out.="</div>\n";
+	
+		$out.="<script>";
+		$out.="$('#moretabs').mouseenter( function() { $('#moretabsList').css('left','auto');});";
+		$out.="$('#moretabs').mouseleave( function() { $('#moretabsList').css('left','-999em');});";
+		$out.="</script>";
+	}
 
 	if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
-
+	
 	return $out;
 }
 

From 748bef6134a5f663c71fe409f4490a2caf04f8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 22 Dec 2014 20:02:53 +0100
Subject: [PATCH 188/345] Translation error

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

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 1e3027acd25..e290bd49c31 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
 ProductsOnSell=Available products
 ProductsNotOnSell=Obsolete products
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Products for sale and for purchase
 ServicesOnSell=Available services
 ServicesNotOnSell=Obsolete services
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
 LastRecordedProductsAndServices=Last %s recorded products/services

From 46fe2c67e0a5ce2dbf82ba4b420154e1ae4d5940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 22 Dec 2014 22:32:05 +0100
Subject: [PATCH 189/345] Fix: [ bug #1736 ] Failing supplier Elephant
 numeration module with some masks

---
 ChangeLog                          | 1 +
 htdocs/core/lib/functions2.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..92b3911a14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed.
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4127686b459..4c2dd6e5189 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -738,7 +738,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     $sql.= " AND entity IN (".getEntity($table, 1).")";
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;

From db301863867d9f1c48020a0897d9079e3e361358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 22 Dec 2014 22:52:43 +0100
Subject: [PATCH 190/345] Fix: [ bug #1731 ] Can't use quick navigation on
 project tasks secondary tabs

---
 ChangeLog                        |  1 +
 htdocs/projet/tasks/contact.php  | 10 +++++-----
 htdocs/projet/tasks/document.php |  2 +-
 htdocs/projet/tasks/note.php     |  2 +-
 htdocs/projet/tasks/time.php     |  8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..00a07efb2d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Fix: Paypal link were broken dur to SSL v3 closed.
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index f0bdce25fca..8a6ebb0a3d4 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -57,7 +57,7 @@ $projectstatic = new Project($db);
 // Add new contact
 if ($action == 'addcontact' && $user->rights->projet->creer)
 {
-	$result = $object->fetch($id);
+	$result = $object->fetch($id, $ref);
 
     if ($result > 0 && $id > 0)
     {
@@ -87,7 +87,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
-	if ($object->fetch($id))
+	if ($object->fetch($id, $ref))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
 	}
@@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 // Efface un contact
 if ($action == 'deleteline' && $user->rights->projet->creer)
 {
-	$object->fetch($id);
+	$object->fetch($id, $ref);
 	$result = $object->delete_contact($_GET["lineid"]);
 
 	if ($result >= 0)
@@ -152,7 +152,7 @@ $userstatic = new User($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id) > 0)
+	if ($object->fetch($id, $ref) > 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@@ -245,7 +245,7 @@ if ($id > 0 || ! empty($ref))
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	    print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	    print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 50763f839f7..03ca7bae452 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -209,7 +209,7 @@ if ($object->id > 0)
 		$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index a6f8846ce0e..04e92c7c7f2 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -181,7 +181,7 @@ if ($object->id > 0)
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
 	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 	print '</td></tr>';
 
 	// Label
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 7136ffc43c5..8f72510adba 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -72,7 +72,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 
 	if (! $error)
 	{
-		$object->fetch($id);
+		$object->fetch($id, $ref);
 
 		$object->timespent_note = $_POST["timespent_note"];
 		$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
@@ -109,7 +109,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
 
 	if (! $error)
 	{
-		$object->fetch($id);
+		$object->fetch($id, $ref);
 
 		$object->timespent_id = $_POST["lineid"];
 		$object->timespent_note = $_POST["timespent_note_line"];
@@ -183,7 +183,7 @@ if ($id > 0 || ! empty($ref))
 	/*
 	 * Fiche projet en mode visu
 	*/
-	if ($object->fetch($id) >= 0)
+	if ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$projectstatic->fetch($object->fk_project);
 		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
@@ -277,7 +277,7 @@ if ($id > 0 || ! empty($ref))
 			$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-		print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label

From 56eddeade17904ddd5eb55dc6f0b23cc4a152d39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 02:36:01 +0100
Subject: [PATCH 191/345] Fix merge changelog

---
 ChangeLog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a169a80654b..5f468fa452d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 3.5.7 compared to 3.5.6 *****
-Fix: Paypal link were broken dur to SSL v3 closed.
-
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
 - Fix: bug 1588 : relative discount.
@@ -154,6 +151,9 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 - Remove add_photo_web() that is ot used anymore by core code.
 
 
+***** ChangeLog for 3.5.7 compared to 3.5.6 *****
+Fix: Paypal link were broken dur to SSL v3 closed.
+
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
 Fix: Can't update phone_pro from web service

From 3212fd2b27973d248e8ab7e36746a7ee63186a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 11:00:18 +0100
Subject: [PATCH 192/345] Fix: [ bug #1649 ] Cancel button of several
 thirdparty actions, does the same thing as modify

---
 ChangeLog              |  1 +
 htdocs/comm/fiche.php  | 30 +++++++++++++++++++-----------
 htdocs/fourn/fiche.php | 20 ++++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f468fa452d..0e00afbbda0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ English Dolibarr ChangeLog
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 7ba1cc8bc48..307a8c57385 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -79,17 +79,21 @@ $object = new Societe($db);
 $parameters = array('socid' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
 
+//Some actions show a "cancel" input submit button with name="cancel"
+$cancelbutton = GETPOST('cancel');
 
 if ($action == 'setcustomeraccountancycode')
 {
-	$result=$object->fetch($id);
-	$object->code_compta=$_POST["customeraccountancycode"];
-	$result=$object->update($object->id,$user,1,1,0);
-	if ($result < 0)
-	{
-		$mesgs[]=join(',',$object->errors);
+	if (!$cancelbutton) {
+		$result=$object->fetch($id);
+		$object->code_compta=$_POST["customeraccountancycode"];
+		$result=$object->update($object->id,$user,1,1,0);
+		if ($result < 0)
+		{
+			$mesgs[]=join(',',$object->errors);
+		}
+		$action="";
 	}
-	$action="";
 }
 
 // conditions de reglement
@@ -139,10 +143,14 @@ if ($action == 'cstc')
 // Update communication level
 if ($action == 'setOutstandingBill')
 {
-	$object->fetch($id);
-	$object->outstanding_limit=GETPOST('OutstandingBill');
-	$result=$object->set_OutstandingBill($user);
-	if ($result < 0) setEventMessage($object->error,'errors');
+	if (!$cancelbutton) {
+		$object->fetch($id);
+		$object->outstanding_limit = GETPOST('OutstandingBill');
+		$result = $object->set_OutstandingBill($user);
+		if ($result < 0) {
+			setEventMessage($object->error, 'errors');
+		}
+	}
 }
 
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 2719f9e0a9b..b4ceb2ae1b0 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -60,14 +60,18 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 
 if ($action == 'setsupplieraccountancycode')
 {
-    $result=$object->fetch($id);
-    $object->code_compta_fournisseur=$_POST["supplieraccountancycode"];
-    $result=$object->update($object->id,$user,1,0,1);
-    if ($result < 0)
-    {
-        $mesg=join(',',$object->errors);
-    }
-    $action="";
+	$cancelbutton = GETPOST('cancel');
+
+	if (!$cancelbutton) {
+
+		$result = $object->fetch($id);
+		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
+		$result = $object->update($object->id, $user, 1, 0, 1);
+		if ($result < 0) {
+			$mesg = join(',', $object->errors);
+		}
+		$action = "";
+	}
 }
 // conditions de reglement
 if ($action == 'setconditions' && $user->rights->societe->creer)

From 8a1440997403cf077ebdd8ee4ddd503edbd38e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 11:39:43 +0100
Subject: [PATCH 193/345] Fix: [ bug #1533 ] Links triggers do not show trigger
 error message

---
 ChangeLog                                            | 1 +
 htdocs/core/class/link.class.php                     | 3 ++-
 htdocs/core/tpl/document_actions_pre_headers.tpl.php | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ec86761300..de2f3618cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,7 @@ For users:
 - Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
 - Fix: [ bug #1506, #1507 ] ECM trigger error problem
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
+- Fix: [ bug #1533 ] Links triggers do not show trigger error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
 - Fix: datepicker first day of week can be monday by setting into display setup
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index dce575a1d47..0cdc6a8c4a8 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -187,7 +187,7 @@ class Link extends CommonObject
             {
                 // Call trigger
                 $result=$this->call_trigger('LINK_MODIFY',$user);
-                if ($result < 0) $error++;            
+                if ($result < 0) $error++;
                 // End call triggers
             }
 
@@ -197,6 +197,7 @@ class Link extends CommonObject
                 $this->db->commit();
                 return 1;
             } else {
+                setEventMessages('', $this->errors, 'errors');
                 $this->db->rollback();
                 return -1;
             }
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index a4d97e7defb..36b6ce75fe1 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -72,11 +72,16 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
             $link->id = $linkid;
             $link->fetch();
             $res = $link->delete($user);
+
             $langs->load('link');
-            if ($res) {
+            if ($res > 0) {
                 setEventMessage($langs->trans("LinkRemoved", $link->label));
             } else {
-                setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
+                if (count($link->errors)) {
+                    setEventMessages('', $link->errors, 'errors');
+                } else {
+                    setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
+                }
             }
         }
         header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id.(!empty($withproject)?'&withproject=1':''));

From e8addcb8ba2df0c292f47cd14fe2b6fdcb9e968f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 12:25:21 +0100
Subject: [PATCH 194/345] Fixed: [ bug #1756 ] PHP error while removing an
 import profile

---
 htdocs/core/tpl/extrafields_view.tpl.php | 15 ++++++++-------
 htdocs/imports/class/import.class.php    |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index ad2fa068757..7f0115b83bc 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -33,13 +33,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		if ($action == 'edit_extras')
 		{
-			$value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
+			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
 		}
 		else
 		{
-			$value = $object->array_options ["options_" . $key];
+			$value = $object->array_options["options_" . $key];
 		}
-		if ($extrafields->attribute_type [$key] == 'separate')
+		if ($extrafields->attribute_type[$key] == 'separate')
 		{
 			print $extrafields->showSeparator($key);
 		}
@@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td';
-			if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"';
+			//var_dump($action);exit;
+			if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
 			print '>' . $label . '</td>';
 
 			//TODO Improve element and rights detection
@@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 			print '<td colspan="5">';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) {
-				$value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
+			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
 			}
 
 			//TODO Improve element and rights detection
@@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
-				print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 				print '<input type="hidden" name="id" value="' . $object->id . '">';
 
 				print $extrafields->showInputField($key, $value);
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 58a1bf3e931..b846d158227 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -22,8 +22,7 @@
  */
 
 /**
- *	\class 		Import
- *	\brief 		Class to manage imports
+ *	Class to manage imports
  */
 class Import
 {
@@ -313,10 +312,12 @@ class Import
 		{
 			if (! $notrigger)
 			{
+				/* Not used. This is not a business object. To convert it we must herit from CommonObject
                 // Call trigger
                 $result=$this->call_trigger('IMPORT_DELETE',$user);
-                if ($result < 0) $error++;          
+                if ($result < 0) $error++;
                 // End call triggers
+                 */
 			}
 		}
 

From acf7b9f130bb1e45ce34d819615afc4224572c97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 12:59:34 +0100
Subject: [PATCH 195/345] Because this is a legal issue (OPCA), i added the
 hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES
 => Button "Classified Billed" is visible on proposal even if there is no
 invoice linked to proposal. Fixed: Also fix get list of invoice that report
 too many data.

---
 htdocs/comm/propal.php                    | 8 +++++---
 htdocs/comm/propal/class/propal.class.php | 9 ++++++---
 htdocs/core/class/commonobject.class.php  | 2 +-
 htdocs/langs/en_US/workflow.lang          | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 0ac5d78aead..0143e20ba77 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2109,12 +2109,14 @@ if ($action == 'create')
 
 				// Create an invoice and classify billed
 				if ($object->statut == 2) {
-					if (! empty($conf->facture->enabled) && $user->rights->facture->creer) {
+					if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
 					}
 
-					$arraypropal = $object->getInvoiceArrayList();
-					if (is_array($arraypropal) && count($arraypropal) > 0) {
+					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
+					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES))
+					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
 					}
 				}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fb9d5257d49..be22043e4b5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1987,16 +1987,19 @@ class Propal extends CommonObject
                 {
                     $linkedInvoices[] = $objectid[$i];
                 }
-                // Cas des factures liees via la commande
+                // Cas des factures liees par un autre objet (ex: commande)
                 else
-                {
+				{
                     $this->fetchObjectLinked($objectid[$i],$objecttype);
                     foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid)
                     {
                         $numj=count($subobjectid);
                         for ($j=0;$j<$numj;$j++)
                         {
-                            $linkedInvoices[] = $subobjectid[$j];
+                        	if ($subobjecttype == 'facture')
+                        	{
+                            	$linkedInvoices[] = $subobjectid[$j];
+                        	}
                         }
                     }
                 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1a9195e069d..54c7b9d860d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1851,7 +1851,7 @@ abstract class CommonObject
             }
         }
         else
-        {
+		{
             $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')";
             $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')";
         }
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index d4ecf42b997..e08c88a9170 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin 
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in.
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
 ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. 
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed

From aa618d481b00b683ede0184fc8f54b31e87921bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 13:07:16 +0100
Subject: [PATCH 196/345] Fixed: [ bug #1690 ] Sorting on salary table triggers
 SQL errors

---
 htdocs/compta/charges/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index dd6455a3932..ca03e11bcba 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -102,7 +102,7 @@ if ($conf->salaries->enabled)
 			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 			$sql.= " AND s.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 		}
-		if (preg_match('/^s/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+		if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 
 		$result = $db->query($sql);
 		if ($result)
@@ -204,7 +204,7 @@ if ($conf->tax->enabled)
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= ")";
 	}
-	if (! preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+	if (preg_match('/^cs\./',$sortfield) || preg_match('/^c\./',$sortfield) || preg_match('/^pc\./',$sortfield) || preg_match('/^pct\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 	//$sql.= $db->plimit($limit+1,$offset);
 	//print $sql;
 
@@ -295,7 +295,7 @@ if ($conf->tax->enabled)
 			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 			$sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 		}
-		if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+		if (preg_match('/^pv\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 
 		$result = $db->query($sql);
 		if ($result)

From 2b4edd999670eadc3104d0496ed2973d553b73e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 13:21:40 +0100
Subject: [PATCH 197/345] Fix: [ bug #1687 ] The ref filter searches on ref and
 rowid in supplier invoices list

---
 htdocs/fourn/facture/list.php                  | 2 +-
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 357df92a4eb..2a01602eadc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -150,7 +150,7 @@ if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
 
 if ($search_ref)
 {
-	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility
+	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref);
 	else $sql .= natural_search('fac.ref', $search_ref);
 }
 if (search_ref_supplier)
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index e2c586de47f..2281793929f 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
 
+UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = '';
+
 ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
 ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
 ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;

From a90a03412ab292966f8c02baa9ee2743ac3a9824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:43:45 +0100
Subject: [PATCH 198/345] Fixed string not translated in linked objects of a
 project

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

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 4a0c70e04af..28f41370d5f 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -373,8 +373,10 @@ foreach ($listofreferent as $key => $value)
 	}
 }
 
+$langs->load('margins');
+
 // Margin display of the project
-print_titre("Margin");
+print_titre($langs->trans("Margins"));
 print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td align="left" width="200">'.$langs->trans("Element").'</td>';

From 78307a748dc3c66e1855ccf3aa50258201ad6654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:56:29 +0100
Subject: [PATCH 199/345] Corrected confusing table header in task list

---
 htdocs/langs/en_US/projects.lang | 1 +
 htdocs/projet/tasks/index.php    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index a37e9651bcc..e9d04c8c8db 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -3,6 +3,7 @@ RefProject=Ref. project
 ProjectId=Project Id
 Project=Project
 Projects=Projects
+ProjectStatus=Project status
 SharedProject=Everybody
 PrivateProject=Contacts of project
 MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index ec23afb1902..94711b4d92e 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -97,7 +97,7 @@ print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Project").'</td>';
-print '<td>'.$langs->trans("Status").'</td>';
+print '<td>'.$langs->trans("ProjectStatus").'</td>';
 print '<td>'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td align="center">'.$langs->trans("DateStart").'</td>';

From 743867b91b8305eed0125acb9328355ffc169a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 15:57:30 +0100
Subject: [PATCH 200/345] Spanish translation

---
 htdocs/langs/es_ES/projects.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 988b3e545c8..f393616f898 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -3,6 +3,7 @@ RefProject=Ref. proyecto
 ProjectId=Id proyecto
 Project=Proyecto
 Projects=Proyectos
+ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).

From 416f13c708cbfbff3e0ff0e1997867e3b37b9a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 16:00:04 +0100
Subject: [PATCH 201/345]  Fix: [ bug #1752 ] Date filter of margins module,
 filters since 12H instead of 00H

---
 ChangeLog                      | 1 +
 htdocs/margin/agentMargins.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..d24728054e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index e618931ee77..da7bf758f1d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -57,9 +57,9 @@ $pagenext = $page + 1;
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(12, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(12, 0, 0, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
 /*
  * View

From 034455fc2d0e55724ae6d1ad2e80f35d04e9ac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 16:37:53 +0100
Subject: [PATCH 202/345] Fix: [ bug #1722 ] Missing link in homepage project's
 box

---
 htdocs/core/boxes/box_project.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 62ed89dd65b..57863100999 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -45,7 +46,7 @@ class box_project extends ModeleBoxes
 		$langs->load("boxes");
 		$langs->load("projects");
 
-		$this->boxlabel="Projet";
+		$this->boxlabel="Projects";
 	}
 
 	/**
@@ -63,13 +64,8 @@ class box_project extends ModeleBoxes
 		$totalMnt = 0;
 		$totalnb = 0;
 		$totalnbTask=0;
-		include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
-		$projectstatic=new Project($db);
 
-
-
-		$textHead = $langs->trans("Projet");
+		$textHead = $langs->trans("Projects");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
@@ -91,14 +87,15 @@ class box_project extends ModeleBoxes
 				$i = 0;
 				while ($i < $num)
 				{
-					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projectpub');
-
 					$objp = $db->fetch_object($result);
-					$projectstatic->fetch($objp->rowid);
+
+					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+						'logo' => 'object_project',
+						'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-					'text' =>$projectstatic->getNomUrl(1)
-					);
+						'text' => $objp->ref,
+						'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left"',
 					'text' => $objp->title

From d03cc03cd7ed5fcaef5d26e1912ecc8d82852287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Dec 2014 16:42:05 +0100
Subject: [PATCH 203/345] Enhance select_salesrepresentatives with select2

---
 htdocs/core/class/html.formother.class.php | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index d6cf08594bb..4f0439d7b3c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -356,9 +356,18 @@ class FormOther
         global $conf,$langs;
         $langs->load('users');
 
+        $out = '';
+        $nodatarole = '';
+        // Enhance with select2
+        if ($conf->use_javascript_ajax)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out.= ajax_combobox($htmlname);
+            $nodatarole=' data-role="none"';
+        }
         // Select each sales and print them in a select input
-        $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
-        $moreforfilter.='<option value="">&nbsp;</option>';
+        $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<option value="">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
@@ -383,34 +392,35 @@ class FormOther
         {
             while ($obj_usr = $this->db->fetch_object($resql_usr))
             {
-                $moreforfilter.='<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"';
+                $out.='<option value="'.$obj_usr->rowid.'"';
 
-                $moreforfilter.='>';
-                $moreforfilter.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
+                if ($obj_usr->rowid == $selected) $out.=' selected="selected"';
+
+                $out.='>';
+                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
                 // Complete name with more info
                 $moreinfo=0;
                 if (! empty($conf->global->MAIN_SHOW_LOGIN))
                 {
-                	$moreforfilter.=($moreinfo?' - ':' (').$obj_usr->login;
-                	$moreinfo++;
+                    $out.=($moreinfo?' - ':' (').$obj_usr->login;
+                    $moreinfo++;
                 }
                 if ($showstatus >= 0)
                 {
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
 	                	$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
                 		$moreinfo++;
 					}
 				}
-				$moreforfilter.=($moreinfo?')':'');
-                $moreforfilter.='</option>';
+				$out.=($moreinfo?')':'');
+                $out.='</option>';
             }
             $this->db->free($resql_usr);
         }
@@ -418,9 +428,9 @@ class FormOther
         {
             dol_print_error($this->db);
         }
-        $moreforfilter.='</select>';
+        $out.='</select>';
 
-        return $moreforfilter;
+        return $out;
     }
 
     /**

From b7dbb1e9cd1e7f8926d7c8ad5ff525d59f5d148b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 17:46:30 +0100
Subject: [PATCH 204/345] Fixed: Do not show disabled user when creating a new
 event.

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 8a2c602a3f0..180dbcddb30 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -678,7 +678,7 @@ if ($action == 'create')
 			$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
 		}
 	}
-	print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
+	print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 	if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked="checked"':'').'> '.$langs->trans("Busy");
 	print '</td></tr>';
 
@@ -925,7 +925,7 @@ if ($id > 0)
 				$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
-		print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
+		print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 		if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").':  <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy");
 		print '</td></tr>';
 

From a111c4765c250c9008e16de5d1c5ab2f46e3800d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 18:00:14 +0100
Subject: [PATCH 205/345] Fixed: Filter lost with navigation

---
 htdocs/fichinter/list.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9030cd9c4ac..851077b510f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -121,7 +121,13 @@ if ($result)
 {
 	$num = $db->num_rows($result);
 
-	$urlparam="&amp;socid=$socid";
+	$urlparam='';
+	if ($socid) $urlparam.="&socid=".$socid;
+	if ($search_ref) $urlparam.="&search_ref=".urlencode($search_ref);
+	if ($search_company) $urlparam.="&search_company=".urlencode($search_company);
+	if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc);
+	if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status);
+
 	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -193,7 +199,7 @@ if ($result)
 			print '<td align="right">'.convertSecondToTime($objp->duree).'</td>';
 		}
 		print '<td align="right">'.$interventionstatic->LibStatut($objp->fk_statut,5).'</td>';
-		
+
 		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 
@@ -207,7 +213,7 @@ if ($result)
 		print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td>&nbsp;</td><td>&nbsp;</td>';
 		print '</tr>';
 	}
-	
+
 	print '</table>';
 	print "</form>\n";
 	$db->free($result);

From 6b29c8e5c6ebb9a007f2e256d46191cd8b9c52c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Dec 2014 19:06:51 +0100
Subject: [PATCH 206/345] Update index.php

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

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index fd25287c029..4b4db757dc2 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -483,7 +483,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			$var=true;
 
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</td></tr>';
+			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></td></tr>';
 
 			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)

From 7001cd0283b3bfd0d7ca74de3c5f596297f502d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Dec 2014 20:11:13 +0100
Subject: [PATCH 207/345] Update index.php

---
 htdocs/compta/index.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 2359d70d07b..72b860977f6 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -167,7 +167,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("CustomersDraftInvoices").($num?' ('.$num.')':'').'</td></tr>';
+		print '<td colspan="3">'.$langs->trans("CustomersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -236,7 +236,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num?' ('.$num.')':'').'</td></tr>';
+		print '<td colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -555,7 +555,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("ContributionsToPay").($num?' ('.$num.')':'').'</td>';
+			print '<td>'.$langs->trans("ContributionsToPay").($num?' <span class="badge">'.$num.'</span>':'').'</td>';
 			print '<td align="center">'.$langs->trans("DateDue").'</td>';
 			print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
 			print '<td align="right">'.$langs->trans("Paid").'</td>';
@@ -639,7 +639,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 			$i = 0;
 			print '<table class="noborder" width="100%">';
 			print "<tr class=\"liste_titre\">";
-			print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?status=3&afacturer=1">('.$num.')</a></td>';
+			print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?status=3&amp;afacturer=1"><span class="badge">'.$num.'</span></a></td>';
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
 			print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
 			print '<td align="right">'.$langs->trans("ToBill").'</td>';
@@ -737,7 +737,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$i = 0;
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">('.$num.')</a></td>';
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php"><span class="badge">'.$num.'</span></a></td>';
 		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
 		print '<td align="right">'.$langs->trans("Received").'</td>';
@@ -842,7 +842,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php">('.$num.')</a></td>';
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></td>';
 		if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
 		print '<td align="right">'.$langs->trans("Paid").'</td>';
@@ -916,7 +916,7 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr ".$bc[$var]."><td>".dol_print_date($obj->da,"day")."</td>";
-		print "<td><a href=\"action/card.php\">$obj->libelle $obj->label</a></td></tr>";
+		print '<td><a href="action/card.php">'.$obj->libelle.' '.$obj->label.'</a></td></tr>';
 		$i++;
 	}
 	$db->free($resql);

From 8e06329f8d58fb6314b80ed7aa82fd48715776e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 23 Dec 2014 21:26:34 +0100
Subject: [PATCH 208/345] Add css badge

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

diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 02a580174c3..3d0fee451be 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -245,7 +245,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("DraftContracts").($num?' ('.$num.')':'').'</td></tr>';
+		print '<td colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>';
 		if ($num)
 		{
 			$companystatic=new Societe($db);
@@ -471,7 +471,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0">('.$num.')</a></td>';
+	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></td>';
 	print "</tr>\n";
 
 	$var=True;
@@ -551,7 +551,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&filter=expired">('.$num.')</a></td>';
+	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></td>';
 	print "</tr>\n";
 
 	$var=True;

From 17eebf750ecd50f937065e02ff3cb0bb106fcee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 24 Dec 2014 00:28:05 +0100
Subject: [PATCH 209/345] Update list.php

ship2bill.php doesn't exist
---
 htdocs/expedition/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 0722dedddf4..2468c9084d2 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -117,14 +117,14 @@ if ($resql)
 	print '<table class="noborder" width="100%">';
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),"ship2bill.php","e.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Company"),"ship2bill.php","s.nom", "", $param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateDeliveryPlanned"),"ship2bill.php","e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateDeliveryPlanned"), $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
 	if($conf->livraison_bon->enabled) {
-		print_liste_field_titre($langs->trans("DeliveryOrder"),"ship2bill.php","e.date_expedition","",$param, '',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("DateReceived"),"ship2bill.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("DeliveryOrder"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, '',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("DateReceived"), $_SERVER["PHP_SELF"],"e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
 	}
-	print_liste_field_titre($langs->trans("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
 	print '<td class="liste_titre">&nbsp;</td>';
 	print "</tr>\n";
 

From b68276637bd2adfe7192546ffebfcb1688b86c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 24 Dec 2014 14:31:17 +0100
Subject: [PATCH 210/345] Fix: [ bug #1736 ] Failing supplier Elephant
 numeration module with some masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
---
 ChangeLog                          | 1 +
 htdocs/core/lib/functions2.lib.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5ec86761300..7b5447aed23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -181,6 +181,7 @@ Dolibarr better:
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 246af863d12..219d0074813 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
     	$sql.= " AND entity IN (".getEntity($table, 1).")";
+
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 

From 294753dc475d0d74235a1cd1a21ae3ff147188b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Wed, 24 Dec 2014 14:31:17 +0100
Subject: [PATCH 211/345] Fix: [ bug #1736 ] Failing supplier Elephant
 numeration module with some masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
---
 ChangeLog                          | 1 +
 htdocs/core/lib/functions2.lib.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 94f568bebfa..e0d1deb8760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -195,6 +195,7 @@ Dolibarr better:
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 246af863d12..219d0074813 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -784,9 +784,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
     	$sql.= " AND entity IN (".getEntity($table, 1).")";
+
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 

From ee1bc22e79313e8937020bdb641aa637d7231dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 23 Dec 2014 16:37:53 +0100
Subject: [PATCH 212/345] Fix: [ bug #1722 ] Missing link in homepage project's
 box

---
 htdocs/core/boxes/box_project.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 62ed89dd65b..57863100999 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -45,7 +46,7 @@ class box_project extends ModeleBoxes
 		$langs->load("boxes");
 		$langs->load("projects");
 
-		$this->boxlabel="Projet";
+		$this->boxlabel="Projects";
 	}
 
 	/**
@@ -63,13 +64,8 @@ class box_project extends ModeleBoxes
 		$totalMnt = 0;
 		$totalnb = 0;
 		$totalnbTask=0;
-		include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
-		$projectstatic=new Project($db);
 
-
-
-		$textHead = $langs->trans("Projet");
+		$textHead = $langs->trans("Projects");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
@@ -91,14 +87,15 @@ class box_project extends ModeleBoxes
 				$i = 0;
 				while ($i < $num)
 				{
-					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projectpub');
-
 					$objp = $db->fetch_object($result);
-					$projectstatic->fetch($objp->rowid);
+
+					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+						'logo' => 'object_project',
+						'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-					'text' =>$projectstatic->getNomUrl(1)
-					);
+						'text' => $objp->ref,
+						'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left"',
 					'text' => $objp->title

From 73b47427d8d3c71a45b72a785f73a9288f796b9b Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 24 Dec 2014 15:41:11 +0100
Subject: [PATCH 213/345] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index e0d1deb8760..7a8978a0c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 3.8 compared to 3.7.* *****
 For users:
 - New: Use new combobox.
+- New: Add hidden option MAXTABS_IN_CARD.
 
 For translators:
 - Update language files.

From 34ef373b3a127e2e7ab0b0ec5bff957cc2a391a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 18:00:14 +0100
Subject: [PATCH 214/345] Fixed: Filter lost with navigation

---
 htdocs/fichinter/list.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9030cd9c4ac..851077b510f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -121,7 +121,13 @@ if ($result)
 {
 	$num = $db->num_rows($result);
 
-	$urlparam="&amp;socid=$socid";
+	$urlparam='';
+	if ($socid) $urlparam.="&socid=".$socid;
+	if ($search_ref) $urlparam.="&search_ref=".urlencode($search_ref);
+	if ($search_company) $urlparam.="&search_company=".urlencode($search_company);
+	if ($search_desc) $urlparam.="&search_desc=".urlencode($search_desc);
+	if ($search_status != '' && $search_status > -1) $urlparam.="&search_status=".urlencode($search_status);
+
 	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -193,7 +199,7 @@ if ($result)
 			print '<td align="right">'.convertSecondToTime($objp->duree).'</td>';
 		}
 		print '<td align="right">'.$interventionstatic->LibStatut($objp->fk_statut,5).'</td>';
-		
+
 		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 
@@ -207,7 +213,7 @@ if ($result)
 		print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td>&nbsp;</td><td>&nbsp;</td>';
 		print '</tr>';
 	}
-	
+
 	print '</table>';
 	print "</form>\n";
 	$db->free($result);

From 2c170dbe0e239b0bd28df1fbf9ba8c5f313de42e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 17:46:30 +0100
Subject: [PATCH 215/345] Fixed: Do not show disabled user when creating a new
 event.

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index e6523d3d4ed..faa4109f736 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -681,7 +681,7 @@ if ($action == 'create')
 			$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
 		}
 	}
-	print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
+	print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 	if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked="checked"':'').'> '.$langs->trans("Busy");
 	print '</td></tr>';
 
@@ -928,7 +928,7 @@ if ($id > 0)
 				$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
-		print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
+		print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
 		if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").':  <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy");
 		print '</td></tr>';
 

From 08fd74e79ee6b2680278d07e2dd156ac0b2c9edc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 13:21:40 +0100
Subject: [PATCH 216/345] Fix: [ bug #1687 ] The ref filter searches on ref and
 rowid in supplier invoices list

---
 htdocs/fourn/facture/list.php                  | 2 +-
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 357df92a4eb..2a01602eadc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -150,7 +150,7 @@ if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
 
 if ($search_ref)
 {
-	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility
+	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref);
 	else $sql .= natural_search('fac.ref', $search_ref);
 }
 if (search_ref_supplier)
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index e2c586de47f..2281793929f 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
 
+UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = '';
+
 ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
 ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
 ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;

From dc4a874e70143d61181d3a10b0952679950ea515 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 13:07:16 +0100
Subject: [PATCH 217/345] Fixed: [ bug #1690 ] Sorting on salary table triggers
 SQL errors

---
 htdocs/compta/charges/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index dd6455a3932..ca03e11bcba 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -102,7 +102,7 @@ if ($conf->salaries->enabled)
 			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 			$sql.= " AND s.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 		}
-		if (preg_match('/^s/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+		if (preg_match('/^s\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 
 		$result = $db->query($sql);
 		if ($result)
@@ -204,7 +204,7 @@ if ($conf->tax->enabled)
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= ")";
 	}
-	if (! preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+	if (preg_match('/^cs\./',$sortfield) || preg_match('/^c\./',$sortfield) || preg_match('/^pc\./',$sortfield) || preg_match('/^pct\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 	//$sql.= $db->plimit($limit+1,$offset);
 	//print $sql;
 
@@ -295,7 +295,7 @@ if ($conf->tax->enabled)
 			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 			$sql.= " AND pv.datev between '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 		}
-		if (preg_match('/^pv/',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
+		if (preg_match('/^pv\./',$sortfield)) $sql.= $db->order($sortfield,$sortorder);
 
 		$result = $db->query($sql);
 		if ($result)

From bd7f6339ce4b1d56485d5fb7eb98ef00e6ec5f60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 12:59:34 +0100
Subject: [PATCH 218/345] Because this is a legal issue (OPCA), i added the
 hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES
 => Button "Classified Billed" is visible on proposal even if there is no
 invoice linked to proposal. Fixed: Also fix get list of invoice that report
 too many data.

---
 htdocs/comm/propal.php                    | 8 +++++---
 htdocs/comm/propal/class/propal.class.php | 9 ++++++---
 htdocs/core/class/commonobject.class.php  | 2 +-
 htdocs/langs/en_US/workflow.lang          | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 5feb7769a43..6110186fcb4 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2110,12 +2110,14 @@ if ($action == 'create')
 
 				// Create an invoice and classify billed
 				if ($object->statut == 2) {
-					if (! empty($conf->facture->enabled) && $user->rights->facture->creer) {
+					if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
 					}
 
-					$arraypropal = $object->getInvoiceArrayList();
-					if (is_array($arraypropal) && count($arraypropal) > 0) {
+					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
+					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES))
+					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
 					}
 				}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fb9d5257d49..be22043e4b5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1987,16 +1987,19 @@ class Propal extends CommonObject
                 {
                     $linkedInvoices[] = $objectid[$i];
                 }
-                // Cas des factures liees via la commande
+                // Cas des factures liees par un autre objet (ex: commande)
                 else
-                {
+				{
                     $this->fetchObjectLinked($objectid[$i],$objecttype);
                     foreach($this->linkedObjectsIds as $subobjecttype => $subobjectid)
                     {
                         $numj=count($subobjectid);
                         for ($j=0;$j<$numj;$j++)
                         {
-                            $linkedInvoices[] = $subobjectid[$j];
+                        	if ($subobjecttype == 'facture')
+                        	{
+                            	$linkedInvoices[] = $subobjectid[$j];
+                        	}
                         }
                     }
                 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4cc8cd23672..6ab8c6c75f2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1851,7 +1851,7 @@ abstract class CommonObject
             }
         }
         else
-        {
+		{
             $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')";
             $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')";
         }
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index d4ecf42b997..e08c88a9170 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin 
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in.
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
 ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. 
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed

From 40404530ba801398fd199b30560e9f1447f0f695 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 23 Dec 2014 12:25:21 +0100
Subject: [PATCH 219/345] Fixed: [ bug #1756 ] PHP error while removing an
 import profile

---
 htdocs/core/tpl/extrafields_view.tpl.php | 15 ++++++++-------
 htdocs/imports/class/import.class.php    |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index ad2fa068757..7f0115b83bc 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -33,13 +33,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		if ($action == 'edit_extras')
 		{
-			$value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
+			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
 		}
 		else
 		{
-			$value = $object->array_options ["options_" . $key];
+			$value = $object->array_options["options_" . $key];
 		}
-		if ($extrafields->attribute_type [$key] == 'separate')
+		if ($extrafields->attribute_type[$key] == 'separate')
 		{
 			print $extrafields->showSeparator($key);
 		}
@@ -47,7 +47,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td';
-			if (! empty($extrafields->attribute_required [$key])) print ' class="fieldrequired"';
+			//var_dump($action);exit;
+			if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
 			print '>' . $label . '</td>';
 
 			//TODO Improve element and rights detection
@@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 			print '<td colspan="5">';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) {
-				$value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
+			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
 			}
 
 			//TODO Improve element and rights detection
@@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
-				print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 				print '<input type="hidden" name="id" value="' . $object->id . '">';
 
 				print $extrafields->showInputField($key, $value);
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 58a1bf3e931..b846d158227 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -22,8 +22,7 @@
  */
 
 /**
- *	\class 		Import
- *	\brief 		Class to manage imports
+ *	Class to manage imports
  */
 class Import
 {
@@ -313,10 +312,12 @@ class Import
 		{
 			if (! $notrigger)
 			{
+				/* Not used. This is not a business object. To convert it we must herit from CommonObject
                 // Call trigger
                 $result=$this->call_trigger('IMPORT_DELETE',$user);
-                if ($result < 0) $error++;          
+                if ($result < 0) $error++;
                 // End call triggers
+                 */
 			}
 		}
 

From 09a094104cc8199b825a3e6a7acb1fd70d78c267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 18:31:24 +0100
Subject: [PATCH 220/345] Removed duplicated and unused translation key

---
 htdocs/langs/en_US/projects.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 8d5d7c26a53..74204a176e4 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -11,7 +11,6 @@ ProjectsDesc=This view presents all projects (your user permissions grant you pe
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-Myprojects=My projects
 ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project

From 146bba90e73f2ebbf92417d8b341a0f7d6bb252a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 18:42:26 +0100
Subject: [PATCH 221/345] Fix: [ bug #1724 ] Can't add a submenu to projects

---
 ChangeLog                               | 1 +
 htdocs/core/menus/init_menu_auguria.sql | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b5447aed23..e6509e65d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -149,6 +149,7 @@ For developers:
 - Qual: Renamed all files & links "fiche.php" into "card.php".
 - Qual: Replace all constants COMPTA_* by ACCOUNTING_*.
 - Qual: Replace all constants ACCOUNTINGEX_* by ACCOUNTING_* to simplify migration of the module
+- Fix: [ bug #1724 ] Can't add a submenu to projects
 
 WARNING: Following changes may create regression for some external modules, but was necessary to make
 Dolibarr better:
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 06a187fd7de..7acce783e39 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -232,7 +232,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3610__+MAX_llx_menu__, 'project', 'myprojects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;mode=mine', 'MyProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3611__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine', 'NewProject', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3612__+MAX_llx_menu__, 'project', '', 3610__+MAX_llx_menu__, '/projet/list.php?leftmenu=projects&amp;mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__);
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 781de5f2913..74d6b95df73 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1132,12 +1132,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("projects");
 
 				// Project affected to user
-				$newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'projects');
+				$newmenu->add("/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire, '', $mainmenu, 'myprojects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire);
 
 				// All project i have permission on
-				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire);
+				$newmenu->add("/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire && $user->rights->projet->lire, '', $mainmenu, 'projects');
 				$newmenu->add("/projet/card.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
 				$newmenu->add("/projet/list.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire);
 

From f735aa676e30b5f07e01c63f6387827ad4a579fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 19:16:25 +0100
Subject: [PATCH 222/345] Fix: [ bug #1674 ] PayPal logo copyright issues

---
 htdocs/paypal/admin/paypal.php      |   2 +-
 htdocs/paypal/img/object_paypal.png | Bin 1055 -> 4438 bytes
 htdocs/paypal/img/paypal.png        | Bin 1684 -> 0 bytes
 htdocs/paypal/img/paypal_logo.png   | Bin 1159 -> 0 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 htdocs/paypal/img/paypal.png
 delete mode 100644 htdocs/paypal/img/paypal_logo.png

diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 69b0664eb9d..e3dff71b721 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal');
+print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
 print '<br>';
 
 $head=paypaladmin_prepare_head();
diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
index 4ff3c80565df25279d900d6cee4d29676f0676d5..6b1f28eb73ea2cee17cdabbfd316134f42dec56b 100644
GIT binary patch
literal 4438
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
E0AB_H&j0`b

literal 1055
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<E43JD4bOZ4Wx1`2T&
zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxB|r)7?~NFSs0kvS%83*
zm4%g!fsKcSlaGO0oQ+4AonM@RN0LEImq${STi!%M#gIYSLsZ8}#xhjiK90dCl@W-H
z)0lwBB#qf5jm0#b)hvSzh|DuMEV4MQvbe0Wd8~8z?DEvDe6`ISg&Ycm91DaU3&dQC
zBwULn-AbfAN@YFE<h;r)TmlrlE0p}IR0C?%0&CO*YcztYbt2nMV_K~eJFJsB&C+LC
zWX`tAo@1Xk&n2VJw_u8I;grDQY3`+qyepP?S1k3fS{78hBB^m<X4{hdo)sB=o9kz6
zs+_f_W$xCtdE5F|AD^=N$kg?xW~@E5Xv?uB+fFRqesbB)Q>*u!UA_P6+I<(c9KN*e
z#I5ZoZ|^#Bb@!=T`%d53f9A%)^LLJ1xO42{-4j<IpSk|{^o^%yZ$7(r|K+WRFFt(!
z_WRGD-+%u8|NkEplA~a#g@ELw+QUFMGnNGT1v5B2yO9RuO!ahe45_%4oRIKAw3We-
z%|Kwfz|?D31E)_fWhh>ns?yu!yr<W7YjDFJk-)&z^K0(-SO;nfh_AS6V5V+;FDAs8
z^8~9@lBCqT=PMRu%;$J`Dtm?INzLfCr43uVv|dX}MD1`t=CI||kF+Jrm%6YUIb50L
z@{`5QeYt_d4kNk3MjitNtyQ8e4-A(aQD0uAxPwPdPL6|*A(T-jIi+iN9Vmo7UHx3v
IIVCg!05E6hbpQYW

diff --git a/htdocs/paypal/img/paypal.png b/htdocs/paypal/img/paypal.png
deleted file mode 100644
index 2caabff50b7ae15efb13052edc98b896f9676bb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/htdocs/paypal/img/paypal_logo.png b/htdocs/paypal/img/paypal_logo.png
deleted file mode 100644
index 2a4fd7c9ad51c3bbb336089638471cd366e24ff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1159
zcmV;21bF+2P)<h;3K|Lk000e1NJLTq001}u000mO1^@s6LwUSK0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$DM>^@RCwCFmS=2@Q5eV1``+8?txIbZ
z(TY&JYQ(M)#E$)e=m$a~))yg02q6(MVz2ljcEpOr3?i{b8`R!S)F^e)O4Yc-|7ri1
zr>~0EdXiu6x$k?<dCqg5^;&VsLyeMQpd)w>{2&CLf`j0d`BMo7ja|N?iA-v5jAdi@
z;9xxMMtuS5djSrCXJy=dBuE0MK_-X>Ic_yU#*;w@Dzm6C2lN7K!P!4D(6&wRL!R+J
ze`MSV^<CI~9G>=Z=zBwb8^Q5X?pz7X1`WVxa33_4v)gJ?B51|23-~y>20eRNz5jiI
z=logsO)%G2)7Y-|N}m|^3B-Y+jGC^c+_eRb6S)f>f+HYJd$28t<ah&^0jh&FyyXgD
z5O@Uofx0w42%dmb;0ovohJbfqG05efvVKa@8Y>;)ngyT5^4)eYiJn+a1LZ6d!WrCC
z^u=?&q|F&{QJr0+0HkxA6AsI;wBfIW$!_L_aFPZZdUOm}R>Cb7(6B~e0-wn(p5u59
zm}Y_jV|gkJu)HyCOfVGIw+G~rqcl+DBS>X>I7Mp2Sg;wi<g-ljJu6g*v{MI_8;W89
z7^CJ(4n8P6Xi=_;F;nS94@2sjBkV<*gNcQsfPZI1?M8>JsOYXJGGQaKKsgq;32MD~
z=^mKLcMZXK8Yj-_&fjFtze*<*D=Z?lK@*OndGnI=_0-&ztWYB78S~9RWflp!tj9d;
zM_y2P{Q^+lghFqva-Qi{w70VHe`&^d9(pjK@<?P0&modV<HV4voGWL)4r;1(mz-{P
zt0eWR=k@uUPmgRO9a*h<a%}-~#l`ueFdMuE3A{MD<^Dx&BCyC6pZLu3c)P*CY9)AD
z_PfEb+rXkWmnjm-_Yvycmw9$KL;d;>g`0=#pq_05ow!hLtqYB7&iv@hyy^{V@uo$d
zvjBadk%s%M{}w)$z0Qt}lYW?@^zEaLmh?mljZ37yfegL=)VG@JBwufVa3#*>{~tV<
zpsJ9>_EO%WQ--q=iYx>t_`j7Z&pwVNR9k~O;T8|?&9=R<`L;JkJei^j+6soeQwFnT
zh%928@~C2XhpnYG|7R%u#SHAh&@(I`_kPlAvekGM=QdG!c7q2tY_wV=$Bq_y&$6ni
z3l*>5{E5DoYP<xDX6iIn1tmtEy(Fg;8u*1hOp421XBASim6di7L*+ILPb!msyPB&H
z{f>EL?3gNY1(Hh_SS*gIKIxSGpfec3{`Y|19>w=N_`8<{ZC{Ds73y2mX1V{B)Z!()
zRF@P`-ZL~he1Q32p7g)S#%*C_RSD6u=!@t6*{Y?5O1ZXJqc7D0wgG3u)goatONIP$
z{Vn<%`kWu#fiivmn!hje_*HKhnt9(W%Jmg>*Z(N)f3T<I+%8tq1I1jH=Tj~A|HxMX
Z1^@$<AuF&nzvln|002ovPDHLkV1fpWFbDtu


From 9d82e16506f5465aa12502cbaf484afbb35bbb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 19:17:52 +0100
Subject: [PATCH 223/345] Resized PayPal logo

---
 htdocs/paypal/img/object_paypal.png | Bin 4438 -> 4120 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
index 6b1f28eb73ea2cee17cdabbfd316134f42dec56b..74ac4392ded01a9a13c00027dcef80a6142c39ba 100644
GIT binary patch
delta 744
zcmV<E0vG+(BA6h5iBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(EtDd1ZP1_
zK>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhP
zJOBUy32;bRa{vGf6951U69E94oEQKA4Lxa8SaeuTOgdw+J3bA60!2wgK~yLeRZ&f7
z6G0e#Gdr_MlTAZXMB+~?)kbMW@FE5A50Aa*LA(?_35wvUS8-1wBG!v|^&m*<Ne`X`
zX~9zIQIdm)R!c37g*N7Qo88RkH`}QA!N<(b?0esP^8^6FO^1L1eeqFAy6H(6(}p0)
z=UfsLb+?0hZE>T2yz~UYhZVq=4D$I0-=KJB6sqtAa8p3U0L#}eA>g<kWVllao1ZV^
z+xyKvE1-mPL?;p{*CldYr{9uSNm}!GYK2JV#~pF%oTXDhIi?oIi~$Y|8NfsWoozP2
z`@fS}dLj!^ki%HD2CnVNA?-1c1qfkax<I$diUaNr(Bn0KY)et!g1K__{=|#rvl4IS
zEG^IWihXhd_4wQ2)_~?tC4jY>(39h#89tspbKu|<OBKX0Pe2@w33!7JPubzN;2M)e
zZQ#O5GUqP|^tuRIodyGKjqD?13T%!gvA<l3Q1Do}L&#@<(W8Xo35rr_rQ5&oy7Fl;
z1`do&6+-EM>_^1j6dz4rCuB1M5yzsngv(Nmfk@|o&D9cSZ_LMWWW4k-D2}fa8Wgg?
zAWxB;v74~3)k6@pvAbI}>*eR+-HBUPV?0rN$uUH1wH@^^G-zE)2=*7We$v;ad$Rg{
zC2TZ*;N9a53xe;<7^uAbX*81d={0gZQ8|&&NlBewdZqXDW{IC?uYAt(0mw!cOLe;S
zSre_@meqx645bzzwF2=yiM1H<k(8YRpEDM53V*2nt?JqGTm5Q_)XQ~J59ep%n>k|L
a|JQHlz}o!ZyQowE0000<MNUMnLSTZ;EJwBg

delta 1052
zcmV+%1mpXdAl4!-iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^0drDE
zLIAGL9O<!gOAUVm$4Nv%R7eetRZVOgRS^DWf4ts}oj<#FS^-f4ZCZS26%@4>BsjDj
zkdP{Ygan65a6oO55C`Bwkx-AhA}-uOTzWt%P>CCtqL!Zum7=Jng&@+TKP~}7V#oHr
z$INqfyKB2PBd_1j%$slKdo#O)K62p58!yr1{F_=etv-M1#1?H(xVeJOweP~(l`k%z
zKYKNyG*jx{khML1`~rf94??y2sndJJF31LSyRNGj7ghDkQ%M6Sx!9fuI$zvH4hOIM
zsr#HTTdq&j&%A48teRT=d@-`>rNDcLod;9UDzf>XqXxn{Xma6gU~D2f)C1s*6lP($
zE{7l4bVh$e1)I}=N6xrG(e)>HM~8bjP}%ZcLig41y1Bs-4!9EmwmB{*Kr5`XaYuSG
zAg8!59X&hOAyEGlX#DlyNA&;P=0NVjI(qVDc5i(503chKgG%r($*4AiaQcJj5nagV
z@}8!nC*HAMS$t1&=myAYcXWn5if&sN!2l%pB3*yi*ycd??9pg9Knu^kesQH%=mHqq
zNp5au8i1V);y%I%na0t)#{7OltI2nfnXtX=bPB-9PR+o|c!rMXpp2&BgsTULP}<_?
z4?nH3qeu`it|-O76oB$eb4+yFi}Zs~)U|Dl#PQaa+>geyM-&b%SZH$eV%%!hJhio&
zDpP;T6nZO2oY(6ekR*!5u?4=y?#DEqJOn&C+i@<%;ADWCS1<3Mn!A$%fLGj`svv0`
zi~kNjp)nFLh^$G$_X!iDgmM`u@;yp+l1U^PANb*`k7XGHR4SFsQe%9Uk`>hC=pUa6
z@%&-Ol%N1cl_!z5nQN&WnMaZhpjWT|sLp?$NdpiS%KQ%6C6^P694t+8*|C!?;dX#n
z{6_V2(CceA)CVVC1Xh^WL<XT>oI&XMsc0<DeLSCzP)<oxc}$skKe3GjviWxv7d|_q
zK0W<D?k?XFGm)4g9dHG02$|a%$ly8(<2hz6(PZMh-B{P(pZf@ne`~1zQM1;o*V=!-
ze0vGEZ`={5Nr?gAmAHZuBIPMnk_#AM8&uTHF}^wXiTd#PTak4FKH7@M`+eZ;sC2#o
zk_A8FG(W-)Jxb9gU$5V<{1kf_GBE($C!}q^WC}zam`@<9#&SXv7iuB{?hCs4+qEHn
zW3{1(h;(KCsTXMZ*D1c0jyI{k11DsU!OpzOZP_^>{MR???OV&sv4<g(_zr%)^!0VN
zl_wUvTzbv4MU;STL)Y%z#oE$ZY&2vN1N61a7axJ*W|C_Waa_>K(s`Z@X$oU){{91+
W5LNtOQ{4Cf0000<MNUMnLSTXkefR7D


From 1f00794c9807bc58d990d161f794ea894e673b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 21:47:39 +0100
Subject: [PATCH 224/345] Fixed bug which didn't show documents in auto GED
 when an object had '/' in its ref

---
 htdocs/comm/propal/class/propal.class.php     |  5 +++
 htdocs/commande/class/commande.class.php      |  5 +++
 htdocs/compta/facture/class/facture.class.php |  6 +++-
 .../sociales/class/chargesociales.class.php   |  5 +++
 htdocs/contrat/class/contrat.class.php        |  5 +++
 htdocs/core/class/commonobject.class.php      | 32 +++++++++++++++++++
 htdocs/core/class/html.formfile.class.php     | 15 +++++++--
 htdocs/fichinter/class/fichinter.class.php    |  5 +++
 .../class/fournisseur.commande.class.php      |  5 +++
 .../fourn/class/fournisseur.facture.class.php |  5 +++
 htdocs/product/class/product.class.php        |  5 +++
 htdocs/projet/class/project.class.php         |  5 +++
 12 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index be22043e4b5..589afedd00c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -47,6 +47,11 @@ class Propal extends CommonObject
     public $fk_element='fk_propal';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $socid;		// Id client
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 49ba2536bfa..06f381a41a9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -44,6 +44,11 @@ class Commande extends CommonOrder
     public $fk_element = 'fk_commande';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $socid;		// Id client
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 632381c8541..f81fb37849f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -50,6 +50,11 @@ class Facture extends CommonInvoice
 	public $fk_element = 'fk_facture';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'facnumber';
+
 	var $id;
 	//! Id client
 	var $socid;
@@ -833,7 +838,6 @@ class Facture extends CommonInvoice
 		return $result;
 	}
 
-
 	/**
 	 *	Get object and lines from database
 	 *
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index fb8bc162c83..1d684c65552 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -34,6 +34,11 @@ class ChargeSociales extends CommonObject
     public $table='chargesociales';
     public $table_element='chargesociales';
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
     var $ref;
     var $date_ech;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ae384195162..5265f7025c5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -44,6 +44,11 @@ class Contrat extends CommonObject
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $id;
 	var $ref;
 	var $ref_ext;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 54c7b9d860d..9fb4841c0a9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -54,6 +54,12 @@ abstract class CommonObject
 
     // No constructor as it is an abstract class
 
+    /**
+     * Column name of the ref field.
+     * @var string
+     */
+    protected $table_ref_field = '';
+
 
     /**
      * Check an object id/ref exists
@@ -631,6 +637,32 @@ abstract class CommonObject
     }
 
 
+    /**
+     * Looks for an object with ref matching the wildcard provided
+     * It does only work when $this->table_ref_field is set
+     *
+     * @param string $ref Wildcard
+     * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
+     */
+    public function fetchOneLike($ref)
+    {
+        if (!$this->table_ref_field) {
+            return 0;
+        }
+
+        $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
+
+        $query = $this->db->query($sql);
+
+        if (!$this->db->num_rows($query)) {
+            return 0;
+        }
+
+        $result = $this->db->fetch_object($query);
+
+        return $this->fetch($result->rowid);
+    }
+
     /**
      *	Load data for barcode into properties ->barcode_type*
      *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1ef5045c845..34f6418de34 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -997,7 +997,6 @@ class FormFile
                 if ($modulepart == 'user')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
                 if (! $id && ! $ref) continue;
-
                 $found=0;
                 if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
                 {
@@ -1006,7 +1005,19 @@ class FormFile
                 else
                 {
                     //print 'Fetch '.$id." - ".$ref.'<br>';
-                    $result=$object_instance->fetch($id,$ref);
+
+                    if ($id) {
+                        $result = $object_instance->fetch($id);
+                    } else {
+                        //fetchOneLike looks for objects with wildcards in its reference.
+                        //It is useful for those masks who get underscores instead of their actual symbols
+                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+                        //that's why we look only look fetchOneLike when fetch returns 0
+                        if (!$result = $object_instance->fetch('', $ref)) {
+                            $result = $object_instance->fetchOneLike($ref);
+                        }
+                    }
+
                     if ($result > 0)  { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); }    // Save object into a cache
                     if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
                 }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 28ef737de13..4ab0cfdb96b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -37,6 +37,11 @@ class Fichinter extends CommonObject
 	public $fk_element='fk_fichinter';
 	public $table_element_line='fichinterdet';
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $id;
 
 	var $socid;		// Id client
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7593dcf9903..4fe4675f5d8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -45,6 +45,11 @@ class CommandeFournisseur extends CommonOrder
     public $fk_element = 'fk_commande';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
 
     var $ref;		 // TODO deprecated
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 95da7550db7..d9a4469481f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -43,6 +43,11 @@ class FactureFournisseur extends CommonInvoice
     public $fk_element='fk_facture_fourn';
     protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $rowid;
     var $ref;
     var $product_ref;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 390f250f5d9..ba179aef616 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -46,6 +46,11 @@ class Product extends CommonObject
 	protected $isnolinkedbythird = 1;     // No field fk_soc
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
 	var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
 
 	//! Identifiant unique
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 41ae40a259d..f762b10d2ca 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -38,6 +38,11 @@ class Project extends CommonObject
     public $fk_element = 'fk_projet';
     protected $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
     var $ref;
     var $description;

From ca133d74acd8ccc25bd23bf25e143321e9f0d5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:20:09 +0100
Subject: [PATCH 225/345] Corrected key not translated

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

diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 7d0fc5c64bf..7626774b24c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -409,7 +409,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"),   'desc'=>$langs->trans("ECMDocsByInvoices")); }
 	if (! empty($conf->tax->enabled))         { $langs->load("compta"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"),     'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
 	if (! empty($conf->projet->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"),     'desc'=>$langs->trans("ECMDocsByProjects")); }
-	if (! empty($conf->ficheinter->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"),     'desc'=>$langs->trans("ECMDocsByInterventions")); }
+	if (! empty($conf->ficheinter->enabled))      { $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"),     'desc'=>$langs->trans("ECMDocsByInterventions")); }
 	$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"),     'desc'=>$langs->trans("ECMDocsByUsers"));
 	
 }

From c870f0e3db09eda2ae2cdda07d8f473181e22885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:30:47 +0100
Subject: [PATCH 226/345] Updated changelog

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

diff --git a/ChangeLog b/ChangeLog
index 7b5447aed23..3f752e4db68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@ For users:
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
 - Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
 - Fix: datepicker first day of week can be monday by setting into display setup
+- Fix: [ bug #575 ] GED doesn't works if there is "/" in a mask
 
 For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy

From 7b6a4d1bfd923dfca6c8a62ea46a9bbda0196cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:50:15 +0100
Subject: [PATCH 227/345] Fix: [ bug #1715 ] Valign and width attributes are
 used in div tags

---
 htdocs/core/class/html.form.class.php | 16 ++++++++++++++--
 htdocs/core/lib/agenda.lib.php        |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 61d1c08f2aa..e61f1af9617 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -400,14 +400,26 @@ class Form
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
         $s="";
         if (empty($notabs))	$s.='<table class="nobordernopadding" summary=""><tr>';
-        if ($direction < 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction < 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // TODO add this in css
         //if ($text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
         $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':'');
         $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':'');
         if ((string) $text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
-        if ($direction > 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction > 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         if (empty($notabs))	$s.='</tr></table>';
 
         return $s;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 3d51490f6b2..23a17534ccf 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -149,7 +149,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	if (! empty($conf->browser->phone)) print '</div>';
 	else print '</td>';
 
-	if (! empty($conf->browser->phone)) print '<div class="fichehalfright" valign="middle">';
+	if (! empty($conf->browser->phone)) print '<div class="fichehalfright">';
 	else print '<td align="center" valign="middle" class="nowrap">';
 
 	print '<table><tr><td align="center">';

From eb524cfd29a38d50dbb0c09ce579a18e9d320670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:50:33 +0100
Subject: [PATCH 228/345] Copyright info

---
 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 e61f1af9617..e90dbdd203d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Herve Prot            <herve.prot@symeos.com>
- * Copyright (C) 2012      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2013      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014      Alexandre Spangaro    <alexandre.spangaro@gmail.com>
  *

From 2616deb58d5d2e94235dee46292c9bf6b15eabf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:52:11 +0100
Subject: [PATCH 229/345] Copyright info

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9fb4841c0a9..d0e4e086640 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2011-2014 Philippe Grand	    <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 5ec38d89ffd75482a23ede368a2645b1fde6792a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 22:59:57 +0100
Subject: [PATCH 230/345] Fixed [ bug #1763 ] Undefined variable $interface in
 Project:574

---
 htdocs/projet/class/project.class.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 41ae40a259d..fb98bec1c46 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -568,16 +568,9 @@ class Project extends CommonObject
             {
                 // Call trigger
                 $result=$this->call_trigger('PROJECT_DELETE',$user);
-                if ($result < 0)
-                {
+
+                if ($result < 0) {
                     $error++;
-                    if (! empty($interface->errors))
-                    {
-                		foreach ($interface->errors as $errmsg ) {
-                			dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-                			$this->errors[] =$errmsg;
-                		}
-                    }
                 }
                 // End call triggers
             }

From aec1bdb3c4bf2608963ca28fd3a771fd043135f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 23:08:07 +0100
Subject: [PATCH 231/345] Fixed [ bug #1766 ] PHP Warning when adding a service
 to a supplier invoice

---
 htdocs/comm/propal.php         |  5 +----
 htdocs/commande/card.php       |  4 ++--
 htdocs/compta/facture.php      |  6 +++---
 htdocs/expedition/card.php     |  4 +---
 htdocs/fourn/commande/card.php | 12 +++---------
 htdocs/fourn/facture/card.php  |  8 ++------
 htdocs/livraison/card.php      |  4 +---
 7 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 5d20743d029..3744a9e4bab 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -189,8 +189,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -499,9 +499,6 @@ else if ($action == 'add' && $user->rights->propal->creer)
 			    			$outputlangs->setDefaultLang($newlang);
 			    		}
 			    		$model=$object->modelpdf;
-			    		if (empty($model)) {
-			    			$tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0];
-			    		}
 
 			    		$ret = $object->fetch($id); // Reload to get new records
 			    		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1291d6cce26..62577387bbd 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -922,8 +922,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -971,8 +971,8 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) {
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 4f8eb73a8db..000b1f7de90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -417,8 +417,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			if ($result < 0) dol_print_error($db,$result);
 			}
@@ -500,8 +500,8 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model=$object->modelpdf;
-				if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 				$ret = $object->fetch($id); // Reload to get new records
+
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
@@ -1328,8 +1328,8 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$model=$object->modelpdf;
-					if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
 					$ret = $object->fetch($id); // Reload to get new records
+
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6ee45778d18..423d1565f8c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -279,10 +279,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'shipping'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 753f91fbdda..09556bd9125 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -357,10 +357,8 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -462,10 +460,8 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -526,10 +522,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 38a0f79a6ea..9542fc062e7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -711,10 +711,8 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
@@ -793,10 +791,8 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
     			$outputlangs->setDefaultLang($newlang);
     		}
     		$model=$object->modelpdf;
-    		if (empty($model)) {
-    			$tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
-    		}
     		$ret = $object->fetch($id); // Reload to get new records
+
     		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		if ($result < 0) dol_print_error($db,$result);
     	}
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 2b6a74a519e..1a89a377fef 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -135,10 +135,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$model=$object->modelpdf;
-		if (empty($model)) {
-			$tmp=getListOfModels($db, 'delivery'); $keys=array_keys($tmp); $model=$keys[0];
-		}
 		$ret = $object->fetch($id); // Reload to get new records
+
 		$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		if ($result < 0) dol_print_error($db,$result);
 	}

From f4def9ea288c0677117087f883e1625a01b1f358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:07:24 +0100
Subject: [PATCH 232/345] Fix: [ bug #1769 ] Error when installing to a
 PostgreSQL DB that contains numbers

---
 ChangeLog                      | 1 +
 htdocs/core/db/pgsql.class.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..48cc3247cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index efb9888f8b3..3af1c4bef83 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1021,7 +1021,7 @@ class DoliDBPgsql extends DoliDB
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql='CREATE DATABASE '.$database.' OWNER '.$owner.' ENCODING \''.$charset.'\'';
+		$sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
 		dol_syslog($sql,LOG_DEBUG);
 		$ret=$this->query($sql);
 		return $ret;

From 1d39c1acc22fdd7d2767fea7061b24b3242477d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:12:16 +0100
Subject: [PATCH 233/345] Fix: [ bug #1768 ] PHP Warning when error connecting
 to a PostgreSQL server in install script

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

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index efb9888f8b3..f0f1f0333c8 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -402,7 +402,7 @@ class DoliDBPgsql extends DoliDB
 		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
 		{
 			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
-			$this->db = pg_connect($con_string);
+			$this->db = @pg_connect($con_string);
 		}
 
 		// if local connection failed or not requested, use TCP/IP
@@ -412,7 +412,7 @@ class DoliDBPgsql extends DoliDB
 			if (! $port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
-			$this->db = pg_connect($con_string);
+			$this->db = @pg_connect($con_string);
 		}
 
 		// now we test if at least one connect method was a success

From 8e47fe9e1c0d6983fdffcab77d927c3528dda030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:19:09 +0100
Subject: [PATCH 234/345] Fix: [ bug #1757 ] Sorting breaks product/service
 statistics

---
 ChangeLog                   |  1 +
 htdocs/product/popuprop.php | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 949492346b2..624f4ca15a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken dur to SSL v3 closed.
+Fix: [ bug #1757 ] Sorting breaks product/service statistics
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 5404dd1848a..b89fbc3b911 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,7 +72,9 @@ llxHeader('','',$helpurl);
 $sql = "SELECT count(*) as c";
 $sql.= " FROM ".MAIN_DB_PREFIX."product";
 $sql.= ' WHERE entity IN ('.getEntity('product', 1).')';
-if (isset($type)) $sql.= " AND fk_product_type = ".$type;
+if ($type !== '') {
+	$sql.= " AND fk_product_type = ".$type;
+}
 
 $result=$db->query($sql);
 if ($result)
@@ -82,11 +85,14 @@ if ($result)
 
 $param = '';
 $title = $langs->trans("ListProductServiceByPopularity");
-if (isset($type))
-{
+if ($type !== '') {
 	$param = '&amp;type='.$type;
-	$title = $langs->trans("ListProductByPopularity");
-	if ($type == 1) $title = $langs->trans("ListServiceByPopularity");
+
+	if ($type == 1) {
+		$title = $langs->trans("ListServiceByPopularity");
+	} else {
+		$title = $langs->trans("ListProductByPopularity");
+	}
 }
 
 print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num);
@@ -106,7 +112,9 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";
 $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 $sql.= " AND p.rowid = pd.fk_product";
-if (isset($type)) $sql.= " AND fk_product_type = ".$type;
+if ($type !== '') {
+	$sql.= " AND fk_product_type = ".$type;
+}
 $sql.= " GROUP BY (p.rowid)";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit, $offset);

From 745eece5fed0d9fbdb7bcd6a72c5efb189a3d438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 00:34:57 +0100
Subject: [PATCH 235/345] Fix: [ bug #1761 ] SQL error when installing 3.7 with
 PostgreSQL

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

diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
index 333eb41ad08..0a89810dce5 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -21,6 +21,6 @@ CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields (
   tms                       timestamp,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
-) ENGINE=InnoDB ;
+)ENGINE=innodb;
 
 

From 420ebe0be914511eb6d303581a18f5cdf233a47b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Dec 2014 04:04:16 +0100
Subject: [PATCH 236/345] Fix: Change order to create fields

---
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 2281793929f..0b71a2fe6fe 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -220,8 +220,8 @@ create table llx_accounting_fiscalyear
 	fk_user_modif	integer NULL
 )ENGINE=innodb;
 
-ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref;
-ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext;
+ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref;
+ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref_supplier;
 
 ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison;
 ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison;

From 75dbcf4a78048a067cfeb4e16fcdce4f1dfb46a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Dec 2014 04:35:48 +0100
Subject: [PATCH 237/345] Fixed: doxygen

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b97103458c3..2cb3e634841 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2848,10 +2848,10 @@ class Societe extends CommonObject
     }
 
     /**
-     *  Check if thirdparty may using localtax or not
+     *  Check if we must use localtax feature or not according to country (country of $mysocin most cases).
      *
      *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
-     *  @return		array					array(0=>boolean, 1=>boolean)
+     *  @return		boolean					true or false
      */
     function useLocalTax($localTaxNum=0)
     {
@@ -2873,9 +2873,9 @@ class Societe extends CommonObject
     }
 
     /**
-     *  Check if thirdparty is from a country using revenue stamps
+     *  Check if we must use revenue stamps feature or not according to country (country of $mysocin most cases).
      *
-     *  @return		boolean			Yes or no
+     *  @return		boolean			true or false
      */
     function useRevenueStamp()
     {

From d8557d8af0dcb5bda7310fe6a6d507936dd33636 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Dec 2014 05:16:00 +0100
Subject: [PATCH 238/345] Fixed: label

---
 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 0152c34db7d..09e3404837d 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1197,7 +1197,7 @@ class Form
             else $sql.= " WHERE u.entity IS NOT NULL";
         }
         else
-        {
+       {
         	if (! empty($conf->multicompany->transverse_mode))
         	{
         		$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
@@ -1291,7 +1291,7 @@ class Form
                         }
                         else
                      {
-                        	$out.=($moreinfo?' - ':' (').$obj->label;
+                        	$out.=($moreinfo?' - ':' (').($obj->label?$obj->label:$langs->trans("EntityNameNotDefined"));
                         	$moreinfo++;
                      	}
                     }

From d40229e9cc87e706e533b07de90ce0f7ee9a29ec Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Dec 2014 09:14:19 +0100
Subject: [PATCH 239/345] Fix: Bad order field value

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

diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index dc65764defd..001b528d431 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,7 +154,7 @@ if ($id > 0 || ! empty($ref))
 			print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
 			print "</tr>\n";
 

From bdf5f5726f7af2f85a14eff9a64f417bf11ca95f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Dec 2014 09:29:27 +0100
Subject: [PATCH 240/345] Fix: Bad order field value

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

diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 39768262f10..49e5651b065 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref))
                 print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print "</tr>\n";
 

From a901329a7d7a5c46023017bbcf177cdcf687ab84 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 26 Dec 2014 09:29:27 +0100
Subject: [PATCH 241/345] Fix: Bad order field value

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

diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 39768262f10..49e5651b065 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref))
                 print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
                 print "</tr>\n";
 

From e7ebb78ffde0ea3bd64b3ee4d6cd2b79d891e0fc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 26 Dec 2014 11:09:46 +0100
Subject: [PATCH 242/345] in PDF, no line jump after doc linked ref. Fix bug
 1605.

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c8fb09a6195..129d32fc7d9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -900,7 +900,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
 
 			if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
 			{
-				$posy+=7;
+				$posy+=3;
 				$pdf->SetXY($posx,$posy);
 				$pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
 			}

From 9f6f90275a651b3893693483b0f6f7b1a0ac0da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 26 Dec 2014 12:03:29 +0100
Subject: [PATCH 243/345] Fix  [ bug #1714 ] Id "sall" is used twice in
 different HTML tags

---
 htdocs/core/search_page.php |  4 ++--
 htdocs/main.inc.php         | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 9f1734b2326..49fefc3ebed 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -85,7 +85,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em
 	&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
 {
 	$langs->load("products");
-	$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall');
+	$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', '', 'sall'.rand(0,10));
 	$nbofsearch++;
 }
 
@@ -100,7 +100,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em
 if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 {
 	$langs->load("members");
-	$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall');
+	$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'sall'.rand(0,10));
 	$nbofsearch++;
 }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 15f2281cc1f..ae9f347f4e8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2008      Matteli
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1556,7 +1557,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
 	    {
 	        $langs->load("products");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P');
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'sall'.rand(0, 10));
 	    }
 
 	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
@@ -1569,7 +1570,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 	    {
 	        $langs->load("members");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M');
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M', 'sall'.rand(0, 10));
 	    }
 
 	    // Execute hook printSearchForm
@@ -1806,12 +1807,17 @@ function getHelpParamFor($helppagename,$langs)
  *  @param  string	$htmlmodesearch     Value to set into parameter "mode_search" ('soc','contact','products','member',...)
  *  @param  string	$htmlinputname      Field Name input form
  *  @param	string	$accesskey			Accesskey
+ * @param string $htmlinputid           Input ID
  *  @return	string
  */
-function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='')
+function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='', $htmlinputid = '')
 {
     global $conf,$langs;
 
+    if (!$htmlinputid) {
+        $htmlinputid = $htmlinputname;
+    }
+
     $ret='';
     $ret.='<form action="'.$urlaction.'" method="post">';
 	$ret.='<div class="menu_titre menu_titre_search">';
@@ -1828,7 +1834,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
     $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
     if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
     else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
-    $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />';
+    $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputid.'" size="10" />';
     $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
     $ret.="</form>\n";
     return $ret;

From 5d80061caf2031d34ef027a63357ca22666177c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Dec 2014 22:04:16 +0100
Subject: [PATCH 244/345] Mark property error as deprecated

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 18927b9df51..0dedb135298 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -35,8 +35,18 @@
 abstract class CommonObject
 {
     public $db;
+
+    /**
+     * @var error 	Error string
+     * @deprecated	Use instead the array of error strings
+     */
     public $error;
+
+    /**
+     * @var errors	Aray of error string
+     */
     public $errors;
+
     public $canvas;                // Contains canvas name if it is
 
     public $name;

From 613d1b381b2f4fc4ad0482bb278059ceb9d29814 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Dec 2014 01:10:42 +0100
Subject: [PATCH 245/345] Doxygen

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 5265f7025c5..fac549515fc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -59,11 +59,11 @@ class Contrat extends CommonObject
 	var $product;
 
 	var $user_author;
-	var $date_creation;
-	var $date_validation;
+	var $date_creation;		// date of creation
+	var $date_validation;	// date of last update
 
-	var $date_contrat;
-	var $date_cloture;
+	var $date_contrat;  // date when contract was signed
+	var $date_cloture;	// deprecated (we close contract lines, not a contract)
 
 	var $commercial_signature_id;
 	var $commercial_suivi_id;

From 953e736a97d2aacad8962b998d49db0f89aa4c7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Dec 2014 02:21:37 +0100
Subject: [PATCH 246/345] Prepare version 3.6.2

---
 build/debian/changelog           |  7 +++++++
 build/exe/doliwamp/.gitignore    |  1 +
 build/exe/doliwamp/doliwamp.iss  |  8 ++++----
 build/makepack-dolibarr.pl       | 15 ++++++++++-----
 build/rpm/dolibarr_fedora.spec   |  3 +++
 build/rpm/dolibarr_generic.spec  |  3 +++
 build/rpm/dolibarr_mandriva.spec |  3 +++
 build/rpm/dolibarr_opensuse.spec |  3 +++
 htdocs/filefunc.inc.php          |  2 +-
 9 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 build/exe/doliwamp/.gitignore

diff --git a/build/debian/changelog b/build/debian/changelog
index ab2fe33ec0a..4a711c9868c 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,10 @@
+dolibarr (3.6.2-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Sat, 27 dec 2014 12:00:00 +0100      
+
 dolibarr (3.6.1-3) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
diff --git a/build/exe/doliwamp/.gitignore b/build/exe/doliwamp/.gitignore
new file mode 100644
index 00000000000..ce74d54f78e
--- /dev/null
+++ b/build/exe/doliwamp/.gitignore
@@ -0,0 +1 @@
+/doliwamp.tmp.iss
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 1657ff1c7e7..6183bcac85c 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -16,10 +16,10 @@
 [Setup]
 ; ----- Change this -----
 AppName=DoliWamp
-; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.6.1
-; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.6.1
+; Replace key with DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+AppVerName=__FILENAMEEXEDOLIWAMP__
+; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 8abac38d802..8467d4140f3 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir: 
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -911,8 +911,6 @@ if ($nboftargetok) {
             close SPECFROM;
             close SPECTO;
             print "Version set to $MAJOR.$MINOR.$newbuild\n";
-            #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
-            #$ret=`$cmd`;
             $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
             $ret=`$cmd`;
             $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
@@ -951,8 +949,12 @@ if ($nboftargetok) {
  
  			$SOURCEBACK=$SOURCE;
  			$SOURCEBACK =~ s/\//\\/g;
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
+
+    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
+    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
@@ -962,6 +964,9 @@ if ($nboftargetok) {
     		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
             print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
             $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
+            
+            $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+            
     		next;
     	}
     }
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 7dc332f0432..0904797b5a4 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -333,6 +333,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 1949398ecc2..44a5ea1d842 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -569,6 +569,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 0331a0a9cc3..a06162bcf1a 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -338,6 +338,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f85cc0fa7a0..1c939abae87 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -349,6 +349,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
 * Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
 - Upstream release
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8066c2a1a22..526f2aa2e57 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.1');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.2');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

From dc18759c6c022b7049c352ae9c587b932cf90b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 27 Dec 2014 11:15:26 +0100
Subject: [PATCH 247/345] Attribut width not allowed with div or span

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 09e3404837d..491e590403c 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -399,28 +399,28 @@ class Form
         if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
         $s="";
-        if (empty($notabs))	$s.='<table class="nobordernopadding" summary=""><tr>';
-        if ($direction < 0)	{
+        if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';
+        if ($direction < 0) {
             $s.='<'.$tag.$paramfortooltipimg;
             if ($tag == 'td') {
-                $s .= 'valign="top" ';
+                $s .= ' valign="top" width="14"';
             }
-            $s.= 'width="14">'.$img.'</'.$tag.'>';
+            $s.= '>'.$img.'</'.$tag.'>';
         }
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // TODO add this in css
-        //if ($text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
+        //if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
         $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':'');
         $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':'');
-        if ((string) $text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
-        if ($direction > 0)	{
+        if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+        if ($direction > 0) {
             $s.='<'.$tag.$paramfortooltipimg;
             if ($tag == 'td') {
-                $s .= 'valign="top" ';
+                $s .= ' valign="top" width="14"';
             }
-            $s.= 'width="14">'.$img.'</'.$tag.'>';
+            $s.= '>'.$img.'</'.$tag.'>';
         }
-        if (empty($notabs))	$s.='</tr></table>';
+        if (empty($notabs)) $s.='</tr></table>';
 
         return $s;
     }

From 1ab6955494849e57cad898585082f7be18b3f021 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Sat, 27 Dec 2014 11:27:41 +0100
Subject: [PATCH 248/345] FIX: dont remove price ht if it is forced (ie:
 calculated by margin rate and cost price, or by external module)

---
 htdocs/comm/propal.php    | 3 +--
 htdocs/commande/fiche.php | 3 +--
 htdocs/compta/facture.php | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e3be3ac8361..4929ee9c70e 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -545,16 +545,15 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index e0950bdccc7..1c01b975a3b 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -511,16 +511,15 @@ else if ($action == 'addline' && $user->rights->commande->creer) {
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 25330ba548b..d9582e957e2 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1064,16 +1064,15 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 	// Set if we used free entry or predefined product
 	$predef='';
 	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$price_ht = GETPOST('price_ht');
 	if (GETPOST('prod_entry_mode') == 'free')
 	{
 		$idprod=0;
-		$price_ht = GETPOST('price_ht');
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	}
 	else
 	{
 		$idprod=GETPOST('idprod', 'int');
-		$price_ht = '';
 		$tva_tx = '';
 	}
 

From 6e69d5c4bd10235189e37a125131603e088910dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 27 Dec 2014 11:28:10 +0100
Subject: [PATCH 249/345] Typo

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 72b860977f6..9265c9ee463 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -587,7 +587,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Total").'</td>';
 				print '<td align="right">'.price($tot_ttc).'</td>';
 				print '<td align="right"></td>';
-				print '<td align="right">&nbsp</td>';
+				print '<td align="right">&nbsp;</td>';
 				print '</tr>';
 			}
 			else

From 250a995de824d361be68a53cd22a2df6cd9d2310 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 28 Dec 2014 02:54:42 +0100
Subject: [PATCH 250/345] Bug?

---
 dev/translation/strip_language_file.php | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index d6c45d9f249..42a70c8c1a6 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,20 +1,20 @@
 #!/usr/bin/php
 <?php
 /* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
- * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * -----
  *
@@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess)
 
 	print "Output can be found at $output.\n";
 
-	print "To rename all .delta files, you can do\n";
-	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+	print "To rename all .delta files, you can do\n";
+	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 

From bdd7e9df2386ff8cf05dfcb9e01a0da94266b653 Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Sun, 28 Dec 2014 03:39:30 +0100
Subject: [PATCH 251/345] Added searching using year

---
 htdocs/projet/index.php | 3 ++-
 htdocs/projet/list.php  | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 36f53b02680..ec807f5a5a3 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -84,7 +84,8 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProject").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
 	print '<td class="nowrap"><label for="sf_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_ref" id="sf_ref" size="18"></td>';
-	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<td rowspan="3"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="syear">'.$langs->trans("Year").'</label>:</td><td><input type="text" class="flat" name="search_year" id="search_year" size="18"></td>';
 	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="search_all" id="search_all" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 614f91468cc..f00a6ef518b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -27,6 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load('projects');
 
@@ -61,6 +62,7 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 $search_ref=GETPOST("search_ref");
 $search_label=GETPOST("search_label");
 $search_societe=GETPOST("search_societe");
+$search_year=GETPOST("search_year");
 $search_all=GETPOST("search_all");
 
 // Purge criteria
@@ -69,6 +71,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_ref="";
 	$search_label="";
 	$search_societe="";
+	$search_year="";
 	$search_all=0;
 }
 
@@ -106,6 +109,10 @@ if ($search_societe)
 {
 	$sql .= natural_search('s.nom', $search_societe);
 }
+if ($search_year) {
+	$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($search_year,12,false)).")";
+	$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($search_year,1,false)).")";
+}
 if ($search_all)
 {
 	$sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all);

From 191d4467e358274a77e21f821838924170fd99f3 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 28 Dec 2014 12:31:27 +0100
Subject: [PATCH 252/345] Update facture.php

$soc already filled upper when $socid send
---
 htdocs/compta/facture.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 25330ba548b..b2da9f652f7 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1884,8 +1884,10 @@ if ($action == 'create')
 			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
-
-			$soc = $objectsrc->thirdparty;
+	
+			// only if socid not filled else it's allready done upper
+			if (empty($socid))
+				$soc = $objectsrc->thirdparty;
 
 			$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
 			$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));

From 2957c1445eb62aaf4adaf2746eb184d23692d871 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 28 Dec 2014 12:34:21 +0100
Subject: [PATCH 253/345] Update facture.php

$soc already filled upper if $socid filled
---
 htdocs/compta/facture.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 000b1f7de90..2ea3baa6198 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1767,7 +1767,9 @@ if ($action == 'create')
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
 
-			$soc = $objectsrc->thirdparty;
+			// only if socid not filled else it's allready done upper
+			if (empty($socid))
+				$soc = $objectsrc->thirdparty;
 
 			$cond_reglement_id 	= (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
 			$mode_reglement_id 	= (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));

From da0d0838e25b43f08587e1072288371cd5b3edbe Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sun, 28 Dec 2014 13:20:51 +0100
Subject: [PATCH 254/345] Update card.php

don't show line with empty duration when FICHINTER_HIDE_EMPTY_DURATION is active
---
 htdocs/fichinter/card.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index a9888a59a24..f618e6ff9ad 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1373,6 +1373,8 @@ else if ($id > 0 || ! empty($ref))
 		$sql.= ' ft.date as date_intervention';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 		$sql.= ' WHERE ft.fk_fichinter = '.$object->id;
+		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION))
+			$sql.= ' AND ft.duree <> 0';
 		$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
 
 		$resql = $db->query($sql);

From 56dd276504426124ec9b87e71470a4f8d04409ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 28 Dec 2014 15:17:54 +0100
Subject: [PATCH 255/345] Enhance search_categories with select2

---
 htdocs/core/class/html.formother.class.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 29d1140d215..68a7b677667 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -311,15 +311,25 @@ class FormOther
      */
     function select_categories($type,$selected=0,$htmlname='search_categ',$nocateg=0)
     {
-        global $langs;
+        global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
         // Load list of "categories"
         $static_categs = new Categorie($this->db);
         $tab_categs = $static_categs->get_full_arbo($type);
 
+        $moreforfilter = '';
+        $nodatarole = '';
+        // Enhance with select2
+        if ($conf->use_javascript_ajax)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $moreforfilter.= ajax_combobox('select_categ_'.$htmlname);
+            $nodatarole=' data-role="none"';
+        }
+
         // Print a select with each of them
-        $moreforfilter ='<select class="flat" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
+        $moreforfilter.='<select class="flat" id="select_categ_'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
         $moreforfilter.='<option value="">&nbsp;</option>';	// Should use -1 to say nothing
 
         if (is_array($tab_categs))

From d4e7a97fdb54058990ff1f6fa6ebae43d0302179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 17:31:27 +0100
Subject: [PATCH 256/345] Fix: [ bug #1774 ] PHP Fatal error when creating a
 contract with Product module not enabled

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e4a8c644615..274376860da 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1229,8 +1229,10 @@ else
         /*
          * Lines of contracts
          */
-        $productstatic=new Product($db);
 
+	    if ($conf->product->enabled) {
+			$productstatic=new Product($db);
+	    }
 
         $usemargins=0;
 		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;

From b9d6f2a4963e4265ffe04ffedfafa30776bff8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 17:43:25 +0100
Subject: [PATCH 257/345] Fix: [ bug #1775 ] New lines can be entered after
 contract validation

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e4a8c644615..f23ffb33845 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1672,7 +1672,7 @@ else
         }
 
 		// Form to add new line
-        if ($user->rights->contrat->creer && ($object->statut >= 0))
+        if ($user->rights->contrat->creer && ($object->statut == 0))
         {
         	$dateSelector=1;
 

From 584be6a589e3d55d6c45b50a997a79e9423254c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 17:47:13 +0100
Subject: [PATCH 258/345] Fixed Contrat::fetch

---
 htdocs/contrat/class/contrat.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 5265f7025c5..8c96727c5aa 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -470,6 +470,18 @@ class Contrat extends CommonObject
 				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
 				$this->fetch_optionals($this->id,$extralabels);
 
+				/*
+				 * Lines
+				*/
+
+				$this->lines  = array();
+
+				$result=$this->fetch_lines();
+				if ($result < 0)
+				{
+					$this->error=$this->db->error();
+					return -3;
+				}
 
 				return $this->id;
 			}

From e70b6714ce475f4dae98abd3bace519988c74668 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Dec 2014 01:10:42 +0100
Subject: [PATCH 259/345] Doxygen (cherry picked from commit 613d1b3)

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8c96727c5aa..3b23f739a50 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -59,11 +59,11 @@ class Contrat extends CommonObject
 	var $product;
 
 	var $user_author;
-	var $date_creation;
-	var $date_validation;
+	var $date_creation;		// date of creation
+	var $date_validation;	// date of last update
 
-	var $date_contrat;
-	var $date_cloture;
+	var $date_contrat;  // date when contract was signed
+	var $date_cloture;	// deprecated (we close contract lines, not a contract)
 
 	var $commercial_signature_id;
 	var $commercial_suivi_id;

From cd468b65fdd198f02095ecb3976d22fc62cf9c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 17:55:21 +0100
Subject: [PATCH 260/345] Documented Contrat class

---
 htdocs/contrat/class/contrat.class.php | 77 ++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 3b23f739a50..f546531a256 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -49,27 +49,94 @@ class Contrat extends CommonObject
 	 */
 	protected $table_ref_field = 'ref';
 
+	/**
+	 * Id of the contract
+	 * @var int
+	 */
 	var $id;
+
+	/**
+	 * Reference of the contract
+	 * @var string
+	 */
 	var $ref;
+
+	/**
+	 * External reference of the contract.
+	 * Used by 3rd party services
+	 * @var string
+	 */
 	var $ref_ext;
+
+	/**
+	 * Supplier reference of the contract
+	 * @var string
+	 */
 	var $ref_supplier;
+
+	/**
+	 * Client id linked to the contract
+	 * @var int
+	 */
 	var $socid;
 	var $societe;		// Objet societe
+
+	/**
+	 * Status of the contract
+	 * @var int
+	 */
 	var $statut=0;		// 0=Draft,
 	var $product;
 
+	/**
+	 * Author of the contract
+	 * @var
+	 */
 	var $user_author;
-	var $date_creation;		// date of creation
-	var $date_validation;	// date of last update
 
-	var $date_contrat;  // date when contract was signed
-	var $date_cloture;	// deprecated (we close contract lines, not a contract)
+	/**
+	 * Date of creation
+	 * @var int
+	 */
+	var $date_creation;
+
+	/**
+	 * Date of last update
+	 * @var int
+	 */
+	var $date_validation;
+
+	/**
+	 * Date when contract was signed
+	 * @var int
+	 */
+	var $date_contrat;
+
+	/**
+	 * Date of contract closure
+	 * @var int
+	 * @deprecated we close contract lines, not a contract
+	 */
+	var $date_cloture;
 
 	var $commercial_signature_id;
 	var $commercial_suivi_id;
 
-	var $note;			// deprecated
+	/**
+	 * @deprecated Use note_private or note_public instead
+	 */
+	var $note;
+
+	/**
+	 * Private note
+	 * @var string
+	 */
 	var $note_private;
+
+	/**
+	 * Public note
+	 * @var string
+	 */
 	var $note_public;
 	var $modelpdf;
 

From 52b8bb350ed5de7d7254a079305ab2aacb499a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 18:10:30 +0100
Subject: [PATCH 261/345] Fixed Contrat::fetch not setting
 Contrat::date_creation and improved class doc

---
 htdocs/contrat/class/contrat.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f546531a256..77dde27dd46 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -140,8 +140,13 @@ class Contrat extends CommonObject
 	var $note_public;
 	var $modelpdf;
 
+	/**
+	 * @deprecated Use fk_project instead
+	 */
 	var $fk_projet;
 
+	public $fk_project;
+
 	var $extraparams=array();
 
 	var $lines=array();
@@ -508,7 +513,9 @@ class Contrat extends CommonObject
 				$this->ref_ext					= $result["ref_ext"];
 				$this->statut					= $result["statut"];
 				$this->mise_en_service			= $this->db->jdate($result["datemise"]);
+
 				$this->date_contrat				= $this->db->jdate($result["datecontrat"]);
+				$this->date_creation				= $this->db->jdate($result["datecontrat"]);
 
 				$this->user_author_id			= $result["fk_user_author"];
 

From df1f931ab8a0c85855903b14e3d1ae5b30da1ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 18:10:41 +0100
Subject: [PATCH 262/345] Fixed: [ bug #1767 ] Contract document is not
 generated properly

---
 .../contract/doc/pdf_strato.modules.php       | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index be686377ce3..46364b23d0d 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -239,29 +239,9 @@ class pdf_strato extends ModelePDFContract
 
 				$iniY = $tab_top + 7;
 				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
+				$nexY = $tab_top + 2;
 
 				$pdf->SetXY($this->marge_gauche, $tab_top);
-				$pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
-				$pdf->line($this->marge_gauche, $tab_top + 8, $this->page_largeur-$this->marge_droite, $tab_top + 8);
-
-				$pdf->SetFont('', '', $default_font_size - 1);
-
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetXY($this->marge_gauche, $tab_top + 8);
-				$text=$object->description;
-				if ($object->duree > 0)
-				{
-				    $totaltime=convertSecondToTime($object->duree,'all',$conf->global->MAIN_DURATION_OF_WORKDAY);
-				    $text.=($text?' - ':'').$langs->trans("Total").": ".$totaltime;
-				}
-				$desc=dol_htmlentitiesbr($text,1);
-				//print $outputlangs->convToOutputCharset($desc); exit;
-
-				$pdf->writeHTMLCell(180, 3, 10, $tab_top + 8, $outputlangs->convToOutputCharset($desc), 0, 1);
-				$nexY = $pdf->GetY();
-
-				$pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY);
 
 				$pdf->MultiCell(0, 2, '');		// Set interline to 3. Then writeMultiCell must use 3 also.
 
@@ -285,7 +265,20 @@ class pdf_strato extends ModelePDFContract
 						$pageposbefore=$pdf->getPage();
 
 						// Description of product line
-						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).'</strong>';
+
+						if ($objectligne->datei) {
+							$datei = dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true);
+						} else {
+							$datei = $langs->trans("Unknown");
+						}
+
+						if ($objectligne->duration) {
+							$durationi = convertSecondToTime($objectligne->duration);
+						} else {
+							$durationi = $langs->trans("Unknown");
+						}
+
+						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".$datei." - ".$outputlangs->transnoentities("Duration")." : ".$durationi,1,$outputlangs->charset_output).'</strong>';
 						$desc=dol_htmlentitiesbr($objectligne->desc,1);
 
 						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0);
@@ -533,7 +526,7 @@ class pdf_strato extends ModelePDFContract
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->datec,"day",false,$outputlangs,true), '', 'R');
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_creation,"day",false,$outputlangs,true), '', 'R');
 
 		if ($object->client->code_client)
 		{

From 7670ae46a6437186041168804ca37703388e4604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 18:56:23 +0100
Subject: [PATCH 263/345]  Fix [ bug #1778 ] Cancel button of edit ref.
 supplier contract card saves changes instead of cancelling

---
 htdocs/contrat/card.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 14a43e59f12..f27d47f2dd5 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Ferran Marcet		  	<fmarcet@2byte.es>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -718,19 +719,25 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra
 		setEventMessage($object->error,'errors');
 	}
 } elseif ($action=='setref_supplier') {
-	$result = $object->fetch($id);
-	if ($result < 0) {
-		setEventMessage($object->errors,'errors');
-	}
-	$object->ref_supplier=GETPOST('ref_supplier','alpha');
 
-	$result = $object->update($user);
-	if ($result < 0) {
-		setEventMessage($object->errors,'errors');
-		$action='editref_supplier';
-	} else {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
+	$cancelbutton = GETPOST('cancel');
+
+	if (!$cancelbutton) {
+
+		$result = $object->fetch($id);
+		if ($result < 0) {
+			setEventMessage($object->errors, 'errors');
+		}
+		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
+
+		$result = $object->update($user);
+		if ($result < 0) {
+			setEventMessage($object->errors, 'errors');
+			$action = 'editref_supplier';
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
 	}
 } elseif ($action=='setref') {
 	$object->ref=GETPOST('ref','alpha');

From 0b4bddd738e0897a43bb285d5f8a4b865f153ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 18:57:59 +0100
Subject: [PATCH 264/345]  Fix [ bug #1779 ] Undefined variable $localtaxtx1
 and $localtaxtx2 in Contrat::updateline

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 77dde27dd46..ea133a86b0d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1390,7 +1390,7 @@ class Contrat extends CommonObject
 
 		$localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
 
-		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type);
+		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtax1tx, $localtax2tx, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type);
 		$total_ht  = $tabprice[0];
 		$total_tva = $tabprice[1];
 		$total_ttc = $tabprice[2];

From ec7bc21e4c2873ebeb7bde8d1d9231d80dc8d0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 19:01:39 +0100
Subject: [PATCH 265/345] Fixed undefined variable $pu_ht

---
 htdocs/contrat/class/contrat.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ea133a86b0d..df22f1d0469 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1403,19 +1403,19 @@ class Contrat extends CommonObject
 		// TODO A virer
 		// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 		$remise = 0;
-		$price = price2num(round($pu_ht, 2));
+		$price = price2num(round($pu, 2));
 		if (dol_strlen($remise_percent) > 0)
 		{
-		    $remise = round(($pu_ht * $remise_percent / 100), 2);
-		    $price = $pu_ht - $remise;
+		    $remise = round(($pu * $remise_percent / 100), 2);
+		    $price = $pu - $remise;
 		}
 
 	    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 ($pu > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
+				$pa_ht = $pu * (1 - $remise_percent / 100);
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($desc)."'";

From ef4d710f788a518e19ffc2d2805023c128d82cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 19:16:14 +0100
Subject: [PATCH 266/345] Improving CommonObject and Contrat documentation

---
 htdocs/contrat/class/contrat.class.php   | 32 +++++++++++++-----------
 htdocs/core/class/commonobject.class.php |  3 +++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index df22f1d0469..623e7e121f2 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -149,6 +149,10 @@ class Contrat extends CommonObject
 
 	var $extraparams=array();
 
+	/**
+	 * Contract lines
+	 * @var ContratLigne[]
+	 */
 	var $lines=array();
 
 
@@ -215,8 +219,8 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User qui active le contrat
 	 *  @param  int			$line_id    Id de la ligne de detail a activer
-	 *  @param  timestamp	$date       Date d'ouverture
-	 *  @param  timestamp	$date_end   Date fin prevue
+	 *  @param  int			$date       Date d'ouverture
+	 *  @param  int|string	$date_end   Date fin prevue
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
@@ -262,7 +266,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User qui active le contrat
 	 *  @param  int			$line_id    Id de la ligne de detail a activer
-	 *  @param  timestamp	$date_end	Date fin
+	 *  @param  int			$date_end	Date fin
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
@@ -578,7 +582,7 @@ class Contrat extends CommonObject
 	/**
 	 *  Load lignes array into this->lines
 	 *
-	 *  @return    Array   Return array of contract lines
+	 *  @return ContratLigne[]   Return array of contract lines
 	 */
 	function fetch_lines()
 	{
@@ -1183,16 +1187,16 @@ class Contrat extends CommonObject
 	 *  @param  float		$txlocaltax2        Local tax 2 rate
 	 *  @param  int			$fk_product      	Id produit
 	 *  @param  float		$remise_percent  	Pourcentage de remise de la ligne
-	 *  @param  timestamp	$date_start      	Date de debut prevue
-	 *  @param  timestamp	$date_end        	Date de fin prevue
-	 *	@param	float		$price_base_type	HT or TTC
+	 *  @param  int			$date_start      	Date de debut prevue
+	 *  @param  int			$date_end        	Date de fin prevue
+	 *	@param	string		$price_base_type	HT or TTC
 	 * 	@param  float		$pu_ttc             Prix unitaire TTC
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 * 	@param  int			$fk_fournprice		Fourn price id
 	 *  @param  int			$pa_ht				Buying price HT
 	 *  @return int             				<0 si erreur, >0 si ok
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
 	{
 		global $user, $langs, $conf, $mysoc;
 
@@ -1340,20 +1344,20 @@ class Contrat extends CommonObject
 	 *  @param  float		$pu               	Prix unitaire
 	 *  @param  int			$qty              	Quantite
 	 *  @param  float		$remise_percent   	Pourcentage de remise de la ligne
-	 *  @param  timestamp	$date_start       	Date de debut prevue
-	 *  @param  timestamp	$date_end         	Date de fin prevue
+	 *  @param  int			$date_start       	Date de debut prevue
+	 *  @param  int			$date_end         	Date de fin prevue
 	 *  @param  float		$tvatx            	Taux TVA
 	 *  @param  float		$localtax1tx      	Local tax 1 rate
 	 *  @param  float		$localtax2tx      	Local tax 2 rate
-	 *  @param  timestamp	$date_debut_reel  	Date de debut reelle
-	 *  @param  timestamp	$date_fin_reel    	Date de fin reelle
-	 *	@param	float		$price_base_type	HT or TTC
+	 *  @param  int|string	$date_debut_reel  	Date de debut reelle
+	 *  @param  int|string	$date_fin_reel    	Date de fin reelle
+	 *	@param	string		$price_base_type	HT or TTC
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 * 	@param  int			$fk_fournprice		Fourn price id
 	 *  @param  int			$pa_ht				Buying price HT
 	 *  @return int              				< 0 si erreur, > 0 si ok
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0, $localtax2tx=0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
 	{
 		global $user, $conf, $langs, $mysoc;
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d0e4e086640..ca9461e7deb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -47,6 +47,9 @@ abstract class CommonObject
 
     public $array_options=array();
 
+    /**
+     * @var Societe
+     */
     public $thirdparty;
 
     public $linkedObjectsIds;	// Loaded by ->fetchObjectLinked

From 7424ee1107a78b1634c43e8e054fe474bd5a57a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 19:28:25 +0100
Subject: [PATCH 267/345] Improving Contrat documentation and fixed some
 properties usage

---
 htdocs/contrat/class/contrat.class.php | 39 ++++++++++++++++++++++++--
 htdocs/install/upgrade2.php            |  2 +-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 623e7e121f2..9e0005bf3ad 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -89,11 +89,38 @@ class Contrat extends CommonObject
 	var $product;
 
 	/**
+	 * TODO: Which is the correct one?
 	 * Author of the contract
 	 * @var
 	 */
 	var $user_author;
 
+	/**
+	 * TODO: Which is the correct one?
+	 * Author of the contract
+	 * @var User
+	 */
+	public $user_creation;
+
+	/**
+	 * TODO: Which is the correct one?
+	 * Author of the contract
+	 * @var int
+	 */
+	public $fk_user_author;
+
+	/**
+	 * TODO: Which is the correct one?
+	 * Author of the contract
+	 * @var int
+	 */
+	public $user_author_id;
+
+	/**
+	 * @var User
+	 */
+	public $user_cloture;
+
 	/**
 	 * Date of creation
 	 * @var int
@@ -101,7 +128,14 @@ class Contrat extends CommonObject
 	var $date_creation;
 
 	/**
-	 * Date of last update
+	 * Date of last modification
+	 * Not filled until you call ->info()
+	 * @var int
+	 */
+	public $date_modification;
+
+	/**
+	 * Date of validation
 	 * @var int
 	 */
 	var $date_validation;
@@ -1952,7 +1986,6 @@ class Contrat extends CommonObject
 		while ($xnbp < $nbp)
 		{
 			$line=new ContratLigne($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
 			$line->qty=1;
 			$line->subprice=100;
 			$line->price=100;
@@ -2421,7 +2454,7 @@ class ContratLigne extends CommonObject
 		$sql.= ",total_localtax1=".price2num($this->total_localtax1,'MT')."";
 		$sql.= ",total_localtax2=".price2num($this->total_localtax2,'MT')."";
 		$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
-		$sql.= " WHERE rowid = ".$this->rowid;
+		$sql.= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 09f0d507a39..7bee1a38b6b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1523,7 +1523,7 @@ function migrate_price_contrat($db,$langs,$conf)
                 // On met a jour les 3 nouveaux champs
                 $contratligne= new ContratLigne($db);
                 //$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis
-                $contratligne->rowid=$rowid;
+                $contratligne->id=$rowid;
 
                 $result=calcul_price_total($qty,$pu,$remise_percent,$txtva,0,0,0,'HT',$info_bits,0,$tmpmysoc);
                 $total_ht  = $result[0];

From 2202380bc2a11c27383cdbcf90c9b8eed2c386fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 19:36:43 +0100
Subject: [PATCH 268/345] Improving ContratLigne documentation

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9e0005bf3ad..a407f0c3a6f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2055,6 +2055,13 @@ class ContratLigne extends CommonObject
 	var $fk_product;
 	var $statut;					// 0 inactive, 4 active, 5 closed
 	var $label;
+
+	/**
+	 * @var string
+	 * @deprecated Use $label instead
+	 */
+	public $libelle;
+
 	var $description;
 	var $date_commande;
 	var $date_ouverture_prevue;		// date start planned
@@ -2072,6 +2079,13 @@ class ContratLigne extends CommonObject
 	var $fk_remise_except;
 
 	var $subprice;					// Unit price HT
+
+	/**
+	 * @var float
+	 * @deprecated Use $price_ht instead
+	 */
+	public $price;
+
 	var $price_ht;
 
 	var $total_ht;

From 86100758ffa4f796bef02b57f648b09b873c8fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 28 Dec 2014 20:12:32 +0100
Subject: [PATCH 269/345] Miscellaneous corrections

---
 htdocs/admin/tools/export.php                 |  2 +-
 htdocs/comm/action/class/actioncomm.class.php |  2 +-
 .../compta/paiement/class/paiement.class.php  |  1 -
 htdocs/compta/tva/index.php                   |  2 +-
 htdocs/core/actions_sendmails.inc.php         |  1 -
 .../core/class/commondocgenerator.class.php   |  2 +-
 htdocs/core/class/commonobject.class.php      | 33 +++++++++----------
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/lib/date.lib.php                  |  2 +-
 .../doc/doc_generic_project_odt.modules.php   |  2 +-
 .../task/doc/doc_generic_task_odt.modules.php |  2 +-
 htdocs/user/class/user.class.php              |  4 +--
 12 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 203776bc7f9..0831571ace1 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -485,7 +485,7 @@ function backup_tables($outputfile, $tables='*')
 	                    $row[$j] = "''";
 	                } elseif(is_numeric($row[$j]) and !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
 	                    // if it's a number, we return it as-is
-	                    $row[$j] = $row[$j];
+//	                    $row[$j] = $row[$j];
 	                } else { // else for all other cases we escape the value and put quotes around
 	                    $row[$j] = addslashes($row[$j]);
 	                    $row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 15394c81a3a..135b775249b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -350,7 +350,7 @@ class ActionComm extends CommonObject
                 $this->label				= $obj->label;
                 $this->datep				= $this->db->jdate($obj->datep);
                 $this->datef				= $this->db->jdate($obj->datep2);
-				$this->durationp			= $this->durationp;					// deprecated
+//				$this->durationp			= $this->durationp;					// deprecated
 
                 $this->datec   				= $this->db->jdate($obj->datec);
                 $this->datem   				= $this->db->jdate($obj->datem);
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 95503db6ff9..2fce476af78 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -422,7 +422,6 @@ class Paiement extends CommonObject
 
             $totalamount=$this->amount;
             if (empty($totalamount)) $totalamount=$this->total; // For backward compatibility
-            if ($mode == 'payment') $totalamount=$totalamount;
             if ($mode == 'payment_supplier') $totalamount=-$totalamount;
 
             // Insert payment into llx_bank
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 16652327ef3..c0dcff6d5c3 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -60,7 +60,7 @@ if (isset($_GET["modetax"])) $modetax=$_GET["modetax"];
  *
  * @param 	DoliDB	$db		Database handler
  * @param 	string	$sql	SQL Request
- * @param 	date	$date	Date
+ * @param 	string	$date	Date
  * @return	void
  */
 function pt ($db, $sql, $date)
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 40e177404f9..49de1529321 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -131,7 +131,6 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
-			$sendtocc = $sendtocc;
 			$sendtobcc= GETPOST('sendtoccc');
 			if ($mode == 'emailfromproposal') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO);
 			if ($mode == 'emailfromorder')    $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 26f209ed107..fbf5363b753 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -388,7 +388,7 @@ abstract class CommonDocGenerator
 			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
 			$object->fetch_optionals($object->id,$extralabels);
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 		}
 		return $resarray;
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d0e4e086640..8b91d8ac9c3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2109,24 +2109,23 @@ abstract class CommonObject
         dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
         if ($this->db->query($sql))
         {
-        	if (! $error)
-			{
-				$trigkey='';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+            $error = 0;
 
-				if ($trigkey)
-				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
-		 			if ($result < 0) {
-		 				$error++; $this->errors=$interface->errors;
-		 			}
-					// Fin appel triggers
-				}
-			}
+            $trigkey='';
+            if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
+            if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+
+            if ($trigkey)
+            {
+                // Appel des triggers
+                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                $interface=new Interfaces($this->db);
+                $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
+                if ($result < 0) {
+                    $error++; $this->errors=$interface->errors;
+                }
+                // Fin appel triggers
+            }
 
 			if (! $error)
 			{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e90dbdd203d..7d2851f1b31 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4375,7 +4375,7 @@ class Form
      *    @param   string	$morehtmlref  	Code html supplementaire a afficher apres ref
      *    @param   string	$moreparam  	More param to add in nav link url.
      *	  @param	int		$nodbprefix		Do not include DB prefix to forge table name
-     * 	  @return  tring    				Portion HTML avec ref + boutons nav
+     * 	  @return  string    				Portion HTML avec ref + boutons nav
      */
     function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0)
     {
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 4b9401498d7..d2c6ce4bd4f 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -169,7 +169,7 @@ function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0)
  *    	@param      string	$format		    Output format (all: total delay days hour:min like "2 days 12:30"", allhourmin: total delay hours:min like "60:30", allhour: total delay hours without min/sec like "60:30", fullhour: total delay hour decimal like "60.5" for 60:30, hour: only hours part "12", min: only minutes part "30", sec: only seconds part, month: only month part, year: only year part);
  *      @param      int		$lengthOfDay    Length of day (default 86400 seconds for 1 day, 28800 for 8 hour)
  *      @param      int		$lengthOfWeek   Length of week (default 7)
- *    	@return     sTime		 		 	Formated text of duration
+ *    	@return     string		 		 	Formated text of duration
  * 	                                		Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
  */
 function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7)
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 1364aeff65e..f19d8a0e3a0 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -138,7 +138,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
 			$object->fetch_optionals($object->id,$extralabels);
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 		}
 
 		return $resarray;
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 7f93851cc65..c074cba31e5 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -139,7 +139,7 @@ class doc_generic_task_odt extends ModelePDFTask
 			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
 			$object->fetch_optionals($object->id,$extralabels);
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
 		}
 
 		return $resarray;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 837be155929..b2502e2140f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1662,7 +1662,7 @@ class User extends CommonObject
 	/**
 	 *  Add user into a group
 	 *
-	 *  @param	Group	$group      Id of group
+	 *  @param	int	$group      Id of group
 	 *  @param  int		$entity     Entity
 	 *  @param  int		$notrigger  Disable triggers
 	 *  @return int  				<0 if KO, >0 if OK
@@ -1721,7 +1721,7 @@ class User extends CommonObject
 	/**
 	 *  Remove a user from a group
 	 *
-	 *  @param	Group   $group       Id of group
+	 *  @param	int   $group       Id of group
 	 *  @param  int		$entity      Entity
 	 *  @param  int		$notrigger   Disable triggers
 	 *  @return int  			     <0 if KO, >0 if OK

From a9a33479f176a3464302b1459cbff5ca3063a963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 29 Dec 2014 03:44:03 +0100
Subject: [PATCH 270/345] Fixed error deleting survey comment

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

diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index fa506285cc8..b4c8570dec8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -496,7 +496,7 @@ class Opensurveysondage extends CommonObject
 	 */
 	public function deleteComment($id_comment)
 	{
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = '.$this->id_sondage;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = "'.$this->db->escape($this->id_sondage).'"';
 		$resql = $this->db->query($sql);
 
 		if (!$resql) {

From 410c8e56c6c30ca1f38af56fb138a1c866bb26e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Dec 2014 04:30:32 +0100
Subject: [PATCH 271/345] Better fix

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ae9f347f4e8..c6c7654cf00 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1557,7 +1557,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
 	    {
 	        $langs->load("products");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'sall'.rand(0, 10));
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'sallsearchleftp');
 	    }
 
 	    if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
@@ -1570,7 +1570,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 	    {
 	        $langs->load("members");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M', 'sall'.rand(0, 10));
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M', 'sallsearchleftm');
 	    }
 
 	    // Execute hook printSearchForm

From 15c98ff2e1615e25be7b9798ef5d9b6d35a02488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 30 Dec 2014 17:59:40 +0100
Subject: [PATCH 272/345] Update cidlookup.php

---
 htdocs/asterisk/cidlookup.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index d1dcb501f41..9ef0e85f326 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -33,6 +33,12 @@ $phone = $_GET['phone'];
 include '../master.inc.php';
 
 
+// Security check
+if (empty($conf->clicktodial->enabled)) {
+    print "Error: Module Click to dial not active\n";
+    exit;
+}
+
 // Check parameters
 if (empty($phone))
 {

From ddcd086ada2fed56d91f9f8923760f0c1dda33dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 30 Dec 2014 18:11:55 +0100
Subject: [PATCH 273/345] Update cidlookup.php

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

diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index 9ef0e85f326..6b566e60f55 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -28,10 +28,11 @@
  *
  */
 
-$phone = $_GET['phone'];
 
 include '../master.inc.php';
 
+$phone = GETPOST('phone');
+
 
 // Security check
 if (empty($conf->clicktodial->enabled)) {

From d72d056e026b4e7a137bfd1bfcbf19ed59db265a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Dec 2014 21:04:02 +0100
Subject: [PATCH 274/345] Enhance look for contacts forms of thirdparties.

---
 htdocs/contact/card.php                       |  25 ++--
 htdocs/contact/class/contact.class.php        |   2 +-
 htdocs/core/lib/company.lib.php               | 121 ++++++------------
 htdocs/core/lib/functions.lib.php             |  30 +++--
 .../theme/amarok/img/object_phoning_fax.png   | Bin 0 -> 408 bytes
 .../theme/auguria/img/object_phoning_fax.png  | Bin 0 -> 304 bytes
 .../bureau2crea/img/object_phoning_fax.png    | Bin 0 -> 1037 bytes
 .../theme/cameleo/img/object_phoning_fax.png  | Bin 0 -> 1037 bytes
 htdocs/theme/eldy/img/object_address.png      | Bin 1642 -> 358 bytes
 htdocs/theme/eldy/img/object_phoning.png      | Bin 304 -> 577 bytes
 htdocs/theme/eldy/img/object_phoning_fax.png  | Bin 0 -> 633 bytes
 11 files changed, 74 insertions(+), 104 deletions(-)
 create mode 100644 htdocs/theme/amarok/img/object_phoning_fax.png
 create mode 100644 htdocs/theme/auguria/img/object_phoning_fax.png
 create mode 100644 htdocs/theme/bureau2crea/img/object_phoning_fax.png
 create mode 100644 htdocs/theme/cameleo/img/object_phoning_fax.png
 create mode 100644 htdocs/theme/eldy/img/object_phoning_fax.png

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a1030a68292..afa64c0733e 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -374,6 +374,7 @@ else
     /*
      * Onglets
      */
+    $head=array();
     if ($id > 0)
     {
         // Si edition contact deja existant
@@ -386,9 +387,6 @@ else
         $head = contact_prepare_head($object);
 
         $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-        dol_fiche_head($head, 'card', $title, 0, 'contact');
-
-        dol_htmloutput_events();
     }
 
     if ($user->rights->societe->contact->creer)
@@ -438,13 +436,16 @@ else
 				print '</script>'."\n";
             }
 
-            print '<br>';
             print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="add">';
             print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+            dol_fiche_head($head, 'card', '', 0, '');
+
             print '<table class="border" width="100%">';
 
+
             // Name
             print '<tr><td width="20%" class="fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
 	        print '<td width="30%"><input name="lastname" id="lastname" type="text" size="30" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname")?GETPOST("lastname"):$object->lastname).'" autofocus="autofocus"></td>';
@@ -611,8 +612,9 @@ else
             }
             print '</tr>';
 
-            print "</table><br><br>";
+            print "</table>";
 
+            print dol_fiche_end();
 
             print '<div class="center">';
             print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
@@ -674,6 +676,8 @@ else
             print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
             if (! empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
+            dol_fiche_head($head, 'card', $title, 0, 'contact');
+
             print '<table class="border" width="100%">';
 
             // Ref
@@ -856,7 +860,9 @@ else
             else print $langs->trans("NoDolibarrAccess");
             print '</td></tr>';
 
-            print '</table><br>';
+            print '</table>';
+
+            print dol_fiche_end();
 
             print '<div class="center">';
             print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -878,6 +884,8 @@ else
 
         dol_htmloutput_errors($error,$errors);
 
+        dol_fiche_head($head, 'card', $title, 0, 'contact');
+
         if ($action == 'create_user')
         {
             // Full firstname and lastname separated with a dot : firstname.lastname
@@ -1078,7 +1086,7 @@ else
 
         print "</table>";
 
-        print "</div>";
+        print dol_fiche_end();
 
         // Barre d'actions
         print '<div class="tabsAction">';
@@ -1113,7 +1121,8 @@ else
             }
         }
 
-        print "</div><br>";
+        print "</div>";
+        print "<br>";
 
 		if (! empty($conf->agenda->enabled))
 		{
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6a7776b27bd..cbb7ee94823 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -560,7 +560,7 @@ class Contact extends CommonObject
 
 				$this->email			= $obj->email;
 				$this->jabberid			= $obj->jabberid;
-        $this->skype			= $obj->skype;
+        		$this->skype			= $obj->skype;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4dd9a51d0b7..0504727b61e 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -561,6 +561,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     $search_status		= GETPOST("search_status",'int');
     if ($search_status=='') $search_status=1; // always display activ customer first
     $search_name = GETPOST("search_name",'alpha');
+    $search_addressphone = GETPOST("search_addressphone",'alpha');
 
     if (! $sortorder) $sortorder="ASC";
     if (! $sortfield) $sortfield="p.lastname";
@@ -603,18 +604,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Poste"),$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("PhonePro"),$_SERVER["PHP_SELF"],"p.phone","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email","",$param,'',$sortfield,$sortorder);
-    if (! empty($conf->skype->enabled))
-    {
-		$colspan++;
-		print '<td>'.$langs->trans("Skype").'</td>';
-    }
+    print_liste_field_titre($langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder);
-    // Copy to clipboard
-    print "<td>&nbsp;</td>";
     // Add to agenda
     if (! empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create))
     {
@@ -627,32 +618,24 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
 
     print '<tr class="liste_titre">';
+    // Name - Position
     print '<td class="liste_titre">';
     print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
     print '</td>';
 
-    print '<td>&nbsp;</td>';
-    print '<td>&nbsp;</td>';
+    // Address / Phone
+    print '<td>';
+    //print '<input type="text" class="flat" name="search_addressphone" size="20" value="'.$search_addressphone.'">';
+    print '</td>';
 
+    // Email
     print '<td>&nbsp;</td>';
 
-    print '<td>&nbsp;</td>';
-
-    print '<td>&nbsp;</td>';
-    if (! empty($conf->skype->enabled))
-    {
-		$colspan++;
-		print '<td>&nbsp;</td>';
-    }
-
     // Status
     print '<td class="liste_titre maxwidthonsmartphone">';
-    print $form->selectarray('search_status', array('-1'=>'','0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+    print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
     print '</td>';
 
-    // Copy to clipboard
-    print "<td>&nbsp;</td>";
-
     // Add to agenda
     if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
     {
@@ -668,7 +651,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print "</tr>";
 
 
-    $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.skype, p.statut ";
+    $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.poste, p.phone, p.phone_mobile, p.phone_perso, p.fax, p.email, p.skype, p.statut ";
     $sql .= ", p.civility as civility_id, p.address, p.zip, p.town";
     $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
     $sql .= " WHERE p.fk_soc = ".$object->id;
@@ -680,7 +663,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     $result = $db->query($sql);
     $num = $db->num_rows($result);
 
-	$var=false;
+	$var=true;
 	if ($num)
     {
         $i=0;
@@ -698,74 +681,50 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             $contactstatic->firstname = $obj->firstname;
             $contactstatic->civility_id = $obj->civility_id;
             print $contactstatic->getNomUrl(1,'',0,'&backtopage='.urlencode($backtopage));
+			print '</td><td>';
+            if ($obj->poste) print $obj->poste;
             print '</td>';
 
-            print '<td>'.$obj->poste.'</td>';
-
             $country_code = getCountry($obj->country_id, 'all');
 
-            // Lien click to dial
+            // Address and phone
             print '<td>';
-            print dol_print_phone($obj->phone,$country_code['code'],$obj->rowid,$object->id,'AC_TEL');
-            print '</td>';
-            print '<td>';
-            print dol_print_phone($obj->phone_mobile,$country_code['code'],$obj->rowid,$object->id,'AC_TEL');
-            print '</td>';
-            print '<td>';
-            print dol_print_phone($obj->fax,$country_code['code'],$obj->rowid,$object->id,'AC_FAX');
-            print '</td>';
-            print '<td>';
-            print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
-            print '</td>';
+            $outdone=0;
+            $contactstatic->address = $obj->address;
+            $contactstatic->zip = $obj->zip;
+            $contactstatic->town = $obj->town;
+            $contactstatic->country_id = $obj->country_id;
+            $coords = $contactstatic->getFullAddress(1,', ');
+            if (! empty($conf->use_javascript_ajax))
+            {
+				$namecoords = $contactstatic->getFullName($langs,1).'<br>'.$coords;
+				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
+				print '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+            	print img_picto($langs->trans("Address"), 'object_address.png');
+            	print '</a> ';
+            }
+            if ($coords) { print dol_print_address($coords,'address_contact_'.$obj->rowid, 'contact', $obj->rowid); $outdone++; }
+            if ($obj->phone || $obj->phone_mobile || $obj->phone_perso) print ($outdone?'<br>':'');
+            if ($obj->phone) { print dol_print_phone($obj->phone,$country_code['code'],$obj->rowid,$object->id,'AC_TEL','&nbsp;','phone'); $outdone++; }
+            if ($obj->phone_mobile) { print dol_print_phone($obj->phone_mobile,$country_code['code'],$obj->rowid,$object->id,'AC_TEL','&nbsp;','phone'); $outdone++; }
+            if ($obj->phone_perso) { print dol_print_phone($obj->phone_perso,$country_code['code'],$obj->rowid,$object->id,'AC_TEL','&nbsp;','phone'); $outdone++; }
+            if ($obj->fax) { print dol_print_phone($obj->fax,$country_code['code'],$obj->rowid,$object->id,'AC_FAX','&nbsp;','fax'); $outdone++; }
+            print '<div style="clear: both;"></div>';
+            $outdone=0;
+            if ($obj->email) print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL',0,0,1);
             if (! empty($conf->skype->enabled))
             {
-                print '<td>';
-                print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');
-                print '</td>';
+				if ($obj->skype) print ($outdone?'<br>':'').dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');
             }
+            print '</td>';
 
             // Status
 			print '<td>'.$contactstatic->getLibStatut(5).'</td>';
 
-            print '<td align="center">';
-            if (! empty($conf->use_javascript_ajax))
-            {
-       			// Copy to clipboard
-				$coords = '';
-				if (!empty($object->name))   $coords .= $object->name."<br>";
-				$coords .= $contactstatic->getFullName($langs,1).' ';
-				$coords .= "<br>";
-				if (!empty($obj->address))
-				{
-					$coords .= dol_nl2br($obj->address,1,true)."<br>";
-					if (!empty($obj->zip))  $coords .= $obj->zip.' ';
-					if (!empty($obj->town)) $coords .= $obj->town;
-					if (!empty($obj->country_id)) $coords .= "<br>".$country_code['label'];
-				}
-				else if (!empty($object->address))
-				{
-					$coords .= dol_nl2br($object->address,1,true)."<br>";
-					if (!empty($object->zip))  $coords .= $object->zip.' ';
-					if (!empty($object->town)) $coords .= $object->town;
-					if (!empty($object->country_id)) $coords .= "<br>".$country_code['label'];
-				}
-				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-				print '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($coords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-            	print img_picto($langs->trans("Address"), 'object_address.png');
-            	print '</a>';
-            }
-            print '</td>';
-
             // Add to agenda
             if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
             {
                 print '<td align="center">';
-                if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-                {
-                	print '<a class="hideonsmartphone" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
-                	print img_object($langs->trans("Rendez-Vous"),"action_rdv");
-                	print '</a> ';
-                }
                 print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
                 print img_object($langs->trans("Event"),"action");
                 print '</a></td>';
@@ -787,7 +746,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     }
     else
 	{
-        print "<tr ".$bc[$var].">";
+        print "<tr ".$bc[! $var].">";
         print '<td colspan="'.$colspan.'">'.$langs->trans("None").'</td>';
         print "</tr>\n";
     }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f4e1fe159fe..8f1b4ecd54f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -683,7 +683,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		if (count($keys)) $maxkey=max($keys);
 	}
 
-	// Show tabs 
+	// Show tabs
 	$bactive=false;
 	// if =0 we don't use the feature
 	$limittoshow=($conf->global->MAXTABS_IN_CARD?$conf->global->MAXTABS_IN_CARD:99);
@@ -754,7 +754,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		$out.='<div id=moretabs class="inline-block tabsElem"><a href="" data-role="button" style="background-color: #f0f0f0;" class="tab inline-block">Plus</a>';
 		$out.='<div id=moretabsList style="position: absolute; left: -999em;text-align: left;margin:0px;padding:2px">'.$outmore.'</div></div>';
 		$out.="</div>\n";
-	
+
 		$out.="<script>";
 		$out.="$('#moretabs').mouseenter( function() { $('#moretabsList').css('left','auto');});";
 		$out.="$('#moretabs').mouseleave( function() { $('#moretabsList').css('left','-999em');});";
@@ -762,7 +762,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 	}
 
 	if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
-	
+
 	return $out;
 }
 
@@ -1295,9 +1295,10 @@ function dol_print_url($url,$target='_blank',$max=32)
  * @param 	int			$addlink		0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on)
  * @param	int			$max			Max number of characters to show
  * @param	int			$showinvalid	Show warning if syntax email is wrong
+ * @param	int			$widthpicto		Show picto
  * @return	string						HTML Link
  */
-function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1)
+function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1,$withpicto=0)
 {
 	global $conf,$user,$langs;
 
@@ -1323,7 +1324,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
 		{
 			$type='AC_EMAIL'; $link='';
 			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			$newemail='<table class="nobordernopadding"><tr><td>'.$newemail.' </td><td>&nbsp;'.$link.'</td></tr></table>';
+			if ($link) $newemail='<div>'.$newemail.' '.$link.'</div>';
 		}
 	}
 	else
@@ -1334,7 +1335,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
 			$newemail.=img_warning($langs->trans("ErrorBadEMail",$email));
 		}
 	}
-	return $newemail;
+	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto($langs->trans("EMail"), 'object_email.png').' ':'').$newemail.'</div>';
 }
 
 /**
@@ -1360,18 +1361,18 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
 		$newskype='<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_callbutton.png" border="0">&nbsp;';
-		$newskype.='</a>&nbsp;<a href="skype:';
+        $newskype.='<img src="../theme/common/skype_callbutton.png" border="0">';
+		$newskype.='</a>&nbsp; &nbsp;<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">&nbsp;';
-		$newskype.='</a>';
+        $newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">';
+		$newskype.='</a>&nbsp;';
 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_SKYPE'; $link='';
 			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			$newskype='<table class="nobordernopadding"><tr><td>'.$newskype.' </td><td>&nbsp;'.$link.'</td></tr></table>';
+			$newskype='<div class="divskype nowrap">'.$newskype.($link?' '.$link:'').'</div>';
 		}
 	}
 	else
@@ -1391,9 +1392,10 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
  * 	@param 	int		$socid 		Id of third party if known
  * 	@param 	int		$addlink	''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
  * 	@param 	string	$separ 		Separation between numbers for a better visibility example : xx.xx.xx.xx.xx
+ *  @param	string  $withpicto  Show picto
  * 	@return string 				Formated phone number
  */
-function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="&nbsp;")
+function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="&nbsp;",$withpicto='')
 {
 	global $conf,$user,$langs,$mysoc;
 
@@ -1469,11 +1471,11 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
 			$type='AC_TEL'; $link='';
 			if ($addlink == 'AC_FAX') $type='AC_FAX';
 			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
-			if ($link) $newphone='<table class="nobordernopadding"><tr><td>'.$newphone.' </td><td>&nbsp;'.$link.'</td></tr></table>';
+			if ($link) $newphone='<div>'.$newphone.' '.$link.'</div>';
 		}
 	}
 
-	return $newphone;
+	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto?img_picto(($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone")), 'object_'.($withpicto=='fax'?'phoning_fax':'phoning').'.png').' ':'').$newphone.'</div>';
 }
 
 /**
diff --git a/htdocs/theme/amarok/img/object_phoning_fax.png b/htdocs/theme/amarok/img/object_phoning_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1266e841276ca20241ae6e3b62b5601f6f90f8b
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004BNkl<ZILoC|
z%}T>S5dQWrZJKCRJV*tPVoyDJ=tX=1AHZ`idha7B^bLFfAEuO^JoPR`p?VOEF(yso
z%+eJqqP1NZW|_?Q&3-czQB@VzITC9g5k=9NQmVBIxG0JTO%nF|{r(LH#^W*C?KWn!
z*`HvoHF~|?r6v}U=eZ4*WeL8Y-`*iNA<`^ImSrfYPsZ~Q1U{N!h*m@4>SUW=AT(8z
zt|A3&^|HQ+<D)~oB?;o>9Unv_J%dINAZ%_xl@;Z^a;~%l40Hr+d%nWs(=&wal7L_L
zU}`lqh{U6z?fSwMTO{D>e7`>3ft23|#IKC4vDBiFmOzq5E5U);k47UT^!(v)_@n3V
zoX6M&0%x60XDM$9(lnJ$yR*Syu#{&kgVmSH`82xSE@-)a_4B4HJ)KUy$z);!aU8?l
zmpP0T#+VDTgH=|UmhPTM?U8NqcK#F3dSAr4zw;-wd>mvqU2E+C0000<MNUMnLSTa4
C7r3<m

literal 0
HcmV?d00001

diff --git a/htdocs/theme/auguria/img/object_phoning_fax.png b/htdocs/theme/auguria/img/object_phoning_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..36cdcc8d4a2d0220e02cdddb5d62dea514d60a54
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~x+Sg=CC){ui6xo&c?uz!xv2~(
znYnrjW(v89Ma2q61_q`I1_o9J=2iyA3fcyS1_sq-mEJ&&>?NMQuIyKtS;gh~&R(+K
z1Qg;d@Q5sCVBq=y!i-L9OlANDS<)SS9T^xl_H+M9WCilo1AIbUfpm3sbx%*voH=ur
zE?pWF6qKBtTwGk7ot-^p%9N<6C?_YUmX;Q|rF)xzN*POn{DK)Ap4~_Ta@;&!978y+
zCnq>C9Ck1`8az#rVNw6`R7nQSXPZ7rZ74X(*s;om*&uf^$Hml%Wei^C4VmBiSPaf;
nFicDjF>A{Z5D`gBU|`rYle_!xQMrpi6B#^R{an^LB{Ts5*fLyA

literal 0
HcmV?d00001

diff --git a/htdocs/theme/bureau2crea/img/object_phoning_fax.png b/htdocs/theme/bureau2crea/img/object_phoning_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f5a14edd2302a73970ce6bd1814b416e3acee64
GIT binary patch
literal 1037
zcmaJ=&ui0A9M7BwH=GQ-_>1w#Zo1}I*R=_)TbH!1vXq(@EIa7Z<aG^g@?!F4v+bnz
zGTa|9rB}g$2!h~2MHDA^5j+gt!HWkEf_U*N_|mnV2WudC@B8KR`Fww7vyi_uHhN~1
zqNuUlf})XgJbaH1lkbl&Uqi=foGIfXs^X^ZK`L#c3IsV@Ux6Cb&9xivVUnVTX{%Jm
zWpz<9kj>~Jh6!w!uqi4z8@RerhZt1gishu}pU+>>z%o<x)tJhut_*9|!ny~G>-mzg
zUN=OOp1lZ?fkXssh;<Oy4ab*)6y4F4$UStkH0VHZJw+cRRaOf?Mjiw)hKm^73<qX-
zhL29i<MAmVa6HFy0?P{#J}yNCiQ_=`p-D8)tV)`a?ZzTjimqYoN-W!KHkoFWLEZ|>
zi=r562ttG)BL13#^&sN-lRX6m`i5t@*g_5n74-^Q#VML(dQgJx_GKNv+a}U5Hqc#`
zXSlGW9#B>P54G(++Q%9^%=e$dere5xtOk9w>KSBk)yXiFE6E<zG4e_XHF{kv)DT8~
z4Y@!r#(=6DmJ`|?ysAn$$H%&3z?_nzi2`F;rX(a{@=PL;iOX@3=auYyS`p-QLYx;w
zIl)KcJ+6X`RU10E$2AYR*@4_}6>OJ8R-k9ygl5)5Ht3WrS%Y(t2kLdX=HOhEfn1g(
z!-j+XYtTIx*`Dy)Ut41I7auxg+dZ<@*B}0VMt+Hj!eS{yPEFI6mX-{|sMqVh?{92u
zv|6pLt*v&u{gyxfk|2h#mM>Cs-#%A~aXF`?OUFJL%X3HCn<L}dohN6vcPAQ;#G!ky
z#l7jL)Kua7i7Qe>Jo#q(+VQ>Q?*6%V+%2vww?Ce0ScMDwLiIyy<iU_lQFrc--~IKX
Qy+c%~TqdtPo?pKG2Ti(1asU7T

literal 0
HcmV?d00001

diff --git a/htdocs/theme/cameleo/img/object_phoning_fax.png b/htdocs/theme/cameleo/img/object_phoning_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f5a14edd2302a73970ce6bd1814b416e3acee64
GIT binary patch
literal 1037
zcmaJ=&ui0A9M7BwH=GQ-_>1w#Zo1}I*R=_)TbH!1vXq(@EIa7Z<aG^g@?!F4v+bnz
zGTa|9rB}g$2!h~2MHDA^5j+gt!HWkEf_U*N_|mnV2WudC@B8KR`Fww7vyi_uHhN~1
zqNuUlf})XgJbaH1lkbl&Uqi=foGIfXs^X^ZK`L#c3IsV@Ux6Cb&9xivVUnVTX{%Jm
zWpz<9kj>~Jh6!w!uqi4z8@RerhZt1gishu}pU+>>z%o<x)tJhut_*9|!ny~G>-mzg
zUN=OOp1lZ?fkXssh;<Oy4ab*)6y4F4$UStkH0VHZJw+cRRaOf?Mjiw)hKm^73<qX-
zhL29i<MAmVa6HFy0?P{#J}yNCiQ_=`p-D8)tV)`a?ZzTjimqYoN-W!KHkoFWLEZ|>
zi=r562ttG)BL13#^&sN-lRX6m`i5t@*g_5n74-^Q#VML(dQgJx_GKNv+a}U5Hqc#`
zXSlGW9#B>P54G(++Q%9^%=e$dere5xtOk9w>KSBk)yXiFE6E<zG4e_XHF{kv)DT8~
z4Y@!r#(=6DmJ`|?ysAn$$H%&3z?_nzi2`F;rX(a{@=PL;iOX@3=auYyS`p-QLYx;w
zIl)KcJ+6X`RU10E$2AYR*@4_}6>OJ8R-k9ygl5)5Ht3WrS%Y(t2kLdX=HOhEfn1g(
z!-j+XYtTIx*`Dy)Ut41I7auxg+dZ<@*B}0VMt+Hj!eS{yPEFI6mX-{|sMqVh?{92u
zv|6pLt*v&u{gyxfk|2h#mM>Cs-#%A~aXF`?OUFJL%X3HCn<L}dohN6vcPAQ;#G!ky
z#l7jL)Kua7i7Qe>Jo#q(+VQ>Q?*6%V+%2vww?Ce0ScMDwLiIyy<iU_lQFrc--~IKX
Qy+c%~TqdtPo?pKG2Ti(1asU7T

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/object_address.png b/htdocs/theme/eldy/img/object_address.png
index a4b878966dcc70ba0ccbf3647d56a39cef02a864..201577281f048ad530a5ffc90ae5ddcde1ea09cb 100644
GIT binary patch
literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003kNkl<ZI8UvT
zflb3O5Jl@`0AK>L0Z}plWdk}vvjJrS(g|RMG6Aqb7$A{1XxV@ckc4-Yja>Hv5+YJ0
z`@Zk)|9@v@%2$@<E#W)<xr3X&@7LDaCVp<>0LdF-ORexYj_a=L>JU3B;5xtXV9(=v
z7=~AQoFqwQjCqhVOm0FZM+J(aXn1%{@;#lN!cJf-ut%_WFfVNuGZ<Z$3%Y!U1@b)4
z(lp&ltZm!xy#Fl#O$*H{%`C85eE3a5IDr+0y*U$?BzyOtkx+SgQ&Z5U=wk~C9Ht}R
z$sRy;N4Lv~J@{Y(+2kGw;I;l~ktB(6oinZ-$Fr!&9#67(yeASIi^I}{1+?W-J@83>
zE9D-K?ne(ih?E>DjohI=hq~2#Q6&T{Dmml)MoX617w|ux5f5W7c>n+a07*qoM6N<$
Ef*ux?eE<Le

literal 1642
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVin(!#{m#Ms!(3>eCWu7(z-t_H3y=FVo0#>N(I
zu5K{BF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTuTvc~HG6
zxZPreQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?u1QXu3=B;7JY5_^G|tDK
zy`3M-%5dP}{heRuY$}UxEL|GAdkORM*@;{SkGkwpm|?L;C(A*8kDcbsi#q!<YA*gr
zN;=Y*pON(F#-dLBV=g8~PBj;Ct_uo_dO2m|wvyMmYu;Ke&#pfA@htoP`Uk?3POAK@
zk&C?^85^6rc-z5yw$+|0LQ}k4%f9?x%)RpI_v&BD=R=BSM#OI~d-EgRn04lVK~_P>
z1}8i5b1B{LHU3SUKCk|7#`_oN6q0Vwuqk~c{Qu9LJIaUZ7bga2iJkm2_0>y`b(vL4
z`F1rgIPZT5m?1a4H(c~Zkn6goL38HKt#zK3D(M=yLX3M}g^l6TcRPNst>u^Dc(X5C
z+|ImYwOMosXCTAoryFc*)T?H5?hINf(0^S1&#yCwVopzUe(!tl_~OThcgS$}t1a|k
z(mlN}t7OHM+gEhNkM6pxZq~~tzCPUU-v3wb3v-p(e|%{!zj!_G(d$WqED_hO*G!om
zqi?n|=uN@Pw7EG;^*SzQTxosAw<Yh0g;9=yo!OD;@pBe2--*iKxFxMfHGRUVH4kg-
z{h!}Cf92L9<)zd9)ury=_485i?mvfe=kv!;Z~q!4d;fv0PWY`m8s>$o`5JHNG|Kk{
zzm|I7box~1)vvD(w*T73wf|p5TXpt!OEc5fWjlYqjcPnvAI3Q`-LkTC^~=;8&tq@i
zx{IhfPLo}8>>%eill{rdRW31}Icv5vhj-`Y6wS)+O=5`$zHK!6A=7$Kan06v9!ZCy
zl_&cBA6b5pn0EEprra;j)VemY>KeFtT#n%B3p%ML<y=2+UgggZ`zCKnjda=>q9nn?
zB+xzg@t>!wdF*W)%U_peT@|`%UuX2kE$!dQk1yI6$wYmu*y|Cu{`<cYtK40txgS1H
zHvY=3ExXp-rfF@(3H9^av$^lr884X9zpvoQ&Gjyk_g0uo?TFF3^ySN!n@$T0Zf<+K
z<E=%0xptZDUJ3r$JCD5Iy?y5T-rjqKPE)RCSqM2^=k>Yl5*qrCb)lnA^`faqCxA+S
MPgg&ebxsLQ0Ec6b_5c6?

diff --git a/htdocs/theme/eldy/img/object_phoning.png b/htdocs/theme/eldy/img/object_phoning.png
index 36cdcc8d4a2d0220e02cdddb5d62dea514d60a54..23a4e0b1dbbc3749b03c45864b52f7d12f907520 100644
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=G
z5-v5<z@S3_00F^CL_t(I%Z*a8ic>)pJ!kSDS+&{-L5pA`*kxuOD?yNLEQI|7OB<JM
z*1}J)5NzCHHDWJTet{@rDa@PKyRcn0AU1*~@ZKDo$r2XDcdOyvx#!+<?m=0W008IQ
zCGY(f09b3$H3$G@S>BX11Avs$lNe)VtwoIS{{YUpD<nUX+yMYdP20A&>bgGZvVk$i
zJR`ZI93+dPC_aqG<4zO|fJXqp9Fhd!#&9_Fod6`g&u^`PQc91jstVrwP8+<<+$rf-
zN@=&Msw3|`LI|AzzDW8;5&(W1W6rF#otgo_gb;oJcn3fvhbg6l)oR6ye)tz1lW+fA
z(jsecI2a6G0yy`<nvQes&U8A(COFr{$z(DqiXvt`B<b~Xxjg9i`-(BbId^D`c>&<G
zX_|X=U7uKMalUGd5#IZK0LLVaBuF|k#vHe8d#%^&ea=3iq$Z_wJH}XXlVb=0-ur!$
zuhw}<-vMj^xJ(ioAfF`dnf1rqj1a=CX&Ni(EDL)zH|v6a0>Iv8W<H<8T8p}_7o*YW
z4apY3b&}h8F!J=TBp-$l7W~_3HcjNc-v)4(<O50f0n8*lt*Yv0S(f+%4m|HfYohlX
P00000NkvXXu0mjf`Q!7k

literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~x+Sg=CC){ui6xo&c?uz!xv2~(
znYnrjW(v89Ma2q61_q`I1_o9J=2iyA3fcyS1_sq-mEJ&&>?NMQuIyKtS;gh~&R(+K
z1Qg;d@Q5sCVBq=y!i-L9OlANDS<)SS9T^xl_H+M9WCilo1AIbUfpm3sbx%*voH=ur
zE?pWF6qKBtTwGk7ot-^p%9N<6C?_YUmX;Q|rF)xzN*POn{DK)Ap4~_Ta@;&!978y+
zCnq>C9Ck1`8az#rVNw6`R7nQSXPZ7rZ74X(*s;om*&uf^$Hml%Wei^C4VmBiSPaf;
nFicDjF>A{Z5D`gBU|`rYle_!xQMrpi6B#^R{an^LB{Ts5*fLyA

diff --git a/htdocs/theme/eldy/img/object_phoning_fax.png b/htdocs/theme/eldy/img/object_phoning_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d96a1e4145122326f1e9797bcdeb090918b8e4
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=G
z5->DyhOY_$00H?)L_t(I%Z-vTYZXBhh0mGYkVLKWgrG&R5$xXVEU^)>u@L+RmNteo
zvG6BY2sWmOM(oAPUm%KD%FNF82JDi6*a(`y&K!%(dn}J2o@Qs3z4xB;?M2(R0Dz`x
zE;#2_0l->|{}lnCZQJXT_5mR0{3OQMS!+>M6#(eGI`942p=p{+BtMee1OQ1xO6f-5
z_XowDW`m06ckexnG3FV`O%;)>>$?81v9U3)DAP1@Gd~*uj{ty0k_6z|WHND!zP<Mx
zM+X2S>HVlHNHXXAxa+!b*6ZIg0N$4Dl=M62e5dQWUFRG^2q=&>el9lnBIz4R0Qh5!
zIkMIwgn$B(Bg<R>3KK&33E&+7k(}h5w@*(`2>>Z2c<*Nr$M7_EfSmJlNyml3&dSQl
zO8|&50sx$I@ZK}$d~0cGiQaprln4NvWt~o^)4Hx>;UP({Pfkv@mzS3nV?@(5JI0t7
z0KN~yaJTRK18ePB9&0UPjBw6v0oWsHBtg=yF=j8Nbfv1Q&t*?2X~;R>j4^g|ATuY<
zxh;~f=Aoq@09FB9B#BXzPm=DN*@vYVA%y*57_6kD0`_t#Ui^guz-s*F@bD1UTJ(K?
zyuQBvhGYV8mE>9(j57Tz$%i3?W1hEN<0W#=tpT`A@`0p#0QMz4?Yiz)+qU=%*8vob
TUmP9000000NkvXXu0mjfTM`(a

literal 0
HcmV?d00001


From baa247ea8696062c7c1d00a27a326220b9140ac8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Dec 2014 21:24:57 +0100
Subject: [PATCH 275/345] Fixed: doxygen

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8f1b4ecd54f..311f433c9cf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1295,7 +1295,7 @@ function dol_print_url($url,$target='_blank',$max=32)
  * @param 	int			$addlink		0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on)
  * @param	int			$max			Max number of characters to show
  * @param	int			$showinvalid	Show warning if syntax email is wrong
- * @param	int			$widthpicto		Show picto
+ * @param	int			$withpicto		Show picto
  * @return	string						HTML Link
  */
 function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=1,$withpicto=0)

From be34fcfa8af181c51aa1056b59c655d96b4a4c40 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Dec 2014 21:33:56 +0100
Subject: [PATCH 276/345] Removed duplicate link making same thing

---
 htdocs/core/lib/company.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4dd9a51d0b7..5a906298312 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -760,12 +760,12 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
             {
                 print '<td align="center">';
-                if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-                {
-                	print '<a class="hideonsmartphone" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
-                	print img_object($langs->trans("Rendez-Vous"),"action_rdv");
-                	print '</a> ';
-                }
+                //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+                //{
+                //	print '<a class="hideonsmartphone" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
+                //	print img_object($langs->trans("Rendez-Vous"),"action_rdv");
+                //	print '</a> ';
+                //}
                 print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
                 print img_object($langs->trans("Event"),"action");
                 print '</a></td>';

From 96e6c6636539d86f782174107f7e6a78b74d856e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 1 Jan 2015 11:24:00 +0100
Subject: [PATCH 277/345] better translation and typo

---
 htdocs/core/class/hookmanager.class.php | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index d1fc6e4662d..3ad0ec897f9 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -47,7 +47,7 @@ class HookManager
 	/**
 	 * Constructor
 	 *
-	 * @param	DoliDB		$db		Handler acces base de donnees
+	 * @param	DoliDB		$db		Database handler
 	 */
 	function __construct($db)
 	{
@@ -56,13 +56,13 @@ class HookManager
 
 
 	/**
-	 *	Init array this->hooks with instantiated action controlers.
+	 *	Init array $this->hooks with instantiated action controlers.
 	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS
 	 *  with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
-	 *  This make conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
-	 *  When initHooks function is called, with initHooks(list_of_contexts), an array this->hooks is defined with instance of controler
+	 *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
+	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
 	 *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
-	 *  Then when a hook is executeHook('aMethod'...) is called, the method aMethod found into class will be executed.
+	 *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
 	 *
 	 *	@param	array	$arraycontext	    Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ...
 	 *	@return	int							Always 1
@@ -116,7 +116,7 @@ class HookManager
      * 	    @param		array	$parameters		Array of parameters
      * 		@param		Object	$object			Object to use hooks on
      * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     * 		@return		mixed					For doActions,formObjectOptions,pdf_xxx:    								Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
+     * 		@return		mixed					For doActions,formObjectOptions,pdf_xxx:    								Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 means KO.
      * 											For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints.
      *                                          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.
@@ -150,11 +150,11 @@ class HookManager
         		)
         	)) $hooktype='addreplace';
 
-        // Loop on each hook to qualify modules that declared context
+        // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
 		$this->resPrint=''; $this->resArray=array();
-        foreach($this->hooks as $context => $modules)    // this->hooks is an array with context as key and value is an array of modules that handle this context
+        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
             {
@@ -162,18 +162,18 @@ class HookManager
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
-                	// jump to next module/class if method does not exists
+                	// jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
-                    // test to avoid to run twice a hook, when a module implements several active contexts
+                    // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
-                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice
+                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
 
-                    // Clean class (an error may have been set into a previous call of another method for same module/hook)
+                    // Clean class (an error may have been set from a previous call of another method for same module/hook)
                     $actionclassinstance->error=0;
                     $actionclassinstance->errors=array();
 
-                    // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
                     // Hooks that must return int (hooks with type 'addreplace')
                     if ($hooktype == 'addreplace')

From 68049a2f0e608e14f56f11a88e3dadb1ec35b9c3 Mon Sep 17 00:00:00 2001
From: Drosis Nikos <drosis.nikos@gmail.com>
Date: Fri, 2 Jan 2015 18:10:47 +0200
Subject: [PATCH 278/345] Fix Lang for Check Payment Type

---
 htdocs/cashdesk/tpl/facturation1.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 47116705320..338c0f23b16 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -193,9 +193,9 @@ $langs->load("cashdesk");
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
 			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</td>';
 			?>
 			</tr>

From a5572eb200cd0ebcd2b7ecf717d8a0c73887ea9d Mon Sep 17 00:00:00 2001
From: Drosis Nikos <drosis.nikos@gmail.com>
Date: Fri, 2 Jan 2015 18:15:14 +0200
Subject: [PATCH 279/345] Fix Lang for cashdesk Check Payment Type

---
 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 9429a682857..12778d6b9ea 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -348,6 +348,7 @@ ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
 ChequeMaker=Check transmitter
 ChequeBank=Bank of Check
+CheckBank=Check
 NetToBePaid=Net to be paid
 PhoneNumber=Tel
 FullPhoneNumber=Telephone

From f14ea7b6490508ca33f9b07a166e0c37e3b2a44d Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 3 Jan 2015 15:07:54 +0100
Subject: [PATCH 280/345] Add module accountancy expert in auguria menu

---
 htdocs/core/menus/init_menu_auguria.sql    | 38 ++++++++++++----------
 htdocs/core/menus/standard/auguria.lib.php | 36 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 7acce783e39..2758ff5ecbd 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -187,26 +187,28 @@ 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->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
 -- Ventilation (accounting)
-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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil', 6__+MAX_llx_menu__, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8, __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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/list.php', 'ToDispatch', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/ventilation/lignes.php', 'Dispatched', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2404__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2405__+MAX_llx_menu__, 'accountancy', '', 2403__+MAX_llx_menu__, '/compta/param/comptes/card.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 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->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil_customer', 6__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=ventil_customer', 'CustomersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 8, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 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->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__);
+
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'ventil_supplier', 6__+MAX_llx_menu__, '/accountancy/supplier/index.php?leftmenu=ventil_supplier', 'SuppliersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 9, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 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->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__);
 -- Rapports
 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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
--- Fiscal year
+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->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+-- Book Keeping
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2720__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 6__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?leftmenu=bookkeeping', 'Bookkeeping', 0, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2721__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyyear.php', 'ByYear', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 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->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2722__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/balancebymonth.php', 'AccountBalanceByMonth', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 1, __ENTITY__);
+-- Fiscal year & Chart of accounts
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'main', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'main', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__);
 -- Check deposit
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index c411ef96039..d732de547ab 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -273,6 +273,42 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		else dol_print_error($db);
 		$db->free($resql);
 	}
+	
+	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
+	{
+		$newmenu->add('/accountancy/journal/index.php?leftmenu=journal',$langs->trans("Journaux"),0,$user->rights->banque->lire);
+
+		if ($leftmenu == 'journal')
+		{
+			$sql = "SELECT rowid, label, accountancy_journal";
+			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+			$sql.= " WHERE entity = ".$conf->entity;
+			$sql.= " AND clos = 0";
+			$sql.= " ORDER BY label";
+
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$numr = $db->num_rows($resql);
+				$i = 0;
+
+				if ($numr > 0)
+
+				while ($i < $numr)
+				{
+					$objp = $db->fetch_object($resql);
+					$newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid,$langs->trans("Journal").' - '.$objp->label,1,$user->rights->accounting->comptarapport->lire);
+					$i++;
+				}
+			}
+			else dol_print_error($db);
+			$db->free($resql);
+
+			// Add other journal
+			$newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire);
+			$newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire);
+		}
+	}
 
 	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
 	{

From df3987fa103490131f59316b1b0cd0a6486236d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jan 2015 14:51:16 +0100
Subject: [PATCH 281/345] Fixed: Bad url link with jquery mobile. We must add
 rel="external" on all external links.

---
 htdocs/admin/modules.php      |  8 ++++----
 htdocs/admin/system/about.php | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index df9632761dd..e3524425c6c 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -520,17 +520,17 @@ else
     $var=!$var;
     print "<tr ".$bc[$var].">\n";
     $url='http://www.dolistore.com';
-    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+    print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
     print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
-    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
     $var=!$var;
     print "<tr ".$bc[$var].">\n";
     $url='http://partners.dolibarr.org';
-    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
+    print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
     print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
-    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
     print "</table>\n";
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index e7490225107..532293cdad2 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -51,8 +51,8 @@ print '</ul>';
 
 print $langs->trans("Developpers").':';
 print '<ul>';
-print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank">http://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
-print '<li>'.$langs->trans("DoliForge").': <a href="http://www.doliforge.org" target="_blank">http://wwww.doliforge.org</a></li>';
+print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank" rel="external">http://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
+print '<li>'.$langs->trans("DoliForge").': <a href="http://www.doliforge.org" target="_blank" rel="external">http://wwww.doliforge.org</a></li>';
 print '</ul>';
 
 //print "<br>\n";
@@ -61,31 +61,31 @@ print $langs->trans("OtherInformations").':';
 
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolibarr.org/">'.$langs->trans("OfficialWebSite").'</a>';
+print '<a target="_blank" href="http://www.dolibarr.org/" rel="external">'.$langs->trans("OfficialWebSite").'</a>';
 print '</li>';
 // If the French language, it displays French website
 if (preg_match('/^fr_/i',$langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.fr/">'.$langs->trans("OfficialWebSiteFr").'</a>';
+	print '<a target="_blank" href="http://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteFr").'</a>';
 	print '</li>';
 }
 print '<li>';
-print '<a target="_blank" href="http://wiki.dolibarr.org/">'.$langs->trans("OfficialWiki").'</a>';
+print '<a target="_blank" href="http://wiki.dolibarr.org/" rel="external">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("Demo").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolibarr.org/onlinedemo/">'.$langs->trans("OfficialDemo").'</a>';
+print '<a target="_blank" href="http://www.dolibarr.org/onlinedemo/" rel="external">'.$langs->trans("OfficialDemo").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("ModulesMarketPlaces").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolistore.com">'.$langs->trans("OfficialMarketPlace").'</a>';
+print '<a target="_blank" href="http://www.dolistore.com" rel="external">'.$langs->trans("OfficialMarketPlace").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -94,7 +94,7 @@ print $langs->trans("HelpCenter").':';
 print '<ul>';
 print '<li>';
 //print $langs->trans("SeeWikiPage",'http://wiki.dolibarr.org/index.php/List_of_OpenSource_Software_companies_and_freelancers');
-print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php">'.$langs->trans("HelpCenter").'</a>';
+print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php" data-ajax="false">'.$langs->trans("HelpCenter").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -104,11 +104,11 @@ print '<ul>';
 $url='http://wiki.dolibarr.org/index.php/Subscribe';
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Subscribirse';
-print '<li><a href="'.$url.'" target="_blank">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
 
-print '<li><a href="http://facebook.com/dolibarr" target="_blank">FaceBook</a></li>';
-print '<li><a href="http://twitter.com/dolibarr" target="_blank">Twitter</a></li>';
-print '<li><a href="http://plus.google.com/+DolibarrOrg" target="_blank">Google Plus page</a></li>';
+print '<li><a href="http://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
+print '<li><a href="http://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
+print '<li><a href="http://plus.google.com/+DolibarrOrg" target="_blank" rel="external">Google Plus page</a></li>';
 
 print '</ul>';
 
@@ -120,11 +120,11 @@ $url='http://saas.dolibarr.org'; $title=$langs->trans("OfficialWebHostingService
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
 print '<li>';
-print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
+print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
 print '</li>';
 $url='http://partners.dolibarr.org'; $title=$langs->trans("ReferencedPreferredPartners");
 print '<li>';
-print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
+print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
 print '</li>';
 
 print '</ul>';

From 48818ed2fdd4255c3f2c7ed8ecfb209614a99bb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jan 2015 15:40:01 +0100
Subject: [PATCH 282/345] Fixed: Quick solution to solve problem of unknown
 payment amount for online subscription.

---
 htdocs/langs/en_US/main.lang        | 1 +
 htdocs/public/paypal/newpayment.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index fd07d379a44..bfded6f40e2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -61,6 +61,7 @@ ErrorFailedToSaveFile=Error, failed to save file.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
+SeeHere=See here
 BackgroundColorByDefault=Default background color
 FileNotUploaded=The file was not uploaded
 FileUploaded=The file was successfully uploaded
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index afe685fb6ac..b28ce169230 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -870,7 +870,12 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	// Amount
 	$var=!$var;
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount))
+	{
+		print ' ('.$langs->trans("ToComplete");
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{

From c0b5b9f00b4c19a089c26b7919c1c66c1c59bf17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jan 2015 19:26:51 +0100
Subject: [PATCH 283/345] Fixed: Removed deprecated function

---
 test/phpunit/ContratTest.php | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index 149d867135e..d62a7bf388d 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -162,37 +162,13 @@ class ContratTest extends PHPUnit_Framework_TestCase
     	return $localobject;
     }
 
-    /**
-     * testContratValid
-     *
-     * @param	Contrat		$localobject		Contract
-     * @return	int
-     *
-     * @depends	testContratFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testContratValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-    	$result=$localobject->update_statut($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
-
    /**
-     * testContratValid
+     * testContratOther
      *
      * @param	Object	$localobject	Object contract
      * @return	int
      *
-     * @depends testContratValid
+     * @depends testContratFetch
      * The depends says test is run only if previous is ok
      */
     public function testContratOther($localobject)

From d8d01090cdb11ff53820ed2c0d200da141257129 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Jan 2015 19:28:05 +0100
Subject: [PATCH 284/345] Fixed: Mark function as deprecated

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 5265f7025c5..8c44b0538d4 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1445,6 +1445,7 @@ class Contrat extends CommonObject
 	 *
 	 *	@param	User	$user		Object user
 	 *	@return int     			<0 if KO, >0 if OK
+	 *  @deprecated					This function will never be used. Status of a contract is status of its lines.
 	 */
 	function update_statut($user)
 	{

From b4b5b35afa77d9ea80a31e3e520c5414f1e57281 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 4 Jan 2015 20:17:49 +0100
Subject: [PATCH 285/345] Skype :: Better presentation

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dbc1cc31e85..4afe2d7917a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1297,11 +1297,11 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
  * Show Skype link
  *
  * @param	string		$skype			Skype to show (only skype, without 'Name of recipient' before)
- * @param int 			$cid 			  Id of contact if known
- * @param int 			$socid 			Id of third party if known
- * @param int 			$addlink		0=no link to create action
- * @param	int			  $max			  Max number of characters to show
- * @return	string						  HTML Link
+ * @param	int 		$cid 			Id of contact if known
+ * @param	int 		$socid 			Id of third party if known
+ * @param	int 		$addlink		0=no link to create action
+ * @param	int			$max			Max number of characters to show
+ * @return	string						HTML Link
  */
 function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
 {
@@ -1316,11 +1316,11 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
 		$newskype='<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_callbutton.png" border="0">&nbsp;';
-		$newskype.='</a>&nbsp;<a href="skype:';
+		$newskype.='<img src="../theme/common/skype_callbutton.png" border="0">';
+		$newskype.='</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">&nbsp;';
+		$newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">';
 		$newskype.='</a>';
 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

From a7fc2b3779b94552ef7311a799846feff11d2f5a Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Mon, 5 Jan 2015 17:55:59 +0100
Subject: [PATCH 286/345] Fix / Improve : [ bug #1747 ] Remove creation of
 batch 'Undefined'

---
 ChangeLog                        |  2 +
 htdocs/product/stock/product.php | 73 +++++++++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61c83e5bcbf..9ae46a57e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ English Dolibarr ChangeLog
 For users:
 - New: Use new combobox.
 - New: Add hidden option MAXTABS_IN_CARD.
+- Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
+
 
 For translators:
 - Update language files.
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index b7eb79e5ab7..eaa12794688 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Cédric Salvador      <csalvador.gpcsolutions.fr>
  * Copyright (C) 2013      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2014      Cédric Gross         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014-2015 Cédric Gross         <c.gross@kreiz-it.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
@@ -239,7 +239,45 @@ if ($action == "transfert_stock" && ! $cancel)
 	}
 }
 
+if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
+{
 
+    $pdluo = new Productbatch($db);
+    $result=$pdluo->fetch(GETPOST('pdluoid','int'));
+
+    if ($result>0)
+    {
+        if ($pdluo->id)
+        {
+            if ((! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) {
+                setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("atleast1batchfield")), 'errors');
+            }
+            else
+            {
+                $d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+                $d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+                $pdluo->batch=GETPOST("batch_number",'san_alpha');
+                $pdluo->eatby=$d_eatby;
+                $pdluo->sellby=$d_sellby;
+                $result=$pdluo->update($user);
+                if ($result<0)
+                {
+                    setEventMessages($pdluo->error,$pdluo->errors, 'errors');
+                }
+            }
+        }
+        else
+        {
+            setEventMessages($langs->trans('BatchInformationNotfound'),null, 'errors');
+        }
+    }
+    else
+    {
+        setEventMessages($pdluo->error,null, 'errors');
+    }
+    header("Location: product.php?id=".$id);
+    exit;
+}
 /*
  * View
  */
@@ -663,12 +701,33 @@ if ($resql)
 			if ($details<0) dol_print_error($db);
 			foreach ($details as $pdluo)
 			{
-				print "\n".'<tr><td></td>';
-				print '<td align="right">'.$pdluo->batch.'</td>';
-				print '<td align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
-				print '<td align="right">'. dol_print_date($pdluo->sellby,'day') .'</td>';
-				print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
-				print '<td colspan="4"></td></tr>';
+			    if ( $action == 'editline' && GETPOST('lineid',int)==$pdluo->id )
+			    { //Current line edit
+			        print "\n".'<tr><td colspan="9">';
+			        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder" width="100%"><tr><td width="10%"></td>';
+			        print '<td align="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
+			        print '<td align="right" width="10%">';
+			        $form->select_date($pdluo->eatby,'eatby','','',1,"");
+			        print '</td>';
+			        print '<td align="right" width="10%">';
+			        $form->select_date($pdluo->sellby,'sellby','','',1,"");
+			        print '</td>';
+			        print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+			        print '<td colspan="4"><input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
+		            print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
+			        print '</table></form>';
+			    }
+			    else
+			    {
+                    print "\n".'<tr><td align="right">';
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
+                    print img_edit().'</a></td>';
+                    print '<td align="right">'.$pdluo->batch.'</td>';
+                    print '<td align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
+                    print '<td align="right">'. dol_print_date($pdluo->sellby,'day') .'</td>';
+                    print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+                    print '<td colspan="4"></td></tr>';
+			    }
 			}
 		}
 		$i++;

From 3794c9305e159fb89c1a717c9924fc1d2d3e0280 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jan 2015 00:04:23 +0100
Subject: [PATCH 287/345] Fix: [ bug #1754 ] Error while installing 3.7

---
 htdocs/install/mysql/tables/llx_c_departements.key.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql
index 427d031a705..66194440610 100644
--- a/htdocs/install/mysql/tables/llx_c_departements.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql
@@ -21,5 +21,8 @@ ALTER TABLE llx_c_departements ADD UNIQUE uk_departements (code_departement,fk_r
 
 ALTER TABLE llx_c_departements ADD INDEX idx_departements_fk_region (fk_region);
 
+-- NOTE: We duplicate creation of unique keys on llx_c_regions NOW to be able to create foreign keys. 
+ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region);
+
 ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_fk_region	FOREIGN KEY (fk_region) REFERENCES llx_c_regions (code_region);
 

From a668d163fdbf3cf97ba685b015a2c6ff4b573ef9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jan 2015 00:27:35 +0100
Subject: [PATCH 288/345] Repair corrupted data

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

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 70fae404149..90730796279 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -115,7 +115,7 @@ ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseu
 -- Fix: deprecated tag to new one
 update llx_opensurvey_sondage set format = 'D' where format = 'D+';
 update llx_opensurvey_sondage set format = 'A' where format = 'A+';
-
+update llx_opensurvey_sondage set tms = now();
 
 -- ALTER TABLE llx_facture_fourn ALTER COLUMN fk_cond_reglement DROP NOT NULL;
 

From 2bf2c8fce7966c800b1c5a8fd181ceeddeef38f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jan 2015 00:34:23 +0100
Subject: [PATCH 289/345] Restore all requets

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

diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 0b71a2fe6fe..ad05f850e16 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1145,5 +1145,5 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;
 ALTER TABLE llx_resource MODIFY COLUMN entity integer DEFAULT 1 NOT NULL;
 
 -- This request make mysql drop (mysql bug, so we add it at end):
---ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
 

From ce3a60b2a3b03a772d06d8a4c8cd5c2f5885d733 Mon Sep 17 00:00:00 2001
From: KreizIT <KreizIT@users.noreply.github.com>
Date: Tue, 6 Jan 2015 13:23:51 +0100
Subject: [PATCH 290/345] Allow warehouse transfer for batched product

---
 htdocs/product/class/productbatch.class.php |   7 +-
 htdocs/product/stock/product.php            | 111 +++++++++++++++-----
 2 files changed, 91 insertions(+), 27 deletions(-)

diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index a4df7a95829..088dccf6861 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -42,6 +42,7 @@ class Productbatch extends CommonObject
 	var $batch='';
 	var $qty;
 	var $import_key;
+	public $warehouseid;
 
 
 
@@ -155,10 +156,11 @@ class Productbatch extends CommonObject
 		$sql.= " t.eatby,";
 		$sql.= " t.batch,";
 		$sql.= " t.qty,";
-		$sql.= " t.import_key";
-
+		$sql.= " t.import_key,";
+		$sql.= " w.fk_entrepot";
 
         $sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t";
+        $sql.= " INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock=w.rowid";
         $sql.= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -177,6 +179,7 @@ class Productbatch extends CommonObject
 				$this->batch = $obj->batch;
 				$this->qty = $obj->qty;
 				$this->import_key = $obj->import_key;
+				$this->warehouseid= $obj->fk_entrepot;
 			}
 			$this->db->free($resql);
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index eaa12794688..13a798548d5 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -170,13 +170,13 @@ if ($action == "correct_stock" && ! $cancel)
 // Transfer stock from a warehouse to another warehouse
 if ($action == "transfert_stock" && ! $cancel)
 {
-	if (! (GETPOST("id_entrepot_source") > 0) || ! (GETPOST("id_entrepot_destination") > 0))
+	if (! (GETPOST("id_entrepot_source",'int') > 0) || ! (GETPOST("id_entrepot_destination",'int') > 0))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Warehouse")), 'errors');
 		$error++;
 		$action='transfert';
 	}
-	if (! GETPOST("nbpiece"))
+	if (! GETPOST("nbpiece",'int'))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("NumberOfUnit")), 'errors');
 		$error++;
@@ -185,9 +185,9 @@ if ($action == "transfert_stock" && ! $cancel)
 
 	if (! $error)
 	{
-		if (GETPOST("id_entrepot_source") <> GETPOST("id_entrepot_destination"))
+		if (GETPOST("id_entrepot_source",'int') <> GETPOST("id_entrepot_destination",'int'))
 		{
-			if (is_numeric(GETPOST("nbpiece")) && $id)
+			if (GETPOST("nbpiece",'int') && $id)
 			{
 				$product = new Product($db);
 				$result=$product->fetch($id);
@@ -201,28 +201,59 @@ if ($action == "transfert_stock" && ! $cancel)
 				if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp;
 				$pricedest=$pricesrc;
 
-				//print 'price src='.$pricesrc.', price dest='.$pricedest;exit;
+				$pdluoid=GETPOST('pdluoid','int');
 
-				// Remove stock
-				$result1=$product->correct_stock(
-	    			$user,
-	    			GETPOST("id_entrepot_source"),
-	    			GETPOST("nbpiece"),
-	    			1,
-	    			GETPOST("label"),
-	    			$pricesrc
-				);
+				if ($pdluoid>0)
+				{
+				    $pdluo = new Productbatch($db);
+				    $result=$pdluo->fetch($pdluoid);
 
-				// Add stock
-				$result2=$product->correct_stock(
-	    			$user,
-	    			GETPOST("id_entrepot_destination"),
-	    			GETPOST("nbpiece"),
-	    			0,
-	    			GETPOST("label"),
-	    			$pricedest
-				);
+				    if ($result>0 && $pdluo->id)
+				    {
+                        // Remove stock
+                        $result1=$product->correct_stock_batch(
+				            $user,
+				            $pdluo->warehouseid,
+				            GETPOST("nbpiece",'int'),
+				            1,
+				            GETPOST("label",'san_alpha'),
+				            $pricesrc,
+				            $pdluo->eatby,$pdluo->sellby,$pdluo->batch
+				        );
+                        // Add stock
+                        $result2=$product->correct_stock_batch(
+                            $user,
+                            GETPOST("id_entrepot_destination",'int'),
+                            GETPOST("nbpiece",'int'),
+                            0,
+                            GETPOST("label",'san_alpha'),
+                            $pricedest,
+                            $pdluo->eatby,$pdluo->sellby,$pdluo->batch
+                        );
+				    }
+				}
+				else
+				{
+                    // Remove stock
+                    $result1=$product->correct_stock(
+                        $user,
+                        GETPOST("id_entrepot_source"),
+                        GETPOST("nbpiece"),
+                        1,
+                        GETPOST("label"),
+                        $pricesrc
+                    );
 
+                    // Add stock
+                    $result2=$product->correct_stock(
+                        $user,
+                        GETPOST("id_entrepot_destination"),
+                        GETPOST("nbpiece"),
+                        0,
+                        GETPOST("label"),
+                        $pricedest
+                    );
+				}
 				if ($result1 >= 0 && $result2 >= 0)
 				{
 					$db->commit();
@@ -239,6 +270,7 @@ if ($action == "transfert_stock" && ! $cancel)
 	}
 }
 
+// Update batch information
 if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
 {
 
@@ -540,15 +572,43 @@ if ($id > 0 || $ref)
 	 */
 	if ($action == "transfert")
 	{
+	    $pdluoid=GETPOST('pdluoid','int');
+
+	    if ($pdluoid > 0)
+	    {
+	        $pdluo = new Productbatch($db);
+	        $result=$pdluo->fetch($pdluoid);
+
+	        if ($result > 0)
+	        {
+	            $pdluoid=$pdluo->id;
+	        }
+	        else
+	        {
+	            dol_print_error($db);
+	        }
+	    }
+
 		print_titre($langs->trans("StockTransfer"));
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'" method="post">'."\n";
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="transfert_stock">';
+		if ($pdluoid)
+		{
+		    print '<input type="hidden" name="pdluoid" value="'.$pdluoid.'">';
+		}
 		print '<table class="border" width="100%">';
 
 		print '<tr>';
 		print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseSource").'</td><td width="20%">';
-		print $formproduct->selectWarehouses(($_GET["dwid"]?$_GET["dwid"]:GETPOST('id_entrepot_source')),'id_entrepot_source','',1);
+		if ($pdluoid)
+		{
+		    print $formproduct->selectWarehouses($pdluo->warehouseid,'id_entrepot_source','',1,1);
+		}
+		else
+		{
+            print $formproduct->selectWarehouses(($_GET["dwid"]?$_GET["dwid"]:GETPOST('id_entrepot_source')),'id_entrepot_source','',1);
+		}
 		print '</td>';
 		print '<td width="20%" class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td width="20%">';
 		print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1);
@@ -630,7 +690,7 @@ if (empty($action) && $product->id)
 
 
 /*
- * Contenu des stocks
+ * Stock detail
  */
 print '<br><table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td width="40%" colspan="4">'.$langs->trans("Warehouse").'</td>';
@@ -720,6 +780,7 @@ if ($resql)
 			    else
 			    {
                     print "\n".'<tr><td align="right">';
+                    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='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
                     print img_edit().'</a></td>';
                     print '<td align="right">'.$pdluo->batch.'</td>';

From 50c2b75ef89a36c6d2c9335e548f13da1f94f043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Fri, 14 Nov 2014 16:43:49 +0100
Subject: [PATCH 291/345] Invoices: added situation (or interim) invoices
 support

---
 htdocs/accountancy/journal/sellsjournal.php   |  23 +-
 htdocs/compta/facture.php                     | 232 +++++++++++++-
 htdocs/compta/facture/class/facture.class.php | 294 +++++++++++++++++-
 htdocs/compta/facture/impayees.php            |   4 +-
 htdocs/compta/journal/sellsjournal.php        |  24 +-
 htdocs/compta/paiement.php                    |   4 +-
 .../compta/paiement/class/paiement.class.php  |  13 +-
 htdocs/compta/resultat/clientfourn.php        |  10 +-
 htdocs/compta/resultat/index.php              |   8 +-
 htdocs/compta/stats/cabyprodserv.php          |   4 +-
 htdocs/compta/stats/cabyuser.php              |   4 +-
 htdocs/compta/stats/casoc.php                 |   4 +-
 htdocs/compta/stats/index.php                 |   4 +-
 htdocs/core/class/commoninvoice.class.php     |  15 +-
 htdocs/core/class/commonobject.class.php      |  18 ++
 htdocs/core/class/html.form.class.php         |  54 +++-
 htdocs/core/lib/pdf.lib.php                   |  27 ++
 htdocs/core/lib/price.lib.php                 |   7 +-
 htdocs/core/lib/tax.lib.php                   |  26 +-
 .../modules/facture/doc/pdf_crabe.modules.php | 101 +++++-
 htdocs/core/tpl/objectline_create.tpl.php     |  11 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |  72 +++--
 htdocs/core/tpl/objectline_view.tpl.php       |  19 +-
 .../install/mysql/migration/3.7.0-3.8.0.sql   |   7 +
 htdocs/install/mysql/tables/llx_facture.sql   |   8 +-
 .../install/mysql/tables/llx_facturedet.sql   |   9 +-
 htdocs/langs/en_US/bills.lang                 |  19 +-
 htdocs/langs/fr_FR/bills.lang                 |  18 ++
 28 files changed, 914 insertions(+), 125 deletions(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 5bb1f989a92..8a0318473c9 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,9 +101,9 @@ if (! empty($conf->multicompany->enabled)) {
 }
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	$sql .= " AND f.type IN (0,1,2)";
+	$sql .= " AND f.type IN (0,1,2,5)";
 else
-	$sql .= " AND f.type IN (0,1,2,3)";
+	$sql .= " AND f.type IN (0,1,2,3,5)";
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
@@ -136,6 +137,16 @@ if ($result) {
 		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef");
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
+		// Situation invoices handling
+		$line = new FactureLigne($db);
+		$line->fetch($obj->id);
+		$prev_progress = $line->get_prev_progress();
+		if ($obj->situation_percent == 0) { // Avoid divide by 0
+			$situation_ratio = 0;
+		} else {
+			$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		}
+
 		// Invoice lines
 		$tabfac[$obj->rowid]["date"] = $obj->df;
 		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
@@ -148,9 +159,9 @@ if ($result) {
 			$tabht[$obj->rowid][$compta_prod] = 0;
 		if (! isset($tabtva[$obj->rowid][$compta_tva]))
 			$tabtva[$obj->rowid][$compta_tva] = 0;
-		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
-		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
-		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
@@ -471,4 +482,4 @@ if ($action == 'export_csv') {
 	// End of page
 	llxFooter();
 }
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 9f104180def..3feb30cdb27 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -7,9 +7,10 @@
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012-2013 Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
- * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014	   Ferran Marcet		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -802,7 +803,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 	}
 
 	// Standard or deposit or proforma invoice
-	if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT || $_POST['type'] == Facture::TYPE_PROFORMA) && $_POST['fac_rec'] <= 0)
+	if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT || $_POST['type'] == Facture::TYPE_PROFORMA || ($_POST['type'] == Facture::TYPE_SITUATION && empty($_POST['situations']))) && $_POST['fac_rec'] <= 0)
 	{
 		if (GETPOST('socid', 'int') < 1)
 		{
@@ -837,6 +838,12 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->remise_absolue		= $_POST['remise_absolue'];
 			$object->remise_percent		= $_POST['remise_percent'];
 
+			if($_POST['type'] == Facture::TYPE_SITUATION) {
+				$object->situation_counter = 1;
+				$object->situation_final = 0;
+				$object->situation_cycle_ref = $object->newCycle();
+			}
+
 			$object->fetch_thirdparty();
 
 			// If creation from another object of another module (Example: origin=propal, originid=1)
@@ -987,6 +994,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 
 								$label=(! empty($lines[$i]->label)?$lines[$i]->label:'');
 								$desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle);
+								if ($object->situation_counter == 1) $lines[$i]->situation_percent =  0;
 
 								if ($lines[$i]->subprice < 0)
 								{
@@ -1040,7 +1048,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 										$array_option = $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, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $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_option);
+									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $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_option, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id);
 
 									if ($result > 0) {
 										$lineid = $result;
@@ -1089,6 +1097,44 @@ else if ($action == 'add' && $user->rights->facture->creer)
 		}
 	}
 
+	if ($_POST['type'] == Facture::TYPE_SITUATION && (!empty($_POST['situations']))) {
+		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		if (empty($datefacture)) {
+			$error++;
+			$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->trans("Date")) . '</div>';
+		}
+
+		if (!($_POST['situations'] > 0)) {
+			$error++;
+			$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceSituation")) . '</div>';
+		}
+
+		if (!$error) {
+			$result = $object->fetch($_POST['situations']);
+			$object->fk_facture_source = $_POST['situations'];
+			$object->type = Facture::TYPE_SITUATION;
+
+			$object->fetch_thirdparty();
+			$object->date = $datefacture;
+			$object->note_public = trim($_POST['note_public']);
+			$object->note = trim($_POST['note']);
+			$object->ref_client = $_POST['ref_client'];
+			$object->ref_int = $_POST['ref_int'];
+			$object->modelpdf = $_POST['model'];
+			$object->fk_project = $_POST['projectid'];
+			$object->cond_reglement_id = $_POST['cond_reglement_id'];
+			$object->mode_reglement_id = $_POST['mode_reglement_id'];
+			$object->remise_absolue = $_POST['remise_absolue'];
+			$object->remise_percent = $_POST['remise_percent'];
+
+			// Proprietes particulieres a facture de remplacement
+
+			$object->situation_counter = $object->situation_counter + 1;
+			$id = $object->createFromCurrent($user);
+			if ($id <= 0) $mesg = $object->error;
+		}
+	}
+
 	// End of object creation, we show it
 	if ($id > 0 && ! $error)
 	{
@@ -1312,7 +1358,7 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 			setEventMessage($mesg, 'errors');
 		} else {
 			// Insert line
-			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option);
+			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option, $_POST['progress']);
 
 			if ($result > 0)
 			{
@@ -1363,6 +1409,9 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 		    	unset($_POST['date_endday']);
 		    	unset($_POST['date_endmonth']);
 		    	unset($_POST['date_endyear']);
+
+				unset($_POST['situations']);
+				unset($_POST['progress']);
 			} else {
 				setEventMessage($object->error, 'errors');
 			}
@@ -1413,6 +1462,17 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 		}
 	}
 
+	$line = new FactureLigne($db);
+	$line->fetch(GETPOST('lineid'));
+	$percent = $line->get_prev_progress();
+
+	if (GETPOST('progress') < $percent) {
+		$mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
+		setEventMessages($mesg, null, 'warnings');
+		$error++;
+		$result = -1;
+	}
+
 	// Check minimum price
 	$productid = GETPOST('productid', 'int');
 	if (! empty($productid)) {
@@ -1450,7 +1510,7 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 
 	// Update line
 	if (! $error) {
-		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
+		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option, GETPOST('progress'));
 
 		if ($result >= 0) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1484,12 +1544,28 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 			unset($_POST['buying_price']);
 			unset($_POST['np_marginRate']);
 			unset($_POST['np_markRate']);
+			unset($_POST['situations']);
+			unset($_POST['progress']);
 		} else {
 			setEventMessage($object->error, 'errors');
 		}
 	}
 }
 
+else if ($action == 'updatealllines' && $user->rights->facture->creer && $_POST['all_percent'] == $langs->trans('Modifier')) {
+	if (!$object->fetch($id) > 0) dol_print_error($db);
+	if (!is_null(GETPOST('all_progress')) && GETPOST('all_progress') != "") {
+		foreach ($object->lines as $line) {
+			$percent = $line->get_prev_progress();
+			if (GETPOST('all_progress') < $percent) {
+				$mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
+				$result = -1;
+			} else
+				$object->update_percent($line, $_POST['all_progress']);
+		}
+	}
+}
+
 else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['cancel'] == $langs->trans('Cancel')) {
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $id); // Pour reaffichage de la fiche en cours d'edition
 	exit();
@@ -1800,6 +1876,8 @@ if ($action == 'create')
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 		print ajax_combobox('fac_replacement');
 		print ajax_combobox('fac_avoir');
+		print ajax_combobox('situations');
+
 	}
 
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
@@ -1961,6 +2039,29 @@ if ($action == 'create')
 
 	if ($socid > 0)
 	{
+		// First situation invoice
+		print '<tr height="18"><td width="16px" valign="middle">';
+		print '<input type="radio" name="type" value="5"' . (GETPOST('type') == 5 ? ' checked="checked"' : '') . '>';
+		print '</td><td valign="middle">';
+		$desc = $form->textwithpicto($langs->trans("InvoiceFirstSituationAsk"), $langs->transnoentities("InvoiceFirstSituationDesc"), 1);
+		print $desc;
+		print '</td></tr>' . "\n";
+
+		// Next situation invoice
+		$opt = $form->load_situation_invoices(GETPOST('originid'), $socid);
+		print '<tr height="18"><td valign="middle">';
+		print '<input type="radio" name="type" value="5"' . (GETPOST('type') == 5 && GETPOST('originid') ? ' checked="checked"' : '') . ' ';
+		if ($opt == '<option value ="0" selected="selected">' . $langs->trans('NoSituations') . '</option>' || (GETPOST('origin') && GETPOST('origin') != 'facture')) print 'disabled="disabled"';
+		print '>';
+		print '</td><td valign="middle">';
+		$text = $langs->trans("InvoiceSituationAsk") . ' ';
+		$text .= '<select class="flat" id="situations" name="situations">';
+		$text .= $opt;
+		$text .= '</select>';
+		$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceSituationDesc"), 1);
+		print $desc;
+		print '</td></tr>' . "\n";
+
 		// Replacement
 		print '<tr height="18"><td valign="middle">';
 		print '<input type="radio" name="type" id="radio_replacement" value="1"' . (GETPOST('type') == 1 ? ' checked="checked"' : '');
@@ -3093,6 +3194,50 @@ if ($action == 'create')
 	print "</td>";
 	print '</tr>';
 
+	// Situations
+	if ($object->type == 5 && ($object->situation_counter > 1)) {
+		$prevsits = $object->get_prev_sits();
+		print '<tr><td>';
+		print $langs->trans('SituationAmount');
+		print ' ';
+
+		print $prevsits[0]->situation_counter;
+		for ($i = 1; $i < count($prevsits); $i++) {
+			print ' + ';
+			print $prevsits[$i]->situation_counter;
+		}
+		print ' + ';
+		print $object->situation_counter;
+
+		print '</td>';
+		print '<td align="right" colspan="2" nowrap>';
+
+		$prevsits_total_amount = 0;
+		foreach ($prevsits as $situation) {
+			$prevsits_total_amount += $situation->total_ht;
+		}
+		$prevsits_total_amount += $object->total_ht;
+
+		print price($prevsits_total_amount);
+		print '</td>';
+		print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+
+		// Previous situation(s) deduction(s)
+		for ($i = 0; $i < count($prevsits); $i++) {
+			print '<tr><td>';
+			print '<a href="' . $_SERVER['PHP_SELF'] . '?facid=' . $prevsits[$i]->id . '">';
+			print $langs->trans('SituationDeduction');
+			print ' ';
+			print $prevsits[$i]->situation_counter;
+			print '</a></td>';
+
+			print '<td align="right" colspan="2" nowrap>';
+			print '- ' . price($prevsits[$i]->total_ht);
+			print '</td>';
+			print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+		}
+	}
+
 	// Amount
 	print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
 	print '<td align="right" colspan="3" nowrap>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
@@ -3190,6 +3335,58 @@ if ($action == 'create')
 	// Lines
 	$result = $object->getLinesArray();
 
+	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+	}
+
+	print '<table id="tablelines" class="noborder noshadow" width="100%">';
+
+	// Show global modifiers
+	if ($object->situation_cycle_ref && $object->statut == 0) {
+		print '<tr class="liste_titre nodrag nodrop">';
+		print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">';
+		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />';
+		print '<input type="hidden" name="action" value="updatealllines" />';
+		print '<input type="hidden" name="id" value="' . $object->id . '" />';
+
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			print '<td align="center" width="5">&nbsp;</td>';
+		}
+		print '<td>' . $langs->trans('ModifyAllLines') . '</td>';
+		print '<td align="right" width="50">&nbsp;</td>';
+		print '<td align="right" width="80">&nbsp;</td>';
+		if ($inputalsopricewithtax) print '<td align="right" width="80">&nbsp;</td>';
+		print '<td align="right" width="50">&nbsp</td>';
+		print '<td align="right" width="50">&nbsp</td>';
+		print '<td align="right" width="50">' . $langs->trans('Progress') . '</td>';
+		if (! empty($conf->margin->enabled) && empty($user->societe_id))
+		{
+			print '<td align="right" class="margininfos" width="80">&nbsp;</td>';
+			if ((! empty($conf->global->DISPLAY_MARGIN_RATES) || ! empty($conf->global->DISPLAY_MARK_RATES)) && $user->rights->margins->liretous) {
+				print '<td align="right" class="margininfos" width="50">&nbsp;</td>';
+			}
+		}
+		print '<td align="right" width="50">&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td width="10">&nbsp;</td>';
+		print '<td width="10">&nbsp;</td>';
+		print "</tr>\n";
+
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			print '<td align="center" width="5">&nbsp;</td>';
+		}
+		print '<tr width="100%" height="18" class="nodrag nodrop">';
+		print '<td>&nbsp;</td>';
+		print '<td width="50">&nbsp;</td>';
+		print '<td width="80">&nbsp;</td>';
+		print '<td width="50">&nbsp;</td>';
+		print '<td width="50">&nbsp;</td>';
+		print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>';
+		print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
+		print '</tr>';
+		print '</form>';
+	}
+
 	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
 	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
 	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
@@ -3197,18 +3394,12 @@ if ($action == 'create')
 	<input type="hidden" name="id" value="' . $object->id . '">
 	';
 
-	if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
-		include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-	}
-
-	print '<table id="tablelines" class="noborder noshadow" width="100%">';
-
 	// Show object lines
 	if (! empty($object->lines))
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
+	if ($object->statut == 0 && $user->rights->facture->creer && $action != 'valid' && $action != 'editline' && ($object->is_first() || !$object->situation_cycle_ref))
 	{
 		if ($action != 'editline')
 		{
@@ -3245,12 +3436,14 @@ if ($action == 'create')
 				$ventilExportCompta = $object->getVentilExportCompta();
 
 				if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0) {
-					if (! $objectidnext) {
+					if (! $objectidnext && $object->is_last_in_cycle()) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?facid=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
 						} else {
 							print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("NotEnoughPermissions") . '">' . $langs->trans('Modify') . '</span></div>';
 						}
+					} else if (!$object->is_last_in_cycle()) {
+						print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("NotLastInCycle") . '">' . $langs->trans('Modify') . '</span></div>';
 					} else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('Modify') . '</span></div>';
 					}
@@ -3273,7 +3466,7 @@ if ($action == 'create')
 			}
 
 			// Validate
-			if ($object->statut == 0 && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && (! empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
+			if ($object->statut == 0 && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA|| $object->type == Facture::TYPE_SITUATION) && (! empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
 				if ($user->rights->facture->valider) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&amp;action=valid">' . $langs->trans('Validate') . '</a></div>';
 				}
@@ -3385,6 +3578,17 @@ if ($action == 'create')
 				}
 			}
 
+			//Create next situation invoice
+			if ($user->rights->facture->creer && ($object->type == 5) && ($object->statut == 1 || $object->statut == 2)) {
+				if ($object->is_last_in_cycle() && $object->situation_final != 1) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=create&amp;type=5&amp;origin=facture&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '" >' . $langs->trans('CreateNextSituationInvoice') . '</a></div>';
+				} else if (!$object->is_last_in_cycle()) {
+					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseNotLastInCycle") . '">' . $langs->trans('CreateNextSituationInvoice') . '</a></div>';
+				} else {
+					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseFinal") . '">' . $langs->trans('CreateNextSituationInvoice') . '</a></div>';
+				}
+			}
+
 			// Delete
 			if ($user->rights->facture->supprimer)
 			{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index f81fb37849f..f28f068c255 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -10,6 +10,8 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012-2014 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2012      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013      Cedric Gross          <c.gross@kreiz-it.fr>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  *
@@ -122,6 +124,21 @@ class Facture extends CommonInvoice
 
 	var $fac_rec;
 
+	/**
+	 * @var int Situation cycle reference number
+	 */
+	public $situation_cycle_ref;
+
+	/**
+	 * @var int Situation counter inside the cycle
+	 */
+	public $situation_counter;
+
+	/**
+	 * @var bool Final situation flag
+	 */
+	public $situation_final;
+
     /**
      * Standard invoice
      */
@@ -147,6 +164,11 @@ class Facture extends CommonInvoice
      */
     const TYPE_PROFORMA = 4;
 
+	/**
+	 * Situation invoice
+	 */
+	const TYPE_SITUATION = 5;
+
 	/**
 	 * 	Constructor
 	 *
@@ -180,6 +202,17 @@ class Facture extends CommonInvoice
 		if (! $this->cond_reglement_id) $this->cond_reglement_id = 0;
 		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
 		$this->brouillon = 1;
+		if (empty($this->situation_cycle_ref)) {
+			$this->situation_cycle_ref = 'null';
+		}
+
+		if (empty($this->situation_counter)) {
+			$this->situation_counter = 'null';
+		}
+
+		if (empty($this->situation_final)) {
+			$this->situation_final = '0';
+		}
 
 		dol_syslog(get_class($this)."::create user=".$user->id);
 
@@ -248,6 +281,7 @@ class Facture extends CommonInvoice
         $sql.= ", fk_account";
 		$sql.= ", fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
+		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql.= ")";
 		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -269,7 +303,11 @@ class Facture extends CommonInvoice
 		$sql.= ",".($this->fk_project?$this->fk_project:"null");
 		$sql.= ','.$this->cond_reglement_id;
 		$sql.= ",".$this->mode_reglement_id;
-		$sql.= ", '".$this->db->idate($datelim)."', '".$this->modelpdf."')";
+		$sql.= ", '".$this->db->idate($datelim)."', '".$this->modelpdf."'";
+		$sql.= ", ".$this->situation_cycle_ref;
+		$sql.= ", ".$this->situation_counter;
+		$sql.= ", ".$this->situation_final;
+		$sql.=")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -399,7 +437,9 @@ class Facture extends CommonInvoice
 							$this->lines[$i]->fk_fournprice,
 							$this->lines[$i]->pa_ht,
 							$this->lines[$i]->label,
-							$this->lines[$i]->array_options
+							$this->lines[$i]->array_options,
+							$this->lines[$i]->situation_percent,
+							$this->lines[$i]->fk_prev_id
 						);
 						if ($result < 0)
 						{
@@ -451,7 +491,9 @@ class Facture extends CommonInvoice
 						0,
 						null,
 						0,
-						$_facrec->lines[$i]->label
+						$_facrec->lines[$i]->label,
+						null,
+						$_facrec->lines[$i]->situation_percent
 					);
 
 					if ( $result_insert < 0)
@@ -556,10 +598,14 @@ class Facture extends CommonInvoice
 
 		$facture->lines		    	= $this->lines;	// Tableau des lignes de factures
 		$facture->products		    = $this->lines;	// Tant que products encore utilise
+		$facture->situation_counter = $this->situation_counter;
+		$facture->situation_cycle_ref=$this->situation_cycle_ref;
+		$facture->situation_final  = $this->situation_final;
 
 		// Loop on each line of new invoice
 		foreach($facture->lines as $i => $line)
 		{
+			$facture->lines[$i]->fk_prev_id = $this->lines[$i]->rowid;
 			if ($invertdetail)
 			{
 				$facture->lines[$i]->subprice  = -$facture->lines[$i]->subprice;
@@ -827,6 +873,7 @@ class Facture extends CommonInvoice
 		if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
 		if ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
 		if ($this->type == self::TYPE_DEPOSIT) $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+		if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref;
 		if ($moretitle) $label.=' - '.$moretitle;
 
 		$linkstart='<a href="'.$url.'">';
@@ -863,6 +910,7 @@ class Facture extends CommonInvoice
 		$sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
 		$sql.= ', f.fk_facture_source';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
+		$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
 		$sql.= ', f.fk_account';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
@@ -923,7 +971,9 @@ class Facture extends CommonInvoice
 				$this->user_author			= $obj->fk_user_author;
 				$this->user_valid			= $obj->fk_user_valid;
 				$this->modelpdf				= $obj->model_pdf;
-
+				$this->situation_cycle_ref  = $obj->situation_cycle_ref;
+				$this->situation_counter    = $obj->situation_counter;
+				$this->situation_final      = $obj->situation_final;
 				$this->extraparams			= (array) json_decode($obj->extraparams, true);
 
 				if ($this->statut == 0)	$this->brouillon = 1;
@@ -974,6 +1024,7 @@ class Facture extends CommonInvoice
 		$this->lines=array();
 
 		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.tva_tx, ';
+		$sql .= ' l.situation_percent, l.fk_prev_id,';
 		$sql.= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
 		$sql.= ' l.rang, l.special_code,';
 		$sql.= ' l.date_start as date_start, l.date_end as date_end,';
@@ -1033,6 +1084,8 @@ class Facture extends CommonInvoice
 				$line->rang				= $objp->rang;
 				$line->special_code		= $objp->special_code;
 				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->situation_percent= $objp->situation_percent;
+				$line->fk_prev_id       = $objp->fk_prev_id;
 
 				$this->lines[$i] = $line;
 
@@ -1073,6 +1126,17 @@ class Facture extends CommonInvoice
 		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
 		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
 		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (empty($this->situation_cycle_ref)) {
+			$this->situation_cycle_ref = 'null';
+		}
+
+		if (empty($this->situation_counter)) {
+			$this->situation_counter = 'null';
+		}
+
+		if (empty($this->situation_final)) {
+			$this->situation_final = '0';
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -1110,7 +1174,10 @@ class Facture extends CommonInvoice
 		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
 		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
 		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
+		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+		$sql.= ", situation_cycle_ref=".$this->situation_cycle_ref;
+		$sql.= ", situation_counter=".$this->situation_counter;
+		$sql.= ", situation_final=".$this->situation_final;
 
 		$sql.= " WHERE rowid=".$this->id;
 
@@ -1808,6 +1875,15 @@ class Facture extends CommonInvoice
 				$this->statut=1;
 				$this->brouillon=0;
 				$this->date_validation=$now;
+				$i = 0;
+				$final = True;
+				while ($i < count($this->lines) && $final == True) {
+					$final = ($this->lines[$i]->situation_percent == 100);
+					$i++;
+				}
+				if ($final) {
+					$this->setFinal();
+				}
 			}
 		}
 		else
@@ -1947,9 +2023,11 @@ class Facture extends CommonInvoice
 	 * 		@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
 	 * 		@param		string		$label				Label of the line (deprecated, do not use)
 	 *		@param		array		$array_option		extrafields array
+	 *      @param      int         $situation_percent  Situation advance percentage
+	 *      @param      int         $fk_prev_id         Previous situation line id reference
 	 *    	@return    	int             				<0 if KO, Id of line if OK
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0, $situation_percent=0, $fk_prev_id='')
 	{
 		global $mysoc, $conf, $langs;
 
@@ -1966,6 +2044,8 @@ class Facture extends CommonInvoice
 		if (empty($txlocaltax1)) $txlocaltax1=0;
 		if (empty($txlocaltax2)) $txlocaltax2=0;
 		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+		if (empty($fk_prev_id)) $fk_prev_id = 'null';
+		if (is_null($situation_percent) || $situation_percent > 100) $situation_percent = 100;
 
 		$remise_percent=price2num($remise_percent);
 		$qty=price2num($qty);
@@ -1999,7 +2079,7 @@ class Facture extends CommonInvoice
 
 			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
-			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, $situation_percent);
 
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
@@ -2060,6 +2140,8 @@ class Facture extends CommonInvoice
 			$this->line->fk_parent_line=$fk_parent_line;
 			$this->line->origin=$origin;
 			$this->line->origin_id=$origin_id;
+			$this->line->situation_percent = $situation_percent;
+			$this->line->fk_prev_id = $fk_prev_id;
 
 			// infos marge
 			$this->line->fk_fournprice = $fk_fournprice;
@@ -2121,9 +2203,10 @@ class Facture extends CommonInvoice
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
      *  @param		array		$array_option		extrafields array
+	 * @param       int         $situation_percent  Situation advance percentage
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0, $situation_percent=0)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -2139,6 +2222,8 @@ class Facture extends CommonInvoice
 			if (empty($qty)) $qty=0;
 			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
 			if (empty($special_code) || $special_code == 3) $special_code=0;
+			if ($situation_percent > 100 || is_null($situation_percent) || $situation_percent == "") $situation_percent = 100;
+
 
 			$remise_percent	= price2num($remise_percent);
 			$qty			= price2num($qty);
@@ -2157,7 +2242,7 @@ class Facture extends CommonInvoice
 
 			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
-			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'',$localtaxes_type);
+			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'',$localtaxes_type, $situation_percent);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
@@ -2205,6 +2290,8 @@ class Facture extends CommonInvoice
 			$this->line->product_type		= $type;
 			$this->line->fk_parent_line		= $fk_parent_line;
 			$this->line->skip_update_total	= $skip_update_total;
+			$this->line->situation_percent  = $situation_percent;
+
 
 			// infos marge
 			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
@@ -2247,6 +2334,28 @@ class Facture extends CommonInvoice
 		}
 	}
 
+	/**
+	 * @param FactureLigne $line Invoice line
+	 * @param int $percent
+	 */
+	function update_percent($line, $percent)
+	{
+		include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php');
+
+		// Cap percentages to 100
+		if ($percent > 100) $percent = 100;
+		$line->situation_percent = $percent;
+		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->product_type, 'HT', 0, 0, '', '', $percent);
+		$line->total_ht = $tabprice[0];
+		$line->total_tva = $tabprice[1];
+		$line->total_ttc = $tabprice[2];
+		$line->total_localtax1 = $tabprice[9];
+		$line->total_localtax2 = $tabprice[10];
+		$line->update();
+		$this->update_price(1);
+		$this->db->commit();
+	}
+
 	/**
 	 *	Delete line in database
 	 *
@@ -2647,6 +2756,10 @@ class Facture extends CommonInvoice
 			if ($maxfacnumber == '' && $ventilExportCompta == 0) return 1;
 			// If invoice to delete is last one and not already dispatched, we can delete
 			if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 1;
+			if ($this->situation_cycle_ref) {
+				$last = $this->is_last_in_cycle();
+				return $last;
+			}
 		}
 		else if ($this->statut == 0 && $facref == 'PROV') // Si facture brouillon et provisoire
 		{
@@ -3206,6 +3319,7 @@ class Facture extends CommonInvoice
 	{
 		$sql = 'SELECT l.rowid, l.label as custom_label, l.description, l.fk_product, l.product_type, l.qty, l.tva_tx,';
 		$sql.= ' l.fk_remise_except, l.localtax1_tx, l.localtax2_tx,';
+		$sql .= ' l.situation_percent, l.fk_prev_id,';
 		$sql.= ' l.remise_percent, l.subprice, l.info_bits, l.rang, l.special_code, l.fk_parent_line,';
 		$sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
 		$sql.= ' l.date_start, l.date_end,';
@@ -3247,6 +3361,8 @@ class Facture extends CommonInvoice
 				$this->lines[$i]->total_tva			= $obj->total_tva;
 				$this->lines[$i]->total_ttc			= $obj->total_ttc;
 				$this->lines[$i]->fk_parent_line	= $obj->fk_parent_line;
+				$this->lines[$i]->situation_percent = $obj->situation_percent;
+				$this->lines[$i]->fk_prev_id        = $obj->fk_prev_id;
 				$this->lines[$i]->special_code		= $obj->special_code;
 				$this->lines[$i]->rang				= $obj->rang;
 				$this->lines[$i]->date_start		= $this->db->jdate($obj->date_start);
@@ -3304,12 +3420,119 @@ class Facture extends CommonInvoice
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
+	/**
+	 * Gets the smallest reference available for a new cycle
+	 *
+	 * @return int >= 1 if OK, -1 if error
+	 *
+	 *
+	 */
+	function newCycle()
+	{
+		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture';
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($resql->num_rows > 0) {
+				$res = $this->db->fetch_array($resql);
+				$ref = $res['max(situation_cycle_ref)'];
+				$ref++;
+			} else {
+				$ref = 1;
+			}
+			$this->db->free($resql);
+			return $ref;
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
+	/**
+	 * Checks if the invoice is the first of a cycle
+	 *
+	 */
+	function is_first()
+	{
+		return ($this->situation_counter == 1);
+	}
 
+	/**
+	 * Returns an array containing the previous situations as Facture objects
+	 *
+	 */
+	function get_prev_sits()
+	{
+
+		$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'facture';
+		$sql .= ' where situation_cycle_ref = ' . $this->situation_cycle_ref;
+		$sql .= ' and situation_counter < ' . $this->situation_counter;
+		$resql = $this->db->query($sql);
+		$res = array();
+		if ($resql && $resql->num_rows > 0) {
+			while ($row = $this->db->fetch_object($resql)) {
+				$id = $row->rowid;
+				$situation = new Facture($this->db);
+				$situation->fetch($id);
+				$res[] = $situation;
+			}
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+			return -1;
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Sets the invoice as a final situation
+	 *
+	 * @return int 1 if ok, -1 if error
+	 */
+	function setFinal()
+	{
+		global $conf, $langs, $user;
+		$this->situation_final = 1;
+		$sql = 'update ' . MAIN_DB_PREFIX . 'facture set situation_final = ' . $this->situation_final . ' where rowid = ' . $this->id;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			// FIXME: call triggers?
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this) . "::update Error setFinal " . $sql, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Checks if the invoice is the last in its cycle
+	 *
+	 * @return int 0 or 1 if OK, -1 if error
+	 *
+	 */
+
+	function is_last_in_cycle()
+	{
+		$sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref;
+		$resql = $this->db->query($sql);
+
+		if ($resql && $resql->num_rows > 0) {
+			$res = $this->db->fetch_array($resql);
+			$last = $res['max(situation_counter)'];
+			return ($last == $this->situation_counter);
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
+	}
 }
 
-
-
 /**
  *	Class to manage invoice lines.
  *  Saved into database table llx_facturedet
@@ -3391,6 +3614,16 @@ class FactureLigne extends CommonInvoiceLine
 
 	var $skip_update_total; // Skip update price total for special lines
 
+	/**
+	 * @var int Situation advance percentage
+	 */
+	public $situation_percent;
+
+	/**
+	 * @var int Previous situation line id reference
+	 */
+	public $fk_prev_id;
+
 	/**
 	 *  Constructor
 	 *
@@ -3414,6 +3647,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql.= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
 		$sql.= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
 		$sql.= ' fd.fk_code_ventilation,';
+		$sql.= ' fd.situation_percent, fd.fk_prev_id,';
 		$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
@@ -3461,6 +3695,9 @@ class FactureLigne extends CommonInvoiceLine
 			$this->product_label		= $objp->product_libelle;
 			$this->product_desc			= $objp->product_desc;
 
+			$this->situation_percent    = $objp->situation_percent;
+			$this->fk_prev_id           = $objp->fk_prev_id;
+
 			$this->db->free($result);
 		}
 		else
@@ -3498,6 +3735,8 @@ class FactureLigne extends CommonInvoiceLine
 		if (empty($this->subprice)) $this->subprice=0;
 		if (empty($this->special_code)) $this->special_code=0;
 		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;
 
@@ -3541,7 +3780,8 @@ class FactureLigne extends CommonInvoiceLine
 		$sql.= ' fk_product, product_type, remise_percent, subprice, fk_remise_except,';
 		$sql.= ' date_start, date_end, fk_code_ventilation, ';
 		$sql.= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
-		$sql.= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2)';
+		$sql.= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
+		$sql.= ' situation_percent, fk_prev_id)';
 		$sql.= " VALUES (".$this->fk_facture.",";
 		$sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
 		$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -3570,6 +3810,8 @@ class FactureLigne extends CommonInvoiceLine
 		$sql.= " ".price2num($this->total_ttc).",";
 		$sql.= " ".price2num($this->total_localtax1).",";
 		$sql.= " ".price2num($this->total_localtax2);
+		$sql .= ", " . $this->situation_percent;
+		$sql .= ", " . $this->fk_prev_id;
 		$sql.= ')';
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
@@ -3687,6 +3929,7 @@ class FactureLigne extends CommonInvoiceLine
 		if (empty($this->special_code)) $this->special_code=0;
 		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;
 
 		// Check parameters
 		if ($this->product_type < 0) return -1;
@@ -3732,6 +3975,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql.= ",fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
 		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
+		$sql .= ", situation_percent=" . $this->situation_percent;
 		$sql.= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -3846,5 +4090,29 @@ class FactureLigne extends CommonInvoiceLine
 			return -2;
 		}
 	}
-}
 
+	/**
+	 * Returns situation_percent of the previous line
+	 *
+	 * @return int >= 0
+	 */
+
+	function get_prev_progress()
+	{
+		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
+			return 0;
+		} else {
+			$sql = 'SELECT situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet WHERE rowid=' . $this->fk_prev_id;
+			$resql = $this->db->query($sql);
+			if ($resql && $resql->num_rows > 0) {
+				$res = $this->db->fetch_array($resql);
+				return $res['situation_percent'];
+			} else {
+				$this->error = $this->db->error();
+				dol_syslog(get_class($this) . "::select Error " . $this->error, LOG_ERR);
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
+}
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index a010e7d7401..0c6b2af84f0 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -3,6 +3,8 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -408,7 +410,7 @@ $sql.= ",".MAIN_DB_PREFIX."facture as f";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND f.entity = ".$conf->entity;
-$sql.= " AND f.type IN (0,1,3) AND f.fk_statut = 1";
+$sql.= " AND f.type IN (0,1,3,5) AND f.fk_statut = 1";
 $sql.= " AND f.paye = 0";
 if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index e249d3fe554..9fd0d411d8e 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -4,7 +4,9 @@
  * Copyright (C) 2011-2014	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,7 +103,7 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];
 
 $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.ref_client,";
-$sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2,";
+$sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2, fd.rowid as id, fd.situation_percent,";
 $sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.client,";
 $sql.= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell,";
 $sql.= " ct.accountancy_code_sell as account_tva, ct.recuperableonly";
@@ -112,8 +114,8 @@ $sql.= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
 $sql.= " WHERE f.entity = ".$conf->entity;
 $sql.= " AND f.fk_statut > 0";
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-else $sql.= " AND f.type IN (0,1,2,3)";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+else $sql.= " AND f.type IN (0,1,2,3,5)";
 $sql.= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 $sql.= " ORDER BY f.rowid";
@@ -157,6 +159,16 @@ if ($result)
 		$account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $obj->thirdparty, $mysoc);
 		$compta_localtax2= (! empty($account_localtax2[3])?$account_localtax2[3]:$langs->trans("CodeNotDef"));
 
+		// Situation invoices handling
+		$line = new FactureLigne($db);
+		$line->fetch($obj->id);
+		$prev_progress = $line->get_prev_progress();
+		if ($obj->situation_percent == 0) { // Avoid divide by 0
+			$situation_ratio = 0;
+		} else {
+			$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+		}
+
     	//la ligne facture
    		$tabfac[$obj->rowid]["date"] = $obj->datef;
    		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
@@ -166,9 +178,9 @@ if ($result)
    		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva]=0;
    		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1]=0;
    		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2]=0;
-   		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
-   		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
-   		if($obj->recuperableonly != 1) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+		if($obj->recuperableonly != 1) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
    		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
    		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
    		$tabcompany[$obj->rowid]=array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 0ccf0dee6bf..fabf656c895 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -4,6 +4,8 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2012      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -469,7 +471,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         $sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
         if ($facture->type != 2)
         {
-            $sql .= ' AND type IN (0,1,3)';	// Standard invoice, replacement, deposit
+            $sql .= ' AND type IN (0,1,3,5)';	// Standard invoice, replacement, deposit, situation
         }
         else
         {
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 95503db6ff9..6c3743f70a6 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C)      2005 Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2012      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014      Marcos García <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -212,13 +214,14 @@ class Paiement extends CommonObject
 
                             //Invoice types that are eligible for changing status to paid
 							$affected_types = array(
-								0,
-								1,
-								2,
-								3
+								Facture::TYPE_STANDARD,
+								Facture::TYPE_REPLACEMENT,
+								Facture::TYPE_CREDIT_NOTE,
+								Facture::TYPE_DEPOSIT,
+								Facture::TYPE_SITUATION
 							);
 
-                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more.");
+                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
                             else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
                             else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
                             else
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 9122ece2ed9..8c522df75d4 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Dourseanud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
@@ -166,9 +168,9 @@ if ($modecompta == 'CREANCES-DETTES')
     $sql.= " WHERE f.fk_soc = s.rowid";
     $sql.= " AND f.fk_statut IN (1,2)";
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-    	$sql.= " AND f.type IN (0,1,2)";
+    	$sql.= " AND f.type IN (0,1,2,5)";
 	else
-		$sql.= " AND f.type IN (0,1,2,3)";
+		$sql.= " AND f.type IN (0,1,2,3,5)";
     if (! empty($date_start) && ! empty($date_end))
     	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 }
@@ -693,9 +695,9 @@ if ($modecompta == 'CREANCES-DETTES')
     $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
     $sql.= " WHERE f.fk_statut IN (1,2)";
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-    	$sql.= " AND f.type IN (0,1,2)";
+    	$sql.= " AND f.type IN (0,1,2,5)";
 	else
-		$sql.= " AND f.type IN (0,1,2,3)";
+		$sql.= " AND f.type IN (0,1,2,3,5)";
     if (! empty($date_start) && ! empty($date_end))
     	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
     $sql.= " AND f.entity = ".$conf->entity;
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index b586241c11e..ec29d25a76e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -103,8 +103,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql.= ", ".MAIN_DB_PREFIX."facture as f";
 	$sql.= " WHERE f.fk_soc = s.rowid";
 	$sql.= " AND f.fk_statut IN (1,2)";
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-	else $sql.= " AND f.type IN (0,1,2,3)";
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+	else $sql.= " AND f.type IN (0,1,2,3,5)";
 }
 else
 {
@@ -246,8 +246,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql = "SELECT sum(f.tva) as amount, date_format(f.datef,'%Y-%m') as dm";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql.= " WHERE f.fk_statut IN (1,2)";
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-	else $sql.= " AND f.type IN (0,1,2,3)";
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+	else $sql.= " AND f.type IN (0,1,2,3,5)";
 	$sql.= " AND f.entity = ".$conf->entity;
 	$sql.= " GROUP BY dm";
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 8263dc76cb8..61f0bbb590d 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -193,9 +193,9 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql.= " AND l.fk_facture = f.rowid";
     $sql.= " AND f.fk_statut in (1,2)";
     if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql.= " AND f.type IN (0,1,2)";
+	$sql.= " AND f.type IN (0,1,2,5)";
     } else {
-	$sql.= " AND f.type IN (0,1,2,3)";
+	$sql.= " AND f.type IN (0,1,2,3,5)";
     }
     if ($date_start && $date_end) {
 	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index e88d370a0c6..066967cc2c3 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -178,9 +178,9 @@ if ($modecompta == 'CREANCES-DETTES') {
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
     $sql.= " WHERE f.fk_statut in (1,2)";
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql.= " AND f.type IN (0,1,2)";
+	    $sql.= " AND f.type IN (0,1,2,5)";
 	    } else {
-	    $sql.= " AND f.type IN (0,1,2,3)";
+	    $sql.= " AND f.type IN (0,1,2,3,5)";
 	}
 	if ($date_start && $date_end) {
 	    $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 1d34f78a181..a4c4663dc40 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -191,9 +191,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 	$sql.= " WHERE f.fk_statut in (1,2)";
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql.= " AND f.type IN (0,1,2)";
+	    $sql.= " AND f.type IN (0,1,2,5)";
 	} else {
-	    $sql.= " AND f.type IN (0,1,2,3)";
+	    $sql.= " AND f.type IN (0,1,2,3,5)";
 	}
 	$sql.= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index cfd816c29b6..f704ca90f73 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -91,8 +91,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql  = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql.= " WHERE f.fk_statut in (1,2)";
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-	else $sql.= " AND f.type IN (0,1,2,3)";
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+	else $sql.= " AND f.type IN (0,1,2,3,5)";
 }
 else
 {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 90ad3e196e3..991601a4fbd 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2012 Regis Houssin  <regis.houssin@capnetworks.com>
+/* Copyright (C) 2012       Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,11 +145,12 @@ abstract class CommonInvoice extends CommonObject
 	function getLibType()
 	{
 		global $langs;
-		if ($this->type == 0) return $langs->trans("InvoiceStandard");
-		if ($this->type == 1) return $langs->trans("InvoiceReplacement");
-		if ($this->type == 2) return $langs->trans("InvoiceAvoir");
-		if ($this->type == 3) return $langs->trans("InvoiceDeposit");
-		if ($this->type == 4) return $langs->trans("InvoiceProForma");
+		if ($this->type == Facture::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
+		if ($this->type == Facture::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
+		if ($this->type == Facture::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
+		if ($this->type == Facture::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
+		if ($this->type == Facture::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");
+		if ($this->type == Facture::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
 		return $langs->trans("Unknown");
 	}
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0dedb135298..81a4946208a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2011-2014 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1740,6 +1741,19 @@ abstract class CommonObject
             // Add revenue stamp to total
             $this->total_ttc       += isset($this->revenuestamp)?$this->revenuestamp:0;
 
+			// Situations totals
+			if ($this->situation_cycle_ref && $this->situation_counter > 1) {
+				$prev_sits = $this->get_prev_sits();
+
+				foreach ($prev_sits as $sit) {
+					$this->total_ht -= $sit->total_ht;
+					$this->total_tva -= $sit->total_tva;
+					$this->total_localtax1 -= $sit->total_localtax1;
+					$this->total_localtax2 -= $sit->total_localtax2;
+					$this->total_ttc -= $sit->total_ttc;
+				}
+			}
+
             $this->db->free($resql);
 
             // Now update global field total_ht, total_ttc and tva
@@ -2568,6 +2582,10 @@ abstract class CommonObject
 		// Reduction short
 		print '<td align="right" width="50"><label for="remise_percent">'.$langs->trans('ReductionShort').'</label></td>';
 
+		if ($this->situation_cycle_ref) {
+			print '<td align="right" width="50"><label for="progress">' . $langs->trans('Progress') . '</label></td>';
+		}
+
 		if (! empty($conf->margin->enabled) && empty($user->societe_id))
 		{
 			if ($conf->global->MARGIN_TYPE == "1")
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 491e590403c..9ce830ac513 100755
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -13,7 +13,8 @@
  * Copyright (C) 2010-2014 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Herve Prot            <herve.prot@symeos.com>
  * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
- * Copyright (C) 2013      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014      Alexandre Spangaro    <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2657,6 +2658,57 @@ class Form
         }
     }
 
+	/**
+	 * Creates HTML last in cycle situation invoices selector
+	 *
+	 * @param       string  $selected   Preselected ID
+	 * @param       int     $socid      Company ID
+	 *
+	 * @return    string                     HTML select
+	 */
+	function load_situation_invoices($selected = '', $socid)
+	{
+		global $langs;
+
+		$langs->load('bills');
+
+		$opt = '<option value ="" selected="selected"></option>';
+		$sql = 'SELECT rowid, facnumber, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';
+		$sql .= ' order by situation_cycle_ref, situation_counter desc';
+		$resql = $this->db->query($sql);
+		if ($resql && $this->db->num_rows($resql) > 0) {
+			// Last seen cycle
+			$ref = 0;
+			while ($res = $this->db->fetch_array($resql, MYSQL_NUM)) {
+				//Same company ?
+				if ($socid == $res[5]) {
+					//Same cycle ?
+					if ($res[2] != $ref) {
+						// Just seen this cycle
+						$ref = $res[2];
+						//not final ?
+						if ($res[4] != 1) {
+							//Not prov?
+							if (substr($res[1], 1, 4) != 'PROV') {
+								if ($selected == $res[0]) {
+									$opt .= '<option value="' . $res[0] . '" selected="selected">' . $res[1] . '</option>';
+								} else {
+									$opt .= '<option value="' . $res[0] . '">' . $res[1] . '</option>';
+								}
+							}
+						}
+					}
+				}
+			}
+		} else {
+				dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);
+		}
+		if ($opt == '<option value ="" selected="selected"></option>') {
+			$opt = '<option value ="0" selected="selected">' . $langs->trans('NoSituations') . '</option>';
+		}
+		return $opt;
+	}
+
     /**
      *  Return a HTML select list of bank accounts
      *
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 129d32fc7d9..4f1c8f71c5a 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -5,6 +5,8 @@
  * Copyright (C) 2010-2012	Regis Houssin       	<regis.houssin@capnetworks.com>
  * Copyright (C) 2010		Juanjo Menent       	<jmenent@2byte.es>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
@@ -1448,6 +1450,31 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 	}
 }
 
+/**
+ * Return line percent
+ *
+ * @param Object $object Object
+ * @param int $i Current line number
+ * @param Translate $outputlangs Object langs for output
+ * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
+ * @param HookManager $hookmanager Hook manager instance
+ * @return void
+ */
+function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
+{
+	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 = '';
+			return $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+		} else {
+			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
+		}
+	}
+}
+
 /**
  *	Return line total excluding tax
  *
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 00144db74e5..aa3a1e11a46 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -3,6 +3,8 @@
  * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +49,7 @@
  *		@param	int		$type						0/1=Product/service
  *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array	$localtaxes_array			Array with localtaxes info (loaded by getLocalTaxesFromRate function).
+ *		@param  float   $progress                   Situation invoices progress
  *		@return result[ 0=total_ht,
  *						 1=total_vat,
  *						 2=total_ttc,
@@ -64,7 +67,7 @@
  *						14=amount tax1 for total_ht_without_discount,
  *						15=amount tax2 for total_ht_without_discount]
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '',$localtaxes_array='')
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100)
 {
 	global $conf,$mysoc,$db;
 
@@ -128,7 +131,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		else dol_print_error($db);
 	}
 	// initialize total (may be HT or TTC depending on price_base_type)
-	$tot_sans_remise = $pu * $qty;
+	$tot_sans_remise = $pu * $qty * $progress / 100;
 	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index cc9478f5d61..1c048c7d6f5 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -3,6 +3,8 @@
  * Copyright (C) 2006-2007	Yannick Warnier		<ywarnier@beeznest.org>
  * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -133,8 +135,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
             $sql.= " ".MAIN_DB_PREFIX."societe as s";
             $sql.= " WHERE f.entity = " . $conf->entity;
             $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-        	else $sql.= " AND f.type IN (0,1,2,3)";
+        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             if ($y && $m)
             {
                 $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
@@ -170,8 +172,8 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
             $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f, ".MAIN_DB_PREFIX.$invoicetable." as fd, ".MAIN_DB_PREFIX."societe as s";
             $sql.= " WHERE ";
             $sql.= " f.fk_statut in (2)";   // Paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-        	else $sql.= " AND f.type IN (0,1,2,3)";
+        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             if ($y && $m)
             {
                 $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
@@ -294,8 +296,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
             $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-            if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-            else $sql.= " AND f.type IN (0,1,2,3)";
+            if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
             if ($y && $m)
             {
@@ -339,8 +341,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
             $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-        	else $sql.= " AND f.type IN (0,1,2,3)";
+        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
             if ($y && $m)
             {
@@ -452,8 +454,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
             $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-        	else $sql.= " AND f.type IN (0,1,2,3)";
+        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;
             if ($y && $m)
             {
@@ -500,8 +502,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
             $sql.= " WHERE f.entity = " . $conf->entity;
             $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
-        	else $sql.= " AND f.type IN (0,1,2,3)";
+        	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+			else $sql.= " AND f.type IN (0,1,2,3,5)";
             $sql.= " AND f.rowid = d.".$fk_facture;;
             $sql.= " AND pf.".$fk_facture2." = f.rowid";
             $sql.= " AND pa.rowid = pf.".$fk_payment;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6d1f5636b85..06c3df85f4d 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -4,6 +4,8 @@
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2014	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,6 +58,16 @@ class pdf_crabe extends ModelePDFFactures
 
 	var $emetteur;	// Objet societe qui emet
 
+	/**
+	 * @var bool Situation invoice type
+	 */
+	public $situationinvoice;
+
+	/**
+	 * @var float X position for the situation progress column
+	 */
+	public $posxprogress;
+
 
 	/**
 	 *	Constructor
@@ -107,6 +119,7 @@ class pdf_crabe extends ModelePDFFactures
 		$this->posxup=126;
 		$this->posxqty=145;
 		$this->posxdiscount=162;
+		$this->posxprogress=174; // Only displayed for situation invoices
 		$this->postotalht=174;
 		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
 		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
@@ -125,6 +138,7 @@ class pdf_crabe extends ModelePDFFactures
 		$this->localtax2=array();
 		$this->atleastoneratenotnull=0;
 		$this->atleastonediscount=0;
+		$this->situationinvoice=False;
 	}
 
 
@@ -278,6 +292,17 @@ class pdf_crabe extends ModelePDFFactures
 					//$this->postotalht;
 				}
 
+				// Situation invoice handling
+				if ($object->situation_cycle_ref) {
+					$this->situationinvoice = True;
+					$progress_width = 14;
+					$this->posxtva -= $progress_width;
+					$this->posxup -= $progress_width;
+					$this->posxqty -= $progress_width;
+					$this->posxdiscount -= $progress_width;
+					$this->posxprogress -= $progress_width;
+				}
+
 				// New page
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -444,16 +469,27 @@ class pdf_crabe extends ModelePDFFactures
 					{
                         $pdf->SetXY($this->posxdiscount-2, $curY);
 					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+						$pdf->MultiCell($this->posxprogress-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
 					}
 
+					// Situation progress
+					$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
+					$pdf->SetXY($this->posxprogress, $curY);
+					$pdf->MultiCell($this->postotalht-$this->posxprogress, 3, $progress, 0, 'R');	// Enough for 6 chars
+
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$tvaligne=$object->lines[$i]->total_tva;
+					$prev_progress = $object->lines[$i]->get_prev_progress();
+					if ($prev_progress > 0) // Compute progress from previous situation
+					{
+						$tvaligne = $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
 					$localtax1_rate=$object->lines[$i]->localtax1_tx;
@@ -912,7 +948,7 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetFont('','', $default_font_size - 1);
 
 		// Tableau total
-		$col1x = 120; $col2x = 170;
+		$col1x = 120; $col2x = $this->postotalht;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x-=20;
@@ -922,11 +958,44 @@ class pdf_crabe extends ModelePDFFactures
 		$useborder=0;
 		$index = 0;
 
+		// Previous situations summary
+		if ($object->situation_cycle_ref && $object->situation_counter > 1) {
+			// Situations total w/out VAT
+			$counter = ' 1';
+			for ($i = 2; $i <= $object->situation_counter; $i++) {
+				$counter .= ' + ' . $i;
+			}
+
+			$prevsits = $object->get_prev_sits();
+			$prevsits_total_amount = 0;
+			foreach ($prevsits as $situation) {
+				$prevsits_total_amount += $situation->total_ht;
+			}
+			$prevsits_total_amount += $object->total_ht;
+
+			$pdf->SetFillColor(255, 255, 255);
+			$pdf->SetXY($col1x, $tab2_top + 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationAmount") . $counter, 0, 'L', 1);
+			$pdf->SetXY($col2x, $tab2_top + 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($prevsits_total_amount), 0, 'R', 1);
+
+			// Previous situations deduction
+			$pdf->Line($col2x, 0, $col2x, 100000);
+			for ($i = 0; $i < count($prevsits); $i++) {
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationDeduction") . ' ' . ($i + 1) . ' (' . $prevsits[$i]->ref . ')', 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, ' - ' . price($prevsits[$i]->total_ht), 0, 'R', 1);
+			}
+			$index++;
+		}
+
 		// Total HT
 		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-		$pdf->SetXY($col2x, $tab2_top + 0);
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
@@ -1265,19 +1334,21 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($this->posxqty-1, $tab_top+1);
 			$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
 		}
-
 		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+		if ($this->atleastonediscount) {
+			$pdf->line($this->posxprogress, $tab_top, $this->posxprogress, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
-		if ($this->atleastonediscount)
-		{
+
+		if ($this->situationinvoice) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxprogress - 1, $tab_top + 1);
+				$pdf->MultiCell($this->postotalht - $this->posxprogress - 1, 2, $outputlangs->transnoentities("Progress"), '', 'C');
+			}
 		}
 		if (empty($hidetop))
 		{
@@ -1353,6 +1424,8 @@ class pdf_crabe extends ModelePDFFactures
 		if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
 		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
+		if ($object->type == 5 && $object->situation_final == 0) $title = $outputlangs->transnoentities("InvoiceSituation").' n°'.$object->situation_counter;
+		if ($object->type == 5 && $object->situation_final == 1) $title = 'Situation n°'.$object->situation_counter.' : '.$outputlangs->transnoentities("InvoiceSituationLast");
 		$pdf->MultiCell(100, 3, $title, '', 'R');
 
 		$pdf->SetFont('','B',$default_font_size);
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 6037f6c77c9..d90526aba06 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -2,7 +2,9 @@
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,6 +60,9 @@ if (in_array($object->element,array('propal','facture','invoice','commande','ord
 	<td align="right"><?php echo $langs->trans('Qty'); ?></td>
 	<td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
 	<?php
+	if ($this->situation_cycle_ref) {
+		print '<td align="right">' . $langs->trans('Progress') . '</td>';
+	}
 	if (! empty($usemargins))
 	{
 		?>
@@ -214,8 +219,11 @@ else {
 	<td align="right"><input type="text" size="2" name="qty" id="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
 	</td>
 	<td align="right" class="nowrap"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
-
 	<?php
+	if ($this->situation_cycle_ref) {
+		$coldisplay++;
+		print '<td align="right" class="nowrap"><input type="text" size="1" value="0" name="progress">%</td>';
+	}
 	if (! empty($usemargins))
 	{
 		?>
@@ -277,6 +285,7 @@ if (! empty($conf->service->enabled) && $dateSelector && GETPOST('type') != '0')
 {
 	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','facture','invoice','commande','order'))) $colspan++;	// With this, there is a column move button
 
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index fbe2870a6a4..fd2e3e0d469 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -83,22 +85,44 @@ $coldisplay=-1; // We remove first td
 	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
 	}
 
-	// editeur wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $nbrows=ROWS_2;
-    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-    $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	$doleditor=new DolEditor('product_desc',$line->description,'',164,'dolibarr_details','',false,true,$enable,$nbrows,'98%');
-	$doleditor->Create();
+	// Do not allow editing during a situation cycle
+	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
+		// editeur wysiwyg
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$nbrows=ROWS_2;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+		$doleditor=new DolEditor('product_desc',$line->description,'',164,'dolibarr_details','',false,true,$enable,$nbrows,'98%');
+		$doleditor->Create();
+	} else {
+		print '<textarea id="desc" class="flat" name="desc" readonly="readonly" style="width: 200px; height:80px;">' . $line->description . '</textarea>';
+	}
 	?>
 	</td>
 
-	<td align="right"><?php $coldisplay++; ?><?php echo $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?></td>
+	<?php
+	$coldisplay++;
+	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
+		print '<td align="right">' . $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type) . '</td>';
+	} else {
+		print '<td align="right"><input size="1" type="text" class="flat" name="tva_tx" value="' . price($line->tva_tx) . '" readonly="readonly" />%</td>';
+	}
 
-	<td align="right"><?php $coldisplay++; ?><input type="text" class="flat" size="8" id="price_ht" name="price_ht" value="<?php echo price($line->subprice,0,'',0); ?>"></td>
-	<?php if ($inputalsopricewithtax) { ?>
-	<td align="right"><?php $coldisplay++; ?><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="<?php echo price($pu_ttc,0,'',0); ?>"></td>
-	<?php } ?>
+	$coldisplay++;
+	print '<td align="right"><input type="text" class="flat" size="8" id="price_ht" name="price_ht" value="' . price($line->subprice,0,'',0) . '" ';
+	if ($this->situation_counter > 1) {
+		print 'readonly="readonly" ';
+	}
+	print '></td>';
+
+	if ($inputalsopricewithtax) {
+		$coldisplay++;
+		print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="' . price($pu_ttc,0,'',0) . '"';
+		if ($this->situation_counter > 1) {
+			print 'readonly="readonly" ';
+		}
+		print '></td>';
+	} ?>
 
 	<td align="right"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
@@ -106,22 +130,32 @@ $coldisplay=-1; // We remove first td
 		// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-	?>
-		<input size="3" type="text" class="flat" name="qty" id="qty" value="<?php echo $line->qty; ?>">
-	<?php } else { ?>
+		print '<input size="3" type="text" class="flat" name="qty" id="qty" value="' . $line->qty . '" ';
+		if ($this->situation_counter > 1) {
+			print 'readonly="readonly" ';
+		}
+		print '/>';
+	} else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
 
 	<td align="right" nowrap><?php $coldisplay++; ?>
-	<?php if (($line->info_bits & 2) != 2) { ?>
-		<input size="1" type="text" class="flat" name="remise_percent" id="remise_percent" value="<?php echo $line->remise_percent; ?>">%
-	<?php } else { ?>
+	<?php if (($line->info_bits & 2) != 2) {
+		print '<input size="1" type="text" class="flat" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '" ';
+		if ($this->situation_counter > 1) {
+			print 'readonly="readonly" ';
+		}
+		print '/>%';
+	} else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
-
 	<?php
+	if ($this->situation_cycle_ref) {
+		$coldisplay++;
+		print '<td align="right" nowrap><input type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+	}
 	if (! empty($usemargins))
 	{
 	?>
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 3d2ea127b85..2e1cc0f3678 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2010-2013	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -138,6 +140,11 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
 	<td><?php $coldisplay++; ?>&nbsp;</td>
 	<?php }
 
+	if ($this->situation_cycle_ref) {
+		$coldisplay++;
+		print '<td align="right" nowrap="nowrap">' . $line->situation_percent . '%</td>';
+	}
+
   if (! empty($conf->margin->enabled) && empty($user->societe_id)) {
 	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
   ?>
@@ -167,12 +174,16 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
 	</td>
 
 	<td align="center"><?php $coldisplay++; ?>
-		<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id; ?>">
-		<?php echo img_delete(); ?>
-		</a>
+		<?php
+		if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
+			print img_delete();
+			print '</a>';
+		}
+		?>
 	</td>
 
-	<?php if ($num > 1 && empty($conf->browser->phone)) { ?>
+	<?php if ($num > 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?>
 	<td align="center" class="tdlineupdown"><?php $coldisplay++; ?>
 		<?php if ($i > 0) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
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 755195c2a61..02265ff86c8 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
@@ -30,3 +30,10 @@ ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAUL
 
 -- Taiwan VAT Rates
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1);
+
+-- Add situation invoices
+ALTER TABLE llx_facture ADD situation_cycle_ref smallint UNSIGNED;
+ALTER TABLE llx_facture ADD situation_counter tinyint UNSIGNED;
+ALTER TABLE llx_facture ADD situation_final boolean;
+ALTER TABLE llx_facturedet ADD situation_percent real;
+ALTER TABLE llx_facturedet ADD fk_prev_id integer;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 9757f749cd0..144cd349dd6 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -3,6 +3,8 @@
 -- Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 -- Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2014      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -74,6 +76,10 @@ create table llx_facture
   note_public			text,
   model_pdf				varchar(255),
   import_key			varchar(14),
-  extraparams			varchar(255)							-- for stock other parameters with json format
+  extraparams			varchar(255),							-- for stock other parameters with json format
+
+  situation_cycle_ref smallint UNSIGNED,  -- situation cycle reference
+  situation_counter   tinyint UNSIGNED,   -- situation counter
+  situation_final     boolean             -- is the situation final ?
 
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 6a328d4688e..2c01234f4b9 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -3,6 +3,8 @@
 -- Copyright (C) 2004-2005	Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 -- Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+-- Copyright (C) 2012       Cédric Salvador       <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2014       Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -55,8 +57,11 @@ create table llx_facturedet
   fk_code_ventilation			integer    DEFAULT 0 NOT NULL,
   special_code					integer UNSIGNED DEFAULT 0,			-- code pour les lignes speciales
   rang							integer    DEFAULT 0,				-- ordre d'affichage
-  import_key					varchar(14)
-  
+  import_key					varchar(14),
+
+  situation_percent real,   -- % progression of lines invoicing
+  fk_prev_id        integer -- id of the line in the previous situation
+
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 12778d6b9ea..ccf994aff95 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -389,7 +389,7 @@ DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Expected payment
 PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid. 
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. 
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
@@ -411,3 +411,20 @@ TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up s
 TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
 TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
 TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
+# Situation invoices
+InvoiceFirstSituationAsk=First situation invoice
+InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceSituation=Situation invoice
+InvoiceSituationAsk=Invoice following the situation
+InvoiceSituationDesc=Create a new situation following an already existing one
+SituationAmount=Situation invoice amount(net)
+SituationDeduction=Situation subtraction
+Progress=Progress
+ModifyAllLines=Modify all lines
+CreateNextSituationInvoice=Create next situation
+NotLastInCycle=This invoice in not the last in cycle and must not be modified.
+DisabledBecauseNotLastInCycle=The next situation already exists.
+DisabledBecauseFinal=This situation is final.
+CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+NoSituations=No opened situations
+InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 24ebe5ff923..22c80d41300 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -410,3 +410,21 @@ TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable suivi facture fou
 TypeContact_invoice_supplier_external_BILLING=Contact fournisseur facturation
 TypeContact_invoice_supplier_external_SHIPPING=Contact fournisseur livraison
 TypeContact_invoice_supplier_external_SERVICE=Contact fournisseur prestation
+# Factures de situation
+InvoiceFirstSituationAsk=Facture de première situation
+InvoiceFirstSituationDesc=Les <b>factures de situation</b> correspondent aux situations liées à un avancement, par exemple l'avancement des travaux dans le cadre d’un chantier (BTP). Chaque situation correspond à une facture.
+InvoiceFirstSituation=Facture de première situation
+InvoiceSituationAsk=Facture suivant la situation
+InvoiceSituationDesc=Création d'une nouvelle situation qui fera suite à une situation déjà ouverte.
+InvoiceSituation=Facture de situation
+SituationAmount=Montant HT situation
+SituationDeduction=Déduction situation
+Progress=Avanct.
+ModifyAllLines=Modifier toutes les lignes
+CreateNextSituationInvoice=Créer situation suivante
+NotLastInCycle=Cette facture n'est pas la dernière du cycle, il ne faut pas la modifier.
+DisabledBecauseNotLastInCycle=La situation suivante existe déjà.
+DisabledBecauseFinal=Cette situation est finale.
+CantBeLessThanMinPercent=L'avancement d'une ligne ne peut pas être inférieur à sa valeur à la situation précédente.
+NoSituations=Pas de situations en cours
+InvoiceSituationLast=Décompte général et définitif

From 4ee308c77b859937430db4b2c1c36cf8b35a2d27 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Jan 2015 20:58:23 +0100
Subject: [PATCH 292/345] Fixed: Filter lost after search on date

---
 htdocs/comm/action/listactions.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 7fa67695860..a53628e3d31 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -136,6 +136,17 @@ $form=new Form($db);
 
 $nav='';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
+if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
+if ($filtera) $nav.='<input type="hidden" name="filtera" value="'.$filtera.'">';
+if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
+if ($filterd) $nav.='<input type="hidden" name="filterd" value="'.$filterd.'">';
+if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
+if ($showbirthday)  $nav.='<input type="hidden" name="showbirthday" value="1">';
+if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
+if ($type)   $nav.='<input type="hidden" name="type" value="'.$type.'">';
+if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
 $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav.='</form>';
@@ -159,6 +170,7 @@ if ($socid) $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid) $param.="&projectid=".$pid;
 if ($type) $param.="&type=".$type;
+if ($usergroup) $param.="&usergroup=".$usergroup;
 
 $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
 $sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
@@ -203,11 +215,13 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
 	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }
-if ($dateselect > 0) $sql.= " AND a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'";
+// The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
+if ($dateselect > 0) $sql.= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect-3600)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'))";
 if ($datestart > 0) $sql.= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart+3600*24-1)."'";
 if ($dateend > 0) $sql.= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend+3600*24-1)."'";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
+
 //print $sql;
 
 dol_syslog("comm/action/listactions.php", LOG_DEBUG);

From f8792bdbc75032c28094b6bbb1c65037608a1dd9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jan 2015 11:11:40 +0100
Subject: [PATCH 293/345] Fixed: Add opensurvey into list of reloaded modules
 for 3.7

---
 htdocs/install/upgrade2.php | 275 ++++++++++++++++++++----------------
 1 file changed, 154 insertions(+), 121 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 7bee1a38b6b..d5fa016e02a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3634,137 +3634,170 @@ function migrate_delete_old_dir($db,$langs,$conf)
  * We must do this when internal menu of module or permissions has changed
  * or when triggers have moved.
  *
- * @param	DoliDB		$db			Database handler
- * @param	Translate	$langs		Object langs
- * @param	Conf		$conf		Object conf
+ * @param	DoliDB		$db				Database handler
+ * @param	Translate	$langs			Object langs
+ * @param	Conf		$conf			Object conf
+ * @param	array		$listofmodule	List of modules
  * @return	void
  */
-function migrate_reload_modules($db,$langs,$conf)
+function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 {
     dolibarr_install_syslog("upgrade2::migrate_reload_modules");
 
-    if (! empty($conf->global->MAIN_MODULE_AGENDA))
+    // Module to reload if no info is provided
+    if (count($listofmodule) == 0)
     {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
-        if ($res) {
-            $mod=new modAgenda($db);
-            $mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_SOCIETE))
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
-        if ($res) {
-            $mod=new modSociete($db);
-            $mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_PRODUIT))    // Permission has changed into 2.7
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
-        if ($res) {
-            $mod=new modProduct($db);
-            //$mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_SERVICE))    // Permission has changed into 2.7
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
-        if ($res) {
-            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
-            $mod=new modService($db);
-            //$mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_COMMANDE))   // Permission has changed into 2.9
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
-        if ($res) {
-            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
-            $mod=new modCommande($db);
-            //$mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_FACTURE))    // Permission has changed into 2.9
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
-        if ($res) {
-            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
-            $mod=new modFacture($db);
-            //$mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR))    // Permission has changed into 2.9
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
-        if ($res) {
-            $mod=new modFournisseur($db);
-            //$mod->remove('noboxes');
-            $mod->init('newboxdefonly');
-        }
+    	$listofmodule=array(
+	    	'MAIN_MODULE_AGENDA',
+	    	'MAIN_MODULE_SOCIETE',
+	    	'MAIN_MODULE_PRODUIT',
+	    	'MAIN_MODULE_SERVICE',
+	    	'MAIN_MODULE_COMMANDE',
+	    	'MAIN_MODULE_FACTURE',
+	    	'MAIN_MODULE_FOURNISSEUR',
+	    	'MAIN_MODULE_USER',
+	    	'MAIN_MODULE_DEPLACEMENT',
+	    	'MAIN_MODULE_DON',
+	    	'MAIN_MODULE_ECM',
+	    	'MAIN_MODULE_PAYBOX',
+    		'MAIN_MODULE_OPENSURVEY'
+    	);
     }
 
-    if (! empty($conf->global->MAIN_MODULE_USER))    // Permission has changed into 3.0
+    foreach($listofmodule as $moduletoreload)
     {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
-        if ($res) {
-            $mod=new modUser($db);
-            //$mod->remove('noboxes');  // We need to remove because id of module has changed
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT))    // Permission has changed into 3.0
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
-        if ($res) {
-            $mod=new modDeplacement($db);
-            //$mod->remove('noboxes');	// We need to remove because a permission id has been removed
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_DON))    // Permission has changed into 3.0
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
-        if ($res) {
-            $mod=new modDon($db);
-            //$mod->remove('noboxes');	// We need to remove because a permission id has been removed
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_ECM))    // Permission has changed into 3.0 and 3.1
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
-        if ($res) {
-            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
-            $mod=new modECM($db);
-            $mod->remove('noboxes');	// We need to remove because a permission id has been removed
-            $mod->init('newboxdefonly');
-        }
-    }
-    if (! empty($conf->global->MAIN_MODULE_PAYBOX))    // Permission has changed into 3.0
-    {
-        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
-        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
-        if ($res) {
-            $mod=new modPaybox($db);
-            $mod->remove('noboxes');  // We need to remove because id of module has changed
-            $mod->init('newboxdefonly');
-        }
-    }
+	    if (! empty($conf->global->MAIN_MODULE_AGENDA))
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
+	        if ($res) {
+	            $mod=new modAgenda($db);
+	            $mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_SOCIETE))
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
+	        if ($res) {
+	            $mod=new modSociete($db);
+	            $mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_PRODUIT))    // Permission has changed into 2.7
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
+	        if ($res) {
+	            $mod=new modProduct($db);
+	            //$mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_SERVICE))    // Permission has changed into 2.7
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
+	        if ($res) {
+	            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
+	            $mod=new modService($db);
+	            //$mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_COMMANDE))   // Permission has changed into 2.9
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
+	        if ($res) {
+	            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
+	            $mod=new modCommande($db);
+	            //$mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_FACTURE))    // Permission has changed into 2.9
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
+	        if ($res) {
+	            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
+	            $mod=new modFacture($db);
+	            //$mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR))    // Permission has changed into 2.9
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
+	        if ($res) {
+	            $mod=new modFournisseur($db);
+	            //$mod->remove('noboxes');
+	            $mod->init('newboxdefonly');
+	        }
+	    }
 
+	    if (! empty($conf->global->MAIN_MODULE_USER))    // Permission has changed into 3.0
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
+	        if ($res) {
+	            $mod=new modUser($db);
+	            //$mod->remove('noboxes');  // We need to remove because id of module has changed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT))    // Permission has changed into 3.0
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
+	        if ($res) {
+	            $mod=new modDeplacement($db);
+	            //$mod->remove('noboxes');	// We need to remove because a permission id has been removed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_DON))    // Permission has changed into 3.0
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
+	        if ($res) {
+	            $mod=new modDon($db);
+	            //$mod->remove('noboxes');	// We need to remove because a permission id has been removed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_ECM))    // Permission has changed into 3.0 and 3.1
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
+	        if ($res) {
+	            $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
+	            $mod=new modECM($db);
+	            $mod->remove('noboxes');	// We need to remove because a permission id has been removed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+	    if (! empty($conf->global->MAIN_MODULE_PAYBOX))    // Permission has changed into 3.0
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
+	        if ($res) {
+	            $mod=new modPaybox($db);
+	            $mod->remove('noboxes');  // We need to remove because id of module has changed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+    	if (! empty($conf->global->MAIN_MODULE_OPENSURVEY))    // Permission has changed into 3.0
+	    {
+	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
+	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
+	        if ($res) {
+	            $mod=new modOpenSurvey($db);
+	            $mod->remove('noboxes');  // We need to remove because menu entries has changed
+	            $mod->init('newboxdefonly');
+	        }
+	    }
+    }
 }
 
 

From b220bb7b1d4a8714a8bd041cd78264b4c8ea47a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Jan 2015 11:14:51 +0100
Subject: [PATCH 294/345] Fixed: Size too low

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

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 884d5124126..396fdf050ec 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -373,7 +373,7 @@ print '<br>';
 if ($object->allow_comments) {
 	print $langs->trans("AddACommentForPoll") . '<br>';
 	print '<textarea name="comment" rows="2" cols="80"></textarea><br>'."\n";
-	print $langs->trans("Name") .': <input type="text" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
+	print $langs->trans("Name") .': <input type="text" size="50" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") {
 		print "<font color=#FF0000>" . $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")) . "</font>";

From 742ec954cdf64506ace14d2bbe8c1e44b0887eef Mon Sep 17 00:00:00 2001
From: fentman <fentman@fentman.id.au>
Date: Thu, 8 Jan 2015 11:21:25 +1100
Subject: [PATCH 295/345] Change to $listofcurrenciesbefore for GBP + AUD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 311f433c9cf..8b3b15ee86b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2948,7 +2948,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 	{
 		if ($currency_code == 'auto') $currency_code=$conf->currency;
 
-		$listofcurrenciesbefore=array('USD');
+		$listofcurrenciesbefore=array('USD','GBP','AUD');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
 		else
 		{

From 166bbeb8e96229c002510d791a35d6e0cd104ce7 Mon Sep 17 00:00:00 2001
From: fentman <fentman@fentman.id.au>
Date: Thu, 8 Jan 2015 11:27:32 +1100
Subject: [PATCH 296/345] Update en_AU separator from comma to full stop

Updating the en_AU Main Language - Decimal Separator from a Comma to a Full Stop
---
 htdocs/langs/en_AU/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index a2be380b7c2..9661763869d 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_AU - main
 # This file contains only lines that must differs from en_US file
-SeparatorDecimal=,
+SeparatorDecimal=.
 SeparatorThousand=Space
 FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
@@ -37,4 +37,4 @@ IncludedVAT=Included GST
 HT=excl GST
 TTC=Incl GST
 VAT=GST
-VATRate=GST Rate
\ No newline at end of file
+VATRate=GST Rate

From 73fda2cb86d81235bac37808efaf3599ea7e2aed Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Tue, 6 Jan 2015 17:54:36 +0100
Subject: [PATCH 297/345] WIP PSR2

---
 dev/codesniffer/ruleset.xml                   | 146 +++---
 dev/translation/autotranslator.class.php      |  14 +-
 htdocs/admin/tools/eaccelerator.php           | 478 +++++++++---------
 htdocs/compta/localtax/index.php              | 129 ++---
 htdocs/core/boxes/box_project.php             |  81 +--
 htdocs/core/boxes/box_task.php                |  82 +--
 .../connectors/php/commands.php               |   7 +
 .../core/filemanagerdol/connectors/php/io.php |  73 ++-
 htdocs/core/modules/syslog/logHandler.php     |  15 +
 .../modules/syslog/logHandlerInterface.php    |  21 +
 htdocs/product/index.php                      |   8 +-
 .../stock/class/mouvementstock.class.php      |   9 +-
 htdocs/resource/class/resource.class.php      |  20 +-
 test/phpunit/AdherentTest.php                 | 364 ++++++-------
 test/phpunit/AdminLibTest.php                 | 151 +++---
 test/phpunit/AllTests.php                     |  91 ++--
 test/phpunit/BankAccountTest.php              | 197 ++++----
 test/phpunit/BuildDocTest.php                 | 249 ++++-----
 test/phpunit/CMailFileTest.php                | 131 ++---
 test/phpunit/CategorieTest.php                | 325 ++++++------
 test/phpunit/ChargeSocialesTest.php           |   2 +
 test/phpunit/CommandeFournisseurTest.php      | 339 ++++++-------
 test/phpunit/CommandeTest.php                 | 242 ++++-----
 test/phpunit/CommonObjectTest.php             | 191 +++----
 test/phpunit/CompanyBankAccountTest.php       |   2 +
 test/phpunit/ContactTest.php                  |   2 +
 test/phpunit/ContratTest.php                  |   2 +
 test/phpunit/CoreTest.php                     | 391 +++++++-------
 test/phpunit/DateLibTest.php                  |   2 +
 test/phpunit/DateLibTzFranceTest.php          |   2 +
 test/phpunit/DiscountTest.php                 |   2 +
 test/phpunit/EntrepotTest.php                 |   2 +
 test/phpunit/ExportTest.php                   |   2 +
 test/phpunit/FactureFournisseurTest.php       |   2 +
 test/phpunit/FactureRecTest.php               |   2 +
 test/phpunit/FactureTest.php                  | 265 +++++-----
 test/phpunit/FactureTestRounding.php          |   2 +
 test/phpunit/FichinterTest.php                |   2 +
 test/phpunit/FilesLibTest.php                 |   2 +
 test/phpunit/FormAdminTest.php                |   2 +
 test/phpunit/Functions2LibTest.php            |   2 +
 test/phpunit/FunctionsLibTest.php             |   2 +
 test/phpunit/HolidayTest.php                  |   2 +
 test/phpunit/ImagesLibTest.php                |   2 +
 test/phpunit/ImportTest.php                   |   2 +
 test/phpunit/JsonLibTest.php                  |   2 +
 test/phpunit/LangTest.php                     |   2 +
 test/phpunit/MarginsLibTest.php               |   2 +
 test/phpunit/ModulesTest.php                  |   2 +
 test/phpunit/NumberingModulesTest.php         |   2 +
 test/phpunit/PaypalTest.php                   |   2 +
 test/phpunit/PdfDocTest.php                   |   2 +
 test/phpunit/PgsqlTest.php                    |   2 +
 test/phpunit/PricesTest.php                   |   2 +
 test/phpunit/ProductTest.php                  | 233 ++++-----
 test/phpunit/ProjectTest.php                  |   2 +
 test/phpunit/PropalTest.php                   |   2 +
 test/phpunit/ScriptsTest.php                  |   2 +
 test/phpunit/SecurityTest.php                 |   2 +
 test/phpunit/SocieteTest.php                  | 331 ++++++------
 test/phpunit/SqlTest.php                      | 191 +++----
 test/phpunit/UserGroupTest.php                | 269 +++++-----
 test/phpunit/UserTest.php                     | 312 ++++++------
 test/phpunit/WebservicesInvoicesTest.php      | 208 ++++----
 test/phpunit/WebservicesOrdersTest.php        | 206 ++++----
 test/phpunit/WebservicesOtherTest.php         | 262 +++++-----
 test/phpunit/WebservicesProductsTest.php      | 414 ++++++++-------
 test/phpunit/WebservicesThirdpartyTest.php    | 207 ++++----
 test/phpunit/WebservicesUserTest.php          | 260 +++++-----
 test/phpunit/XCalLibTest.php                  | 157 +++---
 70 files changed, 3612 insertions(+), 3523 deletions(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index b121027ad10..49af678ccff 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -175,23 +175,68 @@
 
 
 
-	<!-- Rules from PEAR Standard -->
+    <!-- Rules from PEAR Standard -->
 
-	<rule ref="PEAR.Classes.ClassDeclaration" />
+    <rule ref="PEAR.Classes.ClassDeclaration" />
 
     <!-- Check for duplicate class names -->
     <!-- <rule ref="Generic.Classes.DuplicateClassName" /> -->
 
     <rule ref="PEAR.Commenting.ClassComment" />
-    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
-        <severity>0</severity>
-    </rule>
+
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.Missing" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName" />
+
+    <rule ref="PEAR.Commenting.ClassComment.Missing" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.Missing" />
+
     <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
         <severity>0</severity>
     </rule>
     <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
         <severity>0</severity>
     </rule>
+
     <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
         <severity>0</severity>
     </rule>
@@ -201,94 +246,21 @@
     <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
         <severity>0</severity>
     </rule>
+
     <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
         <severity>0</severity>
     </rule>
     <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
         <severity>0</severity>
     </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
-        <severity>0</severity>
-    </rule>
-    <!-- TODO Remove this and fix reported errors -->
-    <rule ref="PEAR.Commenting.ClassComment.Missing">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Commenting.FunctionComment.Missing">
-        <severity>0</severity>
-    </rule>
-        
+    <rule ref="PEAR.Commenting.ClassComment.Missing" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired" />
+
+    <rule ref="PEAR.Commenting.FunctionComment.Missing" />
+
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
     <rule ref="PEAR.Commenting.FileComment.WrongStyle">
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index 63a69c4b2ef..584d3971b3f 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -40,8 +40,18 @@ class autoTranslator
 	const DIR_SEPARATOR = '/';
 
 
-	function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey)
-	{
+    /**
+     * Constructor
+     *
+     * @param   string $_destlang       Destination lang
+     * @param   string $_refLang        Ref lang
+     * @param   string $_langDir        Dir lang
+     * @param   string $_limittofile    Limit to file
+     * @param   string $_apikey         Api key
+     * @return void
+     */
+    function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey)
+    {
 
 		// Set enviorment variables
 		$this->_destlang = $_destlang;
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 8f82f33d039..a968b47050a 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -34,189 +34,195 @@ if (!$user->admin) accessforbidden();
 llxHeader();
 
 
-if (!function_exists('eaccelerator_info'))
-{
-	print 'eAccelerator is not installed.';
-	llxFooter();
-	exit;
+if (!function_exists('eaccelerator_info')) {
+    print 'eAccelerator is not installed.';
+    llxFooter();
+    exit;
 }
 
 
 $info = eaccelerator_info();
 if (isset($_POST['caching'])) {
-	if ($info['cache']) {
-		eaccelerator_caching(false);
-	} else {
-		eaccelerator_caching(true);
-	}
+    if ($info['cache']) {
+        eaccelerator_caching(false);
+    } else {
+        eaccelerator_caching(true);
+    }
 } else if (isset($_POST['optimizer']) && function_exists('eaccelerator_optimizer')) {
-	if ($info['optimizer']) {
-		eaccelerator_optimizer(false);
-	} else {
-		eaccelerator_optimizer(true);
-	}
+    if ($info['optimizer']) {
+        eaccelerator_optimizer(false);
+    } else {
+        eaccelerator_optimizer(true);
+    }
 } else if (isset($_POST['clear'])) {
-	eaccelerator_clear();
+    eaccelerator_clear();
 } else if (isset($_POST['clean'])) {
-	eaccelerator_clean();
+    eaccelerator_clean();
 } else if (isset($_POST['purge'])) {
-	eaccelerator_purge();
+    eaccelerator_purge();
 }
 $info = eaccelerator_info();
 if (!is_array($info)) {
-	dol_print_error('','An error occured getting eAccelerator information, this is caused if eAccelerator isn\'t initalised properly');
-	exit;
+    dol_print_error('','An error occured getting eAccelerator information, this is caused if eAccelerator isn\'t initalised properly');
+    exit;
 }
 
 
-
+/**
+ * Compare revisions
+ *
+ * @param   array   $x  Parts of version 1
+ * @param   array   $y  Parts of version 2
+ * @return  int         -1 if 1<2, 0 if 1=2, 1 if 1>2
+ */
 function compare($x, $y)
 {
-	global $sortby;
+    global $sortby;
 
-	if ( $x[$sortby] == $y[$sortby] )
-	return 0;
-	else if ( $x[$sortby] < $y[$sortby] )
-	return -1;
-	else
-	return 1;
+    if ( $x[$sortby] == $y[$sortby] ) {
+        return 0;
+    } else if ($x[$sortby] < $y[$sortby]) {
+        return -1;
+    } else {
+        return 1;
+    }
 }
 
 /**
  * Compare revisions
  *
- * @param 	array 	$x	Parts of version 1
- * @param 	array 	$y	Parts of version 2
- * @return	int			1 if 1<2, 0 if 1=2, -1 if 1>2
+ * @param   array   $x  Parts of version 1
+ * @param   array   $y  Parts of version 2
+ * @return  int         1 if 1<2, 0 if 1=2, -1 if 1>2
  */
 function revcompare($x, $y)
 {
-	global $sortby, $langs;
+    global $sortby, $langs;
 
-	if ( $x[$sortby] == $y[$sortby] )
-	return 0;
-	else if ( $x[$sortby] < $y[$sortby] )
-	return 1;
-	else
-	return -1;
+    if ($x[$sortby] == $y[$sortby]) {
+        return 0;
+    } else if ($x[$sortby] < $y[$sortby]) {
+        return 1;
+    } else {
+        return -1;
+    }
 }
 
 /**
  * Output table
  *
- * @param 	array	$list	Array of records
- * @return 	void
+ * @param   array   $list   Array of records
+ * @return  void
  */
 function create_script_table($list)
 {
-	global $sortby,$bc,$langs;
-	$var=true;
+    global $sortby,$bc,$langs;
+    $var=true;
 
-	if (isset($_GET['order']) && ($_GET['order'] == "asc" || $_GET['order'] =="desc")) {
-		$order = $_GET['order'];
-	} else {
-		$order = "asc";
-	}
+    if (isset($_GET['order']) && ($_GET['order'] == "asc" || $_GET['order'] =="desc")) {
+        $order = $_GET['order'];
+    } else {
+        $order = "asc";
+    }
 
-	if (isset($_GET['sort'])) {
-		switch ($_GET['sort']) {
-			case "mtime":
-			case "size":
-			case "reloads":
-			case "hits":
-				$sortby = $_GET['sort'];
-				($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
-				break;
-			default:
-				$sortby = "file";
-				($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
-		}
-	}
+    if (isset($_GET['sort'])) {
+        switch ($_GET['sort']) {
+            case "mtime":
+            case "size":
+            case "reloads":
+            case "hits":
+                $sortby = $_GET['sort'];
+                ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
+                break;
+            default:
+                $sortby = "file";
+                ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
+        }
+    }
 
-	?>
-<table class="noborder">
-	<tr>
-		<th><a
-			href="<?php print $_SERVER['PHP_SELF']?>?sort=file&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Filename"); ?></a>&nbsp;<?php if($sortby == "file") print ($order == "asc" ? "&darr;" : "&uarr;") ?></th>
-		<th><a
-			href="<?php print $_SERVER['PHP_SELF']?>?sort=mtime&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Date"); ?></a>&nbsp;<?php if($sortby == "mtime") print ($order == "asc" ? "&darr;" : "&uarr;") ?></th>
-		<th><a
-			href="<?php print $_SERVER['PHP_SELF']?>?sort=size&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Size"); ?></a>&nbsp;<?php if($sortby == "size") print ($order == "asc" ? "&darr;" : "&uarr;") ?></th>
-		<th><a
-			href="<?php print $_SERVER['PHP_SELF']?>?sort=reloads&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Reloads"); ?></a>&nbsp;<?php if($sortby == "reloads") print ($order == "asc" ? "&darr;" : "&uarr;") ?></th>
-		<th><a
-			href="<?php print $_SERVER['PHP_SELF']?>?sort=hits&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Hits"); ?></a>&nbsp;<?php if($sortby == "hits") print ($order == "asc" ? "&darr;" : "&uarr;") ?></th>
-	</tr>
-	<?php
-	switch ($sortby) {
-		case "mtime":
-		case "size":
-		case "reloads":
-		case "hits":
-			($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
-			break;
-		case "file":
-		default:
-			$sortby = "file";
-			($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
+    print '<table class="noborder">';
+    print '<tr>';
+    print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=file&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Filename").'</a>&nbsp;';
+    if($sortby == "file")
+        print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
+    print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=mtime&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Date").'</a>&nbsp;';
+    if($sortby == "mtime") 
+        print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
+    print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=size&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Size").'</a>&nbsp;';
+    if($sortby == "size") 
+        print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
+    print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=reloads&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Reloads").'</a>&nbsp;';
+    if($sortby == "reloads") 
+        print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
+    print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=hits&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Hits").'</a>&nbsp;';
+    if($sortby == "hits") 
+        print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
+    print '</tr>';
+    switch ($sortby) {
+        case "mtime":
+        case "size":
+        case "reloads":
+        case "hits":
+            ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
+            break;
+        case "file":
+        default:
+            $sortby = "file";
+            ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
 
-	}
+    }
+
+    foreach($list as $script) {
+        $var = ! $var;
+        print '<tr '.$bc[$var].'>';
+        print '<td>'.dol_trunc($script['file'],80,'left').'</td>';
+        print '<td align="center" class="nowrap">'.dol_print_date($script['mtime'],'dayhour').'</td>';
+        print '<td align="right" class="nowrap">'.number_format($script['size'] / 1024, 2).'KB</td>';
+        print '<td align="right" class="nowrap">'.$script['reloads'].' ('.$script['usecount'].')</td>';
+        print '<td align="right" class="nowrap">'.$script['hits'].'</td>';
+        print '</tr>';
+    }
+    print '</table>';
 
-	foreach($list as $script) { ?>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td><?php print dol_trunc($script['file'],80,'left'); ?></td>
-		<td align="center" class="nowrap"><?php print dol_print_date($script['mtime'],'dayhour'); ?></td>
-		<td align="right" class="nowrap"><?php print number_format($script['size'] / 1024, 2); ?>
-		KB</td>
-		<td align="right" class="nowrap"><?php print $script['reloads']; ?> (<?php print $script['usecount']; ?>)</td>
-		<td align="right" class="nowrap"><?php print $script['hits']; ?></td>
-	</tr>
-	<?php } ?>
-</table>
-	<?php
 }
 
 /**
  * Output table
  *
- * @param	array	$list		Array of records
- * @return	void
+ * @param   array   $list       Array of records
+ * @return  void
  */
 function create_key_table($list)
 {
-	global $bc,$langs;
-	$var=true;
-	?>
-<table class="noborder">
-	<tr class="liste_titre">
-		<th>Name</th>
-		<th>Created</th>
-		<th><?php print $langs->trans("Size"); ?></th>
-		<th>ttl</th>
-	</tr>
-	<?php
-	foreach($list as $key) {
-		?>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td><?php print dol_trunc($key['name'],80,'left'); ?></td>
-		<td align="center" class="nowrap"><?php dol_print_date($key['created'],'dayhour'); ?></td>
-		<td align="right" class="nowrap"><?php print number_format($key['size']/1024, 3); ?>
-		KB</td>
-		<td align="right" class="nowrap"><?php
-		if ($key['ttl'] == -1) {
-			print 'expired';
-		} elseif ($key['ttl'] == 0) {
-			print 'none';
-		} else {
-			print dol_print_date($key['ttl'],'dayhour');
-		}
-		?></td>
-	</tr>
-	<?php
-	}
-	?>
-</table>
-	<?php
+    global $bc,$langs;
+    $var=true;
+
+    print '<table class="noborder">';
+    print '<tr class="liste_titre">';
+    print '<th>Name</th>';
+    print '<th>Created</th>';
+    print '<th>'.$langs->trans("Size").'</th>';
+    print '<th>ttl</th>';
+    print '</tr>';
+
+    foreach($list as $key) {
+        $var = !$var;
+        print '<tr '.$bc[$var].'>';
+        print '<td>'.dol_trunc($key['name'],80,'left').'</td>';
+        print '<td align="center" class="nowrap">'.dol_print_date($key['created'],'dayhour').'</td>';
+        print '<td align="right" class="nowrap">'.number_format($key['size']/1024, 3).'KB</td>';
+        print '<td align="right" class="nowrap">';
+        if ($key['ttl'] == -1) {
+            print 'expired';
+        } elseif ($key['ttl'] == 0) {
+            print 'none';
+        } else {
+            print dol_print_date($key['ttl'],'dayhour');
+        }
+        print '</td>';
+        print '</tr>';
+    }
+    print '</table>';
 }
 
 
@@ -225,123 +231,117 @@ print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','',
 
 $var=true;
 
-?>
-<br>
+print '<br>';
 
 
-<table class="noborder">
-	<tr class="liste_titre">
-		<td colspan="2">Information</td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Caching enabled</td>
-		<td align="right"><?php print $info['cache'] ? 'yes':'no' ?></td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Optimizer enabled</td>
-		<td align="right"><?php print $info['optimizer'] ? 'yes':'no' ?></td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Memory usage</td>
-		<td align="right"><?php print number_format(100 * $info['memoryAllocated'] / $info['memorySize'], 2); ?>%
-		(<?php print number_format($info['memoryAllocated'] / (1024*1024), 2); ?>
-		MB / <?php print number_format($info['memorySize'] / (1024*1024), 2); ?>
-		MB)</td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Free memory in reserved cache</td>
-		<td align="right"><?php print number_format($info['memoryAvailable'] / (1024*1024), 2); ?>MB</td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Cached scripts</td>
-		<td align="right"><?php print $info['cachedScripts']; ?></td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Removed scripts</td>
-		<td align="right"><?php print $info['removedScripts']; ?></td>
-	</tr>
-	<tr <?php $var = ! $var; print $bc[$var]; ?>>
-		<td>Cached keys</td>
-		<td align="right"><?php print (isset($info['cachedKeys'])?$info['cachedKeys']:''); ?></td>
-	</tr>
-</table>
-<?php
+print '<table class="noborder">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">Information</td>';
+print '</tr>';
+$var = !$var;
+print '<tr '.$bc[$var].'>';
+print '<td>Caching enabled</td>';
+print '<td align="right">'.($info['cache']?'yes':'no').'</td>';
+print '</tr>';
+$var = !$var;
+print '<tr '.$bc[$var].'>';
+print '<td>Optimizer enabled</td>';
+print '<td align="right">'.$info['optimizer']?'yes':'no'.'</td>';
+print '</tr>';
+$var = !$var;
+print '<tr '.$bc[$var].'>';
+print '<td>Memory usage</td>';
+print '<td align="right">'.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB)</td>';
+print '</tr>';
+$var = ! $var;
+print '<tr '.$bc[$var].'>';
+print '<td>Free memory in reserved cache</td>';
+print '<td align="right">'.number_format($info['memoryAvailable']/(1024*1024), 2).'MB</td>';
+print '</tr>';
+$var = ! $var;
+print '<tr '.$bc[$var].'>';
+print '<td>Cached scripts</td>';
+print '<td align="right">'.$info['cachedScripts'].'</td>';
+print '</tr>';
+$var = ! $var;
+print '<tr '.$bc[$var].'>';
+print '<td>Removed scripts</td>';
+print '<td align="right">'.$info['removedScripts'].'</td>';
+print '</tr>';
+$var = ! $var;
+print '<tr '.$bc[$var].'>';
+print '<td>Cached keys</td>';
+print '<td align="right">'.(isset($info['cachedKeys'])?$info['cachedKeys']:'').'</td>';
+print '</tr>';
+print '</table>';
 
 $var=true;
 
-$resCached = @eaccelerator_cached_scripts();			// If success return an array
+$resCached = @eaccelerator_cached_scripts(); // If success return an array
 $resRemoved = @eaccelerator_removed_scripts();
 
-if (is_array($resCached) || is_array($resRemoved))
-{
-	print "<br>";
-	print '<form name="ea_control" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder">';
-	print '<tr class="liste_titre"><td colspan="2">Actions</td></tr>';
+if (is_array($resCached) || is_array($resRemoved)) {
+    print "<br>";
+    print '<form name="ea_control" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder">';
+    print '<tr class="liste_titre"><td colspan="2">Actions</td></tr>';
 
-	if (is_array($resCached))
-	{
-		$var = ! $var;
-		print "<tr ".$bc[$var].">";
-		print "<td>Caching</td>";
-		print '<td align="right"><input type="submit" class="butAction" name="caching" value="'. ($info['cache']?'disable':'enable') .'" /></td>';
-		print "</tr>";
-		$var = ! $var;
-		print "<tr ".$bc[$var].">";
-		print "<td>Optimizer</td>";
-		print '<td align="right"><input type="submit" class="butAction" name="optimizer" value="'. ($info['optimizer']?'disable':'enable') .'" /></td>';
-		print "</tr>";
-	}
+    if (is_array($resCached)) {
+        $var = ! $var;
+        print "<tr ".$bc[$var].">";
+        print "<td>Caching</td>";
+        print '<td align="right"><input type="submit" class="butAction" name="caching" value="'. ($info['cache']?'disable':'enable') .'" /></td>';
+        print "</tr>";
+        $var = ! $var;
+        print "<tr ".$bc[$var].">";
+        print "<td>Optimizer</td>";
+        print '<td align="right"><input type="submit" class="butAction" name="optimizer" value="'. ($info['optimizer']?'disable':'enable') .'" /></td>';
+        print "</tr>";
+    }
 
-	if (is_array($resRemoved))
-	{
-		$var = ! $var;
-		print "<tr ".$bc[$var].">";
-		print "<td>Clear cache</td>";
-		print '<td align="right"><input type="submit" class="butAction" name="clear" value="clear" title="remove all unused scripts and data from shared memory and disk cache" /></td>';
-		print "</tr>";
-		$var = ! $var;
-		print "<tr ".$bc[$var].">";
-		print "<td>Clean cache</td>";
-		print '<td align="right"><input type="submit" class="butAction" name="clean" value="clean" title=" remove all expired scripts and data from shared memory and disk cache" /></td>';
-		print "</tr>";
-		$var = ! $var;
-		print "<tr ".$bc[$var].">";
-		print "<td>Purge cache</td>";
-		print '<td align="right"><input type="submit" class="butAction" name="purge" value="purge" title="remove all \'removed\' scripts from shared memory" /></td>';
-		print "</tr></table></form>";
-	}
+    if (is_array($resRemoved)) {
+        $var = ! $var;
+        print "<tr ".$bc[$var].">";
+        print "<td>Clear cache</td>";
+        print '<td align="right"><input type="submit" class="butAction" name="clear" value="clear" title="remove all unused scripts and data from shared memory and disk cache" /></td>';
+        print "</tr>";
+        $var = ! $var;
+        print "<tr ".$bc[$var].">";
+        print "<td>Clean cache</td>";
+        print '<td align="right"><input type="submit" class="butAction" name="clean" value="clean" title=" remove all expired scripts and data from shared memory and disk cache" /></td>';
+        print "</tr>";
+        $var = ! $var;
+        print "<tr ".$bc[$var].">";
+        print "<td>Purge cache</td>";
+        print '<td align="right"><input type="submit" class="butAction" name="purge" value="purge" title="remove all \'removed\' scripts from shared memory" /></td>';
+        print "</tr></table></form>";
+    }
 
-	if (is_array($resCached))
-	{
-		print "<br><br>";
-		print "<b>Cached scripts</b><br>";
-		create_script_table($resCached);
-	}
+    if (is_array($resCached)) {
+        print "<br><br>";
+        print "<b>Cached scripts</b><br>";
+        create_script_table($resCached);
+    }
 
-	if (is_array($resRemoved))
-	{
-		print "<br><br>";
-		print "<b>Removed scripts</b><br>";
-		create_script_table($resRemoved);
-	}
-}
-else
-{
-	print "<br><br>";
-	print "Check in your <b>php.ini</b> that <b>eaccelerator.allowed_admin_path</b> parameter is : ";
-	print "<br><br>";
-	print "<b>".$_SERVER["SCRIPT_FILENAME"]."</b>";
-	print "<br><br>";
+    if (is_array($resRemoved)) {
+        print "<br><br>";
+        print "<b>Removed scripts</b><br>";
+        create_script_table($resRemoved);
+    }
+} else {
+    print "<br><br>";
+    print "Check in your <b>php.ini</b> that <b>eaccelerator.allowed_admin_path</b> parameter is : ";
+    print "<br><br>";
+    print "<b>".$_SERVER["SCRIPT_FILENAME"]."</b>";
+    print "<br><br>";
 }
 
-if (function_exists('eaccelerator_get'))
-{
-	print '<br><br>';
-	print '<b>Cached keys</b><br>';
-	$res=eaccelerator_list_keys();
-	create_key_table($res);
+if (function_exists('eaccelerator_get')) {
+    print '<br><br>';
+    print '<b>Cached keys</b><br>';
+    $res=eaccelerator_list_keys();
+    create_key_table($res);
 }
 
 print "<br><br>";
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 1ee31f5ebbd..33ebfd3b1be 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2011-2014 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
+/* Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
  */
 
 /**
- *	    \file       htdocs/compta/localtax/index.php
+ *      \file       htdocs/compta/localtax/index.php
  *      \ingroup    tax
- *		\brief      Index page of IRPF reports
+ *      \brief      Index page of IRPF reports
  */
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
@@ -30,8 +30,7 @@ $langs->load("other");
 $localTaxType=GETPOST('localTaxType', 'int');
 
 $year=$_GET["year"];
-if ($year == 0 )
-{
+if ($year == 0 ) {
     $year_current = strftime("%Y",time());
     $year_start = $year_current;
 } else {
@@ -41,21 +40,30 @@ if ($year == 0 )
 
 // Security check
 $socid = isset($_GET["socid"])?$_GET["socid"]:'';
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) 
+    $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit
 $modetax = $conf->global->TAX_MODE;
-if (isset($_GET["modetax"])) $modetax=$_GET["modetax"];
+if (isset($_GET["modetax"])) 
+    $modetax=$_GET["modetax"];
 
+/**
+ * print function
+ *
+ * @param   DoliDB $db          Database
+ * @param   string $sql     sql
+ * @param   string $date    date
+ * @return  void
+ */
 function pt ($db, $sql, $date)
 {
     global $conf, $bc,$langs;
 
     $result = $db->query($sql);
-    if ($result)
-    {
+    if ($result) {
         $num = $db->num_rows($result);
         $i = 0;
         $total = 0;
@@ -66,8 +74,7 @@ function pt ($db, $sql, $date)
         print '<td>&nbsp;</td>'."\n";
         print "</tr>\n";
         $var=True;
-        while ($i < $num)
-        {
+        while ($i < $num) {
             $obj = $db->fetch_object($result);
             $var=!$var;
             print '<tr '.$bc[$var].'>';
@@ -83,8 +90,7 @@ function pt ($db, $sql, $date)
 
         print "</table>";
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -96,17 +102,14 @@ function pt ($db, $sql, $date)
 
 llxHeader();
 
-if($localTaxType==1)
-{
+if($localTaxType==1) {
 	$LT='LT1';
 	$LTSummary='LT1Summary';
 	$LTPaid='LT1Paid';
 	$LTCustomer='LT1Customer';
 	$LTSupplier='LT1Supplier';
 	$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC1;
-}
-else
-{
+} else {
 	$LT='LT2';
 	$LTSummary='LT2Summary';
 	$LTPaid='LT2Paid';
@@ -138,18 +141,15 @@ print '<tr><td width="50%" valign="top">';
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td width=\"30%\">".$langs->trans("Year")." $y</td>";
-if($CalcLT==0)
-{
-	print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td>";
-	print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td>";
+if($CalcLT==0) {
+    print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td>";
+    print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td>";
 }
-if($CalcLT==1)
-{
-	print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td><td></td>";
+if($CalcLT==1) {
+    print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td><td></td>";
 }
-if($CalcLT==2)
-{
-	print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td><td></td>";
+if($CalcLT==2) {
+    print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td><td></td>";
 }
 
 print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
@@ -161,8 +161,7 @@ $y = $year_current ;
 $var=True;
 $total=0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
 $i=0;
-for ($m = 1 ; $m < 13 ; $m++ )
-{
+for ($m = 1 ; $m < 13 ; $m++ ) {
     $coll_listsell = vat_by_date($db, $y, 0, 0, 0, $modetax, 'sell', $m);
     $coll_listbuy = vat_by_date($db, $y, 0, 0, 0, $modetax, 'buy', $m);
     
@@ -175,72 +174,56 @@ for ($m = 1 ; $m < 13 ; $m++ )
     $hookmanager->initHooks(array('externalbalance'));
     $reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-    if (! is_array($coll_listbuy) && $coll_listbuy == -1)
-    {
+    if (! is_array($coll_listbuy) && $coll_listbuy == -1) {
         $langs->load("errors");
         print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
         break;
     }
-    if (! is_array($coll_listbuy) && $coll_listbuy == -2)
-    {
+    if (! is_array($coll_listbuy) && $coll_listbuy == -2) {
         print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
         break;
     }
 
     $var=!$var;
-    print "<tr ".$bc[$var].">";
+    print '<tr '.$bc[$var].'>';
     print '<td class="nowrap">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
-    if($CalcLT==0)
-    {
-    	$x_coll = 0;
-	    foreach($coll_listsell as $vatrate=>$val)
-	    {
+    if($CalcLT==0) {
+        $x_coll = 0;
+        foreach($coll_listsell as $vatrate=>$val) {
 	        $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
 	    }
 	    $subtotalcoll = $subtotalcoll + $x_coll;
 	    print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td>";
 
 	    $x_paye = 0;
-	    foreach($coll_listbuy as $vatrate=>$val)
-	    {
+	    foreach($coll_listbuy as $vatrate=>$val) {
 	        $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
 	    }
 	    $subtotalpaye = $subtotalpaye + $x_paye;
 	    print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td>";
-    }
-    elseif($CalcLT==1)
-    {
+    } elseif($CalcLT==1) {
     	$x_paye = 0;
-    	foreach($coll_listbuy as $vatrate=>$val)
-    	{
+    	foreach($coll_listbuy as $vatrate=>$val) {
     		$x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
     	}
     	$subtotalpaye = $subtotalpaye + $x_paye;
     	print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td><td></td>";
-    }
-    elseif($CalcLT==2)
-    {
+    } elseif($CalcLT==2) {
     	$x_coll = 0;
-    	foreach($coll_listsell as $vatrate=>$val)
-    	{
+    	foreach($coll_listsell as $vatrate=>$val) {
     		$x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
     	}
     	$subtotalcoll = $subtotalcoll + $x_coll;
     	print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td><td></td>";
     
     }
-	    
-    if($CalcLT==0)
-    {
-    	$diff= $x_coll - $x_paye;
-    }
-    elseif($CalcLT==1)
-    {
-    	$diff= $x_paye;
-    }
-    elseif($CalcLT==2)
-    {
-    	$diff= $x_coll;
+
+    if($CalcLT==0) {
+        $diff= $x_coll - $x_paye;
+    } elseif($CalcLT==1) {
+        $diff= $x_paye;
+    } elseif($CalcLT==2) {
+        $diff= $x_coll;
     }
     
     $total = $total + $diff;
@@ -251,23 +234,17 @@ for ($m = 1 ; $m < 13 ; $m++ )
     print "</tr>\n";
 
     $i++;
-    if ($i > 2)
-    {
+    if ($i > 2) {
         print '<tr class="liste_total">';
         print '<td align="right">'.$langs->trans("SubTotal").':</td>';
-        if($CalcLT==0)
-        {
+        if($CalcLT==0) {
         	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>';
         	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>';
         	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
-        }
-        elseif($CalcLT==1)
-        {
+        } elseif($CalcLT==1) {
         	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td><td></td>';
         	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
-        }
-        elseif($CalcLT==2)
-        {
+        } elseif($CalcLT==2) {
         	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td><td></td>';
         	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
         }
@@ -298,7 +275,7 @@ $sql.= " GROUP BY dm ASC";
 
 pt($db, $sql,$langs->trans("Year")." $y");
 
-print "</td></tr></table>";
+print '</td></tr></table>';
 
 print '</td></tr>';
 print '</table>';
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 57863100999..ef38a2537e6 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *	\file       htdocs/core/boxes/box_activite.php
- *	\ingroup    projet
- *	\brief      Module to show Projet activity of the current Year
+ *  \file       htdocs/core/boxes/box_activite.php
+ *  \ingroup    projet
+ *  \brief      Module to show Projet activity of the current Year
  */
 include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
 
@@ -37,23 +37,27 @@ class box_project extends ModeleBoxes
 	var $info_box_head = array();
 	var $info_box_contents = array();
 
-	/**
-	 *      \brief      Constructeur de la classe
-	 */
-	function box_project()
-	{
-		global $langs;
-		$langs->load("boxes");
-		$langs->load("projects");
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param='')
+    {
+        global $langs;
+        $langs->load("boxes");
+        $langs->load("projects");
 
-		$this->boxlabel="Projects";
-	}
+        $this->db = $db;
+        $this->boxlabel="Projects";
+    }
 
 	/**
 	*  Load data for box to show them later
 	*
-	*  @param	int		$max        Maximum number of records to load
-	*  @return	void
+	*  @param   int		$max        Maximum number of records to load
+	*  @return  void
 	*/
 	function loadBox($max=5)
 	{
@@ -69,8 +73,7 @@ class box_project extends ModeleBoxes
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
-		if ($user->rights->projet->lire)
-		{
+		if ($user->rights->projet->lire) {
 
 			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut ";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
@@ -79,35 +82,37 @@ class box_project extends ModeleBoxes
 			$sql.= " ORDER BY p.datec DESC";
 			$sql.= $db->plimit($max, 0);
 
-			$result = $db->query($sql);
+            $result = $db->query($sql);
 
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$i = 0;
-				while ($i < $num)
-				{
-					$objp = $db->fetch_object($result);
+            if ($result) {
+                $num = $db->num_rows($result);
+                $i = 0;
+                while ($i < $num) {
+                    $objp = $db->fetch_object($result);
 
-					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-						'logo' => 'object_project',
-						'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid);
+                    $this->info_box_contents[$i][0] = array(
+                        'td' => 'align="left" width="16"',
+                        'logo' => 'object_project',
+                        'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid
+                    );
 
-					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-						'text' => $objp->ref,
-						'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
+                    $this->info_box_contents[$i][1] = array(
+                        'td' => 'align="left"',
+                        'text' => $objp->ref,
+                        'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid
+                    );
 
-					$this->info_box_contents[$i][2] = array('td' => 'align="left"',
-					'text' => $objp->title
-					);
+                    $this->info_box_contents[$i][2] = array(
+                        'td' => 'align="left"',
+                        'text' => $objp->title
+                    );
 
 					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
 					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
 					$sql.=" WHERE p.entity = ".$conf->entity;
 
 					$resultTask = $db->query($sql);
-					if ($resultTask)
-					{
+					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
 						$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format($objTask->nb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
 						if ($objTask->nb  > 0 )
@@ -115,9 +120,7 @@ class box_project extends ModeleBoxes
 						else
 							$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
 						$totalnbTask += $objTask->nb;
-					}
-					else
-					{
+					} else {
 						$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format(0, 0, ',', ' '));
 						$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
 					}
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 14ca4448a7c..d20ee2017d6 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -15,10 +16,10 @@
  */
 
 /**
- *	\file       htdocs/core/boxes/box_task.php
- *	\ingroup    Projet
- *	\brief      Module to Task activity of the current year
- *	\version	$Id: box_task.php,v 1.1 2012/09/11 Charles-François BENKE
+ *  \file       htdocs/core/boxes/box_task.php
+ *  \ingroup    Projet
+ *  \brief      Module to Task activity of the current year
+ *  \version    $Id: box_task.php,v 1.1 2012/09/11 Charles-François BENKE
  */
 
 include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
@@ -29,32 +30,36 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  */
 class box_task extends ModeleBoxes
 {
-	var $boxcode="projet";
-	var $boximg="object_projecttask";
-	var $boxlabel;
-	//var $depends = array("projet");
-	var $db;
-	var $param;
+    var $boxcode="projet";
+    var $boximg="object_projecttask";
+    var $boxlabel;
+    //var $depends = array("projet");
+    var $db;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
-	/**
-	 *  Constructor
-	 */
-	function box_task()
-	{
-		global $langs;
-		$langs->load("boxes");
-		$langs->load("projects");
-		$this->boxlabel="Tasks";
-	}
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param='')
+    {
+        global $langs;
+        $langs->load("boxes");
+        $langs->load("projects");
+        $this->boxlabel="Tasks";
+        $this->db = $db;
+    }
 
 	/**
 	 *  Load data for box to show them later
 	 *
-	 *  @param	int		$max        Maximum number of records to load
-	 *  @return	void
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
 	 */
 	function loadBox($max=5)
 	{
@@ -73,8 +78,7 @@ class box_task extends ModeleBoxes
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
-		if ($user->rights->projet->lire)
-		{
+		if ($user->rights->projet->lire) {
 
 			$sql = "SELECT pt.fk_statut, count(pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
@@ -86,23 +90,23 @@ class box_task extends ModeleBoxes
 
 			$result = $db->query($sql);
 
-			if ($result)
-			{
+			if ($result) {
 				$num = $db->num_rows($result);
 				$i = 0;
-				while ($i < $num)
-				{
-					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projecttask');
+                while ($i < $num) {
+                    $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projecttask');
 
-					$objp = $db->fetch_object($result);
-					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-					'text' =>$langs->trans("Task")."&nbsp;".$taskstatic->LibStatut($objp->fk_statut,0)
-					);
+                    $objp = $db->fetch_object($result);
+                    $this->info_box_contents[$i][1] = array(
+                        'td' => 'align="left"',
+                        'text' =>$langs->trans("Task")."&nbsp;".$taskstatic->LibStatut($objp->fk_statut,0)
+                    );
 
-					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
-					'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
-					'url' => DOL_URL_ROOT."/projet/tasks/index.php?leftmenu=projects&viewstatut=".$objp->fk_statut
-					);
+                    $this->info_box_contents[$i][2] = array(
+                        'td' => 'align="right"',
+                        'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
+                        'url' => DOL_URL_ROOT."/projet/tasks/index.php?leftmenu=projects&viewstatut=".$objp->fk_statut
+                    );
 					$totalnb += $objp->nb;
 					$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
 					$totalplannedtot += $objp->plannedtot;
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index fad4926bc4e..3a0dc0378ea 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -118,6 +118,13 @@ function GetFoldersAndFiles( $resourceType, $currentFolder )
 	echo '</Files>' ;
 }
 
+/**
+ * Create folder
+ *
+ * @param   string $resourceType    Resource type
+ * @param   string $currentFolder   Current folder
+ * @return void
+ */
 function CreateFolder( $resourceType, $currentFolder )
 {
 	if (!isset($_GET)) {
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 7f3dd4738db..966efd0f0af 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -123,8 +123,8 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
  */
 function GetParentFolder($folderPath)
 {
-	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
-	return preg_replace($sPattern, '', $folderPath);
+    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
+    return preg_replace($sPattern, '', $folderPath);
 }
 
 /**
@@ -196,46 +196,57 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		return '' ;
 }
 
+/**
+ * Get Root Path
+ *
+ * @return  string              real path
+ */
 function GetRootPath()
 {
-	if (!isset($_SERVER)) {
-		global $_SERVER;
-	}
-	$sRealPath = realpath('./');
-	// #2124 ensure that no slash is at the end
-	$sRealPath = rtrim($sRealPath,"\\/");
+    if (!isset($_SERVER)) {
+        global $_SERVER;
+    }
+    $sRealPath = realpath('./');
+    // #2124 ensure that no slash is at the end
+    $sRealPath = rtrim($sRealPath,"\\/");
 
-	$sSelfPath = $_SERVER['PHP_SELF'] ;
-	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+    $sSelfPath = $_SERVER['PHP_SELF'] ;
+    $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
-	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+    $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
 
-	$position = strpos($sRealPath, $sSelfPath);
+    $position = strpos($sRealPath, $sSelfPath);
 
-	// This can check only that this script isn't run from a virtual dir
-	// But it avoids the problems that arise if it isn't checked
-	if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) )
-		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+    // This can check only that this script isn't run from a virtual dir
+    // But it avoids the problems that arise if it isn't checked
+    if ( $position === false || $position <> strlen($sRealPath) - strlen($sSelfPath) )
+        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
 
-	return substr($sRealPath, 0, $position);
+    return substr($sRealPath, 0, $position);
 }
 
 // Emulate the asp Server.mapPath function.
 // given an url path return the physical directory that it corresponds to
 function Server_MapPath( $path )
 {
-	// This function is available only for Apache
-	if (function_exists('apache_lookup_uri'))
-	{
-		$info = apache_lookup_uri($path);
-		return $info->filename . $info->path_info ;
-	}
+    // This function is available only for Apache
+    if (function_exists('apache_lookup_uri')) {
+        $info = apache_lookup_uri($path);
+        return $info->filename . $info->path_info ;
+    }
 
-	// This isn't correct but for the moment there's no other solution
-	// If this script is under a virtual directory or symlink it will detect the problem and stop
-	return GetRootPath() . $path ;
+    // This isn't correct but for the moment there's no other solution
+    // If this script is under a virtual directory or symlink it will detect the problem and stop
+    return GetRootPath() . $path ;
 }
 
+/**
+ * Is Allowed Extension
+ *
+ * @param   string $sExtension      File extension
+ * @param   string $resourceType    ressource type
+ * @return  boolean                 true or false
+ */
 function IsAllowedExt($sExtension, $resourceType)
 {
 	global $Config ;
@@ -252,6 +263,12 @@ function IsAllowedExt($sExtension, $resourceType)
 	return true ;
 }
 
+/**
+ * Is Allowed Type
+ *
+ * @param   string $resourceType    ressource type
+ * @return  boolean                 true or false
+ */
 function IsAllowedType($resourceType)
 {
 	global $Config ;
@@ -264,8 +281,8 @@ function IsAllowedType($resourceType)
 /**
  * IsAllowedCommand
  *
- * @param 	string		$sCommand		Command
- * @return 	boolean						True or false
+ * @param   string		$sCommand		Command
+ * @return  boolean						True or false
  */
 function IsAllowedCommand($sCommand)
 {
diff --git a/htdocs/core/modules/syslog/logHandler.php b/htdocs/core/modules/syslog/logHandler.php
index d2fba9bd9d7..1701ca2bdce 100644
--- a/htdocs/core/modules/syslog/logHandler.php
+++ b/htdocs/core/modules/syslog/logHandler.php
@@ -1,4 +1,19 @@
 <?php
+/*
+ * This 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/
+ */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandlerInterface.php';
 
diff --git a/htdocs/core/modules/syslog/logHandlerInterface.php b/htdocs/core/modules/syslog/logHandlerInterface.php
index 47807d8f8f6..f0d78735155 100644
--- a/htdocs/core/modules/syslog/logHandlerInterface.php
+++ b/htdocs/core/modules/syslog/logHandlerInterface.php
@@ -1,4 +1,25 @@
 <?php
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/syslog/logHandlerInterface.php
+ *  \ingroup    syslog
+ *  \brief      LogHandlerInterface
+ */
 
 /**
  * LogHandlerInterface
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 4af7772f290..820f0829b61 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -341,8 +341,12 @@ llxFooter();
 $db->close();
 
 
-
-
+/*
+ *  Print html activity for product type
+ *
+ *  @param      int $product_type   Type of product
+ *  @return     void
+ */
 function activitytrim($product_type)
 {
 	global $conf,$langs,$db;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 24ca13da355..ad99f68c9b0 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -495,7 +495,14 @@ class MouvementStock extends CommonObject
 		}
 
 	}
-	
+
+    /**
+     * Get origin
+     *
+     * @param   variant $fk_origin  id of origin
+     * @param   int $origintype     origin type
+     * @return  string              name url
+     */
 	function get_origin($fk_origin, $origintype) {
 		switch ($origintype) {
 			case 'commande':
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index c75f37b00c2..76711d08a06 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -798,16 +798,20 @@ class Resource extends CommonObject
 	    return $resources;
     }
 
+    /*
+     *  Return an int number of resources linked to the element
+     *
+     *  @return     int
+     */
     function fetchElementResources($element,$element_id)
     {
-    	$resources = $this->getElementResources($element,$element_id);
-    	$i=0;
-    	foreach($resources as $nb => $resource)
-    	{
-    		$this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']);
-    		$i++;
-    	}
-    	return $i;
+        $resources = $this->getElementResources($element,$element_id);
+        $i=0;
+        foreach($resources as $nb => $resource) {
+            $this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']);
+            $i++;
+        }
+        return $i;
 
     }
 
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index b43b9d230b3..334e42eb5f9 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
+/* Copyright (C) 2010      Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      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
@@ -19,9 +19,9 @@
 
 /**
  *      \file       test/phpunit/AdherentTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent.class.php';
 require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,72 +48,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class AdherentTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return AdherentTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return AdherentTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n"; die(); }
-
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { 
+            print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
+            die();
+        }
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -124,71 +128,71 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     public function testAdherentTypeCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new AdherentType($this->savdb);
-    	$localobject->statut=1;
-    	$localobject->libelle='Adherent type test';
-    	$localobject->cotisation=1;
-    	$localobject->vote=1;
-     	$result=$localobject->create($user);
+        $localobject=new AdherentType($this->savdb);
+        $localobject->statut=1;
+        $localobject->libelle='Adherent type test';
+        $localobject->cotisation=1;
+        $localobject->vote=1;
+        $result=$localobject->create($user);
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $localobject->id;
+        return $localobject->id;
     }
 
     /**
      * testAdherentCreate
      *
-     * @param	int		$fk_adherent_type		Id type of member
-     * @return 	int
+     * @param   int $fk_adherent_type       Id type of member
+     * @return  int
      *
      * @depends	testAdherentTypeCreate
      * The depends says test is run only if previous is ok
      */
     public function testAdherentCreate($fk_adherent_type)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Adherent($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->typeid=$fk_adherent_type;
-     	$result=$localobject->create($user);
+        $localobject=new Adherent($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->typeid=$fk_adherent_type;
+        $result=$localobject->create($user);
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
      * testAdherentFetch
      *
-     * @param	int		$id		Id of object to fetch
-     * @return	object			Fetched object
+     * @param   int     $id     Id of object to fetch
+     * @return  object          Fetched object
      *
      * @depends	testAdherentCreate
      * The depends says test is run only if previous is ok
      */
     public function testAdherentFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Adherent($this->savdb);
-    	$result=$localobject->fetch($id);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+        $localobject=new Adherent($this->savdb);
+        $result=$localobject->fetch($id);
+        print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
         return $localobject;
@@ -222,78 +226,78 @@ class AdherentTest extends PHPUnit_Framework_TestCase
     /**
      * testAdherentUpdate
      *
-     * @param	Adherent	$localobject	Member instance
-     * @return	Adherent
+     * @param   Adherent    $localobject    Member instance
+     * @return  Adherent
      *
-     * @depends	testAdherentFetchLogin
+     * @depends testAdherentFetchLogin
      * The depends says test is run only if previous is ok
      */
     public function testAdherentUpdate(Adherent $localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
         $timestamp = dol_now();
 
         $localobject->civility_id = 0;
-		$localobject->login='newlogin';
-		$localobject->societe='New company';
-		$localobject->note='New note after update';
-		//$localobject->note_public='New note public after update';
-		$localobject->lastname='New name';
-		$localobject->firstname='New firstname';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-		$localobject->country_id=2;
-		$localobject->statut=0;
+        $localobject->login='newlogin';
+        $localobject->societe='New company';
+        $localobject->note='New note after update';
+        //$localobject->note_public='New note public after update';
+        $localobject->lastname='New name';
+        $localobject->firstname='New firstname';
+        $localobject->address='New address';
+        $localobject->zip='New zip';
+        $localobject->town='New town';
+        $localobject->country_id=2;
+        $localobject->statut=0;
         $localobject->morphy=0;
-		$localobject->phone='New tel pro';
-		$localobject->phone_perso='New tel perso';
-		$localobject->phone_mobile='New tel mobile';
-		$localobject->email='newemail@newemail.com';
+        $localobject->phone='New tel pro';
+        $localobject->phone_perso='New tel perso';
+        $localobject->phone_mobile='New tel mobile';
+        $localobject->email='newemail@newemail.com';
         $localobject->birth=$timestamp;
-		$result=$localobject->update($user);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
-		$result=$localobject->update_note($localobject->note);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
-		//$result=$localobject->update_note_public($localobject->note_public);
-		//print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		//$this->assertLessThan($result, 0);
+        $result=$localobject->update($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        $result=$localobject->update_note($localobject->note);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        //$result=$localobject->update_note_public($localobject->note_public);
+        //print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        //$this->assertLessThan($result, 0);
 
-		$newobject=new Adherent($this->savdb);
-		$result=$newobject->fetch($localobject->id);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+        $newobject=new Adherent($this->savdb);
+        $result=$newobject->fetch($localobject->id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
         $this->assertEquals($localobject->civility_id, $newobject->civility_id);
-		$this->assertEquals($localobject->login, $newobject->login);
-		$this->assertEquals($localobject->societe, $newobject->societe);
-		$this->assertEquals($localobject->note, $newobject->note);
-		//$this->assertEquals($localobject->note_public, $newobject->note_public);
-		$this->assertEquals($localobject->lastname, $newobject->lastname);
-		$this->assertEquals($localobject->firstname, $newobject->firstname);
-		$this->assertEquals($localobject->address, $newobject->address);
-		$this->assertEquals($localobject->zip, $newobject->zip);
-		$this->assertEquals($localobject->town, $newobject->town);
-		$this->assertEquals($localobject->country_id, $newobject->country_id);
-		$this->assertEquals('BE', $newobject->country_code);
+        $this->assertEquals($localobject->login, $newobject->login);
+        $this->assertEquals($localobject->societe, $newobject->societe);
+        $this->assertEquals($localobject->note, $newobject->note);
+        //$this->assertEquals($localobject->note_public, $newobject->note_public);
+        $this->assertEquals($localobject->lastname, $newobject->lastname);
+        $this->assertEquals($localobject->firstname, $newobject->firstname);
+        $this->assertEquals($localobject->address, $newobject->address);
+        $this->assertEquals($localobject->zip, $newobject->zip);
+        $this->assertEquals($localobject->town, $newobject->town);
+        $this->assertEquals($localobject->country_id, $newobject->country_id);
+        $this->assertEquals('BE', $newobject->country_code);
         $this->assertEquals('Belgium', $newobject->country);
-		$this->assertEquals($localobject->statut, $newobject->statut);
-		$this->assertEquals($localobject->phone, $newobject->phone);
-		$this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
-		$this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
-		$this->assertEquals($localobject->email, $newobject->email);
+        $this->assertEquals($localobject->statut, $newobject->statut);
+        $this->assertEquals($localobject->phone, $newobject->phone);
+        $this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
+        $this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
+        $this->assertEquals($localobject->email, $newobject->email);
         $this->assertEquals($localobject->birth, $timestamp);
         $this->assertEquals($localobject->morphy, $newobject->morphy);
 
         //We return newobject because of new values
-    	return $newobject;
+        return $newobject;
     }
 
     /**
@@ -430,24 +434,24 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     public function testAdherentValidate(Adherent $localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->validate($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->validate($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testAdherentOther
      *
-     * @param	Adherent	$localobject	Member instance
-     * @return	int							Id of object
+     * @param   Adherent    $localobject    Member instance
+     * @return  int                         Id of object
      *
      * @depends testAdherentValidate
      * The depends says test is run only if previous is ok
@@ -520,17 +524,17 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     public function testAdherentDelete($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$result=$localobject->delete($localobject->id);
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+        $result=$localobject->delete($localobject->id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-		return $localobject;
+        return $localobject;
     }
 
 
@@ -545,18 +549,18 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     public function testAdherentTypeDelete($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobjectat=new AdherentType($this->savdb);
-     	$result=$localobjectat->fetch($localobject->typeid);
-     	$result=$localobjectat->delete();
-     	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $localobjectat=new AdherentType($this->savdb);
+        $result=$localobjectat->fetch($localobject->typeid);
+        $result=$localobjectat->delete();
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $localobject->id;
+        return $localobject->id;
     }
 }
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index 90b0951cc86..bef0c2eff9d 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/AdminLibTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/admin.lib.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -43,74 +42,76 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class AdminLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return AdminLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return AdminLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -120,25 +121,25 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
      */
     public function testVersionCompare()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$result=versioncompare(array(3,1,-4),array(3,1,1));
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-3,$result);
-		$result=versioncompare(array(3,1,0),array(3,1,1));
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-3,$result);
-		$result=versioncompare(array(3,1,0),array(3,2,0));
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-2,$result);
-		$result=versioncompare(array(3,1,0),array(3,1,0));
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0,$result);
+        $result=versioncompare(array(3,1,-4),array(3,1,1));
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-3,$result);
+        $result=versioncompare(array(3,1,0),array(3,1,1));
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-3,$result);
+        $result=versioncompare(array(3,1,0),array(3,2,0));
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(-2,$result);
+        $result=versioncompare(array(3,1,0),array(3,1,0));
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(0,$result);
 
-		return $result;
+        return $result;
     }
 }
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index a8a554ca25d..5f5d3f940bb 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2012  Regis Houssin       <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,32 +19,29 @@
 
 /**
  *      \file       test/phpunit/AllTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      This file is a test suite to run all unit tests
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 print "PHP Version: ".phpversion()."\n";
 print "Memory: ". ini_get('memory_limit')."\n";
 
 global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if ($langs->defaultlang != 'en_US')
-{
+if ($langs->defaultlang != 'en_US') {
     print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
     exit;
 }
-if (! empty($conf->google->enabled))
-{
-	print "Warning: Google module should not be enabled.\n";
+if (! empty($conf->google->enabled)) {
+    print "Warning: Google module should not be enabled.\n";
 }
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -59,37 +56,37 @@ class AllTests
      *
      * @return	void
      */
-	public static function suite()
+    public static function suite()
     {
-		$suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
+        $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
 
         //require_once dirname(__FILE__).'/CoreTest.php';
         //$suite->addTestSuite('CoreTest');
-		require_once dirname(__FILE__).'/AdminLibTest.php';
-		$suite->addTestSuite('AdminLibTest');
-		require_once dirname(__FILE__).'/DateLibTest.php';
-		$suite->addTestSuite('DateLibTest');
-		//require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
-		//$suite->addTestSuite('DateLibTzFranceTest');
-		require_once dirname(__FILE__).'/MarginsLibTest.php';
-		$suite->addTestSuite('MarginsLibTest');
-		require_once dirname(__FILE__).'/FilesLibTest.php';
-		$suite->addTestSuite('FilesLibTest');
-		require_once dirname(__FILE__).'/JsonLibTest.php';
-		$suite->addTestSuite('JsonLibTest');
-		require_once dirname(__FILE__).'/ImagesLibTest.php';
-		$suite->addTestSuite('ImagesLibTest');
-		require_once dirname(__FILE__).'/FunctionsLibTest.php';
-		$suite->addTestSuite('FunctionsLibTest');
-		require_once dirname(__FILE__).'/Functions2LibTest.php';
-		$suite->addTestSuite('Functions2LibTest');
-		require_once dirname(__FILE__).'/XCalLibTest.php';
-		$suite->addTestSuite('XCalLibTest');
+        require_once dirname(__FILE__).'/AdminLibTest.php';
+        $suite->addTestSuite('AdminLibTest');
+        require_once dirname(__FILE__).'/DateLibTest.php';
+        $suite->addTestSuite('DateLibTest');
+        //require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
+        //$suite->addTestSuite('DateLibTzFranceTest');
+        require_once dirname(__FILE__).'/MarginsLibTest.php';
+        $suite->addTestSuite('MarginsLibTest');
+        require_once dirname(__FILE__).'/FilesLibTest.php';
+        $suite->addTestSuite('FilesLibTest');
+        require_once dirname(__FILE__).'/JsonLibTest.php';
+        $suite->addTestSuite('JsonLibTest');
+        require_once dirname(__FILE__).'/ImagesLibTest.php';
+        $suite->addTestSuite('ImagesLibTest');
+        require_once dirname(__FILE__).'/FunctionsLibTest.php';
+        $suite->addTestSuite('FunctionsLibTest');
+        require_once dirname(__FILE__).'/Functions2LibTest.php';
+        $suite->addTestSuite('Functions2LibTest');
+        require_once dirname(__FILE__).'/XCalLibTest.php';
+        $suite->addTestSuite('XCalLibTest');
 
-		require_once dirname(__FILE__).'/LangTest.php';
-		$suite->addTestSuite('LangTest');
-		require_once dirname(__FILE__).'/SqlTest.php';
-		$suite->addTestSuite('SqlTest');
+        require_once dirname(__FILE__).'/LangTest.php';
+        $suite->addTestSuite('LangTest');
+        require_once dirname(__FILE__).'/SqlTest.php';
+        $suite->addTestSuite('SqlTest');
 
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');
@@ -98,8 +95,8 @@ class AllTests
         $suite->addTestSuite('NumberingModulesTest');
         require_once dirname(__FILE__).'/PgsqlTest.php';
         $suite->addTestSuite('PgsqlTest');
-		require_once dirname(__FILE__).'/PdfDocTest.php';
-		$suite->addTestSuite('PdfDocTest');
+        require_once dirname(__FILE__).'/PdfDocTest.php';
+        $suite->addTestSuite('PdfDocTest');
         require_once dirname(__FILE__).'/BuildDocTest.php';
         $suite->addTestSuite('BuildDocTest');
         require_once dirname(__FILE__).'/CMailFileTest.php';
@@ -147,13 +144,13 @@ class AllTests
         require_once dirname(__FILE__).'/FactureFournisseurTest.php';
         $suite->addTestSuite('FactureFournisseurTest');
 
-		require_once dirname(__FILE__).'/UserTest.php';
+        require_once dirname(__FILE__).'/UserTest.php';
         $suite->addTestSuite('UserTest');
-		require_once dirname(__FILE__).'/UserGroupTest.php';
+        require_once dirname(__FILE__).'/UserGroupTest.php';
         $suite->addTestSuite('UserGroupTest');
         require_once dirname(__FILE__).'/BankAccountTest.php';
         $suite->addTestSuite('BankAccountTest');
-		require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
+        require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
         $suite->addTestSuite('CompanyBankAccountTest');
         require_once dirname(__FILE__).'/ChargeSocialesTest.php';
         $suite->addTestSuite('ChargeSocialesTest');
@@ -195,7 +192,7 @@ class AllTests
 
         // GUI
         require_once dirname(__FILE__).'/FormAdminTest.php';
-		$suite->addTestSuite('FormAdminTest');
+        $suite->addTestSuite('FormAdminTest');
 
 
         return $suite;
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 4983f1e2173..fa952b86640 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/ContratTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/bank/class/account.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,127 +48,129 @@ $langs->load("main");
  */
 class BankAccountTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return BankAccountTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return BankAccountTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
      * testBankAccountCreate
      *
-     * @return	int
+     * @return  int
      */
     public function testBankAccountCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Account($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date_solde=dol_now();
-    	$result=$localobject->create($user);
+        $localobject=new Account($this->savdb);
+        $localobject->initAsSpecimen();
+        $localobject->date_solde=dol_now();
+        $result=$localobject->create($user);
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
      * testBankAccountFetch
      *
-     * @param	int		$id		Id of contract
-     * @return	int
+     * @param   int $id     Id of contract
+     * @return  int
      *
-     * @depends	testBankAccountCreate
+     * @depends testBankAccountCreate
      * The depends says test is run only if previous is ok
      */
     public function testBankAccountFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Account($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Account($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
    /**
      * testBankAccountOther
      *
-     * @param	Object	$localobject	Object contract
-     * @return	int
+     * @param   Object  $localobject    Object contract
+     * @return  int
      *
      * @depends testBankAccountFetch
      * The depends says test is run only if previous is ok
@@ -197,27 +198,27 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
     /**
      * testBankAccountDelete
      *
-     * @param	int		$id		Id of contract
-     * @return	int
+     * @param   int $id     Id of contract
+     * @return  int
      *
-     * @depends	testBankAccountOther
+     * @depends testBankAccountOther
      * The depends says test is run only if previous is ok
      */
     public function testBankAccountDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Account($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+        $localobject=new Account($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($id);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 }
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 3ed7a6524c7..99098c432ea 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin 		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin       <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
 
 /**
  *      \file       test/phpunit/BuildDocTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -56,11 +56,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/modules/project/modules_proje
 require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/modules_fichinter.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/modules_expedition.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -74,35 +73,35 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class BuildDocTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return BuildDocTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return BuildDocTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
 
         if (! $conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); }
         if (! $conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); }
@@ -112,41 +111,43 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
         if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
         if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); }
 
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -156,76 +157,76 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
      */
     public function testFactureBuild()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$conf->facture->dir_output.='/temp';
+        $conf->facture->dir_output.='/temp';
 
-		$localobjectcom=new Commande($this->savdb);
-		$localobjectcom->initAsSpecimen();
+        $localobjectcom=new Commande($this->savdb);
+        $localobjectcom->initAsSpecimen();
 
-		$localobject=new Facture($this->savdb);
-    	$localobject->createFromOrder($localobjectcom);
-    	$localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
+        $localobject=new Facture($this->savdb);
+        $localobject->createFromOrder($localobjectcom);
+        $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
 
-    	// Crabe (english)
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
-		$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (english)
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (japanese)
-    	$newlangs1=new Translate("",$conf);
-    	$newlangs1->setDefaultLang('ja_JP');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (japanese)
+        $newlangs1=new Translate("",$conf);
+        $newlangs1->setDefaultLang('ja_JP');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (saudiarabia)
-    	$newlangs2a=new Translate("",$conf);
-    	$newlangs2a->setDefaultLang('sa_SA');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (saudiarabia)
+        $newlangs2a=new Translate("",$conf);
+        $newlangs2a->setDefaultLang('sa_SA');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (english_saudiarabia)
-    	$newlangs2b=new Translate("",$conf);
-    	$newlangs2b->setDefaultLang('en_SA');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (english_saudiarabia)
+        $newlangs2b=new Translate("",$conf);
+        $newlangs2b->setDefaultLang('en_SA');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (greek)
-    	$newlangs3=new Translate("",$conf);
-    	$newlangs3->setDefaultLang('el_GR');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (greek)
+        $newlangs3=new Translate("",$conf);
+        $newlangs3->setDefaultLang('el_GR');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (chinese)
-    	$newlangs4=new Translate("",$conf);
-    	$newlangs4->setDefaultLang('zh_CN');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (chinese)
+        $newlangs4=new Translate("",$conf);
+        $newlangs4->setDefaultLang('zh_CN');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	// Crabe (russian)
-    	$newlangs5=new Translate("",$conf);
-    	$newlangs5->setDefaultLang('ru_RU');
-    	$localobject->modelpdf='crabe';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5);
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
+        // Crabe (russian)
+        $newlangs5=new Translate("",$conf);
+        $newlangs5->setDefaultLang('ru_RU');
+        $localobject->modelpdf='crabe';
+        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5);
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
 
-    	return 0;
+        return 0;
     }
 
     /**
@@ -247,7 +248,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Canelle
         $localobject->modelpdf='canelle';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -274,7 +275,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Einstein
         $localobject->modelpdf='einstein';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -285,9 +286,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
     /**
      * testCommandeFournisseurBuild
-      *
-    * @return int
-    */
+     *
+     * @return int
+     */
     public function testCommandeFournisseurBuild()
     {
         global $conf,$user,$langs,$db;
@@ -329,7 +330,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Azur
         $localobject->modelpdf='azur';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -355,7 +356,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Baleine
         $localobject->modelpdf='baleine';
-	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index 26e18161b77..52a65a8949e 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CMailFileTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,70 +46,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CMailFileTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CMailFile
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CMailFile
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -120,19 +121,19 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
      */
     public function testCMailFileText()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new CMailFile('Test','test@test.com','from@from.com','Message txt',array(),array(),array(),'','',1,0);
+        $localobject=new CMailFile('Test','test@test.com','from@from.com','Message txt',array(),array(),array(),'','',1,0);
 
-    	$result=$localobject->sendfile();
+        $result=$localobject->sendfile();
         print __METHOD__." result=".$result."\n";
-    	$this->assertFalse($result);   // False because mail send disabled
+        $this->assertFalse($result);   // False because mail send disabled
 
-    	return $result;
+        return $result;
     }
 
     /**
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 3d4801a5854..d9e030ef9ef 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CategorieTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/categories/class/categorie.class.php';
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,70 +47,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CategorieTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CategorieTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CategorieTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -121,145 +122,145 @@ class CategorieTest extends PHPUnit_Framework_TestCase
      */
     public function testCategorieCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
 
-		// We create a category
-		$localobject=new Categorie($this->savdb);
-    	$localobject->initAsSpecimen();
+        // We create a category
+        $localobject=new Categorie($this->savdb);
+        $localobject->initAsSpecimen();
 
-    	// Check it does not exist (return 0)
-    	$resultCheck=$localobject->already_exists();
-    	print __METHOD__." resultCheck=".$resultCheck."\n";
-    	$this->assertEquals(0, $resultCheck);
+        // Check it does not exist (return 0)
+        $resultCheck=$localobject->already_exists();
+        print __METHOD__." resultCheck=".$resultCheck."\n";
+        $this->assertEquals(0, $resultCheck);
 
-    	// Create
-    	$resultFirstCreate=$localobject->create($user);
-    	print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n";
-    	$this->assertGreaterThan(0, $resultFirstCreate);
+        // Create
+        $resultFirstCreate=$localobject->create($user);
+        print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n";
+        $this->assertGreaterThan(0, $resultFirstCreate);
 
-    	// We try to create another one with same ref
-		$localobject2=new Categorie($this->savdb);
-    	$localobject2->initAsSpecimen();
+        // We try to create another one with same ref
+        $localobject2=new Categorie($this->savdb);
+        $localobject2->initAsSpecimen();
 
-    	// Check it does exist (return 1)
-    	$resultCheck=$localobject2->already_exists();
-    	print __METHOD__." resultCheck=".$resultCheck."\n";
-    	$this->assertGreaterThan(0, $resultCheck);
+        // Check it does exist (return 1)
+        $resultCheck=$localobject2->already_exists();
+        print __METHOD__." resultCheck=".$resultCheck."\n";
+        $this->assertGreaterThan(0, $resultCheck);
 
-    	$resultSecondCreate=$localobject2->create($user);
-    	print __METHOD__." result=".$resultSecondCreate."\n";
-    	$this->assertEquals(-4, $resultSecondCreate);
+        $resultSecondCreate=$localobject2->create($user);
+        print __METHOD__." result=".$resultSecondCreate."\n";
+        $this->assertEquals(-4, $resultSecondCreate);
 
-    	return $resultFirstCreate;
+        return $resultFirstCreate;
     }
 
     /**
      * testCategorieProduct
      *
-     * @param	int		$id		Id of category
-     * @return	int
+     * @param   int $id     Id of category
+     * @return  int
      *
-     * @depends	testCategorieCreate
+     * @depends testCategorieCreate
      * The depends says test is run only if previous is ok
      */
     public function testCategorieProduct($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobjecttmp=new Categorie($this->savdb);
-    	$localobjecttmp->initAsSpecimen();
-    	$localobjecttmp->label='Specimen Category for product';
-    	$localobjecttmp->type=0;    // product category
-    	$catid=$localobjecttmp->create($user);
+        $localobjecttmp=new Categorie($this->savdb);
+        $localobjecttmp->initAsSpecimen();
+        $localobjecttmp->label='Specimen Category for product';
+        $localobjecttmp->type=0;    // product category
+        $catid=$localobjecttmp->create($user);
 
         print __METHOD__." catid=".$catid."\n";
         $this->assertGreaterThan(0, $catid);
 
         // Try to create product linked to category
-		$localobject2=new Product($this->savdb);
-    	$localobject2->initAsSpecimen();
-    	$localobject2->ref.='-CATEG';
-    	$localobject2->tva_npr=1;
-    	$result=$localobject2->create($user);
-    	$cat = new Categorie($this->savdb);
-    	$cat->id = $catid;
-    	$result=$cat->add_type($localobject2,"product");
+        $localobject2=new Product($this->savdb);
+        $localobject2->initAsSpecimen();
+        $localobject2->ref.='-CATEG';
+        $localobject2->tva_npr=1;
+        $result=$localobject2->create($user);
+        $cat = new Categorie($this->savdb);
+        $cat->id = $catid;
+        $result=$cat->add_type($localobject2,"product");
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
 
-    	// Get list of categories for product
-    	$localcateg=new Categorie($this->savdb);
-    	$listofcateg=$localcateg->containing($localobject2->id, 'product', 'label');
-    	$this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should');
+        // Get list of categories for product
+        $localcateg=new Categorie($this->savdb);
+        $listofcateg=$localcateg->containing($localobject2->id, 'product', 'label');
+        $this->assertTrue(in_array('Specimen Category for product',$listofcateg), 'Categ not found linked to product when it should');
 
-    	return $id;
+        return $id;
     }
 
     /**
      * testCategorieFetch
      *
-     * @param	int		$id		Id of category
-     * @return	int
+     * @param   int $id     Id of category
+     * @return  int
      *
-     * @depends	testCategorieProduct
+     * @depends testCategorieProduct
      * The depends says test is run only if previous is ok
      */
     public function testCategorieFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Categorie($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Categorie($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
-    	return $localobject;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
     }
 
     /**
      * testCategorieUpdate
      *
-     * @param	Category		$localobject		Category
-     * @return	int
+     * @param   Category        $localobject        Category
+     * @return  int
 
-     * @depends	testCategorieFetch
+     * @depends testCategorieFetch
      * The depends says test is run only if previous is ok
      */
     public function testCategorieUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject->note='New note after update';
-    	$result=$localobject->update($user);
+        $localobject->note='New note after update';
+        $result=$localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+        return $localobject;
     }
 
     /**
      * testCategorieOther
      *
-     * @param	Category	$localobject	Category
-     * @return	int
+     * @param   Category    $localobject    Category
+     * @return  int
      *
      * @depends testCategorieUpdate
      * The depends says test is run only if previous is ok
@@ -289,50 +290,50 @@ class CategorieTest extends PHPUnit_Framework_TestCase
     /**
      * testCategorieDelete
      *
-     * @param	int		$id		Id of category
-     * @return	int
+     * @param   int $id     Id of category
+     * @return  int
      *
      * @depends	testCategorieOther
      * The depends says test is run only if previous is ok
      */
     public function testCategorieDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Categorie($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+        $localobject=new Categorie($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThan(0, $result);
+        return $result;
     }
 
     /**
      * testCategorieStatic
      *
-     * @return	void
+     * @return  void
      *
      * @depends  testCategorieDelete
      */
     public function testCategorieStatic()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Categorie($this->savdb);
+        $localobject=new Categorie($this->savdb);
         $retarray=$localobject->get_full_arbo(3);
 
-		print __METHOD__." retarray size=".count($retarray)."\n";
-    	$this->assertTrue(is_array($retarray));
-    	return $retarray;
+        print __METHOD__." retarray size=".count($retarray)."\n";
+        $this->assertTrue(is_array($retarray));
+        return $retarray;
     }
 
 }
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index 69b1f93f776..0836036afa5 100755
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -80,6 +80,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 90c0d10e3fb..67c120a2bb8 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CommandeFournisseurTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.commande.class.php';
 require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.product.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CommandeFournisseurTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CommandeFournisseurTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
-		//print $db->getVersion()."\n";
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -123,169 +124,169 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
      */
     public function testCommandeFournisseurCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		// Set supplier and product to use
-		$socid=1;
-		$societe=new Societe($db);
-		$societe->fetch($socid);
-		$product=new ProductFournisseur($db);
-		$product->fetch(0,'PIDRESS');
-		if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+        // Set supplier and product to use
+        $socid=1;
+        $societe=new Societe($db);
+        $societe->fetch($socid);
+        $product=new ProductFournisseur($db);
+        $product->fetch(0,'PIDRESS');
+        if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
 
-		$quantity=10;
-		$ref_fourn='SUPPLIER_REF_PHPUNIT';
-		$tva_tx=19.6;
+        $quantity=10;
+        $ref_fourn='SUPPLIER_REF_PHPUNIT';
+        $tva_tx=19.6;
 
-		// Create supplier price
-		$result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
-		$this->assertGreaterThanOrEqual(1, $result);
-		$result=$product->update_buyprice($quantity, 10, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
-		$this->assertGreaterThanOrEqual(0, $result);
+        // Create supplier price
+        $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
+        $this->assertGreaterThanOrEqual(1, $result);
+        $result=$product->update_buyprice($quantity, 10, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
+        $this->assertGreaterThanOrEqual(0, $result);
 
-		// Create supplier order with a too low quantity
-		$localobject=new CommandeFournisseur($db);
-    	$localobject->initAsSpecimen();
-    	$localobject->lines=array();	// Overwrite lines of order
-   		$line=new CommandeFournisseurLigne($db);
-   		$line->desc=$langs->trans("Description")." specimen line too low";
-   		$line->qty=1;					// So lower than $quantity
-  		$line->fk_product=$product->id;
-    	$line->ref_fourn=$ref_fourn;
-  		$localobject->lines[]=$line;
+        // Create supplier order with a too low quantity
+        $localobject=new CommandeFournisseur($db);
+        $localobject->initAsSpecimen();
+        $localobject->lines=array();    // Overwrite lines of order
+        $line=new CommandeFournisseurLigne($db);
+        $line->desc=$langs->trans("Description")." specimen line too low";
+        $line->qty=1;                   // So lower than $quantity
+        $line->fk_product=$product->id;
+        $line->ref_fourn=$ref_fourn;
+        $localobject->lines[]=$line;
 
-    	$result=$localobject->create($user);
+        $result=$localobject->create($user);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(-1, $result);	// must be -1 because quantity is lower than minimum of supplier price
+        $this->assertEquals(-1, $result);   // must be -1 because quantity is lower than minimum of supplier price
 
-    	$sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
-		$db->query($sql);
+        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+        $db->query($sql);
 
-    	// Create supplier order
-    	$localobject2=new CommandeFournisseur($db);
-    	$localobject2->initAsSpecimen();		// This create 5 lines of first product found for socid 1
-    	$localobject2->lines=array();	// Overwrite lines of order
-    	$line=new CommandeFournisseurLigne($db);
-    	$line->desc=$langs->trans("Description")." specimen line ok";
-    	$line->qty=10;					// So enough quantity
-    	$line->fk_product=$product->id;
-    	$line->ref_fourn=$ref_fourn;
-    	$localobject2->lines[]=$line;
+        // Create supplier order
+        $localobject2=new CommandeFournisseur($db);
+        $localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
+        $localobject2->lines=array();       // Overwrite lines of order
+        $line=new CommandeFournisseurLigne($db);
+        $line->desc=$langs->trans("Description")." specimen line ok";
+        $line->qty=10;                      // So enough quantity
+        $line->fk_product=$product->id;
+        $line->ref_fourn=$ref_fourn;
+        $localobject2->lines[]=$line;
 
-    	$result=$localobject2->create($user);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0, $result);
+        $result=$localobject2->create($user);
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0, $result);
 
-    	return $result;
+        return $result;
     }
 
 
     /**
      * testCommandeFournisseurFetch
      *
-     * @param	int		$id		Id of supplier order
-     * @return 	void
+     * @param   int $id     Id of supplier order
+     * @return  void
      *
-     * @depends	testCommandeFournisseurCreate
+     * @depends testCommandeFournisseurCreate
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new CommandeFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new CommandeFournisseur($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
+        print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testCommandeFournisseurValid
      *
-     * @param	Object	$localobject	Supplier order
-     * @return	void
+     * @param   Object $localobject     Supplier order
+     * @return  void
      *
-     * @depends	testCommandeFournisseurFetch
+     * @depends testCommandeFournisseurFetch
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->valid($user);
+        $result=$localobject->valid($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testCommandeFournisseurApprove
      *
-     * @param	Object	$localobject	Supplier order
-     * @return	void
+     * @param   Object $localobject Supplier order
+     * @return  void
      *
-     * @depends	testCommandeFournisseurValid
+     * @depends testCommandeFournisseurValid
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurApprove($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->approve($user);
+        $result=$localobject->approve($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testCommandeFournisseurCancel
      *
-     * @param	Object	$localobject		Supplier order
-     * @return	void
+     * @param   Object  $localobject        Supplier order
+     * @return  void
      *
-     * @depends	testCommandeFournisseurValid
+     * @depends testCommandeFournisseurValid
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurCancel($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->cancel($user);
+        $result=$localobject->cancel($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testCommandeFournisseurOther
      *
-     * @param	Object		$localobject	Supplier order
-     * @return	void
+     * @param   Object $localobject     Supplier order
+     * @return  void
      *
      * @depends testCommandeFournisseurCancel
      * The depends says test is run only if previous is ok
@@ -314,27 +315,27 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
     /**
      * testCommandeFournisseurDelete
      *
-     * @param	int		$id		Id of order
-     * @return	void
+     * @param   int $id     Id of order
+     * @return  void
      *
-     * @depends	testCommandeFournisseurOther
+     * @depends testCommandeFournisseurOther
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFournisseurDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new CommandeFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+        $localobject=new CommandeFournisseur($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 }
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 8a2e3f57120..0bb7788d33f 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CommandeTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,173 +46,176 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommandeTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CommandeTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CommandeTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
-		//print $db->getVersion()."\n";
+        print __METHOD__."\n";
+        //print $db->getVersion()."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
      * testCommandeCreate
      *
-     * @return	void
+     * @return  void
      */
     public function testCommandeCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Commande($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
      * testCommandeFetch
      *
-     * @param	int		$id		Id order
-     * @return	Commande
+     * @param   int $id     Id order
+     * @return  Commande
      *
      * @depends	testCommandeCreate
      * The depends says test is run only if previous is ok
      */
     public function testCommandeFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Commande($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
      * testCommandeValid
      *
-     * @param 	Object 	$localobject	Order
-     * @return	void
+     * @param   Object  $localobject    Order
+     * @return  void
      *
      * @depends	testCommandeFetch
      * The depends says test is run only if previous is ok
      */
     public function testCommandeValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->valid($user);
+        $result=$localobject->valid($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testCommandeCancel
      *
-     * @param	Object	$localobject	Order
-     * @return	void
+     * @param   Object  $localobject    Order
+     * @return  void
      *
-     * @depends	testCommandeValid
+     * @depends testCommandeValid
      * The depends says test is run only if previous is ok
      */
     public function testCommandeCancel($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->cancel();
+        $result=$localobject->cancel();
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testCommandeOther
      *
-     * @param	Object	$localobject	Order
-     * @return	void
+     * @param   Object  $localobject    Order
+     * @return  void
      *
      * @depends testCommandeCancel
      * The depends says test is run only if previous is ok
@@ -241,27 +243,27 @@ class CommandeTest extends PHPUnit_Framework_TestCase
     /**
      * testCommandeDelete
      *
-     * @param	int		$id			Id of order
-     * @return	void
+     * @param   int $id         Id of order
+     * @return  void
      *
-     * @depends	testCommandeOther
+     * @depends testCommandeOther
      * The depends says test is run only if previous is ok
      */
     public function testCommandeDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+        $localobject=new Commande($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($user);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 }
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index a22146dfc2a..18f96034fd1 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CommonObjectTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php';
 require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,138 +47,140 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommonObjectTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CommonObjectTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CommonObjectTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+    */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
     /**
-     *	testFetchUser
+     *  testFetchUser
      *
-     *	@return	void
+     *  @return void
      */
     public function testFetchUser()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-		$localobject->fetch(1);
+        $localobject=new Commande($this->savdb);
+        $localobject->fetch(1);
 
-    	$result=$localobject->fetch_user(1);
+        $result=$localobject->fetch_user(1);
 
-		print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($localobject->user->id, 0);
-    	return $result;
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($localobject->user->id, 0);
+        return $result;
     }
 
     /**
-     *	testFetchProjet
+     *  testFetchProjet
      *
-     *	@return	void
+     *  @return void
      */
     public function testFetchProjet()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-		$localobject->fetch(1);
-    	$result=$localobject->fetch_projet();
+        $localobject=new Commande($this->savdb);
+        $localobject->fetch(1);
+        $result=$localobject->fetch_projet();
 
-		print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result,0);
-    	return $result;
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThanOrEqual($result,0);
+        return $result;
     }
 
     /**
-     *	testFetchThirdParty
+     *  testFetchThirdParty
      *
-     *	@return	void
+     *  @return void
      */
     public function testFetchThirdParty()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Commande($this->savdb);
-		$localobject->fetch(1);
+        $localobject=new Commande($this->savdb);
+        $localobject->fetch(1);
 
-    	$result=$localobject->fetch_thirdparty();
+        $result=$localobject->fetch_thirdparty();
 
-		print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result,0);
-    	return $result;
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThanOrEqual($result,0);
+        return $result;
     }
 }
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index a105bb37a53..95ea937a017 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -80,6 +80,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 3c09df861f0..b638cdc776b 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -89,6 +89,8 @@ class ContactTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index 149d867135e..36724cde73e 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -80,6 +80,8 @@ class ContratTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 8d56b4a0b42..01f06e41af7 100755
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/CoreTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -49,70 +49,72 @@ if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is
  */
 class CoreTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return CoreTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		//print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return CoreTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        //print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		//$db->rollback();
+        global $conf,$user,$langs,$db;
+        //$db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+    */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -123,177 +125,170 @@ class CoreTest extends PHPUnit_Framework_TestCase
      */
     public function testDetectURLROOT()
     {
-    	global $dolibarr_main_prod;
+        global $dolibarr_main_prod;
 
-		global $dolibarr_main_url_root;
-		global $dolibarr_main_data_root;
-		global $dolibarr_main_document_root;
-		global $dolibarr_main_data_root_alt;
-		global $dolibarr_main_document_root_alt;
-		global $dolibarr_main_db_host;
-		global $dolibarr_main_db_port;
-		global $dolibarr_main_db_type;
-		global $dolibarr_main_db_prefix;
+        global $dolibarr_main_url_root;
+        global $dolibarr_main_data_root;
+        global $dolibarr_main_document_root;
+        global $dolibarr_main_data_root_alt;
+        global $dolibarr_main_document_root_alt;
+        global $dolibarr_main_db_host;
+        global $dolibarr_main_db_port;
+        global $dolibarr_main_db_type;
+        global $dolibarr_main_db_prefix;
 
-		$testtodo=3;
+        $testtodo=3;
 
-		// Case 1:
-		// Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
-		// URL: http://localhost/dolibarrnew/admin/system/phpinfo.php
-		// To prepare this test:
-	    // - Create link from htdocs to /var/www/dolibarrnew
-		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
-		if ($testtodo == 1)
-		{
-	    	$_SERVER["HTTPS"]='';
-	        $_SERVER["SERVER_NAME"]='localhost';
-	        $_SERVER["SERVER_PORT"]='80';
-	        $_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
-			$expectedresult='/dolibarrnew';
-		}
+        // Case 1:
+        // Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
+        // URL: http://localhost/dolibarrnew/admin/system/phpinfo.php
+        // To prepare this test:
+        // - Create link from htdocs to /var/www/dolibarrnew
+        // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
+        if ($testtodo == 1) {
+            $_SERVER["HTTPS"]='';
+            $_SERVER["SERVER_NAME"]='localhost';
+            $_SERVER["SERVER_PORT"]='80';
+            $_SERVER["DOCUMENT_ROOT"]='/var/www';
+            $_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
+            $expectedresult='/dolibarrnew';
+        }
 
-		// Case 2:
-		// Test for subdir aaa (that point to dolibarr) in root directory /var/www
-		// URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php
-		// To prepare this test:
-	    // - Create link from dolibarr to /var/www/aaa
-		// - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
-		if ($testtodo == 2)
-		{
-			$_SERVER["HTTPS"]='';
-	        $_SERVER["SERVER_NAME"]='localhost';
-	        $_SERVER["SERVER_PORT"]='80';
-	        $_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
-			$expectedresult='/aaa/htdocs';
-		}
+        // Case 2:
+        // Test for subdir aaa (that point to dolibarr) in root directory /var/www
+        // URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php
+        // To prepare this test:
+        // - Create link from dolibarr to /var/www/aaa
+        // - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
+        if ($testtodo == 2) {
+            $_SERVER["HTTPS"]='';
+            $_SERVER["SERVER_NAME"]='localhost';
+            $_SERVER["SERVER_PORT"]='80';
+            $_SERVER["DOCUMENT_ROOT"]='/var/www';
+            $_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
+            $expectedresult='/aaa/htdocs';
+        }
 
-		// Case 3:
-		// Test for virtual host localhostdolibarrnew that point to htdocs directory with
-		// a direct document root
-		// URL: http://localhostdolibarrnew/admin/system/phpinfo.php
-		// To prepare this test:
-	    // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
-		// - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
-		if ($testtodo == 3)
-		{
-			$_SERVER["HTTPS"]='';
-	        $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-	        $_SERVER["SERVER_PORT"]='80';
-	        $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
-			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-			$expectedresult='';
-		}
+        // Case 3:
+        // Test for virtual host localhostdolibarrnew that point to htdocs directory with
+        // a direct document root
+        // URL: http://localhostdolibarrnew/admin/system/phpinfo.php
+        // To prepare this test:
+        // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
+        // - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
+        if ($testtodo == 3) {
+            $_SERVER["HTTPS"]='';
+            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
+            $_SERVER["SERVER_PORT"]='80';
+            $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
+            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
+            $expectedresult='';
+        }
 
-		// Case 4:
-		// Test for virtual host localhostdolibarrnew that point to htdocs directory with
-		// a symbolic link
-		// URL: http://localhostdolibarrnew/admin/system/phpinfo.php
-		if ($testtodo == 4)
-		{
-			$_SERVER["HTTPS"]='';
-	        $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-	        $_SERVER["SERVER_PORT"]='80';
-	        $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
-			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-			$expectedresult='';
-		}
+        // Case 4:
+        // Test for virtual host localhostdolibarrnew that point to htdocs directory with
+        // a symbolic link
+        // URL: http://localhostdolibarrnew/admin/system/phpinfo.php
+        if ($testtodo == 4) {
+            $_SERVER["HTTPS"]='';
+            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
+            $_SERVER["SERVER_PORT"]='80';
+            $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
+            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
+            $expectedresult='';
+        }
 
-		// Case 5:
-		// Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd
-		// URL: http://localhost/dolibarralias/admin/system/phpinfo.php
-		// To prepare this test:
-	    // - Copy content of dolibarr project into /var/www/dolibarr
-		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
-		// - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
-		if ($testtodo == 5)
-		{
-			$_SERVER["HTTPS"]='';
-	        $_SERVER["SERVER_NAME"]='localhost';
-	        $_SERVER["SERVER_PORT"]='80';
-	        $_SERVER["DOCUMENT_ROOT"]='/var/www';
-			$_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
-			$expectedresult='/dolibarralias';
-		}
+        // Case 5:
+        // Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd
+        // URL: http://localhost/dolibarralias/admin/system/phpinfo.php
+        // To prepare this test:
+        // - Copy content of dolibarr project into /var/www/dolibarr
+        // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
+        // - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
+        if ($testtodo == 5) {
+            $_SERVER["HTTPS"]='';
+            $_SERVER["SERVER_NAME"]='localhost';
+            $_SERVER["SERVER_PORT"]='80';
+            $_SERVER["DOCUMENT_ROOT"]='/var/www';
+            $_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
+            $expectedresult='/dolibarralias';
+        }
 
-		// Force to rerun filefunc.inc.php
-		include dirname(__FILE__).'/../../htdocs/filefunc.inc.php';
+        // Force to rerun filefunc.inc.php
+        include dirname(__FILE__).'/../../htdocs/filefunc.inc.php';
 
-		print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
-		print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
-		$this->assertEquals(DOL_URL_ROOT,$expectedresult);
+        print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
+        print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
+        $this->assertEquals(DOL_URL_ROOT,$expectedresult);
 
-		return true;
+        return true;
     }
 
 
     /**
      * testSqlAndScriptInject
      *
-     * @return	void
+     * @return  void
      */
     public function testSqlAndScriptInject()
     {
-    	global $dolibarr_main_prod;
+        global $dolibarr_main_prod;
 
-		global $dolibarr_main_url_root;
-		global $dolibarr_main_data_root;
-		global $dolibarr_main_document_root;
-		global $dolibarr_main_data_root_alt;
-		global $dolibarr_main_document_root_alt;
-		global $dolibarr_main_db_host;
-		global $dolibarr_main_db_port;
-		global $dolibarr_main_db_type;
-		global $dolibarr_main_db_prefix;
+        global $dolibarr_main_url_root;
+        global $dolibarr_main_data_root;
+        global $dolibarr_main_document_root;
+        global $dolibarr_main_data_root_alt;
+        global $dolibarr_main_document_root_alt;
+        global $dolibarr_main_db_host;
+        global $dolibarr_main_db_port;
+        global $dolibarr_main_db_type;
+        global $dolibarr_main_db_prefix;
 
 
-		// This is code copied from main.inc.php
+        // This is code copied from main.inc.php
 
-		/**
-		 * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
-		 *
-		 * @param		string		$val		Value
-		 * @param		string		$type		1=GET, 0=POST, 2=PHP_SELF
-		 * @return		int						>0 if there is an injection
-		 */
-		function test_sql_and_script_inject($val, $type)
-		{
-		    $sql_inj = 0;
-		    // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
-		    if ($type != 2)
-		    {
-		        $sql_inj += preg_match('/delete[\s]+from/i', $val);
-		        $sql_inj += preg_match('/create[\s]+table/i', $val);
-		        $sql_inj += preg_match('/update.+set.+=/i', $val);
-		        $sql_inj += preg_match('/insert[\s]+into/i', $val);
-		        $sql_inj += preg_match('/select.+from/i', $val);
-		        $sql_inj += preg_match('/union.+select/i', $val);
-		        $sql_inj += preg_match('/(\.\.%2f)+/i', $val);
-		    }
-		    // For XSS Injection done by adding javascript with script
-		    // This is all cases a browser consider text is javascript:
-		    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-		    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
-		    $sql_inj += preg_match('/<script/i', $val);
-		    if (! defined('NOSTYLECHECK')) $sql_inj += preg_match('/<style/i', $val);
-		    $sql_inj += preg_match('/base[\s]+href/i', $val);
-		    if ($type == 1)
-		    {
-		        $sql_inj += preg_match('/javascript:/i', $val);
-		        $sql_inj += preg_match('/vbscript:/i', $val);
-		    }
-		    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-		    if ($type == 1) $sql_inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-		    if ($type == 2) $sql_inj += preg_match('/[\s;"]/', $val);	// PHP_SELF is an url and must match url syntax
-		    return $sql_inj;
-		}
+        /**
+         * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
+         *
+         * @param       string $val     Value
+         * @param       string $type    1=GET, 0=POST, 2=PHP_SELF
+         * @return      int             >0 if there is an injection
+         */
+        function test_sql_and_script_inject($val, $type)
+        {
+            $sql_inj = 0;
+            // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
+            if ($type != 2) {
+                $sql_inj += preg_match('/delete[\s]+from/i', $val);
+                $sql_inj += preg_match('/create[\s]+table/i', $val);
+                $sql_inj += preg_match('/update.+set.+=/i', $val);
+                $sql_inj += preg_match('/insert[\s]+into/i', $val);
+                $sql_inj += preg_match('/select.+from/i', $val);
+                $sql_inj += preg_match('/union.+select/i', $val);
+                $sql_inj += preg_match('/(\.\.%2f)+/i', $val);
+            }
+            // For XSS Injection done by adding javascript with script
+            // This is all cases a browser consider text is javascript:
+            // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
+            // All examples on page: http://ha.ckers.org/xss.html#XSScalc
+            $sql_inj += preg_match('/<script/i', $val);
+            if (! defined('NOSTYLECHECK')) $sql_inj += preg_match('/<style/i', $val);
+            $sql_inj += preg_match('/base[\s]+href/i', $val);
+            if ($type == 1) {
+                $sql_inj += preg_match('/javascript:/i', $val);
+                $sql_inj += preg_match('/vbscript:/i', $val);
+            }
+            // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
+            if ($type == 1) $sql_inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
+            if ($type == 2) $sql_inj += preg_match('/[\s;"]/', $val);	// PHP_SELF is an url and must match url syntax
+            return $sql_inj;
+        }
 
-    	//type=2 key=0 value=/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices
-    	$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
-    	$result=test_sql_and_script_inject($_SERVER["PHP_SELF"],2);
-		$expectedresult=1;
+        //type=2 key=0 value=/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices
+        $_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
+        $result=test_sql_and_script_inject($_SERVER["PHP_SELF"],2);
+        $expectedresult=1;
 
-		$this->assertEquals($result,$expectedresult);
+        $this->assertEquals($result,$expectedresult);
     }
 }
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index f5d9e7d0cc4..9dd362cca9d 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -80,6 +80,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index 22bfc12590e..668af000204 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -85,6 +85,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index d9f92c84bd1..cf4d5033597 100755
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -80,6 +80,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 53788d71dab..d3d7c300308 100755
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -83,6 +83,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 49695ab1946..e4ee73291be 100755
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -84,6 +84,8 @@ class ExportTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index a5855b37a37..199d397f50d 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -80,6 +80,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index 4d4783240fa..f7f857fe317 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -81,6 +81,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index cce025a77eb..c68014e9606 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/FactureTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,74 +46,76 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class FactureTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FactureTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FactureTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
 
         if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-	protected function tearDown()
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
+    protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -124,107 +125,107 @@ class FactureTest extends PHPUnit_Framework_TestCase
      */
     public function testFactureCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Facture($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
      * testFactureFetch
      *
-     * @param	int		$id		Id invoice
-     * @return	int
+     * @param   int $id     Id invoice
+     * @return  int
      *
-     * @depends	testFactureCreate
+     * @depends testFactureCreate
      * The depends says test is run only if previous is ok
      */
     public function testFactureFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Facture($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Facture($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
      * testFactureFetch
      *
-     * @param	Object	$localobject	Invoice
-     * @return	int
+     * @param   Object $localobject Invoice
+     * @return  int
      *
-     * @depends	testFactureFetch
+     * @depends testFactureFetch
      * The depends says test is run only if previous is ok
      */
     public function testFactureUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
         $this->changeProperties($localobject);
-    	$result=$localobject->update($user);
+        $result=$localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testFactureValid
      *
-     * @param	Object	$localobject	Invoice
-     * @return	void
+     * @param   Object $localobject Invoice
+     * @return  void
      *
-     * @depends	testFactureUpdate
+     * @depends testFactureUpdate
      * The depends says test is run only if previous is ok
      */
     public function testFactureValid($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->validate($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->validate($user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	// Test everything are still same than specimen
-    	$newlocalobject=new Facture($this->savdb);
-    	$newlocalobject->initAsSpecimen();
-    	$this->changeProperties($newlocalobject);
+        // Test everything are still same than specimen
+        $newlocalobject=new Facture($this->savdb);
+        $newlocalobject->initAsSpecimen();
+        $this->changeProperties($newlocalobject);
         $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','ref','statut','paye','specimen','facnumber','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement','cond_reglement_doc')), array());    // Actual, Expected
 
-    	return $localobject;
+        return $localobject;
     }
 
    /**
      * testFactureOther
      *
-     * @param	Object	$localobject	Invoice
-     * @return	int
+     * @param   Object $localobject Invoice
+     * @return  int
      *
      * @depends testFactureValid
      * The depends says test is run only if previous is ok
@@ -256,34 +257,34 @@ class FactureTest extends PHPUnit_Framework_TestCase
     /**
      * testFactureDelete
      *
-     * @param	int		$id		Id of invoice
-     * @return	int
+     * @param   int $id     Id of invoice
+     * @return  int
      *
-     * @depends	testFactureOther
+     * @depends testFactureOther
      * The depends says test is run only if previous is ok
      */
     public function testFactureDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Facture($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+        $localobject=new Facture($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($id);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0, $result);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0, $result);
+        return $result;
     }
 
     /**
      * Edit an object to test updates
      *
-     * @param 	mixed	$localobject		Object Facture
-     * @return	void
+     * @param   mixed $localobject        Object Facture
+     * @return  void
      */
     public function changeProperties(&$localobject)
     {
@@ -294,11 +295,11 @@ class FactureTest extends PHPUnit_Framework_TestCase
     /**
      * Compare all public properties values of 2 objects
      *
-     * @param 	Object		$oA						Object operand 1
-     * @param 	Object		$oB						Object operand 2
-     * @param	boolean		$ignoretype				False will not report diff if type of value differs
-     * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
-	 * @return	array								Array with differences
+     * @param   Object $oA                      Object operand 1
+     * @param   Object $oB                      Object operand 2
+     * @param   boolean $ignoretype             False will not report diff if type of value differs
+     * @param   array $fieldstoignorearray      Array of fields to ignore in diff
+     * @return  array                           Array with differences
      */
     public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
     {
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index d4bb8b9dff7..5fe0df4e5d0 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -80,6 +80,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index 96366af85a9..baa72b7020a 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -80,6 +80,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 0e011c96d2c..4477784ae7d 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -81,6 +81,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index 265f8e62759..30c96600210 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -80,6 +80,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 969810cb314..13462afc601 100755
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -83,6 +83,8 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
 
         print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 0ace96c6719..6036909cd23 100755
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -83,6 +83,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
         print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index e91305c21e2..36556fd9281 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -83,6 +83,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index f43bfe1c169..41c7005e25d 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -81,6 +81,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 4d9590e7a1d..067b06910c9 100755
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -82,6 +82,8 @@ class ImportTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index 1a7127c69b1..66999e31c65 100755
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -82,6 +82,8 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
 
         print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 5f876c8740c..d0fba783064 100755
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -92,6 +92,8 @@ class LangTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php
index 7ae615e4934..7c2e8f68ef6 100644
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -80,6 +80,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index b5529489d00..eff4b85c698 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -79,6 +79,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index a3788b309d1..043b8ae5a83 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -79,6 +79,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 20feab6fb0a..fb48279cd66 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -84,6 +84,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 02d20a816a8..13cb1b59ae3 100755
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -83,6 +83,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index 4fdca35eb82..04693c017ed 100755
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -83,6 +83,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 87ffd9c6066..c01a3701177 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -81,6 +81,8 @@ class PricesTest extends PHPUnit_Framework_TestCase
 
         print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 852292a0ad9..199aace802c 100755
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/ProductTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -43,169 +43,170 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class ProductTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ProductTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ProductTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	if (empty($conf->produit->enabled)) { print __METHOD__." Module Product must be enabled.\n"; die(); }
-
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
-
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+
+        if (empty($conf->produit->enabled)) { print __METHOD__." Module Product must be enabled.\n"; die(); }
+
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+    // teardownafterclass
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+    */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
      * testProductCreate
      *
-     * @return	void
+     * @return  void
      */
     public function testProductCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Product($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Product($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
      * testProductFetch
      *
-     * @param	int		$id		Id product
-     * @return	Product
+     * @param   int $id     Id product
+     * @return  Product
      *
-     * @depends	testProductCreate
+     * @depends testProductCreate
      * The depends says test is run only if previous is ok
      */
     public function testProductFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Product($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Product($this->savdb);
+        $result=$localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testProductUpdate
      *
-     * @param	Product	$localobject	Product
-     * @return	void
+     * @param   Product $localobject    Product
+     * @return  void
      *
-     * @depends	testProductFetch
+     * @depends testProductFetch
      * The depends says test is run only if previous is ok
      */
     public function testProductUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject->note='New note after update';
-    	$result=$localobject->update($localobject->id,$user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $localobject->note='New note after update';
+        $result=$localobject->update($localobject->id,$user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testProductOther
      *
-     * @param	Product	$localobject	Product
-     * @return	void
+     * @param   Product $localobject    Product
+     * @return  void
      *
      * @depends	testProductUpdate
      * The depends says test is run only if previous is ok
      */
     public function testProductOther($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
 
         return $localobject->id;
@@ -214,34 +215,34 @@ class ProductTest extends PHPUnit_Framework_TestCase
     /**
      * testProductDelete
      *
-     * @param		int		$id		Id of product
-     * @return		void
+     * @param       int $id     Id of product
+     * @return      void
      *
-     * @depends	testProductOther
+     * @depends testProductOther
      * The depends says test is run only if previous is ok
      */
     public function testProductDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Product($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Product($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($id);
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->delete($id);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
      * testProductStatic
      *
-     * @return	void
+     * @return  void
      */
     public function testProductStatic()
     {
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index 8b97f9fe8ea..e27cd1e0223 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -81,6 +81,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 20b6a5afa38..707673e0d0f 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -80,6 +80,8 @@ class PropalTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 76d59c6705b..b7916c39d9f 100755
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -92,6 +92,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index e7160939532..00714e7bfab 100755
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -92,6 +92,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 
     	print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
     	global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 730d3d457a2..34fdee385f7 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -18,23 +18,22 @@
 
 /**
  *      \file       test/phpunit/SocieteTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/societe/class/societe.class.php';
 $langs->load("dict");
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,35 +47,35 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class SocieteTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return SocieteTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return SocieteTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
 
         if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
 
@@ -84,40 +83,42 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 
         $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -127,130 +128,130 @@ class SocieteTest extends PHPUnit_Framework_TestCase
      */
     public function testSocieteCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Societe($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Societe($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
      * testSocieteFetch
      *
-     * @param	int		$id				Company id
-     * @return	Societe	$localobject	Company
-	 *
+     * @param   int     $id             Company id
+     * @return  Societe $localobject    Company
+     *
      * @depends	testSocieteCreate
      * The depends says test is run only if previous is ok
      */
     public function testSocieteFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Societe($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Societe($this->savdb);
+        $result=$localobject->fetch($id);
         print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
         $result=$localobject->verify();
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertEquals($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testSocieteUpdate
      *
-     * @param	Societe	$localobject	Company
-     * @return	Societe	$localobject	Company
-	 *
-     * @depends	testSocieteFetch
+     * @param   Societe $localobject    Company
+     * @return  Societe $localobject    Company
+    *
+     * @depends testSocieteFetch
      * The depends says test is run only if previous is ok
      */
     public function testSocieteUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject->note_private='New private note after update';
-		$localobject->note_public='New public note after update';
-		$localobject->name='New name';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-		$localobject->country_id=2;
-		$localobject->status=0;
-		$localobject->phone='New tel';
-		$localobject->fax='New fax';
-		$localobject->email='newemail@newemail.com';
-		$localobject->url='New url';
-		$localobject->idprof1='new idprof1';
-		$localobject->idprof2='new idprof2';
-		$localobject->idprof3='new idprof3';
-		$localobject->idprof4='new idprof4';
+        $localobject->note_private='New private note after update';
+        $localobject->note_public='New public note after update';
+        $localobject->name='New name';
+        $localobject->address='New address';
+        $localobject->zip='New zip';
+        $localobject->town='New town';
+        $localobject->country_id=2;
+        $localobject->status=0;
+        $localobject->phone='New tel';
+        $localobject->fax='New fax';
+        $localobject->email='newemail@newemail.com';
+        $localobject->url='New url';
+        $localobject->idprof1='new idprof1';
+        $localobject->idprof2='new idprof2';
+        $localobject->idprof3='new idprof3';
+        $localobject->idprof4='new idprof4';
 
-		$result=$localobject->update($localobject->id,$user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	$result=$localobject->update_note($localobject->note_private,'_private');
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Holiday::update_note_private error');
-
-    	$result=$localobject->update_note_public($localobject->note_public);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Holiday::update_note_public error');
-
-		$newobject=new Societe($this->savdb);
-    	$result=$newobject->fetch($localobject->id);
+        $result=$localobject->update($localobject->id,$user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	$this->assertEquals($localobject->note_private, $newobject->note_private);
-    	//$this->assertEquals($localobject->note_public, $newobject->note_public);
-    	$this->assertEquals($localobject->name, $newobject->name);
-    	$this->assertEquals($localobject->address, $newobject->address);
-    	$this->assertEquals($localobject->zip, $newobject->zip);
-    	$this->assertEquals($localobject->town, $newobject->town);
-    	$this->assertEquals($localobject->country_id, $newobject->country_id);
-    	$this->assertEquals('BE', $newobject->country_code);
-    	$this->assertEquals($localobject->status, $newobject->status);
-    	$this->assertEquals($localobject->phone, $newobject->phone);
-    	$this->assertEquals($localobject->fax, $newobject->fax);
-    	$this->assertEquals($localobject->email, $newobject->email);
-    	$this->assertEquals($localobject->url, $newobject->url);
-    	$this->assertEquals($localobject->idprof1, $newobject->idprof1);
-    	$this->assertEquals($localobject->idprof2, $newobject->idprof2);
-    	$this->assertEquals($localobject->idprof3, $newobject->idprof3);
-    	$this->assertEquals($localobject->idprof4, $newobject->idprof4);
+        $result=$localobject->update_note($localobject->note_private,'_private');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note_private error');
 
-    	return $localobject;
+        $result=$localobject->update_note_public($localobject->note_public);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note_public error');
+
+        $newobject=new Societe($this->savdb);
+        $result=$newobject->fetch($localobject->id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        $this->assertEquals($localobject->note_private, $newobject->note_private);
+        //$this->assertEquals($localobject->note_public, $newobject->note_public);
+        $this->assertEquals($localobject->name, $newobject->name);
+        $this->assertEquals($localobject->address, $newobject->address);
+        $this->assertEquals($localobject->zip, $newobject->zip);
+        $this->assertEquals($localobject->town, $newobject->town);
+        $this->assertEquals($localobject->country_id, $newobject->country_id);
+        $this->assertEquals('BE', $newobject->country_code);
+        $this->assertEquals($localobject->status, $newobject->status);
+        $this->assertEquals($localobject->phone, $newobject->phone);
+        $this->assertEquals($localobject->fax, $newobject->fax);
+        $this->assertEquals($localobject->email, $newobject->email);
+        $this->assertEquals($localobject->url, $newobject->url);
+        $this->assertEquals($localobject->idprof1, $newobject->idprof1);
+        $this->assertEquals($localobject->idprof2, $newobject->idprof2);
+        $this->assertEquals($localobject->idprof3, $newobject->idprof3);
+        $this->assertEquals($localobject->idprof4, $newobject->idprof4);
+
+        return $localobject;
     }
 
     /**
      * testIdProfCheck
      *
-     * @param	Societe	$localobject	Company
-     * @return	Societe	$localobject	Company
+     * @param   Societe $localobject    Company
+     * @return  Societe $localobject    Company
      *
-     * @depends	testSocieteUpdate
+     * @depends testSocieteUpdate
      * The depends says test is run only if previous is ok
      */
     public function testIdProfCheck($localobject)
@@ -302,19 +303,19 @@ class SocieteTest extends PHPUnit_Framework_TestCase
     /**
      * testSocieteOther
      *
-     * @param	Societe	$localobject	Company
-     * @return	int		$id				Id of company
+     * @param   Societe $localobject    Company
+     * @return  int     $id             Id of company
      *
-     * @depends	testIdProfCheck
+     * @depends testIdProfCheck
      * The depends says test is run only if previous is ok
      */
     public function testSocieteOther($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
         $result=$localobject->set_as_client();
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -347,34 +348,34 @@ class SocieteTest extends PHPUnit_Framework_TestCase
     /**
      * testSocieteDelete
      *
-     * @param	int		$id		Id of company
-     * @return	int
+     * @param   int     $id     Id of company
+     * @return  int
      *
-     * @depends	testSocieteOther
+     * @depends testSocieteOther
      * The depends says test is run only if previous is ok
      */
     public function testSocieteDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Societe($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Societe($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($id);
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->delete($id);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
-	 * testSocieteStatic
-	 *
-	 * @return	void
+     * testSocieteStatic
+     *
+     * @return  void
      */
     public function testSocieteStatic()
     {
@@ -394,7 +395,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
     /**
      * testSocieteGetFullAddress
      *
-     * @return	int		$id				Id of company
+     * @return  int     $id             Id of company
      */
     public function testSocieteGetFullAddress()
     {
diff --git a/test/phpunit/SqlTest.php b/test/phpunit/SqlTest.php
index 251709f8471..2587ff5e178 100755
--- a/test/phpunit/SqlTest.php
+++ b/test/phpunit/SqlTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/SqlTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -59,71 +59,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class SqlTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return SecurityTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return SecurityTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -133,38 +135,37 @@ class SqlTest extends PHPUnit_Framework_TestCase
      */
     public function testSql()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
+        $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-		foreach ($listofsqldir as $dir)
-		{
-			print 'Process dir '.$dir."\n";
-			$filesarray = scandir($dir);
-			foreach($filesarray as $key => $file)
-			{
-				if (! preg_match('/\.sql$/',$file)) continue;
+        foreach ($listofsqldir as $dir) {
+            print 'Process dir '.$dir."\n";
+            $filesarray = scandir($dir);
+            foreach($filesarray as $key => $file) {
+                if (! preg_match('/\.sql$/',$file))
+                    continue;
 
-				print 'Check sql file '.$file."\n";
-				$filecontent=file_get_contents($dir.'/'.$file);
+                print 'Check sql file '.$file."\n";
+                $filecontent=file_get_contents($dir.'/'.$file);
 
-				$result=strpos($filecontent,'`');
-				print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
-				$this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
+                $result=strpos($filecontent,'`');
+                print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
+                $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
-				$result=strpos($filecontent,'int(');
-				print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found int(x) instead of integer into '.$file.'. Bad.');
+                $result=strpos($filecontent,'int(');
+                print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
+                $this->assertTrue($result===false, 'Found int(x) instead of integer into '.$file.'. Bad.');
 
-				$result=strpos($filecontent,'ON DELETE CASCADE');
-				print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
-				$this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
-			}
-		}
+                $result=strpos($filecontent,'ON DELETE CASCADE');
+                print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
+                $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
+            }
+        }
 
         return;
     }
@@ -176,28 +177,28 @@ class SqlTest extends PHPUnit_Framework_TestCase
      */
     public function testInitData()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata');
-		foreach($filesarray as $key => $file)
-		{
-			if (! preg_match('/\.sql$/',$file)) continue;
+        $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdata');
+        foreach($filesarray as $key => $file) {
+            if (! preg_match('/\.sql$/',$file))
+                continue;
 
-			print 'Check sql file '.$file."\n";
-			$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file);
+            print 'Check sql file '.$file."\n";
+            $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdata/'.$file);
 
-			$result=strpos($filecontent,'@gmail.com');
-			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-			$this->assertTrue($result===false, 'Found a bad key into file '.$file);
+            $result=strpos($filecontent,'@gmail.com');
+            print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
+            $this->assertTrue($result===false, 'Found a bad key into file '.$file);
 
-			$result=strpos($filecontent,'eldy@');
-			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-			$this->assertTrue($result===false, 'Found a bad key into file '.$file);
-		}
+            $result=strpos($filecontent,'eldy@');
+            print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
+            $this->assertTrue($result===false, 'Found a bad key into file '.$file);
+        }
 
         return;
     }
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index 0e43b361e20..d41eefcbd39 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -18,22 +18,21 @@
 
 /**
  *      \file       test/phpunit/UserGroupTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/user/class/usergroup.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,71 +46,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class UserGroupTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return UserGroupTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return UserGroupTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+    */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -121,120 +122,120 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
      */
     public function testUserGroupCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new UserGroup($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new UserGroup($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
      * testUserGroupFetch
      * 
-     * @param	int		$id				Id of group
-     * @return	void
-     * @depends	testUserGroupCreate
+     * @param   int $id             Id of group
+     * @return  void
+     * @depends testUserGroupCreate
      * The depends says test is run only if previous is ok
      */
     public function testUserGroupFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new UserGroup($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new UserGroup($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
      * testUserGroupUpdate
      * 
-     * @param	Object	$localobject	Group
-     * @return	void
-     * @depends	testUserGroupFetch
+     * @param   Object $localobject Group
+     * @return  void
+     * @depends testUserGroupFetch
      * The depends says test is run only if previous is ok
      */
     public function testUserGroupUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject->note='New note after update';
-    	$result=$localobject->update($user);
+        $localobject->note='New note after update';
+        $result=$localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testUserGroupAddRight
      * 
-     * @param	Object	$localobject	Object to show
-     * @return	void
-     * @depends	testUserGroupUpdate
+     * @param   Object $localobject Object to show
+     * @return  void
+     * @depends testUserGroupUpdate
      * The depends says test is run only if previous is ok
      */
     public function testUserGroupAddRight($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->addrights(1,'bookmarks');
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->addrights(1,'bookmarks');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testUserGroupDelRight
      * 
-     * @param	Object	$localobject	Object
-     * @return	void
-     * @depends	testUserGroupAddRight
+     * @param   Object $localobject Object
+     * @return  void
+     * @depends testUserGroupAddRight
      * The depends says test is run only if previous is ok
      */
     public function testUserGroupDelRight($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->delrights(1,'bookmarks');
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->delrights(1,'bookmarks');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        return $localobject;
     }
 
     /**
      * testUserGroupOther
      * 
-     * @param	Object	$localobject	Object
-     * @return 	void
+     * @param   Object $localobject Object
+     * @return  void
      * @depends testUserGroupDelRight
      * The depends says test is run only if previous is ok
      */
@@ -261,26 +262,26 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
     /**
      * testUserGroupDelete
      * 
-     * @param	int		$id				Id of object
-     * @return	void
-     * @depends	testUserGroupOther
+     * @param   int $id             Id of object
+     * @return  void
+     * @depends testUserGroupOther
      * The depends says test is run only if previous is ok
      */
     public function testUserGroupDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new UserGroup($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+        $localobject=new UserGroup($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($id);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 }
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index e0eaa03acec..1e171737a6b 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/UserTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/user/class/user.class.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,146 +46,148 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class UserTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return UserTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return UserTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
      * testUserCreate
      *
-     * @return	void
+     * @return  void
      */
     public function testUserCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new User($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new User($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." result=".$result."\n";
+        return $result;
     }
 
     /**
      * testUserFetch
      *
-     * @param	int		$id				Id of user
-     * @return 	void
-     * @depends	testUserCreate
+     * @param   int $id             Id of user
+     * @return  void
+     * @depends testUserCreate
      * The depends says test is run only if previous is ok
      */
     public function testUserFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new User($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new User($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject;
     }
 
     /**
      * testUserUpdate
      *
-     * @param	Object	$localobject	 User
-     * @return	void
-     * @depends	testUserFetch
+     * @param   Object  $localobject     User
+     * @return  void
+     * @depends testUserFetch
      * The depends says test is run only if previous is ok
      */
     public function testUserUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$this->changeProperties($localobject);
-		$result=$localobject->update($user);
+        $this->changeProperties($localobject);
+        $result=$localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	// Test everything are still same than specimen
-    	$newlocalobject=new User($this->savdb);
-    	$newlocalobject->initAsSpecimen();
-    	$this->changeProperties($newlocalobject);
-    	$this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        // Test everything are still same than specimen
+        $newlocalobject=new User($this->savdb);
+        $newlocalobject->initAsSpecimen();
+        $this->changeProperties($newlocalobject);
+        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
 
         return $localobject;
     }
@@ -194,32 +195,32 @@ class UserTest extends PHPUnit_Framework_TestCase
     /**
      * testUserDisable
      *
-     * @param	Object	$localobject	 User
-     * @return	void
-     * @depends	testUserUpdate
+     * @param   Object  $localobject     User
+     * @return  void
+     * @depends testUserUpdate
      * The depends says test is run only if previous is ok
      */
     public function testUserDisable($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$result=$localobject->setstatus(0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $result=$localobject->setstatus(0);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
      * testUserOther
      *
-     * @param	Object	$localobject	 User
-     * @return	void
+     * @param   Object  $localobject     User
+     * @return  void
      * @depends testUserDisable
      * The depends says test is run only if previous is ok
      */
@@ -246,75 +247,70 @@ class UserTest extends PHPUnit_Framework_TestCase
     /**
      * testUserDelete
      *
-     * @param	Object	$id		 User
-     * @return	void
-     * @depends	testUserOther
+     * @param   Object  $id      User
+     * @return  void
+     * @depends testUserOther
      * The depends says test is run only if previous is ok
      */
     public function testUserDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new User($this->savdb);
-    	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+        $localobject=new User($this->savdb);
+        $result=$localobject->fetch($id);
+        $result=$localobject->delete($id);
 
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+        return $result;
     }
 
 
     /**
      * Edit an object to test updates
      *
-     * @param 	mixed	$localobject		Object Facture
-     * @return	void
+     * @param   mixed   $localobject        Object Facture
+     * @return  void
      */
     public function changeProperties(&$localobject)
     {
-    	$localobject->note='New note after update';
+        $localobject->note='New note after update';
     }
 
     /**
      * Compare all public properties values of 2 objects
      *
-     * @param 	Object		$oA						Object operand 1
-     * @param 	Object		$oB						Object operand 2
-     * @param	boolean		$ignoretype				False will not report diff if type of value differs
-     * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
-     * @return	array								Array with differences
+     * @param   Object      $oA                     Object operand 1
+     * @param   Object      $oB                     Object operand 2
+     * @param   boolean     $ignoretype             False will not report diff if type of value differs
+     * @param   array       $fieldstoignorearray    Array of fields to ignore in diff
+     * @return  array                               Array with differences
      */
     public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
     {
-    	$retAr=array();
+        $retAr=array();
 
-    	if (get_class($oA) !== get_class($oB))
-    	{
-    		$retAr[]="Supplied objects are not of same class.";
-    	}
-    	else
-    	{
-    		$oVarsA=get_object_vars($oA);
-    		$oVarsB=get_object_vars($oB);
-    		$aKeys=array_keys($oVarsA);
-    		foreach($aKeys as $sKey)
-    		{
-    			if (in_array($sKey,$fieldstoignorearray)) continue;
-    			if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
-    			{
-    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-    			}
-    			if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey])
-    			{
-    				$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-    			}
-    		}
-    	}
-    	return $retAr;
+        if (get_class($oA) !== get_class($oB)) {
+            $retAr[]="Supplied objects are not of same class.";
+        } else {
+            $oVarsA=get_object_vars($oA);
+            $oVarsB=get_object_vars($oB);
+            $aKeys=array_keys($oVarsA);
+            foreach($aKeys as $sKey) {
+                if (in_array($sKey,$fieldstoignorearray)) 
+                    continue;
+                if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
+                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                }
+                if ($ignoretype && $oVarsA[$sKey] != $oVarsB[$sKey]) {
+                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+                }
+            }
+        }
+        return $retAr;
     }
 }
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 20e01595375..202f260bc84 100755
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/WebservicesInvoicesTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -45,75 +44,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -124,60 +125,57 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
      */
     public function testWSInvoicesXxx()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
-    	$WS_METHOD  = 'getInvoice';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
+        $WS_METHOD  = 'getInvoice';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'id'=>1);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'id'=>1);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return $result;
+        return $result;
     }
 
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index d76fc784722..06ead4f4873 100755
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -18,24 +18,23 @@
 
 /**
  *      \file       test/phpunit/WebservicesOrdersTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -124,59 +125,56 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
      */
     public function testWSOrderGetOrder()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
-    	$WS_METHOD  = 'getOrder';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
+        $WS_METHOD  = 'getOrder';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$parameters = array('authentication'=>$authentication,'id'=>1);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $parameters = array('authentication'=>$authentication,'id'=>1);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return $result;
+        return $result;
     }
 
 }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 1ea80beb4bf..d04fc6b9b9c 100755
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/WebservicesOtherTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class WebservicesOtherTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+    */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -124,92 +125,85 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
      */
     public function testWSOtherGetVersions()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
-    	$WS_METHOD  = 'getVersions';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
+        $WS_METHOD  = 'getVersions';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! empty($result['faultstring']))
-    	{
-    		print $result['faultstring']."\n";
-    		$result=0;
-    	}
-    	if (! $result)
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! empty($result['faultstring'])) {
+            print $result['faultstring']."\n";
+            $result=0;
+        }
+        if (! $result) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	// Test method that does not exists
-    	$WS_METHOD='methodthatdoesnotexists';
-    	$result='';
-    	$parameters = array('authentication'=>$authentication);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test method that does not exists
+        $WS_METHOD='methodthatdoesnotexists';
+        $result='';
+        $parameters = array('authentication'=>$authentication);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
 
-    	return $result;
+        return $result;
     }
 
 }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index a4ff7293091..77fd81c78f6 100755
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -20,9 +20,9 @@
 
 /**
  *      \file       test/phpunit/WebservicesProductsTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -33,11 +33,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -51,71 +50,72 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class WebservicesProductsTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -126,198 +126,192 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
      */
     public function testWSProductsCreateProductOrService()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$datestring=dol_print_date(dol_now(),'dayhourlog');
+        $datestring=dol_print_date(dol_now(),'dayhourlog');
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-    	$WS_METHOD  = 'createProductOrService';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+        $WS_METHOD  = 'createProductOrService';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'product'=>array(
-    		'ref'=>'NewProductFromWS'.$datestring,
-    		'label'=>'New Product From WS '.$datestring,
-    		'type'=>1,
-    		'description'=>'This is a new product created from WS PHPUnit test case'));
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK')
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array(
+            'authentication'=>$authentication,'product'=>array(
+                'ref'=>'NewProductFromWS'.$datestring,
+                'label'=>'New Product From WS '.$datestring,
+                'type'=>1,
+                'description'=>'This is a new product created from WS PHPUnit test case'
+            )
+        );
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return $result['id'];
+        return $result['id'];
     }
 
     /**
      * testWSProductsGetProductOrService
      *
-     * @param	int		$id		Id of product or service
-     * @return 	int				Id of product or service
+     * @param   int $id     Id of product or service
+     * @return  int         Id of product or service
      *
      * @depends	testWSProductsCreateProductOrService
      */
     public function testWSProductsGetProductOrService($id)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-    	$WS_METHOD  = 'getProductOrService';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+        $WS_METHOD  = 'getProductOrService';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return $id;
+        return $id;
     }
 
     /**
      * testWSProductsDeleteProductOrService
      *
-     * @param	int		$id		Id of product or service
-     * @return 	int				0
+     * @param   int $id     Id of product or service
+     * @return  int         0
      *
-     * @depends	testWSProductsGetProductOrService
+     * @depends testWSProductsGetProductOrService
      */
     public function testWSProductsDeleteProductOrService($id)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-    	$WS_METHOD  = 'deleteProductOrService';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+        $WS_METHOD  = 'deleteProductOrService';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'listofid'=>$id);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK')
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'listofid'=>$id);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return 0;
+        return 0;
     }
 
 }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 64753dcc502..0c99d7d362a 100755
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/WebservicesThirdpartyTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -45,75 +44,77 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return  void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -124,60 +125,56 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
      */
     public function testWSThirdpartygetThirdParty()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
-    	$WS_METHOD  = 'getThirdParty';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
+        $WS_METHOD  = 'getThirdParty';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+        'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+        'sourceapplication'=>'DEMO',
+        'login'=>'admin',
+        'password'=>'admin',
+        'entity'=>'');
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>1);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>1);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	return $result;
+        return $result;
     }
 
 }
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index e06b98d0921..9be97167104 100755
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -18,9 +18,9 @@
 
 /**
  *      \file       test/phpunit/WebservicesUserTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
@@ -31,11 +31,10 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
 
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,71 +48,73 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class WebservicesUserTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+    */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -124,91 +125,84 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
      */
     public function testWSUserGetUser()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
-    	$WS_METHOD  = 'getUser';
-    	$ns='http://www.dolibarr.org/ns/';
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
+        $WS_METHOD  = 'getUser';
+        $ns='http://www.dolibarr.org/ns/';
 
-    	// Set the WebService URL
-    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
-    	$soapclient = new nusoap_client($WS_DOL_URL);
-    	if ($soapclient)
-    	{
-    		$soapclient->soap_defencoding='UTF-8';
-    		$soapclient->decodeUTF8(false);
-    	}
+        // Set the WebService URL
+        print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $soapclient = new nusoap_client($WS_DOL_URL);
+        if ($soapclient) {
+            $soapclient->soap_defencoding='UTF-8';
+            $soapclient->decodeUTF8(false);
+        }
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+            'sourceapplication'=>'DEMO',
+            'login'=>'admin',
+            'password'=>'admin',
+            'entity'=>''
+        );
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'ref'=>'admin');
-    	print __METHOD__."Call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! empty($result['faultstring']))
-    	{
-    		print $result['faultstring']."\n";
-    		$result=0;
-    	}
-    	if (! $result)
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'ref'=>'admin');
+        print __METHOD__."Call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! empty($result['faultstring'])) {
+            print $result['faultstring']."\n";
+            $result=0;
+        }
+        if (! $result) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'ref'=>'refthatdoesnotexists');
-    	print __METHOD__."Call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $soapclient->error_str;
-    		print "\n<br>\n";
-    		print $soapclient->request;
-    		print "\n<br>\n";
-    		print $soapclient->response;
-    		print "\n";
-    	}
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'ref'=>'refthatdoesnotexists');
+        print __METHOD__."Call method ".$WS_METHOD."\n";
+        try {
+            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $soapclient->error_str;
+            print "\n<br>\n";
+            print $soapclient->request;
+            print "\n<br>\n";
+            print $soapclient->response;
+            print "\n";
+        }
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('NOT_FOUND',$result['result']['result_code']);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('NOT_FOUND',$result['result']['result_code']);
 
-    	return $result;
+        return $result;
     }
 
 }
diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php
index 6ec63912878..3bbf3469b17 100644
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2010-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
@@ -18,22 +18,21 @@
 
 /**
  *      \file       test/phpunit/XCalLibTest.php
- *		\ingroup    test
+ *      \ingroup    test
  *      \brief      PHPUnit test
- *		\remarks	To run this script as CLI:  phpunit filename.php
+ *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
 global $conf,$user,$langs,$db;
-//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/xcal.lib.php';
 
-if (empty($user->id))
-{
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+if (empty($user->id)) {
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -43,98 +42,100 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class XCalLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
 
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FilesLibTest
-	 */
-	function __construct()
-	{
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FilesLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-    	print __METHOD__."\n";
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
     }
+
+    // Static methods
+    public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+        print __METHOD__."\n";
+    }
+
+    // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return  void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
-
-
-	/**
-     * testQuotedPrintEncodeDecode
+    /**
+     * End phpunit tests
      *
      * @return	void
+    */
+    protected function tearDown()
+    {
+        print __METHOD__."\n";
+    }
+
+
+    /**
+     * testQuotedPrintEncodeDecode
+     *
+     * @return  void
      */
     public function testQuotedPrintEncodeDecode()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$stringtoencode='ABCD=1234;';
-		$result=quotedPrintEncode($stringtoencode);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('ABCD=3D1234;',$result);
+        $stringtoencode='ABCD=1234;';
+        $result=quotedPrintEncode($stringtoencode);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('ABCD=3D1234;',$result);
 
-		$resultback=quotedPrintDecode($result);
-    	print __METHOD__." result=".$resultback."\n";
-		$this->assertEquals($stringtoencode,$resultback);
+        $resultback=quotedPrintDecode($result);
+        print __METHOD__." result=".$resultback."\n";
+        $this->assertEquals($stringtoencode,$resultback);
     }
 
 }

From 60661ae948aa7188eb5c3d94cf7050fffb3ad3e2 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 8 Jan 2015 10:01:02 +0100
Subject: [PATCH 298/345] Add some "classfortooltip"

---
 htdocs/adherents/class/adherent.class.php     |  6 +--
 .../adherents/class/adherent_type.class.php   |  2 +-
 htdocs/adherents/class/cotisation.class.php   |  2 +-
 htdocs/categories/class/categorie.class.php   |  2 +-
 htdocs/comm/action/class/actioncomm.class.php | 18 +++----
 htdocs/comm/index.php                         | 16 +++++-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/compta/bank/class/account.class.php    |  4 +-
 htdocs/compta/bank/search.php                 | 53 ++++++++++---------
 .../deplacement/class/deplacement.class.php   |  2 +-
 htdocs/compta/dons/class/don.class.php        |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 .../compta/localtax/class/localtax.class.php  |  2 +-
 .../cheque/class/remisecheque.class.php       |  2 +-
 .../compta/paiement/class/paiement.class.php  |  2 +-
 .../class/bonprelevement.class.php            |  2 +-
 .../salaries/class/paymentsalary.class.php    |  2 +-
 .../sociales/class/chargesociales.class.php   |  2 +-
 .../class/paymentsocialcontribution.class.php |  2 +-
 htdocs/compta/tva/class/tva.class.php         |  2 +-
 htdocs/contact/class/contact.class.php        |  2 +-
 htdocs/contrat/class/contrat.class.php        |  4 +-
 htdocs/core/class/discount.class.php          |  2 +-
 htdocs/ecm/class/ecmdirectory.class.php       |  2 +-
 htdocs/expedition/class/expedition.class.php  |  2 +-
 htdocs/fichinter/class/fichinter.class.php    |  2 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  2 +-
 htdocs/fourn/class/paiementfourn.class.php    |  2 +-
 htdocs/holiday/class/holiday.class.php        | 20 +++----
 htdocs/langs/en_US/banks.lang                 |  1 +
 htdocs/livraison/class/livraison.class.php    |  2 +-
 htdocs/product/class/product.class.php        |  4 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/projet/class/project.class.php         |  2 +-
 htdocs/projet/class/task.class.php            |  2 +-
 htdocs/resource/class/resource.class.php      |  2 +-
 htdocs/societe/class/address.class.php        |  2 +-
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/user/class/user.class.php              |  2 +-
 42 files changed, 104 insertions(+), 88 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 8c8c2d604ca..b7c65c3bbeb 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1572,14 +1572,14 @@ class Adherent extends CommonObject
         }
         if ($option == 'category')
         {
-        	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
-        	$lienfin='</a>';
+            $lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
+            $lienfin='</a>';
         }
 
         $picto='user';
         $label=$langs->trans("ShowMember");
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
         return $result;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 2d5f3d835be..17f61bb27ba 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -277,7 +277,7 @@ class AdherentType extends CommonObject
         $picto='group';
         $label=$langs->trans("ShowTypeCard",$this->libelle);
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin;
         return $result;
diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php
index 5193a729970..660be1f397a 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -271,7 +271,7 @@ class Cotisation extends CommonObject
 		$picto='payment';
 		$label=$langs->trans("ShowSubscription");
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index de8d494f9fc..31b08437aef 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1282,7 +1282,7 @@ class Categorie extends CommonObject
 		$picto='category';
 
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin;
 		return $result;
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 15394c81a3a..6a7d5f111da 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -883,23 +883,23 @@ class ActionComm extends CommonObject
         if ($withpicto == 2)
         {
             $libelle=$label;
-        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
+            if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
             $libelleshort='';
         }
         else
        {
-       		$libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:''));
-       		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
-       		$libelleshort=dol_trunc($libelle,$maxlength);
+            $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:''));
+            if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+            $libelleshort=dol_trunc($libelle,$maxlength);
         }
 
         if ($withpicto)
         {
-        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
-        	{
-        		 $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
-        	}
-            $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin;
+            if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
+            {
+                $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
+            }
+            $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$lienfin;
         }
         if ($withpicto==1) $result.=' ';
         $result.=$lien.$libelleshort.$lienfin;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4b4db757dc2..636c8c5c737 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->commande->enabled))  require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 if (! $user->rights->societe->lire) accessforbidden();
 
@@ -62,6 +63,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $companystatic=new Societe($db);
 if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db);
+if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
 
 llxHeader();
 
@@ -234,7 +236,11 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			{
 				$var=!$var;
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap"><a href="../commande/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>';
+				print '<tr '.$bc[$var].'><td class="nowrap">';
+                $orderstatic->id=$obj->rowid;
+                $orderstatic->ref=$obj->ref;
+                print $orderstatic->getNomUrl(1);
+                print '</td>';
 				print '<td class="nowrap">';
 				$companystatic->id=$obj->socid;
 				$companystatic->name=$obj->name;
@@ -514,7 +520,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 
 				print "</td>";
 
-				print '<td align="left"><a href="card.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).'</a></td>'."\n";
+                print '<td class="nowrap">';
+                $companystatic->id=$obj->rowid;
+                $companystatic->name=$obj->name;
+                $companystatic->client=$obj->client;
+                $companystatic->canvas=$obj->canvas;
+                print $companystatic->getNomUrl(1, 'company', 44);
+                print '</td>';
 				print '<td align="right">';
 				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 589afedd00c..724a3ebe45c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2629,7 +2629,7 @@ class Propal extends CommonObject
         $picto='propal';
         $label=$langs->trans("ShowPropal").': '.$this->ref;
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.$this->ref.$lienfin;
         return $result;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 06f381a41a9..95e330cd4e6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2763,7 +2763,7 @@ class Commande extends CommonOrder
         $picto='order';
         $label=$langs->trans("ShowOrder").': '.$this->ref;
 
-        if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend);
+        if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$linkstart.$this->ref.$linkend;
         return $result;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4343e2cb921..45b049e599b 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -890,7 +890,7 @@ class Account extends CommonObject
             $lienfin='</a>';
         }
 
-        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount"),'account').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount").': '.$this->label, 'account', 'class="classfortooltip"').$lienfin.' ');
         $result.=$lien.$this->label.$lienfin;
         return $result;
     }
@@ -1430,7 +1430,7 @@ class AccountLine extends CommonObject
         $lien = '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$this->rowid.'">';
         $lienfin='</a>';
 
-        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"),'account').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"), 'account', 'class="classfortooltip"').$lienfin.' ');
         $result.=$lien.$this->rowid.$lienfin;
 
         if ($option == 'showall' || $option == 'showconciliated') $result.=' (';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index eba7ea9d67b..534a9bb0e95 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -228,35 +228,38 @@ if ($resql)
 	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></tr>\n";
 
-	// Loop on each record
-	$total_debit=0;
-	$total_credit=0;
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-		$printline=false;
-		//Search Description
-		if ($description) {
-			preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthee on tente recherche de traduction
-			if ($reg[1]) {
-				if ($langs->transnoentities($reg[1])==$description) {
-					$printline=true;
-				}
-			}elseif ($objp->label==$description) {$printline=true;}
-		}else {$printline=true;}
+    // Loop on each record
+    $total_debit=0;
+    $total_credit=0;
+    while ($i < min($num,$limit)) {
+        $objp = $db->fetch_object($resql);
+        $printline=false;
+        //Search Description
+        if ($description) {
+            preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthese on tente recherche de traduction
+            if ($reg[1]) {
+                if ($langs->transnoentities($reg[1])==$description) {
+                    $printline=true;
+                }
+            } elseif ($objp->label==$description) {
+                $printline=true;
+            }
+        } else {
+            $printline=true;
+        }
 
-		if ($printline) {
-			$var=!$var;
+        if ($printline) {
+            $var=!$var;
 
-			print "<tr ".$bc[$var].">";
+            print "<tr ".$bc[$var].">";
 
-			// Ref
-			print '<td align="left" class="nowrap">';
-			print "<a href=\"ligne.php?rowid=".$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid."</a> &nbsp; ";
-			print '</td>';
+            // Ref
+            print '<td align="left" class="nowrap">';
+            print "<a href=\"ligne.php?rowid=".$objp->rowid.'">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'payment', 'class="classfortooltip"').' '.$objp->rowid."</a> &nbsp; ";
+            print '</td>';
 
-			// Date ope
-	        print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n";
+            // Date ope
+            print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n";
 
 	        // Date value
 	        print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n";
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 4eab354577a..bb0e7d3506b 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -365,7 +365,7 @@ class Deplacement extends CommonObject
 
 		$label=$langs->trans("Show").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 61e1b9cd926..4d7c8931e31 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -719,7 +719,7 @@ class Don extends CommonObject
 
         $label=$langs->trans("ShowDonation").': '.$this->id;
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$lien.$this->id.$lienfin;
         return $result;
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f6c0ab1a481..71634aaa3ad 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -566,7 +566,7 @@ class FactureRec extends Facture
 
 		$label=$langs->trans("ShowInvoice").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index f81fb37849f..f4699debd52 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -832,7 +832,7 @@ class Facture extends CommonInvoice
 		$linkstart='<a href="'.$url.'">';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label),$picto).$linkend);
+        if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label), $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
 		return $result;
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index e2c9c94595a..85da8e05476 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -592,7 +592,7 @@ class Localtax extends CommonObject
 		$picto='payment';
 		$label=$langs->trans("ShowVatPayment").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 922ab54ac7c..9db0591ee33 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -773,7 +773,7 @@ class RemiseCheque extends CommonObject
 		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin);
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"), 'payment', 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 95503db6ff9..04a1f9c4f60 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -750,7 +750,7 @@ class Paiement extends CommonObject
 		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 497d690072b..d88bc8da8ac 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1134,7 +1134,7 @@ class BonPrelevement extends CommonObject
             $lienfin='</a>';
         }
 
-        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"),'payment').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"), 'payment', 'class="classfortooltip"').$lienfin.' ');
         $result.=$lien.$this->ref.$lienfin;
         return $result;
     }
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index 5e60b76ee13..635ed77541f 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -493,7 +493,7 @@ class PaymentSalary extends CommonObject
 		$picto='payment';
 		$label=$langs->trans("ShowSalaryPayment").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 1d684c65552..4e7211c75b1 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -424,7 +424,7 @@ class ChargeSociales extends CommonObject
         $lien = '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$this->id.'">';
         $lienfin='</a>';
 
-        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib, 'bill', 'class="classfortooltip"').$lienfin.' ');
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
         return $result;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 395932de69f..a94afc98f6e 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -591,7 +591,7 @@ class PaymentSocialContribution extends CommonObject
 			$lien = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'">';
 			$lienfin='</a>';
 
-			if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' ');
+            if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment', 'class="classfortooltip"').$lienfin.' ');
 			if ($withpicto && $withpicto != 2) $result.=' ';
 			if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
 		}
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index a300579fc1f..96db35f915b 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -645,7 +645,7 @@ class Tva extends CommonObject
 		$picto='payment';
 		$label=$langs->trans("ShowVatPayment").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index cbb7ee94823..cbc813968d1 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -897,7 +897,7 @@ class Contact extends CommonObject
 			$lienfin='</a>';
 		}
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs),'contact').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs), 'contact', 'class="classfortooltip"').$lienfin.' ');
 		$result.=$lien.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$lienfin;
 		return $result;
 	}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index fac549515fc..4cb2f9ec7d1 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1555,7 +1555,7 @@ class Contrat extends CommonObject
 
 		$label=$langs->trans("ShowContract").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+		if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$lienfin;
 		return $result;
@@ -2071,7 +2071,7 @@ class ContratLigne extends CommonObject
 
 		$label=$langs->trans("ShowContractOfService").': '.$this->label;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->label.$lienfin;
 		return $result;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index f0291c9d567..98b1309149e 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -451,7 +451,7 @@ class DiscountAbsolute
         }
 
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.$ref.$lienfin;
         return $result;
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 6c0de13d15b..a4379250914 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -428,7 +428,7 @@ class EcmDirectory // extends CommonObject
 		$newref=$this->ref;
 		$newlabel=$langs->trans("ShowECMSection").': '.$newref;
 
-		if ($withpicto) $result.=($lien.img_object($newlabel,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($newlabel, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.($max?dol_trunc($newref,$max,'middle'):$newref).$lienfin;
 		return $result;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index f9484c1175e..46f2cbc70fe 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1219,7 +1219,7 @@ class Expedition extends CommonObject
 		$picto='sending';
 		$label=$langs->trans("ShowSending").': '.$this->ref;
 
-		if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend);
+		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index fbd5261a55f..b7887c25278 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -555,7 +555,7 @@ class Fichinter extends CommonObject
 
 		$label=$langs->trans("Show").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4fe4675f5d8..3ac895f2764 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -538,7 +538,7 @@ class CommandeFournisseur extends CommonOrder
         $picto='order';
         $label=$langs->trans("ShowOrder").': '.$this->ref;
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.$this->ref.$lienfin;
         return $result;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d9a4469481f..b931b566a61 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1489,7 +1489,7 @@ class FactureFournisseur extends CommonInvoice
         $ref=$this->ref;
         if (empty($ref)) $ref=$this->id;
 
-        if ($withpicto) $result.=($lien.img_object($label,'bill').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' ');
         $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin;
         return $result;
     }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 59dc5dab3d1..5c578938ae9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -499,7 +499,7 @@ class PaiementFourn extends Paiement
 			$text=$langs->trans($reg[1]);
 		}
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$lien.$text.$lienfin;
 		return $result;
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2ecf8edfce3..1a3e9f7ecd3 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -655,21 +655,21 @@ class Holiday extends CommonObject
      */
     function getNomUrl($withpicto=0)
     {
-    	global $langs;
+        global $langs;
 
-    	$result='';
+        $result='';
 
-    	$lien = '<a href="'.DOL_URL_ROOT.'/holiday/card.php?id='.$this->id.'">';
-    	$lienfin='</a>';
+        $lien = '<a href="'.DOL_URL_ROOT.'/holiday/card.php?id='.$this->id.'">';
+        $lienfin='</a>';
 
-    	$picto='holiday';
+        $picto='holiday';
 
-    	$label=$langs->trans("Show").': '.$this->ref;
+        $label=$langs->trans("Show").': '.$this->ref;
 
-    	if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
-    	if ($withpicto && $withpicto != 2) $result.=' ';
-    	if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
-    	return $result;
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
+        return $result;
     }
 
 
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 05156a723ad..10a5f5b3c14 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -8,6 +8,7 @@ FinancialAccount=Account
 FinancialAccounts=Accounts
 BankAccount=Bank account
 BankAccounts=Bank accounts
+ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label
 CashAccount=Cash account
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e95fac9f639..dfad1c7e7b8 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -668,7 +668,7 @@ class Livraison extends CommonObject
 		$picto='sending';
 		$label=$langs->trans("ShowReceiving").': '.$this->ref;
 
-		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+		if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		$result.=$lien.$this->ref.$lienfin;
 		return $result;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d739f72afc4..294c8d1610e 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2841,8 +2841,8 @@ class Product extends CommonObject
 		if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
 
 		if ($withpicto) {
-			if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label,'product').$lienfin.' ');
-			if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label,'service').$lienfin.' ');
+			if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$lienfin.' ');
+			if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$lienfin.' ');
 		}
 		$result.=$lien.$newref.$lienfin;
 		return $result;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 3bf672f29a3..c0627015be3 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -516,7 +516,7 @@ class Entrepot extends CommonObject
 		$lien='<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' ');
+		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"), 'stock', 'class="classfortooltip"').$lienfin.' ');
 		$result.=$lien.$this->libelle.$lienfin;
 		return $result;
 	}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c9d4ed9f546..5bf17d596a4 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -809,7 +809,7 @@ class Project extends CommonObject
 
         $label = $langs->trans("ShowProject") . ': ' . $this->ref . ($this->title ? ' - ' . $this->title : '');
 
-        if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin);
+        if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0f9645fe237..786caafb7ec 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -513,7 +513,7 @@ class Task extends CommonObject
 
         $label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:'');
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
         return $result;
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index c75f37b00c2..983ff501b1f 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -878,7 +878,7 @@ class Resource extends CommonObject
 
         $label=$langs->trans("ShowResource").': '.$this->ref;
 
-        if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+        if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.$this->ref.$lienfin;
         return $result;
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 7b36423cb61..55511922385 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -426,7 +426,7 @@ class Address
 		$lien = '<a href="'.DOL_URL_ROOT.'/comm/address.php?id='.$this->id.'&socid='.$this->socid.'">';
 		$lienfin='</a>';
 
-		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' ');
 		$result.=$lien.$this->label.$lienfin;
 		return $result;
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 430d929320f..8f2e64874c6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1752,7 +1752,7 @@ class Societe extends CommonObject
         $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">';
         $lienfin='</a>';
 
-        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
+        if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name, 'company', 'class="classfortooltip"').$lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
         $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin;
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 837be155929..b1ba3b08438 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1792,7 +1792,7 @@ class User extends CommonObject
 
 		if ($withpicto)
 		{
-			$result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin);
+            $result.=($lien.img_object($langs->trans("ShowUser"), 'user', 'class="classfortooltip"').$lienfin);
 			if ($withpicto != 2) $result.=' ';
 		}
 		$result.=$lien.$this->getFullName($langs,'','',24).$lienfin;

From f54e90c9cf556c1232970d5af25a1464181feca2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jan 2015 13:00:10 +0100
Subject: [PATCH 299/345] Better doc to install external modules. Custom dir
 will be installed by default.

---
 htdocs/.gitignore            | 1 -
 htdocs/conf/conf.php.example | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index 3cba3ce99cd..bf99a2deebe 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -1,5 +1,4 @@
 /test.php
-/custom*
 /extensions*
 /nltechno*
 /ancot*
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 32adc4b87c9..67147a6d06b 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -43,10 +43,10 @@ $dolibarr_main_document_root='';
 // You can put several values, separated by a coma, but number of entries must match 
 // number of entries into $dolibarr_main_document_root_alt.
 // Examples:
-// $dolibarr_main_url_root_alt='/extensions';
+// $dolibarr_main_url_root_alt='/custom';
 // $dolibarr_main_url_root_alt='/extensions1,/extensions2';
 //
-$dolibarr_main_url_root_alt='';
+//$dolibarr_main_url_root_alt='/custom';
 
 
 // dolibarr_main_document_root_alt
@@ -55,10 +55,10 @@ $dolibarr_main_url_root_alt='';
 // You can put several values, separated by a coma, but number of entries must match 
 // number of entries into $dolibarr_main_url_root_alt.
 // Examples:
-// $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/extensions';
+// $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/custom';
 // $dolibarr_main_document_root_alt='C:/My web sites/dolibarr/htdocs/extensions1,C:/My web sites/dolibarr/htdocs/extensions2';
 //
-$dolibarr_main_document_root_alt='';
+//$dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/custom';
 
 
 // dolibarr_main_data_root

From 068ae7f0d4da5f63bc93891c858472141fecdd0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jan 2015 22:32:00 +0100
Subject: [PATCH 300/345] - Fix: ref_ext was not saved when recording a
 customer order from web service

---
 ChangeLog                                | 3 +++
 htdocs/commande/class/commande.class.php | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8f276f9c81..0a849cce895 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 3.6.3 compared to 3.6.2 *****
+- Fix: ref_ext was not saved when recording a customer order from web service
+
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
 - Fix: bug 1588 : relative discount.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8501f04e8b8..52e454bf14e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -658,18 +658,19 @@ class Commande extends CommonOrder
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
-        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_client, ref_int";
+        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
         $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
         $sql.= ", remise_absolue, remise_percent";
         $sql.= ", entity";
         $sql.= ")";
         $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
+        $sql.= ", ".($this->fk_project>0?$this->fk_project:"null");
         $sql.= ", '".$this->db->idate($date)."'";
         $sql.= ", ".($this->source>=0 && $this->source != '' ?$this->source:'null');
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", '".$this->db->escape($this->ref_client)."'";
+        $sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
+        $sql.= ", ".($this->ref_client?"'".$this->db->escape($this->ref_client)."'":"null");
         $sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
         $sql.= ", '".$this->modelpdf."'";
         $sql.= ", ".($this->cond_reglement_id>0?"'".$this->cond_reglement_id."'":"null");
@@ -904,7 +905,7 @@ class Commande extends CommonOrder
         $modCommande = new $obj;
         $this->ref = $modCommande->getNextValue($objsoc,$this);
 
-        
+
         // Create clone
         $result=$this->create($user);
         if ($result < 0) $error++;

From 32edb33411601018ed6bba70daaadd2034c21ea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jan 2015 22:32:25 +0100
Subject: [PATCH 301/345] Start 3.6.3

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 526f2aa2e57..5ef76717d72 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.2');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.3');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

From 9049931ff0141c49aebeb67248546c9709b36a24 Mon Sep 17 00:00:00 2001
From: fentman <fentman@fentman.id.au>
Date: Thu, 8 Jan 2015 11:21:25 +1100
Subject: [PATCH 302/345] Change to $listofcurrenciesbefore for GBP + AUD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4afe2d7917a..dcb76a10cd7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2900,7 +2900,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 	{
 		if ($currency_code == 'auto') $currency_code=$conf->currency;
 
-		$listofcurrenciesbefore=array('USD');
+		$listofcurrenciesbefore=array('USD','GBP','AUD');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
 		else
 		{

From f7960ec1045d3a5aad1e2cd9bc41735876a89704 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Jan 2015 23:19:18 +0100
Subject: [PATCH 303/345] Fixed: Upgrade are done several times

---
 htdocs/install/upgrade2.php | 45 +++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index d5fa016e02a..57004f3cb16 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -363,7 +363,22 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
         	// Reload modules (this must be always and only into last targeted version)
-        	migrate_reload_modules($db,$langs,$conf);
+			$listofmodule=array(
+				    	'MAIN_MODULE_AGENDA',
+				    	'MAIN_MODULE_SOCIETE',
+				    	'MAIN_MODULE_PRODUIT',
+				    	'MAIN_MODULE_SERVICE',
+				    	'MAIN_MODULE_COMMANDE',
+				    	'MAIN_MODULE_FACTURE',
+				    	'MAIN_MODULE_FOURNISSEUR',
+				    	'MAIN_MODULE_USER',
+				    	'MAIN_MODULE_DEPLACEMENT',
+				    	'MAIN_MODULE_DON',
+				    	'MAIN_MODULE_ECM',
+				    	'MAIN_MODULE_PAYBOX',
+			    		'MAIN_MODULE_OPENSURVEY'
+	    	);
+        	migrate_reload_modules($db,$langs,$conf,$listofmodule);
 
         	// Reload menus (this must be always and only into last targeted version)
         	migrate_reload_menu($db,$langs,$conf,$versionto);
@@ -3666,7 +3681,9 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 
     foreach($listofmodule as $moduletoreload)
     {
-	    if (! empty($conf->global->MAIN_MODULE_AGENDA))
+    	if (empty($moduletoreload) || empty($conf->global->$moduletoreload)) continue;
+
+	    if ($moduletoreload == 'MAIN_MODULE_AGENDA')
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
@@ -3676,7 +3693,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_SOCIETE))
+	    if ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
@@ -3686,7 +3703,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_PRODUIT))    // Permission has changed into 2.7
+	    if ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
@@ -3696,7 +3713,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_SERVICE))    // Permission has changed into 2.7
+	    if ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
 	        if ($res) {
@@ -3706,7 +3723,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_COMMANDE))   // Permission has changed into 2.9
+	    if ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
 	        if ($res) {
@@ -3716,7 +3733,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_FACTURE))    // Permission has changed into 2.9
+	    if ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
 	        if ($res) {
@@ -3726,7 +3743,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR))    // Permission has changed into 2.9
+	    if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@@ -3737,7 +3754,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	        }
 	    }
 
-	    if (! empty($conf->global->MAIN_MODULE_USER))    // Permission has changed into 3.0
+	    if ($moduletoreload == 'MAIN_MODULE_USER')    // Permission has changed into 3.0
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
@@ -3747,7 +3764,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT))    // Permission has changed into 3.0
+	    if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
@@ -3757,7 +3774,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_DON))    // Permission has changed into 3.0
+	    if ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
@@ -3767,7 +3784,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_ECM))    // Permission has changed into 3.0 and 3.1
+	    if ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
 	        if ($res) {
@@ -3777,7 +3794,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-	    if (! empty($conf->global->MAIN_MODULE_PAYBOX))    // Permission has changed into 3.0
+	    if ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
@@ -3787,7 +3804,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
 	            $mod->init('newboxdefonly');
 	        }
 	    }
-    	if (! empty($conf->global->MAIN_MODULE_OPENSURVEY))    // Permission has changed into 3.0
+    	if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 	    {
 	        dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
 	        $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';

From 87f70f2d22a9d65eda2ddd92c6446014edc5c116 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jan 2015 01:07:18 +0100
Subject: [PATCH 304/345] Fixed: property must be called billed into web
 service. Fixed: web service to create order was useless. it was not possible
 to change status.

---
 htdocs/commande/class/commande.class.php | 201 ++++++++++++++++-------
 htdocs/webservices/server_order.php      | 129 ++++++++++++++-
 2 files changed, 265 insertions(+), 65 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b7207f0cd42..9b106019642 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -61,8 +61,9 @@ class Commande extends CommonOrder
     var $contactid;
     var $fk_project;
     var $statut;		// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
+    var $facturee;		// deprecated
+    var $billed;		// billed or not
 
-    var $facturee;		// Facturee ou non
     var $brouillon;
     var $cond_reglement_id;
     var $cond_reglement_code;
@@ -435,6 +436,7 @@ class Commande extends CommonOrder
 
         if ($this->statut != 3)
         {
+        	dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
             return 0;
         }
 
@@ -2482,6 +2484,131 @@ class Commande extends CommonOrder
         }
     }
 
+	/**
+	 *      Update database
+	 *
+	 *      @param      User	$user        	User that modify
+	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *      @return     int      			   	<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->ref)) $this->ref=trim($this->ref);
+		if (isset($this->ref_client)) $this->ref_client=trim($this->ref_client);
+		if (isset($this->note) || isset($this->note_private)) $this->note_private=(isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."commande SET";
+
+		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+		$sql.= " ref_client=".(isset($this->ref_client)?"'".$this->db->escape($this->ref_client)."'":"null").",";
+		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
+		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
+		$sql.= " date_commande=".(strval($this->date_commande)!='' ? "'".$this->db->idate($this->date_commande)."'" : 'null').",";
+		$sql.= " date_valid=".(strval($this->date_validation)!='' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
+		$sql.= " tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
+		$sql.= " localtax1=".(isset($this->total_localtax1)?$this->total_localtax1:"null").",";
+		$sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").",";
+		$sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
+		$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
+		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
+		$sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").",";
+		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
+		$sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
+		$sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
+		$sql.= " fk_mode_reglement=".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null").",";
+		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
+		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
+		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
+		$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++; $this->errors[]="Error ".$this->db->lasterror();
+		}
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+	            // Call trigger
+	            $result=$this->call_trigger('ORDER_MODIFY',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+    /**
+     *	Update value of extrafields on order
+     *
+     *	@param      User	$user       Object user that modify
+     *	@return     int         		<0 if ko, >0 if ok
+     */
+    function update_extrafields($user)
+    {
+    	$action='create';
+
+    	// Actions on extra fields (by external module or standard code)
+    	// FIXME le hook fait double emploi avec le trigger !!
+    	$hookmanager->initHooks(array('orderdao'));
+    	$parameters=array('id'=>$this->id);
+    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+    	if (empty($reshook))
+    	{
+    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+    		{
+    			$result=$this->insertExtraFields();
+    			if ($result < 0)
+    			{
+    				$error++;
+    			}
+    		}
+    	}
+    	else if ($reshook < 0) $error++;
+
+    	if (!$error)
+    	{
+    		return 1;
+    	}
+    	else
+    	{
+    		return -1;
+    	}
+
+    }
 
     /**
      *	Delete the customer order
@@ -2673,22 +2800,22 @@ class Commande extends CommonOrder
      *	Return label of status
      *
      *	@param		int		$statut      	Id statut
-     *  @param      int		$facturee    	if invoiced
+     *  @param      int		$billed    		If invoiced
      *	@param      int		$mode        	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
      *  @return     string					Label of status
      */
-    function LibStatut($statut,$facturee,$mode)
+    function LibStatut($statut,$billed,$mode)
     {
         global $langs;
-        //print 'x'.$statut.'-'.$facturee;
+        //print 'x'.$statut.'-'.$billed;
         if ($mode == 0)
         {
             if ($statut==-1) return $langs->trans('StatusOrderCanceled');
             if ($statut==0) return $langs->trans('StatusOrderDraft');
             if ($statut==1) return $langs->trans('StatusOrderValidated');
             if ($statut==2) return $langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 1)
         {
@@ -2696,8 +2823,8 @@ class Commande extends CommonOrder
             if ($statut==0) return $langs->trans('StatusOrderDraftShort');
             if ($statut==1) return $langs->trans('StatusOrderValidatedShort');
             if ($statut==2) return $langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 2)
         {
@@ -2705,8 +2832,8 @@ class Commande extends CommonOrder
             if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
             if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort');
             if ($statut==2) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort');
         }
         elseif ($mode == 3)
         {
@@ -2714,8 +2841,8 @@ class Commande extends CommonOrder
             if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
             if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
             if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
         elseif ($mode == 4)
         {
@@ -2723,8 +2850,8 @@ class Commande extends CommonOrder
             if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
             if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated');
             if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed');
         }
         elseif ($mode == 5)
         {
@@ -2732,8 +2859,8 @@ class Commande extends CommonOrder
             if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDraftShort').' </span>'.img_picto($langs->trans('StatusOrderDraft'),'statut0');
             if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderValidatedShort').' </span>'.img_picto($langs->trans('StatusOrderValidated'),'statut1');
             if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderSentShort').' </span>'.img_picto($langs->trans('StatusOrderSent'),'statut3');
-            if ($statut==3 && (! $facturee && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut7');
-            if ($statut==3 && ($facturee || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').' </span>'.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
+            if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderToBillShort').' </span>'.img_picto($langs->trans('StatusOrderToBill'),'statut7');
+            if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessedShort').' </span>'.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
         }
     }
 
@@ -2954,45 +3081,6 @@ class Commande extends CommonOrder
         }
     }
 
-    /**
-     *	Update value of extrafields on order
-     *
-     *	@param      User	$user       Object user that modify
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    function update_extrafields($user)
-    {
-    	$action='create';
-
-    	// Actions on extra fields (by external module or standard code)
-    	// FIXME le hook fait double emploi avec le trigger !!
-    	$hookmanager->initHooks(array('orderdao'));
-    	$parameters=array('id'=>$this->id);
-    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    	if (empty($reshook))
-    	{
-    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-    		{
-    			$result=$this->insertExtraFields();
-    			if ($result < 0)
-    			{
-    				$error++;
-    			}
-    		}
-    	}
-    	else if ($reshook < 0) $error++;
-
-    	if (!$error)
-    	{
-    		return 1;
-    	}
-    	else
-    	{
-    		return -1;
-    	}
-
-    }
-
     /**
      * 	Return an array of order lines
      *
@@ -3106,8 +3194,7 @@ class Commande extends CommonOrder
 
 
 /**
- *  \class      OrderLine
- *  \brief      Classe de gestion des lignes de commande
+ *  Class to mange order lines
  */
 class OrderLine extends CommonOrderLine
 {
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 2318780608c..9229d3b9c26 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -180,7 +180,7 @@ $order_fields = array(
 	'ref_int' => array('name'=>'ref_int','type'=>'xsd:string'),
 	'thirdparty_id' => array('name'=>'thirdparty_id','type'=>'xsd:int'),
 	'status' => array('name'=>'status','type'=>'xsd:int'),
-	'facturee' => array('name'=>'facturee','type'=>'xsd:string'),
+	'billed' => array('name'=>'billed','type'=>'xsd:string'),
 	'total_net' => array('name'=>'total_net','type'=>'xsd:double'),
 	'total_vat' => array('name'=>'total_vat','type'=>'xsd:double'),
 	'total_localtax1' => array('name'=>'total_localtax1','type'=>'xsd:double'),
@@ -314,8 +314,17 @@ $server->register(
 		'WS to create an order'
 );
 
+$server->register(
+		'updateOrder',
+		array('authentication'=>'tns:authentication','order'=>'tns:order'),	// Entry values
+		array('result'=>'tns:result','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),	// Exit values
+		$ns,
+		$ns.'#updateOrder',
+		$styledoc,
+		$styleuse,
+		'WS to update an order'
+);
 
-// Register WSDL
 $server->register(
 		'validOrder',
 		array('authentication'=>'tns:authentication','id'=>'xsd:string'),	// Entry values
@@ -439,7 +448,7 @@ function getOrder($authentication,$id='',$ref='',$ref_ext='')
 					'remise_absolue' => $order->remise_absolue,
 
 					'source' => $order->source,
-					'facturee' => $order->facturee,
+					'billed' => $order->billed,
 					'note_private' => $order->note_private,
 					'note_public' => $order->note_public,
 					'cond_reglement_id' => $order->cond_reglement_id,
@@ -596,7 +605,7 @@ function getOrdersForThirdParty($authentication,$idthirdparty)
 					'remise_absolue' => $order->remise_absolue,
 
 					'source' => $order->source,
-					'facturee' => $order->facturee,
+					'billed' => $order->billed,
 					'note_private' => $order->note_private,
 					'note_public' => $order->note_public,
 					'cond_reglement_id' => $order->cond_reglement_id,
@@ -679,12 +688,12 @@ function createOrder($authentication,$order)
 		$newobject->note_private=$order['note_private'];
 		$newobject->note_public=$order['note_public'];
 		$newobject->statut=0;	// We start with status draft
-		$newobject->facturee=$order['facturee'];
+		$newobject->billed=$order['billed'];
 		$newobject->fk_project=$order['project_id'];
 		$newobject->cond_reglement_id=$order['cond_reglement_id'];
 		$newobject->demand_reason_id=$order['demand_reason_id'];
 		$newobject->date_creation=$now;
-		
+
 		// Retrieve all extrafield for order
 		// fetch optionals attributes and labels
 		$extrafields=new ExtraFields($db);
@@ -717,7 +726,7 @@ function createOrder($authentication,$order)
 			$newline->total_ttc=$line['total'];
 			$newline->date_start=$line['date_start'];
 			$newline->date_end=$line['date_end'];
-			
+
 			// Retrieve all extrafield for lines
 			// fetch optionals attributes and labels
 			$extrafields=new ExtraFields($db);
@@ -727,7 +736,7 @@ function createOrder($authentication,$order)
 				$key='options_'.$key;
 				$newline->array_options[$key]=$line[$key];
 			}
-			
+
 			$newobject->lines[]=$newline;
 		}
 
@@ -862,5 +871,109 @@ function validOrder($authentication,$id='')
 	return $objectresp;
 }
 
+/**
+ * Update an order
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	array		$order				Order info
+ * @return	array							Array result
+ */
+function updateOrder($authentication,$order)
+{
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: updateOrder login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+	if (empty($order['id']) && empty($order['ref']) && empty($order['ref_ext']))	{
+		$error++; $errorcode='KO'; $errorlabel="Order id or ref or ref_ext is mandatory.";
+	}
+
+	if (! $error)
+	{
+		$objectfound=false;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+		$object=new Commande($db);
+		$result=$object->fetch($order['id'],(empty($order['id'])?$order['ref']:''),(empty($order['id']) && empty($order['ref'])?$order['ref_ext']:''));
+
+		if (!empty($object->id)) {
+
+			$objectfound=true;
+
+			$db->begin();
+
+			if (isset($order['status']))
+			{
+				if ($order['status'] == -1) $result=$object->cancel($fuser);
+				if ($order['status'] == 1)  $result=$object->valid($fuser);
+				if ($order['status'] == 0)  $result=$object->set_reopen($fuser);
+				if ($order['status'] == 3)  $result=$object->cloture($fuser);
+			}
+
+			if (isset($order['billed']))
+			{
+				if ($order['billed'])   $result=$object->classifyBilled($fuser);
+				if (! $order['billed']) $result=$object->classifyBilled($fuser);
+			}
+
+			//Retreive all extrafield for object
+			// fetch optionals attributes and labels
+			$extrafields=new ExtraFields($db);
+			$extralabels=$extrafields->fetch_name_optionals_label('commande',true);
+			foreach($extrafields->attribute_label as $key=>$label)
+			{
+				$key='options_'.$key;
+				if (isset($order[$key]))
+				{
+					$result=$object->setValueFrom($key, $order[$key], 'commande_extrafields');
+				}
+			}
+
+			if ($result <= 0) {
+				$error++;
+			}
+		}
+
+		if ((! $error) && ($objectfound))
+		{
+			$db->commit();
+			$objectresp=array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'id'=>$object->id
+			);
+		}
+		elseif ($objectfound)
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$object->error;
+		} else {
+			$error++;
+			$errorcode='NOT_FOUND';
+			$errorlabel='Order id='.$order['id'].' ref='.$order['ref'].' ref_ext='.$order['ref_ext'].' cannot be found';
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
+}
+
+
 // Return the results.
 $server->service(file_get_contents("php://input"));

From 30d1284379c32e21953518c9f5d3ffd46eb8a537 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jan 2015 01:15:39 +0100
Subject: [PATCH 305/345] Fixed: Missing ref_ext

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9b106019642..2559a68a22e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -671,7 +671,7 @@ class Commande extends CommonOrder
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
-        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_client, ref_int";
+        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
         $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
         $sql.= ", fk_shipping_method";
         $sql.= ", remise_absolue, remise_percent";

From dda12003d42b3dd30b9770966b5c432dc8d006ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jan 2015 12:23:15 +0100
Subject: [PATCH 306/345] Fixed: User of creation was not visible.

---
 htdocs/fourn/class/paiementfourn.class.php | 12 ++++++------
 htdocs/fourn/paiement/info.php             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 59dc5dab3d1..8e5dc6b8fb9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 /**
- *	\class      PaiementFourn
- *	\brief      Classe permettant la gestion des paiements des factures fournisseurs
+ *	Class to manage payments for supplier invoices
  */
 class PaiementFourn extends Paiement
 {
@@ -345,7 +344,7 @@ class PaiementFourn extends Paiement
 	 */
 	function info($id)
 	{
-		$sql = 'SELECT c.rowid, datec, fk_user_author, tms';
+		$sql = 'SELECT c.rowid, datec, fk_user_author as fk_user_creat, tms';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as c';
 		$sql.= ' WHERE c.rowid = '.$id;
 
@@ -357,6 +356,7 @@ class PaiementFourn extends Paiement
 			{
 				$obj = $this->db->fetch_object($resql);
 				$this->id = $obj->rowid;
+
 				if ($obj->fk_user_creat)
 				{
 					$cuser = new User($this->db);
@@ -381,10 +381,10 @@ class PaiementFourn extends Paiement
 	}
 
 	/**
-	 *	Retourne la liste des factures sur lesquels porte le paiement
+	 *	Return list of supplier invoices the payment point to
 	 *
-	 *	@param      string	$filter         Critere de filtre
-	 *	@return     array           		Tableau des id de factures
+	 *	@param      string	$filter         SQL filter
+	 *	@return     array           		Array of supplier invoice id
 	 */
 	function getBillsArray($filter='')
 	{
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index 5e3ea3f18f6..409b567959a 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -52,6 +52,6 @@ print '</td></tr></table>';
 
 print '</div>';
 
-$db->close();
-
 llxFooter();
+
+$db->close();

From e4b89779f76264332d48aae155503369fddfb714 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Jan 2015 21:39:40 +0100
Subject: [PATCH 307/345] Fixed: css conflict

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

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 23d8dd4f326..29eda49a9a9 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -217,7 +217,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 <?php if ($main_home)
 {
 ?>
-	<div class="center" class="login_main_home" style="max-width: 80%">
+	<div class="center login_main_home" style="max-width: 80%">
 	<?php echo $main_home; ?>
 	</div><br>
 <?php

From 173d3aaa90c6161d1ff6737aa890aa2437b8cf66 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sun, 11 Jan 2015 11:31:53 +0100
Subject: [PATCH 308/345] Translation error messages numbering modules

---
 htdocs/admin/commande.php          | 22 ++++++------
 htdocs/admin/contract.php          | 22 ++++++------
 htdocs/admin/expedition.php        | 22 ++++++------
 htdocs/admin/facture.php           | 56 +++++++++++++-----------------
 htdocs/admin/fichinter.php         | 16 ++++++---
 htdocs/admin/livraison.php         | 12 +++----
 htdocs/admin/propal.php            | 22 ++++++------
 htdocs/admin/supplier_invoice.php  | 12 +++----
 htdocs/admin/supplier_order.php    | 12 +++----
 htdocs/core/lib/functions2.lib.php | 25 +++++++------
 htdocs/langs/en_US/errors.lang     |  2 ++
 htdocs/langs/fr_FR/errors.lang     |  2 ++
 12 files changed, 106 insertions(+), 119 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index aaa1949d7dd..7c0d7fdbf9c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -348,18 +348,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$commande->type=0;
 						$nextval=$module->getNextValue($mysoc,$commande);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
-							if ($nextval)
-							{
-								$htmltooltip.=$nextval.'<br>';
-							}
-							else
-							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
-							}
-						}
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
 
 						print '<td align="center">';
 						print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 817ac84d768..45d79f01ae5 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -299,18 +299,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip='';
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval=$module->getNextValue($mysoc,$contract);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
-							if ($nextval)
-							{
-								$htmltooltip.=$nextval.'<br>';
-							}
-							else
-							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
-							}
-						}
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
 
 						print '<td align="center">';
 						print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 2efdfdd56ba..933f9a87d18 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -324,18 +324,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip='';
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval=$module->getNextValue($mysoc,$expedition);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
-							if ($nextval)
-							{
-								$htmltooltip.=$nextval.'<br>';
-							}
-							else
-							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
-							}
-						}
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
 
 						print '<td align="center">';
 						print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index a7692655a0a..298c0beddf5 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -393,61 +393,53 @@ foreach ($dirmodels as $reldir)
                             $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
                             $facture->type=0;
                             $nextval=$module->getNextValue($mysoc,$facture);
-                            if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                            {
+                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                                 $htmltooltip.=$langs->trans("NextValueForInvoices").': ';
-                                if ($nextval)
-                                {
+                                if ($nextval) {
+                                    if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                        $nextval = $langs->trans($nextval);
                                     $htmltooltip.=$nextval.'<br>';
-                                }
-                                else
-                                {
+                                } else {
                                     $htmltooltip.=$langs->trans($module->error).'<br>';
                                 }
                             }
                             // Example for remplacement
                             $facture->type=1;
                             $nextval=$module->getNextValue($mysoc,$facture);
-                            if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                            {
-                            	$htmltooltip.=$langs->trans("NextValueForReplacements").': ';
-                            	if ($nextval)
-                            	{
-                            		$htmltooltip.=$nextval.'<br>';
-                            	}
-                            	else
-                            	{
-                            		$htmltooltip.=$langs->trans($module->error).'<br>';
-                            	}
+                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                                $htmltooltip.=$langs->trans("NextValueForReplacements").': ';
+                                if ($nextval) {
+                                    if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                        $nextval = $langs->trans($nextval);
+                                    $htmltooltip.=$nextval.'<br>';
+                                } else {
+                                    $htmltooltip.=$langs->trans($module->error).'<br>';
+                                }
                             }
                             
                             // Example for credit invoice
                             $facture->type=2;
                             $nextval=$module->getNextValue($mysoc,$facture);
-                            if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                            {
+                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                                 $htmltooltip.=$langs->trans("NextValueForCreditNotes").': ';
-                                if ($nextval)
-                                {
+                                if ($nextval) {
+                                    if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                        $nextval = $langs->trans($nextval);
                                     $htmltooltip.=$nextval.'<br>';
-                                }
-                                else
-                                {
+                                } else {
                                     $htmltooltip.=$langs->trans($module->error).'<br>';
                                 }
                             }
                             // Example for deposit invoice
                             $facture->type=3;
                             $nextval=$module->getNextValue($mysoc,$facture);
-                            if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                            {
+                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                                 $htmltooltip.=$langs->trans("NextValueForDeposit").': ';
-                                if ($nextval)
-                                {
+                                if ($nextval) {
+                                    if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                        $nextval = $langs->trans($nextval);
                                     $htmltooltip.=$nextval;
-                                }
-                                else
-                                {
+                                } else {
                                     $htmltooltip.=$langs->trans($module->error);
                                 }
                             }
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index dad5f484a4d..8965b225cfb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
- * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
  *
@@ -328,10 +328,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip='';
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval=$module->getNextValue($mysoc,$ficheinter);
-						if ($nextval != $langs->trans("NotAvailable"))
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': '.$nextval;
-						}
+                        if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
 						print '<td align="center">';
 						print $form->textwithpicto('',$htmltooltip,1,0);
 						print '</td>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index b591aa79c08..69f5d30b09a 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -309,15 +309,13 @@ foreach ($dirmodels as $reldir)
                         $htmltooltip='';
                         $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
                         $nextval=$module->getNextValue($mysoc,$livraison);
-                        if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                        {
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                             $htmltooltip.=''.$langs->trans("NextValue").': ';
-                            if ($nextval)
-                            {
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
                                 $htmltooltip.=$nextval.'<br>';
-                            }
-                            else
-                            {
+                            } else {
                                 $htmltooltip.=$langs->trans($module->error).'<br>';
                             }
                         }
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 01f32740036..30ae7e71ab3 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -344,18 +344,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$propal->type=0;
 						$nextval=$module->getNextValue($mysoc,$propal);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
-							$htmltooltip.=''.$langs->trans("NextValue").': ';
-							if ($nextval)
-							{
-								$htmltooltip.=$nextval.'<br>';
-							}
-							else
-							{
-								$htmltooltip.=$langs->trans($module->error).'<br>';
-							}
-						}
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
 
 						print '<td align="center">';
 						print $form->textwithpicto('',$htmltooltip,1,0);
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 2f48eb2be79..19b5e89b0dd 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -278,15 +278,13 @@ foreach ($dirmodels as $reldir)
                         $htmltooltip='';
                         $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
                         $nextval=$module->getNextValue($mysoc,$invoice);
-                        if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                        {
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                             $htmltooltip.=''.$langs->trans("NextValue").': ';
-                            if ($nextval)
-                            {
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
                                 $htmltooltip.=$nextval.'<br>';
-                            }
-                            else
-                            {
+                            } else {
                                 $htmltooltip.=$langs->trans($module->error).'<br>';
                             }
                         }
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 2d4be98f34a..24e1682eb18 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -279,15 +279,13 @@ foreach ($dirmodels as $reldir)
                         $htmltooltip='';
                         $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
                         $nextval=$module->getNextValue($mysoc,$commande);
-                        if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-                        {
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                             $htmltooltip.=''.$langs->trans("NextValue").': ';
-                            if ($nextval)
-                            {
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
                                 $htmltooltip.=$nextval.'<br>';
-                            }
-                            else
-                            {
+                            } else {
                                 $htmltooltip.=$langs->trans($module->error).'<br>';
                             }
                         }
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 7517fac7d20..602e308df41 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -608,7 +608,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
-    if (dol_strlen($maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -620,7 +620,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
     else $maskrefclient='';
 
@@ -650,7 +650,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
-	//var_dump($reg);
+    //var_dump($reg);
 
     // If an offset is asked
     if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
@@ -667,17 +667,16 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-    	$maskraz=$yearoffsettype; // For backward compatibility
+        $maskraz=$yearoffsettype; // For backward compatibility
     else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-    	$maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
     //print "maskraz=".$maskraz;	// -1=no reset
 
-    if ($maskraz > 0)    // A reset is required
-    {
-    	if ($maskraz == 99) {
-			$maskraz = date('m', $date);
-			$resetEveryMonth = true;
-		}
+    if ($maskraz > 0) {   // A reset is required
+        if ($maskraz == 99) {
+            $maskraz = date('m', $date);
+            $resetEveryMonth = true;
+        }
         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
 
         // Define posy, posm and reg
@@ -964,7 +963,7 @@ function check_value($mask,$value)
     $maskcounter=$reg[1];
     $maskraz=-1;
     $maskoffset=0;
-    if (dol_strlen($maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -976,7 +975,7 @@ function check_value($mask,$value)
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'CounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
     else $maskrefclient='';
 
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 35b7da13728..08b031690b4 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -91,6 +91,8 @@ ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
+ErrorMaxNumberReachForThisMask=Max number reach for this mask
+ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
 ErrorSelectAtLeastOne=Error. Select at least one entry.
 ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
 ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index e880dbdac8d..4f82ea72bca 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -91,6 +91,8 @@ ErrorModuleSetupNotComplete=La configuration du module semble incomplète. Aller
 ErrorBadMask=Erreur sur le masque
 ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
 ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
+ErrorMaxNumberReachForThisMask=Valeur maximale atteinte pour ce masque
+ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
 ErrorSelectAtLeastOne=Erreur. Sélectionnez au moins une entrée.
 ErrorProductWithRefNotExist=La référence produit '<i>%s</i>' n'existe pas
 ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement porte sur au moins une transaction bancaire rapprochée

From 9662879e522f1df61b936a97e229db567d59da9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jan 2015 15:15:51 +0100
Subject: [PATCH 309/345] Fixed: Permissions

---
 build/debian/apache/.htaccess     | 14 ++++++++++++--
 build/debian/apache/dolibarr.conf |  9 +++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build/debian/apache/.htaccess b/build/debian/apache/.htaccess
index 8ab3fb95cd1..21fdbc00cf7 100644
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -1,7 +1,17 @@
+# To disable access
 <IfVersion >= 2.3>
 Require all denied
 </IfVersion>
 <IfVersion < 2.3>
-Order deny,allow
-Deny from all
+Order deny, allow
+Denied from all
+</IfVersion>
+
+# To allow access
+<IfVersion >= 2.3>
+Require all granted
+</IfVersion>
+<IfVersion < 2.3>
+Order allow, deny
+Allow from all
 </IfVersion>
diff --git a/build/debian/apache/dolibarr.conf b/build/debian/apache/dolibarr.conf
index ae1d7b46d8e..3ceaa5ab1a9 100644
--- a/build/debian/apache/dolibarr.conf
+++ b/build/debian/apache/dolibarr.conf
@@ -14,8 +14,13 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 
 # Directory for web pages
 <Directory /usr/share/dolibarr/htdocs>
-    Order deny,allow
-    Allow from all
+	<IfVersion >= 2.3>
+	Require all granted
+	</IfVersion>
+	<IfVersion < 2.3>
+	Order allow, deny
+	Allow from all
+	</IfVersion>
 
     DirectoryIndex index.php
     Options +FollowSymLinks +Indexes

From c7b311349e7cd32618afefb86a9e1d993c36f5be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jan 2015 15:16:55 +0100
Subject: [PATCH 310/345] Files compatible with apache 2.4

---
 build/debian/apache/.htaccess | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/build/debian/apache/.htaccess b/build/debian/apache/.htaccess
index 21fdbc00cf7..a59829d970b 100644
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -1,17 +1,8 @@
-# To disable access
+# File used to disable access into directory documents
 <IfVersion >= 2.3>
 Require all denied
 </IfVersion>
 <IfVersion < 2.3>
 Order deny, allow
 Denied from all
-</IfVersion>
-
-# To allow access
-<IfVersion >= 2.3>
-Require all granted
-</IfVersion>
-<IfVersion < 2.3>
-Order allow, deny
-Allow from all
-</IfVersion>
+</IfVersion>
\ No newline at end of file

From 6414f415a8f518c654070116651feb4a3a6db19c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jan 2015 15:30:34 +0100
Subject: [PATCH 311/345] Files compatible with apache 2.4

---
 build/debian/apache/dolibarr.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/debian/apache/dolibarr.conf b/build/debian/apache/dolibarr.conf
index 3ceaa5ab1a9..95eaae21190 100644
--- a/build/debian/apache/dolibarr.conf
+++ b/build/debian/apache/dolibarr.conf
@@ -10,6 +10,15 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 #     DocumentRoot /usr/share/dolibarr/
 #     ErrorLog logs/ldap.example.com-error.log
 #     CustomLog logs/ldap.example.com-access.log common
+#
+#	<IfVersion >= 2.3>
+#	Require all granted
+#	</IfVersion>
+#	<IfVersion < 2.3>
+#	Order allow, deny
+#	Allow from all
+#	</IfVersion>
+#
 # </VirtualHost>
 
 # Directory for web pages

From a77a604082699c567384a2c85f1ffdbe9a02d927 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Jan 2015 15:32:11 +0100
Subject: [PATCH 312/345] Fix: include custom dir so everybody has it.

---
 .gitignore              |  1 -
 htdocs/custom/README.md | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/custom/README.md

diff --git a/.gitignore b/.gitignore
index 9b639ce64a6..20c87aa1e42 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
 documents/
-custom/
 custom2/
 test/report/
 nbproject
diff --git a/htdocs/custom/README.md b/htdocs/custom/README.md
new file mode 100644
index 00000000000..e46934902cb
--- /dev/null
+++ b/htdocs/custom/README.md
@@ -0,0 +1,24 @@
+# DOLIBARR ERP & CRM custom directory for external modules.
+
+This directory is dedicated to store external modules.
+To use it, just copy here the directory of the module into this directory.
+
+Note: On linux or MAC systems, it is better to unzip/store the external module directory into 
+a different place than this directory and just adding a symbolic link here to the htdocs directory
+of the module.
+
+For example on Linux OS: Get the module from the command 
+mkdir ~/git; cd ~/git
+git clone https://git.doliforge.org/p/newmodule/newmodule.git
+Then create the symbolic link
+ln -fs ~/git/newmodule/htdocs /path_to_dolibarr/htdocs/custom/newmodule 
+
+WARNING !!!
+You must also enable the custom directory into dolibarr conf/conf.php file by adding the following 
+two lines, so dolibarr will also scan this directories to find external external modules:
+
+$dolibarr_main_url_root_alt='/custom';
+$dolibarr_main_document_root_alt='/path_to_dolibarr/htdocs/custom/';
+
+(This is not enabled by default because enabling external module may slow down application)
+

From 13132ef2ed66f811251f4274e3124aeda572ba36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 13:20:27 +0100
Subject: [PATCH 313/345] Better organisation of entries into security setup
 area

---
 htdocs/admin/security_file.php          | 214 ++++++++++++++++++++++++
 htdocs/admin/security_other.php         | 104 +-----------
 htdocs/core/lib/admin.lib.php           |  15 +-
 htdocs/core/menus/standard/eldy.lib.php |   2 +-
 4 files changed, 226 insertions(+), 109 deletions(-)
 create mode 100644 htdocs/admin/security_file.php

diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
new file mode 100644
index 00000000000..4c0dd435634
--- /dev/null
+++ b/htdocs/admin/security_file.php
@@ -0,0 +1,214 @@
+<?php
+/* Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Juanjo Menent 		<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (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/security_file.php
+ *      \ingroup    core
+ *      \brief      Security options setup
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("users");
+$langs->load("admin");
+$langs->load("other");
+
+if (! $user->admin)
+	accessforbidden();
+
+$action=GETPOST('action','alpha');
+
+$upload_dir=$conf->admin->dir_temp;
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    dol_add_file_process($upload_dir, 0, 0, 'userfile');
+}
+
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+else if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+else if ($action == 'updateform')
+{
+	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity);
+    $res4=dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
+    $res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity);
+    $res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity);
+	if ($res3 && $res4 && $res5 && $res6) setEventMessage($langs->trans("RecordModifiedSuccessfully"));
+}
+
+
+
+// Delete file
+else if ($action == 'delete')
+{
+	$langs->load("other");
+	$file = $conf->admin->dir_temp . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$ret=dol_delete_file($file);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	Header('Location: '.$_SERVER["PHP_SELF"]);
+	exit;
+}
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader('',$langs->trans("Files"));
+
+print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+
+//print $langs->trans("FilesDesc")."<br>\n";
+//print "<br>\n";
+
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateform">';
+
+$head=security_prepare_head();
+
+dol_fiche_head($head, 'file', $langs->trans("Security"));
+
+
+// Upload options
+$var=false;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '</tr>';
+
+print '<tr '.$bc[$var].'>';
+print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
+$max=@ini_get('upload_max_filesize');
+if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.';
+else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
+print '</td>';
+print '</tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("UMask").'</td><td align="right">';
+print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">';
+print '</td>';
+print '</tr>';
+
+// Use anti virus
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
+print $langs->trans("AntiVirusCommandExample");
+// Check command in inside safe_mode
+print '</td>';
+print '<td>';
+if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+{
+    $langs->load("errors");
+    $basedir=preg_replace('/"/','',dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
+    $listdir=explode(';',ini_get('safe_mode_exec_dir'));
+    if (! in_array($basedir,$listdir))
+    {
+        print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
+        dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
+    }
+}
+print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
+print "</td>";
+print '</tr>';
+
+// Use anti virus
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
+print $langs->trans("AntiVirusParamExample");
+print '</td>';
+print '<td>';
+print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
+print "</td>";
+print '</tr>';
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+
+
+// Form to test upload
+print '<br>';
+$formfile=new FormFile($db);
+$formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1, 50, '', '', 1, '', 0);
+
+// List of document
+$filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1);
+$formfile->list_of_documents($filearray, '', 'admin_temp', '');
+
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 064f7ad0cd9..4dc0c0e06a3 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -37,20 +37,12 @@ if (! $user->admin)
 
 $action=GETPOST('action','alpha');
 
-$upload_dir=$conf->admin->dir_temp;
 
 
 /*
  * Actions
  */
 
-if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    dol_add_file_process($upload_dir, 0, 0, 'userfile');
-}
-
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -84,27 +76,11 @@ else if ($action == 'updateform')
 {
 	$res1=dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_APPLICATION_TITLE"],'chaine',0,'',$conf->entity);
     $res2=dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity);
-	$res3=dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity);
-    $res4=dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity);
-    $res5=dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity);
-    $res6=dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity);
-	if ($res1 && $res2 && $res3 && $res4 && $res5 && $res6) setEventMessage($langs->trans("RecordModifiedSuccessfully"));
+	if ($res1 && $res2) setEventMessage($langs->trans("RecordModifiedSuccessfully"));
 }
 
 
 
-// Delete file
-else if ($action == 'delete')
-{
-	$langs->load("other");
-	$file = $conf->admin->dir_temp . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-	$ret=dol_delete_file($file);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-	Header('Location: '.$_SERVER["PHP_SELF"]);
-	exit;
-}
-
 /*
  * View
  */
@@ -230,74 +206,6 @@ print '</tr>';
 
 print '</table>';
 
-print '<br>';
-
-// Upload options
-$var=false;
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
-print '</tr>';
-
-print '<tr '.$bc[$var].'>';
-print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
-$max=@ini_get('upload_max_filesize');
-if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.';
-else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
-print '</td>';
-print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
-print '</td>';
-print '</tr>';
-
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("UMask").'</td><td align="right">';
-print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
-print '</td>';
-print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">';
-print '</td>';
-print '</tr>';
-
-// Use anti virus
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
-print $langs->trans("AntiVirusCommandExample");
-// Check command in inside safe_mode
-print '</td>';
-print '<td>';
-if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-{
-    $langs->load("errors");
-    $basedir=preg_replace('/"/','',dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
-    $listdir=explode(';',ini_get('safe_mode_exec_dir'));
-    if (! in_array($basedir,$listdir))
-    {
-        print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
-        dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
-    }
-}
-print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
-print "</td>";
-print '</tr>';
-
-// Use anti virus
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
-print $langs->trans("AntiVirusParamExample");
-print '</td>';
-print '<td>';
-print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
-print "</td>";
-print '</tr>';
-
-print '</table>';
-
 dol_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
@@ -305,15 +213,5 @@ print '<div class="center"><input type="submit" class="button" name="button" val
 print '</form>';
 
 
-
-// Form to test upload
-print '<br>';
-$formfile=new FormFile($db);
-$formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1, 50, '', '', 1, '', 0);
-
-// List of document
-$filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1);
-$formfile->list_of_documents($filearray, '', 'admin_temp', '');
-
 llxFooter();
 $db->close();
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index dd1615d7427..a54cb5fcc79 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -516,11 +516,6 @@ function security_prepare_head()
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
-    $head[$h][1] = $langs->trans("ExternalAccess");
-    $head[$h][2] = 'proxy';
-    $h++;
-
     $head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";
     $head[$h][1] = $langs->trans("Miscellaneous");
     $head[$h][2] = 'misc';
@@ -531,6 +526,16 @@ function security_prepare_head()
     $head[$h][2] = 'passwords';
     $h++;
 
+    $head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";
+    $head[$h][1] = $langs->trans("Files");
+    $head[$h][2] = 'file';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
+    $head[$h][1] = $langs->trans("ExternalAccess");
+    $head[$h][2] = 'proxy';
+    $h++;
+
     $head[$h][0] = DOL_URL_ROOT."/admin/events.php";
     $head[$h][1] = $langs->trans("Audit");
     $head[$h][2] = 'audit';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9b7b49c9d3d..91a24db79ac 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -487,7 +487,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					}
 					$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"),1);
 					$newmenu->add("/admin/delais.php?mainmenu=home",$langs->trans("Alerts"),1);
-					$newmenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
+					$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"),1);
 					$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
 					$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
 					$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);

From f8b58605c6f8963b863f13ee3deacd62f21b6b20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 13:21:16 +0100
Subject: [PATCH 314/345] Better organisation of entries into security setup
 area

---
 htdocs/core/menus/init_menu_auguria.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 2758ff5ecbd..b5818362591 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -27,7 +27,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 7, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 8, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/security_other.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 8, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 107__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 1, 'admin', '', '', 2, 10, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 11, __ENTITY__);

From 1d2c8bbd4d45aa19a73c473160bb3c055996a8f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 18:16:24 +0100
Subject: [PATCH 315/345] Fixed: Prices visible into stock tab.

---
 htdocs/product/price.php                |  15 +-
 htdocs/product/stock/product.php        |  55 +++-
 test/soapui/Dolibarr-soapui-project.xml | 372 +++++++++++++++++++++++-
 3 files changed, 427 insertions(+), 15 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index bb4690224e8..516a4be9fbd 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -351,28 +351,29 @@ print '</tr>';
 // MultiPrix
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
+	// Price and min price are variable (depends on level of company).
 	if (! empty($socid))
 	{
 		$soc = new Societe($db);
 		$soc->id = $socid;
 		$soc->fetch($socid);
 
+		// Selling price
 		print '<tr><td>' . $langs->trans("SellingPrice") . '</td>';
-
+		print '<td>';
 		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
-			print '<td>' . price($object->multiprices_ttc ["$soc->price_level"]);
+			print price($object->multiprices_ttc["$soc->price_level"]);
 		} else {
-			print '<td>' . 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"]);
+			print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
 		} else {
 			print ' ' . $langs->trans($object->price_base_type);
 		}
 		print '</td></tr>';
 
-		// Prix mini
+		// Price min
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
 		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
 		{
@@ -390,7 +391,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
 			// TVA
-			if ($i == 1) 			// We show only price for level 1
+			if ($i == 1) 			// We show only vat for level 1
 			{
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
 			}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 13a798548d5..1efc3924aa7 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -31,6 +31,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
@@ -310,6 +311,9 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
     header("Location: product.php?id=".$id);
     exit;
 }
+
+
+
 /*
  * View
  */
@@ -379,13 +383,50 @@ if ($id > 0 || $ref)
 		print '<td>'.price($product->pmp).' '.$langs->trans("HT").'</td>';
 		print '</tr>';
 
-        // Sell price
-        print '<tr><td>'.$langs->trans("SellPriceMin").'</td>';
-        print '<td>';
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price($product->price).' '.$langs->trans("HT");
-        else print $langs->trans("Variable");
-        print '</td>';
-        print '</tr>';
+		// Minimum Price
+		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->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
+			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			if ($object->price_base_type == 'TTC') {
+				print price($object->price_ttc) . ' ' . $langs->trans($object->price_base_type);
+			} else {
+				print price($object->price) . ' ' . $langs->trans($object->price_base_type);
+			}
+			print '</td></tr>';
+
+			// Price minimum
+			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			if ($object->price_base_type == 'TTC') {
+				print price($object->price_min_ttc) . ' ' . $langs->trans($object->price_base_type);
+			} else {
+				print price($object->price_min) . ' ' . $langs->trans($object->price_base_type);
+			}
+			print '</td></tr>';
+		}
+		else
+		{
+			// Price
+			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			print $langs->trans("Variable");
+			print '</td></tr>';
+
+			// Price minimum
+			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			print $langs->trans("Variable");
+			print '</td></tr>';
+		}
 
         // Stock
         print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).'</td><td colspan="2">';
diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml
index 1ffd1ad0e3c..c81b1ac8e1f 100755
--- a/test/soapui/Dolibarr-soapui-project.xml
+++ b/test/soapui/Dolibarr-soapui-project.xml
@@ -27446,4 +27446,374 @@
          </actioncomm>
       </ns:updateActionComm>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateActionComm"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateActionComm"/></con:call></con:operation></con:interface><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrOrderBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrOrderBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl"><con:part><con:url>http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">
+      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
+      <xsd:complexType name="authentication">
+        <xsd:all>
+          <xsd:element name="dolibarrkey" type="xsd:string"/>
+          <xsd:element name="sourceapplication" type="xsd:string"/>
+          <xsd:element name="login" type="xsd:string"/>
+          <xsd:element name="password" type="xsd:string"/>
+          <xsd:element name="entity" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="result">
+        <xsd:all>
+          <xsd:element name="result_code" type="xsd:string"/>
+          <xsd:element name="result_label" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="line">
+        <xsd:all>
+          <xsd:element name="id" type="xsd:string"/>
+          <xsd:element name="type" type="xsd:int"/>
+          <xsd:element name="fk_commande" type="xsd:int"/>
+          <xsd:element name="fk_parent_line" type="xsd:int"/>
+          <xsd:element name="desc" type="xsd:string"/>
+          <xsd:element name="qty" type="xsd:double"/>
+          <xsd:element name="price" type="xsd:double"/>
+          <xsd:element name="unitprice" type="xsd:double"/>
+          <xsd:element name="vat_rate" type="xsd:double"/>
+          <xsd:element name="remise" type="xsd:double"/>
+          <xsd:element name="remise_percent" type="xsd:double"/>
+          <xsd:element name="total_net" type="xsd:double"/>
+          <xsd:element name="total_vat" type="xsd:double"/>
+          <xsd:element name="total" type="xsd:double"/>
+          <xsd:element name="date_start" type="xsd:date"/>
+          <xsd:element name="date_end" type="xsd:date"/>
+          <xsd:element name="product_id" type="xsd:int"/>
+          <xsd:element name="product_ref" type="xsd:string"/>
+          <xsd:element name="product_label" type="xsd:string"/>
+          <xsd:element name="product_desc" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="LinesArray2">
+        <xsd:sequence>
+          <xsd:element name="line" type="tns:line" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="order">
+        <xsd:all>
+          <xsd:element name="id" type="xsd:string"/>
+          <xsd:element name="ref" type="xsd:string"/>
+          <xsd:element name="ref_client" type="xsd:string"/>
+          <xsd:element name="ref_ext" type="xsd:string"/>
+          <xsd:element name="ref_int" type="xsd:string"/>
+          <xsd:element name="thirdparty_id" type="xsd:int"/>
+          <xsd:element name="status" type="xsd:int"/>
+          <xsd:element name="facturee" type="xsd:string"/>
+          <xsd:element name="total_net" type="xsd:double"/>
+          <xsd:element name="total_vat" type="xsd:double"/>
+          <xsd:element name="total_localtax1" type="xsd:double"/>
+          <xsd:element name="total_localtax2" type="xsd:double"/>
+          <xsd:element name="total" type="xsd:double"/>
+          <xsd:element name="date" type="xsd:date"/>
+          <xsd:element name="date_creation" type="xsd:dateTime"/>
+          <xsd:element name="date_validation" type="xsd:dateTime"/>
+          <xsd:element name="date_modification" type="xsd:dateTime"/>
+          <xsd:element name="remise" type="xsd:string"/>
+          <xsd:element name="remise_percent" type="xsd:string"/>
+          <xsd:element name="remise_absolue" type="xsd:string"/>
+          <xsd:element name="source" type="xsd:string"/>
+          <xsd:element name="note_private" type="xsd:string"/>
+          <xsd:element name="note_public" type="xsd:string"/>
+          <xsd:element name="project_id" type="xsd:string"/>
+          <xsd:element name="mode_reglement_id" type="xsd:string"/>
+          <xsd:element name="mode_reglement_code" type="xsd:string"/>
+          <xsd:element name="mode_reglement" type="xsd:string"/>
+          <xsd:element name="cond_reglement_id" type="xsd:string"/>
+          <xsd:element name="cond_reglement_code" type="xsd:string"/>
+          <xsd:element name="cond_reglement" type="xsd:string"/>
+          <xsd:element name="cond_reglement_doc" type="xsd:string"/>
+          <xsd:element name="date_livraison" type="xsd:date"/>
+          <xsd:element name="fk_delivery_address" type="xsd:int"/>
+          <xsd:element name="demand_reason_id" type="xsd:string"/>
+          <xsd:element name="lines" type="tns:LinesArray2"/>
+          <xsd:element name="options_aaa" type="xsd:string"/>
+          <xsd:element name="options_bbb" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="OrdersArray2">
+        <xsd:sequence>
+          <xsd:element name="order" type="tns:order" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+  <message name="getOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+    <part name="ref_ext" type="xsd:string"/>
+  </message>
+  <message name="getOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="getOrdersForThirdPartyRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="idthirdparty" type="xsd:string"/>
+  </message>
+  <message name="getOrdersForThirdPartyResponse">
+    <part name="result" type="tns:result"/>
+    <part name="orders" type="tns:OrdersArray2"/>
+  </message>
+  <message name="createOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="createOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+  </message>
+  <message name="updateOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="updateOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+  </message>
+  <message name="validOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+  </message>
+  <message name="validOrderResponse">
+    <part name="result" type="tns:result"/>
+  </message>
+  <portType name="WebServicesDolibarrOrderPortType">
+    <operation name="getOrder">
+      <documentation>WS to get a particular invoice</documentation>
+      <input message="tns:getOrderRequest"/>
+      <output message="tns:getOrderResponse"/>
+    </operation>
+    <operation name="getOrdersForThirdParty">
+      <documentation>WS to get all orders of a third party</documentation>
+      <input message="tns:getOrdersForThirdPartyRequest"/>
+      <output message="tns:getOrdersForThirdPartyResponse"/>
+    </operation>
+    <operation name="createOrder">
+      <documentation>WS to create an order</documentation>
+      <input message="tns:createOrderRequest"/>
+      <output message="tns:createOrderResponse"/>
+    </operation>
+    <operation name="updateOrder">
+      <documentation>WS to update an order</documentation>
+      <input message="tns:updateOrderRequest"/>
+      <output message="tns:updateOrderResponse"/>
+    </operation>
+    <operation name="validOrder">
+      <documentation>WS to valid an order</documentation>
+      <input message="tns:validOrderRequest"/>
+      <output message="tns:validOrderResponse"/>
+    </operation>
+  </portType>
+  <binding name="WebServicesDolibarrOrderBinding" type="tns:WebServicesDolibarrOrderPortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="getOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="getOrdersForThirdParty">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getOrdersForThirdParty" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="createOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#createOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="updateOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#updateOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="validOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#validOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="WebServicesDolibarrOrder">
+    <port name="WebServicesDolibarrOrderPort" binding="tns:WebServicesDolibarrOrderBinding">
+      <soap:address location="http://localhostalias/dolibarr_3.7/webservices/server_order.php"/>
+    </port>
+  </service>
+</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostalias/dolibarr_3.6/webservices/server_order.php</con:endpoint><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createOrder" name="createOrder" bindingOperationName="createOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:createOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">aaa</sourceapplication>
+            <login xsi:type="xsd:string">admin</login>
+            <password xsi:type="xsd:string">admin</password>
+            <entity xsi:type="xsd:string"></entity>
+         </authentication>
+         <order xsi:type="ns:order">
+            <!--You may enter the following 35 items in any order-->
+            <ref_client xsi:type="xsd:string"></ref_client>
+            <ref_ext xsi:type="xsd:string">123ext</ref_ext>
+            <ref_int xsi:type="xsd:string">?</ref_int>
+            <thirdparty_id xsi:type="xsd:int">1</thirdparty_id>
+            <status xsi:type="xsd:int">?</status>
+            <facturee xsi:type="xsd:string">?</facturee>
+            <total_net xsi:type="xsd:double">?</total_net>
+            <total_vat xsi:type="xsd:double">?</total_vat>
+            <total_localtax1 xsi:type="xsd:double">?</total_localtax1>
+            <total_localtax2 xsi:type="xsd:double">?</total_localtax2>
+            <total xsi:type="xsd:double">?</total>
+            <date xsi:type="xsd:date">?</date>
+            <date_creation xsi:type="xsd:dateTime">?</date_creation>
+            <date_validation xsi:type="xsd:dateTime">?</date_validation>
+            <date_modification xsi:type="xsd:dateTime">?</date_modification>
+            <remise xsi:type="xsd:string">?</remise>
+            <remise_percent xsi:type="xsd:string">?</remise_percent>
+            <remise_absolue xsi:type="xsd:string">?</remise_absolue>
+            <source xsi:type="xsd:string">?</source>
+            <note_private xsi:type="xsd:string">?</note_private>
+            <note_public xsi:type="xsd:string">?</note_public>
+            <project_id xsi:type="xsd:string">?</project_id>
+            <mode_reglement_id xsi:type="xsd:string">?</mode_reglement_id>
+            <mode_reglement_code xsi:type="xsd:string">?</mode_reglement_code>
+            <mode_reglement xsi:type="xsd:string">?</mode_reglement>
+            <cond_reglement_id xsi:type="xsd:string">?</cond_reglement_id>
+            <cond_reglement_code xsi:type="xsd:string">?</cond_reglement_code>
+            <cond_reglement xsi:type="xsd:string">?</cond_reglement>
+            <cond_reglement_doc xsi:type="xsd:string">?</cond_reglement_doc>
+            <date_livraison xsi:type="xsd:date">?</date_livraison>
+            <fk_delivery_address xsi:type="xsd:int">?</fk_delivery_address>
+            <demand_reason_id xsi:type="xsd:string">?</demand_reason_id>
+            <lines xsi:type="ns:LinesArray2">
+               <!--Zero or more repetitions:-->
+               <line xsi:type="ns:line">
+                  <!--You may enter the following 20 items in any order-->
+                  <id xsi:type="xsd:string">?</id>
+                  <type xsi:type="xsd:int">?</type>
+                  <fk_commande xsi:type="xsd:int">?</fk_commande>
+                  <fk_parent_line xsi:type="xsd:int">?</fk_parent_line>
+                  <desc xsi:type="xsd:string">?</desc>
+                  <qty xsi:type="xsd:double">?</qty>
+                  <price xsi:type="xsd:double">?</price>
+                  <unitprice xsi:type="xsd:double">?</unitprice>
+                  <vat_rate xsi:type="xsd:double">?</vat_rate>
+                  <remise xsi:type="xsd:double">?</remise>
+                  <remise_percent xsi:type="xsd:double">?</remise_percent>
+                  <total_net xsi:type="xsd:double">?</total_net>
+                  <total_vat xsi:type="xsd:double">?</total_vat>
+                  <total xsi:type="xsd:double">?</total>
+                  <date_start xsi:type="xsd:date">?</date_start>
+                  <date_end xsi:type="xsd:date">?</date_end>
+                  <product_id xsi:type="xsd:int">?</product_id>
+                  <product_ref xsi:type="xsd:string">?</product_ref>
+                  <product_label xsi:type="xsd:string">?</product_label>
+                  <product_desc xsi:type="xsd:string">?</product_desc>
+               </line>
+            </lines>
+         </order>
+      </ns:createOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getOrder" name="getOrder" bindingOperationName="getOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:getOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <id xsi:type="xsd:string">?</id>
+         <ref xsi:type="xsd:string">?</ref>
+         <ref_ext xsi:type="xsd:string">?</ref_ext>
+      </ns:getOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getOrder"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getOrdersForThirdParty" name="getOrdersForThirdParty" bindingOperationName="getOrdersForThirdParty" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:getOrdersForThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <idthirdparty xsi:type="xsd:string">?</idthirdparty>
+      </ns:getOrdersForThirdParty>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getOrdersForThirdParty"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#validOrder" name="validOrder" bindingOperationName="validOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:validOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <id xsi:type="xsd:string">?</id>
+      </ns:validOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#validOrder"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#updateOrder" name="updateOrder" bindingOperationName="updateOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:updateOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string"></sourceapplication>
+            <login xsi:type="xsd:string">admin</login>
+            <password xsi:type="xsd:string">admin</password>
+            <entity xsi:type="xsd:string"></entity>
+         </authentication>
+         <order xsi:type="ns:order">
+            <!--You may enter the following 37 items in any order-->
+            <id xsi:type="xsd:string">6</id>
+<status xsi:type="xsd:string">0</status>
+            <thirdparty_id xsi:type="xsd:int">2</thirdparty_id>
+            <total_net xsi:type="xsd:double">?</total_net>
+            <total_vat xsi:type="xsd:double">?</total_vat>
+            <total_localtax1 xsi:type="xsd:double">?</total_localtax1>
+            <total_localtax2 xsi:type="xsd:double">?</total_localtax2>
+            <total xsi:type="xsd:double">?</total>
+            <note_private xsi:type="xsd:string">?</note_private>
+            <note_public xsi:type="xsd:string">?</note_public>
+            <project_id xsi:type="xsd:string">?</project_id>
+         </order>
+      </ns:updateOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file

From 31fd03790e4b956671a38a560d312d7445bfb6ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 18:26:11 +0100
Subject: [PATCH 316/345] Fixed: Prices visible into stock tab.

Conflicts:
	htdocs/product/stock/product.php
---
 htdocs/langs/en_US/stocks.lang          |   2 +-
 htdocs/product/price.php                |  15 +-
 htdocs/product/stock/product.php        | 122 ++++++--
 test/soapui/Dolibarr-soapui-project.xml | 372 +++++++++++++++++++++++-
 4 files changed, 477 insertions(+), 34 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index b03d26dbe1d..492cbbd7464 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -59,7 +59,7 @@ ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving
 ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Reason for difference stock physical and theoretical
+StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
 DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 98cfd675fac..e4a46c76674 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -351,28 +351,29 @@ print '</tr>';
 // MultiPrix
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
 {
+	// Price and min price are variable (depends on level of company).
 	if (! empty($socid))
 	{
 		$soc = new Societe($db);
 		$soc->id = $socid;
 		$soc->fetch($socid);
 
+		// Selling price
 		print '<tr><td>' . $langs->trans("SellingPrice") . '</td>';
-
+		print '<td>';
 		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
-			print '<td>' . price($object->multiprices_ttc ["$soc->price_level"]);
+			print price($object->multiprices_ttc["$soc->price_level"]);
 		} else {
-			print '<td>' . 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"]);
+			print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
 		} else {
 			print ' ' . $langs->trans($object->price_base_type);
 		}
 		print '</td></tr>';
 
-		// Prix mini
+		// Price min
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
 		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
 		{
@@ -390,7 +391,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
 			// TVA
-			if ($i == 1) 			// We show only price for level 1
+			if ($i == 1) 			// We show only vat for level 1
 			{
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
 			}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 616e91d1924..3dff2284b2a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -31,6 +31,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
@@ -203,26 +204,59 @@ if ($action == "transfert_stock" && ! $cancel)
 
 				//print 'price src='.$pricesrc.', price dest='.$pricedest;exit;
 
-				// Remove stock
-				$result1=$product->correct_stock(
-	    			$user,
-	    			GETPOST("id_entrepot_source"),
-	    			GETPOST("nbpiece"),
-	    			1,
-	    			GETPOST("label"),
-	    			$pricesrc
-				);
+							$pdluoid=GETPOST('pdluoid','int');
 
-				// Add stock
-				$result2=$product->correct_stock(
-	    			$user,
-	    			GETPOST("id_entrepot_destination"),
-	    			GETPOST("nbpiece"),
-	    			0,
-	    			GETPOST("label"),
-	    			$pricedest
-				);
+				if ($pdluoid>0)
+				{
+				    $pdluo = new Productbatch($db);
+				    $result=$pdluo->fetch($pdluoid);
 
+				    if ($result>0 && $pdluo->id)
+				    {
+                        // Remove stock
+                        $result1=$product->correct_stock_batch(
+				            $user,
+				            $pdluo->warehouseid,
+				            GETPOST("nbpiece",'int'),
+				            1,
+				            GETPOST("label",'san_alpha'),
+				            $pricesrc,
+				            $pdluo->eatby,$pdluo->sellby,$pdluo->batch
+				        );
+                        // Add stock
+                        $result2=$product->correct_stock_batch(
+                            $user,
+                            GETPOST("id_entrepot_destination",'int'),
+                            GETPOST("nbpiece",'int'),
+                            0,
+                            GETPOST("label",'san_alpha'),
+                            $pricedest,
+                            $pdluo->eatby,$pdluo->sellby,$pdluo->batch
+                        );
+				    }
+				}
+				else
+				{
+                    // Remove stock
+                    $result1=$product->correct_stock(
+                        $user,
+                        GETPOST("id_entrepot_source"),
+                        GETPOST("nbpiece"),
+                        1,
+                        GETPOST("label"),
+                        $pricesrc
+                    );
+
+                    // Add stock
+                    $result2=$product->correct_stock(
+                        $user,
+                        GETPOST("id_entrepot_destination"),
+                        GETPOST("nbpiece"),
+                        0,
+                        GETPOST("label"),
+                        $pricedest
+                    );
+				}
 				if ($result1 >= 0 && $result2 >= 0)
 				{
 					$db->commit();
@@ -240,6 +274,7 @@ if ($action == "transfert_stock" && ! $cancel)
 }
 
 
+
 /*
  * View
  */
@@ -309,13 +344,50 @@ if ($id > 0 || $ref)
 		print '<td>'.price($product->pmp).' '.$langs->trans("HT").'</td>';
 		print '</tr>';
 
-        // Sell price
-        print '<tr><td>'.$langs->trans("SellPriceMin").'</td>';
-        print '<td>';
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price($product->price).' '.$langs->trans("HT");
-        else print $langs->trans("Variable");
-        print '</td>';
-        print '</tr>';
+		// Minimum Price
+		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->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
+			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			if ($object->price_base_type == 'TTC') {
+				print price($object->price_ttc) . ' ' . $langs->trans($object->price_base_type);
+			} else {
+				print price($object->price) . ' ' . $langs->trans($object->price_base_type);
+			}
+			print '</td></tr>';
+
+			// Price minimum
+			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			if ($object->price_base_type == 'TTC') {
+				print price($object->price_min_ttc) . ' ' . $langs->trans($object->price_base_type);
+			} else {
+				print price($object->price_min) . ' ' . $langs->trans($object->price_base_type);
+			}
+			print '</td></tr>';
+		}
+		else
+		{
+			// Price
+			print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
+			print $langs->trans("Variable");
+			print '</td></tr>';
+
+			// Price minimum
+			print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
+			print $langs->trans("Variable");
+			print '</td></tr>';
+		}
 
         // Stock
         print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).'</td><td colspan="2">';
diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml
index 1ffd1ad0e3c..c81b1ac8e1f 100755
--- a/test/soapui/Dolibarr-soapui-project.xml
+++ b/test/soapui/Dolibarr-soapui-project.xml
@@ -27446,4 +27446,374 @@
          </actioncomm>
       </ns:updateActionComm>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateActionComm"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateActionComm"/></con:call></con:operation></con:interface><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrOrderBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrOrderBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl"><con:part><con:url>http://localhostalias/dolibarr_3.7/webservices/server_order.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="http://www.dolibarr.org/ns/">
+      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/"/>
+      <xsd:complexType name="authentication">
+        <xsd:all>
+          <xsd:element name="dolibarrkey" type="xsd:string"/>
+          <xsd:element name="sourceapplication" type="xsd:string"/>
+          <xsd:element name="login" type="xsd:string"/>
+          <xsd:element name="password" type="xsd:string"/>
+          <xsd:element name="entity" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="result">
+        <xsd:all>
+          <xsd:element name="result_code" type="xsd:string"/>
+          <xsd:element name="result_label" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="line">
+        <xsd:all>
+          <xsd:element name="id" type="xsd:string"/>
+          <xsd:element name="type" type="xsd:int"/>
+          <xsd:element name="fk_commande" type="xsd:int"/>
+          <xsd:element name="fk_parent_line" type="xsd:int"/>
+          <xsd:element name="desc" type="xsd:string"/>
+          <xsd:element name="qty" type="xsd:double"/>
+          <xsd:element name="price" type="xsd:double"/>
+          <xsd:element name="unitprice" type="xsd:double"/>
+          <xsd:element name="vat_rate" type="xsd:double"/>
+          <xsd:element name="remise" type="xsd:double"/>
+          <xsd:element name="remise_percent" type="xsd:double"/>
+          <xsd:element name="total_net" type="xsd:double"/>
+          <xsd:element name="total_vat" type="xsd:double"/>
+          <xsd:element name="total" type="xsd:double"/>
+          <xsd:element name="date_start" type="xsd:date"/>
+          <xsd:element name="date_end" type="xsd:date"/>
+          <xsd:element name="product_id" type="xsd:int"/>
+          <xsd:element name="product_ref" type="xsd:string"/>
+          <xsd:element name="product_label" type="xsd:string"/>
+          <xsd:element name="product_desc" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="LinesArray2">
+        <xsd:sequence>
+          <xsd:element name="line" type="tns:line" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="order">
+        <xsd:all>
+          <xsd:element name="id" type="xsd:string"/>
+          <xsd:element name="ref" type="xsd:string"/>
+          <xsd:element name="ref_client" type="xsd:string"/>
+          <xsd:element name="ref_ext" type="xsd:string"/>
+          <xsd:element name="ref_int" type="xsd:string"/>
+          <xsd:element name="thirdparty_id" type="xsd:int"/>
+          <xsd:element name="status" type="xsd:int"/>
+          <xsd:element name="facturee" type="xsd:string"/>
+          <xsd:element name="total_net" type="xsd:double"/>
+          <xsd:element name="total_vat" type="xsd:double"/>
+          <xsd:element name="total_localtax1" type="xsd:double"/>
+          <xsd:element name="total_localtax2" type="xsd:double"/>
+          <xsd:element name="total" type="xsd:double"/>
+          <xsd:element name="date" type="xsd:date"/>
+          <xsd:element name="date_creation" type="xsd:dateTime"/>
+          <xsd:element name="date_validation" type="xsd:dateTime"/>
+          <xsd:element name="date_modification" type="xsd:dateTime"/>
+          <xsd:element name="remise" type="xsd:string"/>
+          <xsd:element name="remise_percent" type="xsd:string"/>
+          <xsd:element name="remise_absolue" type="xsd:string"/>
+          <xsd:element name="source" type="xsd:string"/>
+          <xsd:element name="note_private" type="xsd:string"/>
+          <xsd:element name="note_public" type="xsd:string"/>
+          <xsd:element name="project_id" type="xsd:string"/>
+          <xsd:element name="mode_reglement_id" type="xsd:string"/>
+          <xsd:element name="mode_reglement_code" type="xsd:string"/>
+          <xsd:element name="mode_reglement" type="xsd:string"/>
+          <xsd:element name="cond_reglement_id" type="xsd:string"/>
+          <xsd:element name="cond_reglement_code" type="xsd:string"/>
+          <xsd:element name="cond_reglement" type="xsd:string"/>
+          <xsd:element name="cond_reglement_doc" type="xsd:string"/>
+          <xsd:element name="date_livraison" type="xsd:date"/>
+          <xsd:element name="fk_delivery_address" type="xsd:int"/>
+          <xsd:element name="demand_reason_id" type="xsd:string"/>
+          <xsd:element name="lines" type="tns:LinesArray2"/>
+          <xsd:element name="options_aaa" type="xsd:string"/>
+          <xsd:element name="options_bbb" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="OrdersArray2">
+        <xsd:sequence>
+          <xsd:element name="order" type="tns:order" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+  <message name="getOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+    <part name="ref_ext" type="xsd:string"/>
+  </message>
+  <message name="getOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="getOrdersForThirdPartyRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="idthirdparty" type="xsd:string"/>
+  </message>
+  <message name="getOrdersForThirdPartyResponse">
+    <part name="result" type="tns:result"/>
+    <part name="orders" type="tns:OrdersArray2"/>
+  </message>
+  <message name="createOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="createOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+  </message>
+  <message name="updateOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="order" type="tns:order"/>
+  </message>
+  <message name="updateOrderResponse">
+    <part name="result" type="tns:result"/>
+    <part name="id" type="xsd:string"/>
+    <part name="ref" type="xsd:string"/>
+  </message>
+  <message name="validOrderRequest">
+    <part name="authentication" type="tns:authentication"/>
+    <part name="id" type="xsd:string"/>
+  </message>
+  <message name="validOrderResponse">
+    <part name="result" type="tns:result"/>
+  </message>
+  <portType name="WebServicesDolibarrOrderPortType">
+    <operation name="getOrder">
+      <documentation>WS to get a particular invoice</documentation>
+      <input message="tns:getOrderRequest"/>
+      <output message="tns:getOrderResponse"/>
+    </operation>
+    <operation name="getOrdersForThirdParty">
+      <documentation>WS to get all orders of a third party</documentation>
+      <input message="tns:getOrdersForThirdPartyRequest"/>
+      <output message="tns:getOrdersForThirdPartyResponse"/>
+    </operation>
+    <operation name="createOrder">
+      <documentation>WS to create an order</documentation>
+      <input message="tns:createOrderRequest"/>
+      <output message="tns:createOrderResponse"/>
+    </operation>
+    <operation name="updateOrder">
+      <documentation>WS to update an order</documentation>
+      <input message="tns:updateOrderRequest"/>
+      <output message="tns:updateOrderResponse"/>
+    </operation>
+    <operation name="validOrder">
+      <documentation>WS to valid an order</documentation>
+      <input message="tns:validOrderRequest"/>
+      <output message="tns:validOrderResponse"/>
+    </operation>
+  </portType>
+  <binding name="WebServicesDolibarrOrderBinding" type="tns:WebServicesDolibarrOrderPortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="getOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="getOrdersForThirdParty">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#getOrdersForThirdParty" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="createOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#createOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="updateOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#updateOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+    <operation name="validOrder">
+      <soap:operation soapAction="http://www.dolibarr.org/ns/#validOrder" style="rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="WebServicesDolibarrOrder">
+    <port name="WebServicesDolibarrOrderPort" binding="tns:WebServicesDolibarrOrderBinding">
+      <soap:address location="http://localhostalias/dolibarr_3.7/webservices/server_order.php"/>
+    </port>
+  </service>
+</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostalias/dolibarr_3.6/webservices/server_order.php</con:endpoint><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createOrder" name="createOrder" bindingOperationName="createOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:createOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">aaa</sourceapplication>
+            <login xsi:type="xsd:string">admin</login>
+            <password xsi:type="xsd:string">admin</password>
+            <entity xsi:type="xsd:string"></entity>
+         </authentication>
+         <order xsi:type="ns:order">
+            <!--You may enter the following 35 items in any order-->
+            <ref_client xsi:type="xsd:string"></ref_client>
+            <ref_ext xsi:type="xsd:string">123ext</ref_ext>
+            <ref_int xsi:type="xsd:string">?</ref_int>
+            <thirdparty_id xsi:type="xsd:int">1</thirdparty_id>
+            <status xsi:type="xsd:int">?</status>
+            <facturee xsi:type="xsd:string">?</facturee>
+            <total_net xsi:type="xsd:double">?</total_net>
+            <total_vat xsi:type="xsd:double">?</total_vat>
+            <total_localtax1 xsi:type="xsd:double">?</total_localtax1>
+            <total_localtax2 xsi:type="xsd:double">?</total_localtax2>
+            <total xsi:type="xsd:double">?</total>
+            <date xsi:type="xsd:date">?</date>
+            <date_creation xsi:type="xsd:dateTime">?</date_creation>
+            <date_validation xsi:type="xsd:dateTime">?</date_validation>
+            <date_modification xsi:type="xsd:dateTime">?</date_modification>
+            <remise xsi:type="xsd:string">?</remise>
+            <remise_percent xsi:type="xsd:string">?</remise_percent>
+            <remise_absolue xsi:type="xsd:string">?</remise_absolue>
+            <source xsi:type="xsd:string">?</source>
+            <note_private xsi:type="xsd:string">?</note_private>
+            <note_public xsi:type="xsd:string">?</note_public>
+            <project_id xsi:type="xsd:string">?</project_id>
+            <mode_reglement_id xsi:type="xsd:string">?</mode_reglement_id>
+            <mode_reglement_code xsi:type="xsd:string">?</mode_reglement_code>
+            <mode_reglement xsi:type="xsd:string">?</mode_reglement>
+            <cond_reglement_id xsi:type="xsd:string">?</cond_reglement_id>
+            <cond_reglement_code xsi:type="xsd:string">?</cond_reglement_code>
+            <cond_reglement xsi:type="xsd:string">?</cond_reglement>
+            <cond_reglement_doc xsi:type="xsd:string">?</cond_reglement_doc>
+            <date_livraison xsi:type="xsd:date">?</date_livraison>
+            <fk_delivery_address xsi:type="xsd:int">?</fk_delivery_address>
+            <demand_reason_id xsi:type="xsd:string">?</demand_reason_id>
+            <lines xsi:type="ns:LinesArray2">
+               <!--Zero or more repetitions:-->
+               <line xsi:type="ns:line">
+                  <!--You may enter the following 20 items in any order-->
+                  <id xsi:type="xsd:string">?</id>
+                  <type xsi:type="xsd:int">?</type>
+                  <fk_commande xsi:type="xsd:int">?</fk_commande>
+                  <fk_parent_line xsi:type="xsd:int">?</fk_parent_line>
+                  <desc xsi:type="xsd:string">?</desc>
+                  <qty xsi:type="xsd:double">?</qty>
+                  <price xsi:type="xsd:double">?</price>
+                  <unitprice xsi:type="xsd:double">?</unitprice>
+                  <vat_rate xsi:type="xsd:double">?</vat_rate>
+                  <remise xsi:type="xsd:double">?</remise>
+                  <remise_percent xsi:type="xsd:double">?</remise_percent>
+                  <total_net xsi:type="xsd:double">?</total_net>
+                  <total_vat xsi:type="xsd:double">?</total_vat>
+                  <total xsi:type="xsd:double">?</total>
+                  <date_start xsi:type="xsd:date">?</date_start>
+                  <date_end xsi:type="xsd:date">?</date_end>
+                  <product_id xsi:type="xsd:int">?</product_id>
+                  <product_ref xsi:type="xsd:string">?</product_ref>
+                  <product_label xsi:type="xsd:string">?</product_label>
+                  <product_desc xsi:type="xsd:string">?</product_desc>
+               </line>
+            </lines>
+         </order>
+      </ns:createOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getOrder" name="getOrder" bindingOperationName="getOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:getOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <id xsi:type="xsd:string">?</id>
+         <ref xsi:type="xsd:string">?</ref>
+         <ref_ext xsi:type="xsd:string">?</ref_ext>
+      </ns:getOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getOrder"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getOrdersForThirdParty" name="getOrdersForThirdParty" bindingOperationName="getOrdersForThirdParty" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:getOrdersForThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <idthirdparty xsi:type="xsd:string">?</idthirdparty>
+      </ns:getOrdersForThirdParty>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getOrdersForThirdParty"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#validOrder" name="validOrder" bindingOperationName="validOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:validOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">?</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string">?</sourceapplication>
+            <login xsi:type="xsd:string">?</login>
+            <password xsi:type="xsd:string">?</password>
+            <entity xsi:type="xsd:string">?</entity>
+         </authentication>
+         <id xsi:type="xsd:string">?</id>
+      </ns:validOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#validOrder"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#updateOrder" name="updateOrder" bindingOperationName="updateOrder" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostalias/dolibarr_3.7/webservices/server_order.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ns:updateOrder soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+         <authentication xsi:type="ns:authentication">
+            <!--You may enter the following 5 items in any order-->
+            <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey>
+            <sourceapplication xsi:type="xsd:string"></sourceapplication>
+            <login xsi:type="xsd:string">admin</login>
+            <password xsi:type="xsd:string">admin</password>
+            <entity xsi:type="xsd:string"></entity>
+         </authentication>
+         <order xsi:type="ns:order">
+            <!--You may enter the following 37 items in any order-->
+            <id xsi:type="xsd:string">6</id>
+<status xsi:type="xsd:string">0</status>
+            <thirdparty_id xsi:type="xsd:int">2</thirdparty_id>
+            <total_net xsi:type="xsd:double">?</total_net>
+            <total_vat xsi:type="xsd:double">?</total_vat>
+            <total_localtax1 xsi:type="xsd:double">?</total_localtax1>
+            <total_localtax2 xsi:type="xsd:double">?</total_localtax2>
+            <total xsi:type="xsd:double">?</total>
+            <note_private xsi:type="xsd:string">?</note_private>
+            <note_public xsi:type="xsd:string">?</note_public>
+            <project_id xsi:type="xsd:string">?</project_id>
+         </order>
+      </ns:updateOrder>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#updateOrder"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
\ No newline at end of file

From 58e4e01db74ce81359e243e84be5250ea09e891e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 18:59:46 +0100
Subject: [PATCH 317/345] Sync transifex

---
 htdocs/langs/cs_CZ/main.lang          |   2 +-
 htdocs/langs/da_DK/accountancy.lang   |  14 +-
 htdocs/langs/da_DK/admin.lang         |  18 +--
 htdocs/langs/de_DE/holiday.lang       |  12 +-
 htdocs/langs/el_GR/accountancy.lang   |  78 +++++-----
 htdocs/langs/el_GR/admin.lang         | 100 ++++++-------
 htdocs/langs/el_GR/bills.lang         |  42 +++---
 htdocs/langs/el_GR/boxes.lang         |  28 ++--
 htdocs/langs/el_GR/companies.lang     |  14 +-
 htdocs/langs/el_GR/compta.lang        |  24 +--
 htdocs/langs/el_GR/donations.lang     |  12 +-
 htdocs/langs/el_GR/holiday.lang       |  28 ++--
 htdocs/langs/el_GR/interventions.lang |  20 +--
 htdocs/langs/el_GR/mails.lang         |   8 +-
 htdocs/langs/el_GR/margins.lang       |  12 +-
 htdocs/langs/el_GR/other.lang         |  40 ++---
 htdocs/langs/el_GR/productbatch.lang  |  36 ++---
 htdocs/langs/el_GR/products.lang      |  18 +--
 htdocs/langs/el_GR/projects.lang      |   4 +-
 htdocs/langs/el_GR/resource.lang      |  16 +-
 htdocs/langs/el_GR/withdrawals.lang   |  14 +-
 htdocs/langs/es_ES/opensurvey.lang    |   2 +-
 htdocs/langs/fr_FR/admin.lang         |   2 +-
 htdocs/langs/fr_FR/holiday.lang       |   2 +-
 htdocs/langs/fr_FR/users.lang         |   2 +-
 htdocs/langs/it_IT/stocks.lang        |  36 ++---
 htdocs/langs/lv_LV/admin.lang         |  14 +-
 htdocs/langs/lv_LV/agenda.lang        |   2 +-
 htdocs/langs/lv_LV/categories.lang    |   2 +-
 htdocs/langs/lv_LV/contracts.lang     |   2 +-
 htdocs/langs/lv_LV/deliveries.lang    |   6 +-
 htdocs/langs/lv_LV/errors.lang        |  12 +-
 htdocs/langs/lv_LV/externalsite.lang  |   2 +-
 htdocs/langs/lv_LV/other.lang         |  34 ++---
 htdocs/langs/lv_LV/printipp.lang      |  18 +--
 htdocs/langs/lv_LV/productbatch.lang  |   2 +-
 htdocs/langs/lv_LV/products.lang      |   2 +-
 htdocs/langs/lv_LV/resource.lang      |  54 +++----
 htdocs/langs/lv_LV/stocks.lang        |   2 +-
 htdocs/langs/nl_NL/dict.lang          |   6 +-
 htdocs/langs/nl_NL/opensurvey.lang    | 128 ++++++++--------
 htdocs/langs/pt_PT/accountancy.lang   |  10 +-
 htdocs/langs/pt_PT/admin.lang         |  86 +++++------
 htdocs/langs/pt_PT/boxes.lang         |  61 ++++----
 htdocs/langs/pt_PT/companies.lang     |  32 ++--
 htdocs/langs/pt_PT/ftp.lang           |  16 +-
 htdocs/langs/pt_PT/install.lang       | 158 ++++++++++----------
 htdocs/langs/pt_PT/languages.lang     |  12 +-
 htdocs/langs/pt_PT/mailmanspip.lang   |  46 +++---
 htdocs/langs/pt_PT/main.lang          | 154 +++++++++----------
 htdocs/langs/pt_PT/productbatch.lang  |  24 +--
 htdocs/langs/pt_PT/salaries.lang      |   4 +
 htdocs/langs/pt_PT/users.lang         | 160 ++++++++++----------
 htdocs/langs/ro_RO/accountancy.lang   |   4 +-
 htdocs/langs/ro_RO/admin.lang         |  74 +++++-----
 htdocs/langs/ro_RO/agenda.lang        |  10 +-
 htdocs/langs/ro_RO/banks.lang         |  24 +--
 htdocs/langs/ro_RO/bills.lang         |  30 ++--
 htdocs/langs/ro_RO/boxes.lang         | 146 +++++++++---------
 htdocs/langs/ro_RO/categories.lang    |  16 +-
 htdocs/langs/ro_RO/commercial.lang    |  12 +-
 htdocs/langs/ro_RO/companies.lang     |  12 +-
 htdocs/langs/ro_RO/compta.lang        |   8 +-
 htdocs/langs/ro_RO/contracts.lang     |   6 +-
 htdocs/langs/ro_RO/deliveries.lang    |  20 +--
 htdocs/langs/ro_RO/donations.lang     |   6 +-
 htdocs/langs/ro_RO/ecm.lang           |   6 +-
 htdocs/langs/ro_RO/errors.lang        |   4 +-
 htdocs/langs/ro_RO/exports.lang       |  32 ++--
 htdocs/langs/ro_RO/ftp.lang           |   2 +-
 htdocs/langs/ro_RO/help.lang          |  26 ++--
 htdocs/langs/ro_RO/install.lang       |   2 +-
 htdocs/langs/ro_RO/ldap.lang          |   2 +-
 htdocs/langs/ro_RO/mails.lang         |   6 +-
 htdocs/langs/ro_RO/main.lang          |  30 ++--
 htdocs/langs/ro_RO/members.lang       |  14 +-
 htdocs/langs/ro_RO/opensurvey.lang    |   2 +-
 htdocs/langs/ro_RO/orders.lang        |  14 +-
 htdocs/langs/ro_RO/other.lang         |  24 +--
 htdocs/langs/ro_RO/products.lang      |  16 +-
 htdocs/langs/ro_RO/projects.lang      |   6 +-
 htdocs/langs/ro_RO/propal.lang        | 112 +++++++-------
 htdocs/langs/ro_RO/sendings.lang      |   8 +-
 htdocs/langs/ro_RO/sms.lang           |   4 +-
 htdocs/langs/ro_RO/stocks.lang        |   4 +-
 htdocs/langs/ro_RO/suppliers.lang     |   2 +-
 htdocs/langs/ro_RO/trips.lang         |  18 +--
 htdocs/langs/ro_RO/users.lang         |   8 +-
 htdocs/langs/ro_RO/withdrawals.lang   |  34 ++---
 htdocs/langs/ro_RO/workflow.lang      |   4 +-
 htdocs/langs/sl_SI/accountancy.lang   |  22 +--
 htdocs/langs/sl_SI/deliveries.lang    |   2 +
 htdocs/langs/sl_SI/dict.lang          |   2 +
 htdocs/langs/sl_SI/donations.lang     |   4 +-
 htdocs/langs/sl_SI/holiday.lang       | 144 +++++++++---------
 htdocs/langs/sl_SI/mails.lang         |  12 +-
 htdocs/langs/sl_SI/printipp.lang      |  26 ++--
 htdocs/langs/sv_SE/admin.lang         |  28 ++--
 htdocs/langs/sv_SE/agenda.lang        |   2 +-
 htdocs/langs/sv_SE/contracts.lang     |   4 +-
 htdocs/langs/sv_SE/errors.lang        |  36 ++---
 htdocs/langs/sv_SE/members.lang       |   2 +-
 htdocs/langs/sv_SE/products.lang      |  10 +-
 htdocs/langs/sv_SE/projects.lang      |   4 +-
 htdocs/langs/sv_SE/withdrawals.lang   |   4 +-
 htdocs/langs/tr_TR/accountancy.lang   |   4 +-
 htdocs/langs/tr_TR/admin.lang         |  10 +-
 htdocs/langs/tr_TR/agenda.lang        |   2 +-
 htdocs/langs/tr_TR/contracts.lang     |   2 +-
 htdocs/langs/tr_TR/withdrawals.lang   |   4 +-
 htdocs/langs/vi_VN/products.lang      | 204 +++++++++++++-------------
 111 files changed, 1461 insertions(+), 1448 deletions(-)

diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 02a8a1c3fe9..ee2a66242e7 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -9,7 +9,7 @@ FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=Space
 FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Yr
 FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 69ee72f82ed..789f9d8a0ff 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Vælg en kontoplan
 Validate=Godkend
 Addanaccount=Tilføj en regnskabsmæssig konto
 AccountAccounting=Regnskabsmæssig konto
-Ventilation=Breakdown
+Ventilation=Sammenbrud
 ToDispatch=Afsend
 Dispatched=Afsendt
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Udspecificer kunder
+SuppliersVentilation=Udspecificer leverandører
 TradeMargin=Handelsforskel
 Reports=Reporter
 ByCustomerInvoice=Efter fakturakunder
@@ -45,9 +45,9 @@ WriteBookKeeping=Optage konti i kontoplanen
 Bookkeeping=Kontoplan
 AccountBalanceByMonth=Kontobalance efter måned
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Udspecificer regnskab
+AccountingVentilationSupplier=Udspecificer regnskab leverandører
+AccountingVentilationCustomer=Udspecificer regnskab kunder
 Line=Linje
 
 CAHTF=Samlet køb leverandør
@@ -56,7 +56,7 @@ InvoiceLinesDone=Fornyede linjer af faktura
 IntoAccount=I den regnskabsmæssige konto
 
 Ventilate=Forny
-VentilationAuto=Automatic breakdown
+VentilationAuto=Udspecificer automatisk
 
 Processing=Forarbejde
 EndProcessing=Forarbejdet
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 92eb78a915a..fc44078647d 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -363,21 +363,21 @@ SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadress
 EnterRefToBuildUrl=Indtast reference for objekter %s
 GetSecuredUrl=Få beregnet URL
 ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+OldVATRates=Gammel moms sats
+NewVATRates=Ny moms sats
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch mass convert
 String=String
-TextLong=Long text
+TextLong=Lang tekst
 Int=Integer
 Float=Float
-DateAndTime=Date and hour
-Unique=Unique
+DateAndTime=Dato og tid
+Unique=Unik
 Boolean=Boolean (Checkbox)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Pris
 ExtrafieldMail = EMail
-ExtrafieldSelect = Select list
+ExtrafieldSelect = Vælg liste
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
@@ -394,7 +394,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
+DefaultLink=Standard link
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
 ExternalModule=External module - Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
@@ -537,7 +537,7 @@ Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Open Poll
 Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
+Module59000Name=Margin
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
@@ -786,7 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=E-mail skabeloner
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 1a83603119d..4850a0a80c7 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -32,7 +32,7 @@ ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
 ReturnCP=Zurück zur vorherigen Seite
 ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubs-Antrag zu lesen.
 InfosCP=Hinweis zum Urlaubsantrag
-InfosWorkflowCP=Information Workflow
+InfosWorkflowCP=Informations-Workflow
 RequestByCP=Beantragt von
 TitreRequestCP=Urlaubsantrag
 NbUseDaysCP=Anzahl genommene Urlaubstage
@@ -65,14 +65,14 @@ ConfirmCancelCP=Möchten Sie diesen Urlaubsantrag wirklich stornieren?
 DetailRefusCP=Ablehnungsgrund
 DateRefusCP=Datum der Ablehnung
 DateCancelCP=Datum der Absage
-DefineEventUserCP=Assign an exceptional leave for a user
+DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen
 addEventToUserCP=Urlaub zuweisen
 MotifCP=Grund
 UserCP=Benutzer
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+ErrorAddEventToUserCP=Ein Fehler ist aufgetreten beim Hinzufügen des Sonderurlaubs
+AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen.
 MenuLogCP=Zeige Logdaten zu Urlaubsanträgen
-LogCP=Log of updates of available vacation days
+LogCP=Log der Aktualisierung von verfügbaren Urlaubstagen
 ActionByCP=Ausgeführt von
 UserUpdateCP=Für den Benutzer
 PrevSoldeCP=Vorherige Übersicht
@@ -92,7 +92,7 @@ DescOptionCP=Beschreibung der Wahlmöglichkeit
 ValueOptionCP=Warenwert
 GroupToValidateCP=Gruppe mit der Berechtigung Urlaub zu bewilligen
 ConfirmConfigCP=Konfiguration bestätigen
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Letzte automatische Aktualisierung von Urlaubstagen
 UpdateConfCPOK=Erfolgreich bearbeitet.
 ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen.
 AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an,  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">indem Sie hier klicken</a>.
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index d77b366a57c..c25a43570df 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -41,7 +41,7 @@ List=Λίστα
 Create=Δημιουργία
 UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού
 UpdateMvts=Τροποποίηση μιας κίνησης
-WriteBookKeeping=Εγγραφή λογαριασμών σε γενικό βιβλίο
+WriteBookKeeping=Εγγραφή λογαριασμών στο γενικό καθολικό
 Bookkeeping=Γενικό Καθολικό
 AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα
 
@@ -51,46 +51,46 @@ AccountingVentilationCustomer=Ανάλυση λογιστικών των πελ
 Line=Γραμμή
 
 CAHTF=Σύνολο προμηθευτή αγορά ΗΤ
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
+InvoiceLines=Εγγραφές τιμολογίου για ανανέωση
+InvoiceLinesDone=Ανανεωμένες εγγραφές τιμολογίου
 IntoAccount=Στο λογιστικό λογαριασμό
 
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=Ανανέωση
+VentilationAuto=Αυτόματη ανάλυση
 
 Processing=Επεξεργασία
 EndProcessing=Τέλος της επεξεργασίας
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Εγγραφές προς ανανέωση
 SelectedLines=Επιλεγμένες γραμμές
 Lineofinvoice=Γραμμή τιμολογίου
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Ανανεώθηκε επιτυχώς στον λογιστικό λογαριασμό
+NotVentilatedinAccount=Δεν ανανεώθηκε στον λογιστικό λογαριασμό
 
 ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Αριθμός αντικειμένων για ανάλυση ανά σελίδα (προτείνεται μέγιστο : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Έχει για κατανομή» από τα πιο πρόσφατα στοιχεία
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Ανάλυση" με τα πιο πρόσφατα στοιχεία
 
 AccountLength=Μήκος των λογιστικών λογαριασμών που φαίνονται στο Dolibarr
 AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρίνεαι μήκος του λογιστικού λογαριασμού αντικαθιστώντας χώρους από τον αριθμό μηδέν. Η λειτουργία αυτή αγγίζει μόνο την οθόνη, δεν τροποποιούν τους λογιστικούς λογαριασμούς στο Dolibarr. Για την εξαγωγή, αυτή η λειτουργία είναι απαραίτητη για να είναι συμβατή με το συγκεκριμένο λογισμικό.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Μήκος γενικών λογαριασμών
+ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτων
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
 ACCOUNTING_BANK_JOURNAL=Τραπεζικό ημερολόγιο
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_CASH_JOURNAL=Ημερολόγιο μετρητών
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια
+ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς
+ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για αγορά προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για πώληση προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για αγορά υπηρεσιών (εάν δεν είναι ορισμένος στην καρτέλα υπηρεσίας)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για πώληση υπηρεσιών (εάν δεν είναι ορισμένος στην καρτέλα υπηρεσίας)
 
 Doctype=Τύπος εγγράφου
 Docdate=Ημερομηνία
@@ -128,31 +128,31 @@ ListeMvts=Λίστα των κινήσεων
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
 
 ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα των πελατών και των προμηθευτών και των λογιστικών τους λογαριασμούς τους
 
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 
 Pcgversion=Έκδοση του σχεδίου
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgtype=Τύπος λογαριασμού
+Pcgsubtype=Δευτερεύουσα κατηγορία λογαριασμού
+Accountparent=Ρίζα του λογαριασμού
+Active=Δήλωση
 
 NewFiscalYear=Νέα οικονομική χρονιά
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των πελατών σας
+TotalVente=Σύνολο κύκλου εργασιών ΗΤ
+TotalMarge=Συνολικό περιθώριο πωλήσεων
+DescVentilDoneCustomer=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων των πελατών και τη λογιστική των λογαριασμών τους
+DescVentilTodoCustomer=Ανανεώστε τις εγγραφές ενός τιμολογίου πελάτη με έναν λογιστικό λογαριασμό
+ChangeAccount=Αλλαγή λογιστικού λογαριασμού για εγγραφές επιλεγμένες από τον λογαριασμό:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των προμηθευτών σας
+DescVentilTodoSupplier=Ανανέωσε τις εγγραφές του τιμολογίου προμηθευτή με έναν λογιστικό λογαριασμό
+DescVentilDoneSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων του προμηθευτή και τη λογιστική του λογαριασμού τους
 
 ValidateHistory=Αυτόματη επικύρωση
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 
-FicheVentilation=Breakdown card
+FicheVentilation=Φόρμα ανάλυσης
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 14ccab0887d..efc83a59004 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -78,7 +78,7 @@ Index=Ευρετήριο
 Mask=Μάσκα
 NextValue=Επόμενο
 NextValueForInvoices=Επόμενο (τιμολόγιο)
-NextValueForCreditNotes=Επόμενο (πιστωτικά σημειώματα)
+NextValueForCreditNotes=Επόμενο (πιστωτικά τιμολόγια)
 NextValueForDeposit=Επόμενη αξία (κατάθεση)
 NextValueForReplacements=Επόμενη αξία (αντικατάστασης)
 MustBeLowerThanPHPLimit=Σημείωση: Η PHP σας περιορίζει το μέγεθος κάθε αρχείου αποστολής σε <b>%s</ b> %s, ανεξάρτητα από το ποιά είναι η αξία αυτής της παραμέτρου.
@@ -425,7 +425,7 @@ Module23Desc= Monitoring the consumption of energies
 Module25Name=Παραγγελίες πελάτη
 Module25Desc=Customer order management
 Module30Name=Τιμολόγια
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
+Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο διαχείρισης για τους πελάτες. Τιμολόγιο διαχείρισης για τους προμηθευτές
 Module40Name=Προμηθευτές
 Module40Desc=Supplier management and buying (orders and invoices)
 Module42Name=Logs
@@ -440,14 +440,14 @@ Module52Name=Αποθήκες
 Module52Desc=Stock's management of products
 Module53Name=Υπηρεσίες
 Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Συμβάσεις/Συνδρομές
+Module54Desc=Διαχείριση συμβολαίων (υπηρεσιών ή ανανεώσιμων συνδρομών)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Τηλεφωνία
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Πάγιες εντολές και διαχείριση απόσυρσης. Επίσης, περιλαμβάνει την παραγωγή του αρχείου SEPA για τις ευρωπαϊκές χώρες.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -478,8 +478,8 @@ Module320Name=RSS Feed
 Module320Desc=Add RSS feed inside Dolibarr screen pages
 Module330Name=Σελιδοδείκτες
 Module330Desc=Bookmark management
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Έργα/Ευκαιρίες/Leads
+Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
@@ -487,7 +487,7 @@ Module500Desc=Διαχείριση των ειδικών δαπανών, όπω
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
 Module600Name=Notifications
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.)
 Module700Name=Δωρεές
 Module700Desc=Donation management
 Module1200Name=Mantis
@@ -498,8 +498,8 @@ Module1780Name=Κατηγορίες
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Δυναμικές Τιμές
+Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματικών εκφράσεων για τις τιμές
 Module2300Name=Μενού
 Module2300Desc=Scheduled task management
 Module2400Name=Ατζέντα
@@ -508,8 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=WebServices
 Module2600Desc=Enable the Dolibarr web services server
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2650Name=Υπηρεσίες Διαδικτύου (πελάτης)
+Module2650Desc=Ενεργοποιήστε το Dolibarr web services client (Μπορεί να χρησιμοποιηθεί για την προώθηση των δεδομένων/αιτήσεις σε εξωτερικούς διακομιστές. Μόνο Παραγγελίες προμηθευτών υποστηρίζονται προς το παρόν)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
@@ -521,7 +521,7 @@ Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Ροή εργασίας
 Module6000Desc=Διαχείρισης Ροών Εργασιών
-Module20000Name=Leave Requests management
+Module20000Name=Αφήστε τη διαχείριση των ερωτήσεων
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Παρτίδα προϊόντων
 Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
@@ -534,7 +534,7 @@ Module50200Desc=Ενότητα για να προσφέρει μια σε απε
 Module50400Name=Λογιστική (για προχωρημένους)
 Module50400Desc=Λογιστική διαχείριση (διπλά μέρη)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module54000Desc=Απευθείας εκτύπωση (χωρίς να ανοίξετε τα έγγραφα) χρησιμοποιώντας Cups IPP διασύνδεση (Ο Εκτυπωτής πρέπει να είναι ορατός από τον server, και το CUPS πρέπει να έχει εγκατασταθεί στο server).
 Module55000Name=Ανοικτή Ψηφοφορία
 Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -613,15 +613,15 @@ Permission151=Read standing orders
 Permission152=Create/modify a standing orders request
 Permission153=Transmission standing orders receipts
 Permission154=Πιστωτικές / αρνηθεί στέκεται εισπράξεις παραγγελιών
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
+Permission161=Διαβάστε συμβάσεις/συνδρομές
+Permission162=Δημιουργία/τροποποίηση συμβολαίων/συνδρομών
+Permission163=Ενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
+Permission164=Απενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
+Permission165=Διαγραφή συμβολαίων/συνδρομών
+Permission171=Διαβάστε τα ταξίδια και τα έξοδα (own and his subordinates)
+Permission172=Δημιουργία/τροποποίηση ταξίδια και έξοδα
 Permission173=Διαγραφή ταξιδιών και εξόδων
-Permission174=Read all trips and expenses
+Permission174=Διαβάστε όλα τα ταξίδια και τα έξοδα
 Permission178=Εξαγωγή ταξιδιών και εξόδων
 Permission180=Read suppliers
 Permission181=Read supplier orders
@@ -679,7 +679,7 @@ Permission300=Read bar codes
 Permission301=Create/modify bar codes
 Permission302=Delete bar codes
 Permission311=Read services
-Permission312=Assign service/subscription to contract
+Permission312=Ανάθεση υπηρεσίας/συνδρομής σε συμβόλαιο
 Permission331=Read bookmarks
 Permission332=Create/modify bookmarks
 Permission333=Delete bookmarks
@@ -709,8 +709,8 @@ Permission701=Read donations
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
 Permission1001=Διαβάστε τα αποθέματα
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Δημιουργία/τροποποίηση αποθηκών
+Permission1003=Διαγραφή αποθηκών
 Permission1004=Διαβάστε τις κινήσεις αποθεμάτων
 Permission1005=Δημιουργία / τροποποίηση των κινήσεων του αποθέματος
 Permission1101=Read delivery orders
@@ -786,7 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας
 DictionarySource=Προέλευση των προτάσεων/παραγγελιών
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=Πρότυπα email
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
@@ -896,7 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Ενεργοποίηση HTML5 (Ανάπτυξη - Διαθέσιμο μόνο για Eldy πρότυπο)
 SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς
 CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού
 CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού
@@ -1083,7 +1083,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
+NotificationsDesc=Emails ειδοποιήσεις η λειτουργία αυτή σας επιτρέπει να στείλετε σιωπηλά αυτόματο μήνυμα, για ορισμένες εκδηλώσεις Dolibarr. Οι στόχοι των κοινοποιήσεων μπορούν να οριστούν:<br>* ανά Πελ./Προμ. (πελάτες ή προμηθευτές), ανά ένα Πελ./Προμ. την φορά.<br>* ή με τον καθορισμό ενός γενικού e-mail στη σελίδα εγκατάστασης του module.
 ModelModules=Πρότυπα εγγράφων
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1120,12 +1120,12 @@ WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct.
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsDate=Invoices date
-BillsNumberingModule=Invoices and credit notes numbering model
+BillsNumberingModule=Τιμολόγια και πιστωτικά τιμολόγια μοντέλο αρίθμησης
 BillsPDFModules=Invoice documents models
-CreditNoteSetup=Credit note module setup
-CreditNotePDFModules=Credit note document models
-CreditNote=Credit note
-CreditNotes=Credit notes
+CreditNoteSetup=Ρυθμίσεις του module πιστωτικό τιμολόγιο
+CreditNotePDFModules=Μοντέλα πιστωτικών τιμολογίων
+CreditNote=Πιστωτικό τιμολόγιο
+CreditNotes=Πιστωτικά τιμολόγια
 ForceInvoiceDate=Force invoice date to validation date
 DisableRepeatable=Disable repeatable invoices
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
@@ -1147,7 +1147,7 @@ AddDeliveryAddressAbility=Add delivery date ability
 UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1156,7 +1156,7 @@ HideTreadedOrders=Απόκρυψη των επεξεργασμένων ή ακυ
 ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
 FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1169,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models
 TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Ρύθμιση module Συμβάσεις/Συνδρομές
 ContractsNumberingModules=Συμβάσεις αρίθμησης ενοτήτων
 TemplatePDFContracts=Συμβάσεις μοντέλα εγγράφων
 FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις
@@ -1333,7 +1333,7 @@ FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζοντ
 CacheByServer=Cache από τον server
 CacheByClient=Cache από τον browser
 CompressionOfResources=Συμπίεση HTTP απαντήσεων
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατόν με τα τρέχουσα προγράμματα περιήγησης
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
@@ -1393,10 +1393,10 @@ MailingSetup=EMailing module setup
 MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
 MailingEMailError=Return EMail (Errors-to) for emails with errors
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Ρύθμιση module EMail κοινοποίησης
 NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
-FixedEmailTarget=Fixed email target
+ListOfAvailableNotifications=Κατάλογος των εκδηλώσεων μπορείτε να ορίσετε ειδοποίηση, για κάθε Πελ./Προμ. (πηγαίνετε στη κάρτα Πελ./Προμ. για την ρύθμιση) ή με τον καθορισμό ενός σταθερού ηλεκτρονικού ταχυδρομείου (Η Λίστα εξαρτάται από τα ενεργοποιημένα modules)
+FixedEmailTarget=Σταθερός email στόχος
 ##### Sendings #####
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
@@ -1424,8 +1424,8 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Ρύθμιση module Αποθήκη
+UserWarehouse=Χρήση των χρηστών προσωπικών αποθηκών
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1491,14 +1491,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Σημείο Πωλήσεων
 CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Προεπιλογή γενικός Πελ./Προμ. να χρησιμοποιηθεί για Πωλήσεις
 CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
 CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Απενεργοποίηση μείωση των αποθεμάτων όταν η πώληση γίνεται από Point of Sale
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+StockDecreaseForPointOfSaleDisabled=Μείωση αποθέματος από Point Of Sale απενεργοποιημένο
+CashDeskYouDidNotDisableStockDecease=Δεν έχετε απενεργοποιήσει μείωση των αποθεμάτων κατά την πραγματοποίηση μιας πώλησης από το σημείο πώλησης "POS". Μια αποθήκη είναι απαραίτητη.
 ##### Bookmark #####
 BookmarkSetup=Bookmark module setup
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1551,14 +1551,14 @@ DeleteFiscalYear=Διαγραφή οικονομικού έτους
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
 Opened=Ανοίξτε
 Closed=Κλείστε
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+AlwaysEditable=Μπορεί πάντα να επεξεργαστή
+MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
 NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
 NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων
 NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
+NoAmbiCaracAutoGeneration=Μη χρησιμοποιείται διφορούμενους χαρακτήρες ("1","l","i","|","0","O") για αυτόματη δημιουργία
+SalariesSetup=Ρύθμιση module μισθών
 SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
 TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index c8a0d2af2e3..cd400fb40ea 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -24,12 +24,12 @@ InvoiceProFormaDesc=Το <b>Προτιμολόγιο</b> είναι η εικό
 InvoiceReplacement=Τιμολόγιο Αντικατάστασης
 InvoiceReplacementAsk=Αντικατάσταση τιμολογίου με
 InvoiceReplacementDesc=<b>Τιμολόγιο αντικατάστασης</b> χρησιμοποιείται για να ακυρώσει και να αντικαταστήσει πλήρως ένα απλήρωτο τιμολόγιο.<br><br>Σημείωση: Μόνο τα τιμολόγια χωρίς καμία πληρωμή μπορούν να αντικατασταθούν. Εάν το τιμολόγιο που θα αντικατασταθεί δεν έχει κλείσει, θα κλείσει αυτόματα και θα σημειωθεί «εγκαταλειμμένο».
-InvoiceAvoir=Πιστωτικό σημείωμα
-InvoiceAvoirAsk=Πιστωτικό σημείωμα για την διόρθωση τιμολογίου
-InvoiceAvoirDesc=Το <b>πιστωτικό σημείωμα</b>είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα).
-invoiceAvoirWithLines=Δημιουργία Πιστωτικού Σημειώματος με γραμμές από το τιμολόγιο προέλευσης.
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+InvoiceAvoir=Πιστωτικό τιμολόγιο
+InvoiceAvoirAsk=Πιστωτικό τιμολόγιο για την διόρθωση τιμολογίου
+InvoiceAvoirDesc=Το <b>πιστωτικό τιμολόγιο</b>είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα).
+invoiceAvoirWithLines=Δημιουργία Πιστωτικού τιμολογίου με γραμμές από το τιμολόγιο προέλευσης.
+invoiceAvoirWithPaymentRestAmount=Δημιουργήστε Πιστωτικό Τιμολόγιο με το υπόλοιπο πριν από την καταβολή του τιμολογίου
+invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό τιμολόγιο για το υπολειπόμενο ανεξόφλητο ποσό
 ReplaceInvoice=Αντικατάσταση Τιμολογίου %s
 ReplacementInvoice=Τιμολόγιο Αντικατάστασης
 ReplacedByInvoice=Αντικαταστάθηκε από το τιμολόγιο %s
@@ -73,7 +73,7 @@ PaymentsReports=Αναφορές Πληρωμών
 PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Κανόνας Πληρωμής
-PaymentMode=Τύπος Πληρωμής
+PaymentMode=Τρόπος Πληρωμής
 PaymentConditions=Συνθήκη Πληρωμής
 PaymentConditionsShort=Συνθήκες Πληρωμής
 PaymentAmount=Σύνολο πληρωμής
@@ -87,7 +87,7 @@ ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμέν
 ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
 ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα»
 CreateBill=Δημιουργία Τιμολογίου
-AddBill=Create invoice or credit note
+AddBill=Δημιουργία τιμολογίου ή δημιουργία σημείωσης
 AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο
 DeleteBill=Διαγραφή Τιμολογίου
 SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
 ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
 Amount=Σύνολο
 PriceBase=Τιμή βάσης
 BillStatus=Κατάσταση τιμολογίου
@@ -154,9 +154,9 @@ ConfirmCancelBill=Είστε σίγουροι ότι θέλετε να ακυρ
 ConfirmCancelBillQuestion=Γιατί θέλετε να χαρακτηρίσετε το τιμολόγιο ώς "Εγκαταλειμμένο"
 ConfirmClassifyPaidPartially=Είστε σίγουροι ότι θέλετε να αλλάξετε την κατάσταση τιμολογίου <b>%s</b> σε 'Πληρωμένο';
 ConfirmClassifyPaidPartiallyQuestion=Το τιμολόγιο δεν αποπληρώθηκε. Για ποιο λόγο θέλετε να κλείσετε το τιμολόγιο;
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχει τακτοποιηθεί το ΦΠΑ με πιστωτικό τιμολόγιο.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
@@ -181,7 +181,7 @@ ShowSocialContribution=Εμφάνιση κοινωνικής εισφοράς
 ShowBill=Εμφάνιση τιμολογίου
 ShowInvoice=Εμφάνιση τιμολογίου
 ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης
-ShowInvoiceAvoir=Εμφάνιση πιστωτικού σημειώματος
+ShowInvoiceAvoir=Εμφάνιση πιστωτικού τιμολογίου
 ShowInvoiceDeposit=Εμφάνιση τιμολογίου κατάθεσης
 ShowPayment=Εμφάνιση πληρωμής
 File=Αρχείο
@@ -189,9 +189,9 @@ AlreadyPaid=Ήδη πληρωμένο
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
 Abandoned=Εγκαταλελειμμένο
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPay=Παραμένουν απλήρωτα
+RemainderToTake=Υπόλοιπο ποσό να ληφθεί
+RemainderToPayBack=Υπόλοιπο ποσό για αποπληρωμή
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
@@ -217,7 +217,7 @@ NoInvoice=Δεν υπάρχει τιμολόγιο
 ClassifyBill=Κατηγοριοποίηση Τιμολογίου
 SupplierBillsToPay=Απλήρωτα τιμολόγια προμηθευτών
 CustomerBillsUnpaid=Απλήρωτα τιμολόγια πελατών
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Τα γραπτά τιμολόγια μέσω μηχανογραφικής διαδικασίας που διανέμονται από τη σειρά επιστολών
 NonPercuRecuperable=Non-recoverable
 SetConditions=Set payment conditions
 SetMode=Set payment mode
@@ -228,7 +228,7 @@ Repeatable=Πρώτυπο
 Repeatables=Πρώτυπα
 ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
 CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
-CreateFromRepeatableInvoice=Create from template invoice
+CreateFromRepeatableInvoice=Δημιουργία από πρότυπο τιμολόγιο
 CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
 ExportDataset_invoice_1=Customer invoices list and invoice's lines
@@ -245,7 +245,7 @@ AddRelativeDiscount=Δημιουργία σχετική έκπτωση
 EditRelativeDiscount=Επεξεργασία σχετικής έκπτωσης
 AddGlobalDiscount=Προσθήκη έκπτωσης
 EditGlobalDiscounts=Επεξεργασία απόλυτη εκπτώσεις
-AddCreditNote=Δημιουργία πιστωτικό σημείωμα
+AddCreditNote=Δημιουργία πιστωτικού τιμολογίου
 ShowDiscount=Εμφάνιση εκπτώσεων
 ShowReduc=Δείτε την έκπτωση
 RelativeDiscount=Σχετική έκπτωση
@@ -254,7 +254,7 @@ CreditNote=Πίστωση
 CreditNotes=Πιστώσεις
 Deposit=Κατάθεση
 Deposits=Καταθέσεις
-DiscountFromCreditNote=Έκπτωση από το πιστωτικό σημείωμα %s
+DiscountFromCreditNote=Έκπτωση από το πιστωτικό τιμολόγιο %s
 DiscountFromDeposit=Πληρωμές από το τιμολόγιο κατάθεσης %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this king of credits
@@ -376,7 +376,7 @@ ChequesReceipts=Αποδείξεις επιταγών
 ChequesArea=Περιοχή επιταγών κατάθεσης
 ChequeDeposits=Επιταγές κατάθεσης
 Cheques=Επιταγές
-CreditNoteConvertedIntoDiscount=Αυτό το πιστωτικό σημείωμα ή το τιμολόγιο καταθέσεων έχει μετατραπεί σε %s
+CreditNoteConvertedIntoDiscount=Αυτό το πιστωτικό τιμολόγιο ή το τιμολόγιο καταθέσεων έχει μετατραπεί σε %s
 UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε πελάτη διεύθυνση επικοινωνίας χρέωσης αντί των Πελ./Προμ. διεύθυνση για τα τιμολόγια
 ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
 ShowUnpaidLateOnly=Εμφάνιση μόνο των καθυστερημένων απλήρωτων τιμολογίων
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index c011ce85374..ee96a994ae7 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -12,7 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ
 BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
 BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
 BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών
-BoxLastValidatedCustomerOrders=Last validated customer orders
+BoxLastValidatedCustomerOrders=Τελευταίες επιβεβαιωμένες παραγγελίες πελατών
 BoxLastBooks=Τελευταία Βιβλία
 BoxLastActions=Τελευταίες Ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
@@ -28,29 +28,29 @@ BoxTitleNbOfCustomers=Πλήθος πελατών
 BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
 BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες
 BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα
-BoxTitleLastCustomerOrders=Last %s customer orders
-BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
+BoxTitleLastCustomerOrders=Τελευταίες %s παραγγελίες των πελατών
+BoxTitleLastModifiedCustomerOrders=Τελευταίες %s τροποποιημένες παραγγελίες πελατών
 BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές
 BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες
 BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές
 BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες
-BoxTitleLastCustomersOrProspects=Last %s customers or prospects
-BoxTitleLastPropals=Last %s proposals
-BoxTitleLastModifiedPropals=Last %s modified proposals
+BoxTitleLastCustomersOrProspects=Τελευταίοι %s πελάτες ή προοπτικές
+BoxTitleLastPropals=Τελευταίες %s προσφορές
+BoxTitleLastModifiedPropals=Τελευταίες %s τροποποιημένες προσφορές
 BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών
-BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
+BoxTitleLastModifiedCustomerBills=Τελευταίες %s τροποποιημένα τιμολόγια πελατών
 BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών
-BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
+BoxTitleLastModifiedSupplierBills=Τελευταίες %s τροποποιημένα τιμολόγια προμηθευτών
 BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές
 BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες
-BoxTitleLastModifiedMembers=Last %s members
+BoxTitleLastModifiedMembers=Τελευταία %s Μέλη
 BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
+BoxTitleOldestUnpaidCustomerBills=Παλαιότερα %s ανεξόφλητα τιμολόγια πελατών 
+BoxTitleOldestUnpaidSupplierBills=Παλαιότερα %s ανεξόφλητα τιμολόγια προμηθευτών
 BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών
 BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων
 BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
+BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών
 BoxTitleLastModifiedContacts=Οι  τελευταίες %s τροποποιημένες επαφές / διευθύνσεις
 BoxMyLastBookmarks=Οι %s νεότεροι σελιδοδείκτες μου
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
@@ -80,8 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
 NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών
-BoxTitleLatestSupplierOrders=Last %s supplier orders
-BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
+BoxTitleLatestSupplierOrders=Τελευταίες %s παραγγελίες Προμηθευτών
+BoxTitleLatestModifiedSupplierOrders=Τελευταίες %s τροποποιημένες παραγγελίες προμηθευτών
 NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών
 BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα
 BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 420b797c36c..c2e78746d67 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -250,7 +250,7 @@ CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση
 CompanyHasRelativeDiscount=This customer has a discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=This customer has no relative discount by default
 CompanyHasAbsoluteDiscount=This customer still has discount credits for <b>%s %s</b>
-CompanyHasCreditNote=This customer still has credit notes or previous deposits for <b>%s %s</b>
+CompanyHasCreditNote=Ο πελάτης εξακολουθεί να έχει πιστωτικά τιμολόγια για <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις (Επικυρωμένες απ' όλους τους χρήστες)
 CustomerAbsoluteDiscountMy=Απόλυτες εκπτώσεις (Επικυρωμένες από εσάς)
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Απόλυτες εκπτώσεις διαθέσιμε
 DiscountNone=Καμία
 Supplier=Προμηθευτής
 CompanyList=Λίστα εταιριών
-AddContact=Προσθήκη επαφής
-AddContactAddress=Προσθήκη επαφής/διεύθυνσης
+AddContact=Δημιουργία επαφής
+AddContactAddress=Δημιουργία επαφής/διεύθυνση
 EditContact=Επεξεργασία επαφής
 EditContactAddress=Επεξεργασία επαφής/διεύθυνσης
 Contact=Υπεύθυνος επικοινωνίας
@@ -268,8 +268,8 @@ ContactsAddresses=Επαφές/Διευθύνσεις
 NoContactDefinedForThirdParty=Δεν έχει ορισθεί πρόσωπο επικοινωνίας για αυτόν τον Πελ/Προμ
 NoContactDefined=Δεν έχει ορισθεί πρόσωπο επικοινωνίας
 DefaultContact=Προκαθορισμένος εκπρόσωπος/διεύθυνση
-AddCompany=Προσθήκη εταιρίας
-AddThirdParty=Προσθήκη Πελ./Προμ.
+AddCompany=Δημιουργία εταιρείας
+AddThirdParty=Δημιουργήστε Πελ./Προμ.
 DeleteACompany=Διαγραφή εταιρίας
 PersonalInformations=Προσωπικά δεδομένα
 AccountancyCode=Λογιστικός κωδικός
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Ετικέτα διεύθυνσης αποστολής
 DeleteDeliveryAddress=Διαγραφή διεύθυνσης αποστολής
 ConfirmDeleteDeliveryAddress=Είστε σίγουροι ότι θέλετε να διαγράψετε την διεύθυνση αποστολής;
 NewDeliveryAddress=Νέα διεύθυνση αποστολής
-AddDeliveryAddress=Προσθήκη Διεύθυνσης
-AddAddress=Προσθήκη Διεύθυνσης
+AddDeliveryAddress=Δημιουργία διεύθυνσης
+AddAddress=Δημιουργία διεύθυνσης
 NoOtherDeliveryAddress=Δεν ορίστηκε εναλλακτική διεύθυνση αποστολής
 SupplierCategory=Κατηγορία Προμηθευτή
 JuridicalStatus200=Ανεξάρτητος
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index c9aaba74e1a..cad5180e87e 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -25,7 +25,7 @@ BillsForSuppliers=Λογαριασμοί για προμηθευτές
 Income=Έσοδα
 Outcome=Έξοδα
 ReportInOut=Έσοδα / Έξοδα
-ReportTurnover=Turnover
+ReportTurnover=Κύκλος εργασιών
 PaymentsNotLinkedToInvoice=Η πληρωμή δεν είναι συνδεδεμένη με κάποιο τιμολόγιο, οπότε δεν συνδέετε με κάποιο στοιχείο/αντιπρόσωπο
 PaymentsNotLinkedToUser=Η πληρωμή δεν είναι συνδεδεμένη με κάποιον πελάτη
 Profit=Κέρδος
@@ -37,13 +37,13 @@ Withdrawal=Απόσυρση
 Withdrawals=Αποσύρσεις
 AmountHTVATRealReceived=Σύνολο καθαρών εισπράξεων
 AmountHTVATRealPaid=Σύνολο καθαρών πληρωμένων
-VATToPay=VAT sells
-VATReceived=VAT received
-VATToCollect=VAT purchases
-VATSummary=VAT Balance
+VATToPay=Φ.Π.Α. Πωλήσεων
+VATReceived=Φ.Π.Α. που εισπράχθηκε
+VATToCollect=Φ.Π.Α. Αγορών
+VATSummary=Υπόλοιπο Φ.Π.Α.
 LT2SummaryES=IRPF Υπόλοιπο
 LT1SummaryES=RE Υπόλοιπο
-VATPaid=VAT paid
+VATPaid=Φ.Π.Α. που καταβλήθηκε
 SalaryPaid=Μισθός που καταβάλλεται
 LT2PaidES=Αμειβόμενος IRPF
 LT1PaidES=RE Πληρωμένα
@@ -100,12 +100,12 @@ AccountNumberShort=Αριθμός Λογαριασμού
 AccountNumber=Αριθμός Λογαριασμού
 NewAccount=Νέος Λογαριασμός
 SalesTurnover=Κύκλος εργασιών πωλήσεων
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών των πωλήσεων
 ByThirdParties=από στοιχεία
 ByUserAuthorOfInvoice=Ανά συντάκτη τιμολογίου
 AccountancyExport=Accountancy export
 ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
-SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
+SuppliersProductsSellSalesTurnover=Ο κύκλος εργασιών από τις πωλήσεις των προϊόντων του προμηθευτή.
 CheckReceipt=Έλεγχος Πίστωσης
 CheckReceiptShort=Check deposit
 LastCheckReceiptShort=Έλεγχος τελευταίων %s εισπράξεων
@@ -170,9 +170,9 @@ Dispatched=Dispatched
 ToDispatch=To dispatch
 ThirdPartyMustBeEditAsCustomer=Το στοιχείο πρέπει να ορισθεί ως πελάτης
 SellsJournal=Ημερολόγιο πωλήσεων
-PurchasesJournal=Αγορές Εφημερίδα
+PurchasesJournal=Ημερολόγιο Αγορών
 DescSellsJournal=Ημερολόγιο πωλήσεων
-DescPurchasesJournal=Αγορές Εφημερίδα
+DescPurchasesJournal=Ημερολόγιο Αγορών
 InvoiceRef=Τιμολόγιο ref.
 CodeNotDef=Δεν προσδιορίζεται
 AddRemind=Αποστολή διαθέσιμο ποσό
@@ -185,7 +185,7 @@ Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
 InvoiceDispatched=Dispatched invoices
 AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
+ByProductsAndServices=Ανά προϊόντα και υπηρεσίες
 RefExt=Εξωτερικές αναφορές
 ToCreateAPredefinedInvoice=Για να δημιουργήσει ένα προκαθορισμένο τιμολόγιο, δημιουργήσετε ένα πρότυπο τιμολόγιο στη συνέχεια, χωρίς επικύρωση, κάντε κλικ στο κουμπί "Μετατροπή σε προκαθορισμένο τιμολόγιο".
 LinkedOrder=Σύνδεση με παραγγελία
@@ -194,7 +194,7 @@ Mode1=Μέθοδος 1
 Mode2=Τρόπος 2
 CalculationRuleDesc=Για να υπολογιστεί το συνολικό ΦΠΑ, υπάρχουν δύο μέθοδοι: <br> Μέθοδος 1 στρογγυλοποίηση ΦΠΑ για κάθε γραμμή, στη συνέχεια, αθροίζοντας τους. <br> Μέθοδος 2 αθροίζοντας όλων των ΦΠΑ σε κάθε γραμμή, τότε η στρογγυλοποίηση είναι στο αποτέλεσμα. <br> Το τελικό αποτέλεσμα μπορεί να διαφέρει από λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η λειτουργία <b>%s</b>.
 CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, επιλέξετε την κατάλληλη μέθοδο για την εφαρμογή του ίδιου κανόνα υπολογισμού και να πάρει ίδιο αποτέλεσμα που αναμένεται από τον προμηθευτή σας.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακής λογιστικής</b> mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστικής δέσμευσης</b> τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής).
+TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
 ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index 69898f3d4aa..c35ee1cbc55 100644
--- a/htdocs/langs/el_GR/donations.lang
+++ b/htdocs/langs/el_GR/donations.lang
@@ -4,7 +4,7 @@ Donations=Δωρεές
 DonationRef=Δωρεά ref.
 Donor=Δωρεά
 Donors=Δωρεές
-AddDonation=Create a donation
+AddDonation=Δημιουργία δωρεάς
 NewDonation=Νέα δωρεά
 ShowDonation=Εμφάνιση δωρεάς
 DonationPromise=Υπόσχεση δώρου
@@ -31,8 +31,8 @@ DonationRecipient=Δικαιούχος δωρεάς
 ThankYou=Σας ευχαριστούμε
 IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό
 MinimumAmount=Το ελάχιστο ποσό είναι %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+FreeTextOnDonations=Ελεύθερο κείμενο για εμφάνιση στο υποσέλιδο
+FrenchOptions=Επιλογές για Γαλλία
+DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχείτε
+DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε
+DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index dd9c902036a..ec8c78077de 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -51,16 +51,16 @@ InvalidValidatorCP=Μπορείτε να επιλέξετε ένα εκπρόσ
 CantUpdate=Δεν μπορείτε να ενημερώσετε αυτό το αίτημα άδειας.
 NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης.
 NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
+ErrorDureeCP=Η αίτηση άδειας δεν περιέχει εργάσιμες ημέρες
+TitleValidCP=Εγκρίνετε την αίτηση άδειας
 ConfirmValidCP=Είστε βέβαιοι ότι θέλετε να εγκρίνει την αίτηση άδειας;
 DateValidCP=Ημερομηνία έγκρισης
 TitleToValidCP=Στείλτε αίτηση άδειας
 ConfirmToValidCP=Είστε βέβαιοι ότι θέλετε να στείλετε την αίτηση άδειας;
-TitleRefuseCP=Refuse the leave request
+TitleRefuseCP=Αρνηθείτε την αίτηση άδειας
 ConfirmRefuseCP=Είστε βέβαιοι ότι θέλετε να απορρίψει την αίτηση άδειας;
 NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης.
-TitleCancelCP=Cancel the leave request
+TitleCancelCP=Ακυρώστε την αίτηση άδειας
 ConfirmCancelCP=Είστε βέβαιοι ότι θέλετε να ακυρώσετε την αίτηση άδειας;
 DetailRefusCP=Λόγος για την απόρριψη
 DateRefusCP=Ημερομηνία της άρνησης
@@ -77,7 +77,7 @@ ActionByCP=Διενεργείται από
 UserUpdateCP=Για το χρήστη
 PrevSoldeCP=Προηγούμενο Υπόλοιπο
 NewSoldeCP=Νέο υπόλοιπο
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Υπάρχει ήδη αίτηση άδειας για αυτήν τη περίοδο.
 UserName=Όνομα
 Employee=Υπάλληλος
 FirstDayOfHoliday=Πρώτη μέρα των αδειών
@@ -87,25 +87,25 @@ ManualUpdate=Χειροκίνητη ενημέρωση
 HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
+ConfCP=Διαχείριση της λειτουργίας αιτήσεων αδειών
 DescOptionCP=Περιγραφή της επιλογής
 ValueOptionCP=Αξία
-GroupToValidateCP=Group with the ability to approve leave requests
+GroupToValidateCP=Ομάδα με τη δυνατότητα να εγκρίνει τις αιτήσεις αδειών
 ConfirmConfigCP=Επικύρωση της διαμόρφωσης
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Τελευταία αυτόματη ενημέρωση της κατανομής των φύλλων
 UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
 ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά.
-AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
+AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο των φύλλων κατανομής των χρηστών από <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">κλικ εδώ</a>.
+DelayForSubmitCP=Προθεσμία για να κάνει μια αίτηση άδειας
+AlertapprobatortorDelayCP=Αποτρέψετε την έγκρισή εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία
 AlertValidatorDelayCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει καθυστέρηση
 AlertValidorSoldeCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο
 nbUserCP=Αριθμός των χρηστών που υποστηρίζονται στο module αδειών
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
+nbHolidayDeductedCP=Αριθμός ημερών αδείας που πρέπει να αφαιρεθεί ανά ημέρες των διακοπών που λαμβάνονται
+nbHolidayEveryMonthCP=Αριθμός ημερών αδείας που προστίθενται κάθε μήνα
 Module27130Name= Διαχείριση των αιτήσεων αδειών
 Module27130Desc= Διαχείριση των αιτήσεων αδειών
-TitleOptionMainCP=Main settings of leave request
+TitleOptionMainCP=Κύριες ρυθμίσεις της αίτησης άδειας
 TitleOptionEventCP=Ρυθμίσεις των αδειών αίτημα για εκδηλώσεις
 ValidEventCP=Επικύρωση
 UpdateEventCP=Ενημέρωση εκδηλώσεων
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index 88304fbdc30..9bc94532667 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Παρέμβαση
 Interventions=Παρεμβάσεις
 InterventionCard=Καρτέλα παρέμβασης
 NewIntervention=Νέα παρέμβαση
-AddIntervention=Create intervention
+AddIntervention=Δημιουργία παρέμβασης
 ListOfInterventions=Λίστα παρεμβάσεων
 EditIntervention=Τροποποίηση παρέμβασης
 ActionsOnFicheInter=Δράσεις για την παρέμβαση
@@ -30,15 +30,15 @@ StatusInterInvoiced=Τιμολογείται
 RelatedInterventions=Οι παρεμβάσεις που σχετίζονται
 ShowIntervention=Εμφάνιση παρέμβασης
 SendInterventionRef=Υποβολή παρέμβασης %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+SendInterventionByMail=Αποστολή παρέμβασης μέσω e-mail
+InterventionCreatedInDolibarr=Παρέμβαση %s δημιουργήθηκε
+InterventionValidatedInDolibarr=Παρέμβαση %s επικυρώθηκε
+InterventionModifiedInDolibarr=Παρέμβαση %s τροποποιήθηκε
+InterventionClassifiedBilledInDolibarr=Σετ Παρέμβασης %s όπως τιμολογείται
+InterventionClassifiedUnbilledInDolibarr=Σετ Παρέμβαση %s ως μη τιμολογημένο
+InterventionSentByEMail=Παρέμβαση %s αποστέλλετε με ηλεκτρονικό ταχυδρομείο 
+InterventionDeletedInDolibarr=Παρέμβαση %s διαγράφετε
+SearchAnIntervention=Αναζήτηση παρέμβασης
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Αντιπρόσωπος που παρακολουθεί την παρέμβαση
 TypeContact_fichinter_internal_INTERVENING=Παρεμβαίνων
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 21f18dfbeb6..debe768f46e 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Στάλθηκε από
 MailingNeedCommand=Για λόγους ασφαλείας, αποστολή ηλεκτρονικού ταχυδρομείου είναι καλύτερη όταν γίνεται από την γραμμή εντολών. Εάν έχετε ένα, ζητήστε από το διαχειριστή του διακομιστή σας για να ξεκινήσει την ακόλουθη εντολή για να στείλετε το ηλεκτρονικό ταχυδρομείο σε όλους τους παραλήπτες:
 MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
 ConfirmSendingEmailing=Εάν δεν μπορείτε ή προτιμάτε την αποστολή τους με το πρόγραμμα περιήγησης σας, παρακαλώ επιβεβαιώστε ότι είστε σίγουροι ότι θέλετε να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου τώρα από τον browser σας;
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Σημείωση: Η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από διαδικτυακή διεπαφή γίνεται αρκετές φορές για λόγους ασφαλείας και τη λήξη χρόνου, <b>%s</b> παραλήπτες ταυτόχρονα για κάθε συνεδρία αποστολής.
 TargetsReset=Εκκαθάριση λίστας
 ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να καταργήσετε τη λίστα παραληπτών για αυτό το ηλεκτρονικό ταχυδρομείο
 ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες
@@ -136,6 +136,6 @@ SomeNotificationsWillBeSent=%s Θα αποστέλλονται ειδοποιή
 AddNewNotification=Ενεργοποιήστε ένα νέο στόχο ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
 ListOfActiveNotifications=Λίστα όλων των ενεργών στόχων ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
 ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
+MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
+MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index 9fa082ec702..c0f9a69deaf 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -5,8 +5,8 @@ Margins=Περιθώρια
 TotalMargin=Συνολικό Περιθώριο
 MarginOnProducts=Περιθώριο / Προϊόντα
 MarginOnServices=Περιθώριο / Υπηρεσίες
-MarginRate=Τιμή Περιθωρίου
-MarkRate=Σημειώστε ποσοστό
+MarginRate=Περιθώριο επί της %
+MarkRate=Ποσοστό Κέρδους
 DisplayMarginRates=Εμφάνιση ποσοστό κέρδους
 DisplayMarkRates=Εμφάνιση σημειωμένων τιμών
 InputPrice=Εισαγωγή τιμής
@@ -38,7 +38,7 @@ BuyingCost=Τιμή κόστους
 UnitCharges=Χρεώσεων
 Charges=Επιβαρύνσεις
 AgentContactType=Εμπορικός αντιπρόσωπος τύπο επαφής
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+AgentContactTypeDetails=Ορίστε τι τύπος επαφής (που συνδέεται στα τιμολόγια)  θα χρησιμοποιηθεί για την έκθεση περιθώριο κέρδους ανά πώληση εκπρόσωπου
+rateMustBeNumeric=Βαθμολογήστε πρέπει να είναι μια αριθμητική τιμή
+markRateShouldBeLesserThan100=Το ποσοστό πρέπει να είναι χαμηλότερη από 100
+ShowMarginInfos=Δείτε πληροφορίες για τα περιθώρια
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 8fd2c21cf77..e15f9952453 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -203,26 +203,26 @@ ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απ
 
 ##### Calendar common #####
 AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Εταιρεία %s προστέθηκε
+ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
+ContractCanceledInDolibarr=Συμβόλαιο %s ακυρώθηκε
+ContractClosedInDolibarr=Συμβόλαιο %s έκλεισε
+PropalClosedSignedInDolibarr=Πρόσφορα %s υπεγράφη
+PropalClosedRefusedInDolibarr=Πρόσφορα %s απορρίφθηκε
+PropalValidatedInDolibarr=Πρόσφορα %s επικυρώθηκε
+PropalClassifiedBilledInDolibarr=Πρόταση %s ταξινομούνται χρεωθεί
+InvoiceValidatedInDolibarr=Τιμολόγιο %s επικυρωθεί
+InvoicePaidInDolibarr=Τιμολόγιο %s άλλαξε σε καταβληθεί
+InvoiceCanceledInDolibarr=Τιμολόγιο %s ακυρώθηκε
+PaymentDoneInDolibarr=Πληρωμή %s Ολοκληρώθηκε
+CustomerPaymentDoneInDolibarr=Πληρωμή των πελατών %s Ολοκληρώθηκε
+SupplierPaymentDoneInDolibarr=Πληρωμή Προμηθευτή %s Ολοκληρώθηκε
+MemberValidatedInDolibarr=Μέλος %s επικυρωθεί
+MemberResiliatedInDolibarr=Μέλος %s resiliated
+MemberDeletedInDolibarr=Μέλος %s διαγράφηκε
+MemberSubscriptionAddedInDolibarr=Συνδρομή για το μέλος %s προστέθηκε
+ShipmentValidatedInDolibarr=Η αποστολή %s επικυρώθηκε
+ShipmentDeletedInDolibarr=Η αποστολή %s διαγράφηκε
 ##### Export #####
 Export=Εξαγωγή
 ExportsArea=Exports area
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index ca3e49749ab..af3f9bba119 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -1,20 +1,20 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Manage batch/serial
-ProductStatusOnBatch=Managed
-ProductStatusNotOnBatch=Not Managed
-ProductStatusOnBatchShort=Managed
-ProductStatusNotOnBatchShort=Not Managed
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
-printBatch=Batch: %s
+ManageLotSerial=Διαχειριστείτε παρτίδα/σειριακό
+ProductStatusOnBatch=Διαχείριση
+ProductStatusNotOnBatch=Χωρίς διαχείριση
+ProductStatusOnBatchShort=Διαχείριση
+ProductStatusNotOnBatchShort=Χωρίς διαχείριση
+Batch=Παρτίδα/Σειριακός
+atleast1batchfield=Φάτε την ημερομηνία λήξης ή ημερομηνία πώλησης ή τον αριθμό παρτίδας
+batch_number=Παρτίδα/Σειριακός αριθμός
+l_eatby=Φάτε ημερομηνία λήξης
+l_sellby=Ημερομηνία πώλησης
+DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού
+DetailBatchFormat=Παρτίδα/Κωδικός: %s - E:%s - s:%s (Ποσότητα: %d)
+printBatch=Παρτίδα: %s
 printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
+printSellby=Πώληση ανά: %s
+printQty=Ποσότητα: %d
+AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής
+BatchDefaultNumber=Απροσδιόριστο
+WhenProductBatchModuleOnOptionAreForced=Όταν το module παρτίδας/σειριακός είναι ενεργοποιημένο, αύξηση/μείωση \nη κατάσταση των αποθεμάτων αναγκάζει την τελευταία επιλογή και δεν μπορούν να τροποποιηθούν. Άλλες επιλογές μπορούν να οριστούν όπως θέλετε.
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index bdc764a85d2..98b79945713 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -100,7 +100,7 @@ AddToOtherBills=Προσθήκη στους άλλους λογαριασμού
 CorrectStock=Σωστό Απόθεμα
 AddPhoto=Προσθήκη φωτογραφίας
 ListOfStockMovements=Λίστα κινήσεων αποθέματος
-BuyingPrice=Buying price
+BuyingPrice=Τιμή Αγοράς
 SupplierCard=Κάρτα προμηθευτή
 CommercialCard=Εμπορική Κάρτα
 AllWays=Μονοπάτι να βρείτε το προϊόν σας σε απόθεμα
@@ -119,10 +119,10 @@ MultiPricesNumPrices=Αριθμός τιμής
 MultiPriceLevelsName=Κατηγορίες τιμών
 AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων
 AssociatedProducts=Πακέτο προϊόντων
-AssociatedProductsNumber=Number of products composing this virtual package product
-ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+AssociatedProductsNumber=Αριθμός προϊόντων που συνθέτουν αυτό το εικονικό προϊόν πακέτο
+ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος
+IfZeroItIsNotAVirtualProduct=Αν 0, το προϊόν αυτό δεν είναι ένα εικονικό προϊόν πακέτο
+IfZeroItIsNotUsedByVirtualProduct=Αν 0, το προϊόν αυτό δεν χρησιμοποιείται από κάθε εικονικό προϊόν πακέτο
 EditAssociate=Συσχέτιση
 Translation=Μετάφραση
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -132,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή
 Quantity=Ποσότητα
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα)
-ProductParentList=List of package products/services with this product as a component
+ProductParentList=Λίστα συσκευασίας προϊόντων/υπηρεσιών με αυτό το προϊόν ως συστατικό
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
@@ -179,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία <b>%s;</b>
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Κλώνος συσκευασμένου προϊόν/υπηρεσίας
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Τιμές πελατών
@@ -244,6 +244,6 @@ MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι
 MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
 PriceExpressionSelected=Επιλογή συνάρτησης τιμών
-PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
-PriceMode=Price mode
+PriceExpressionEditorHelp="τιμή = 2 + 2" or "2 + 2" για τον καθορισμό της τιμής<br>ExtraFields \nείναι μεταβλητές, όπως "#options_myextrafieldkey# * 2"<br>Υπάρχουν ειδικές μεταβλητές όπως #quantity# και #tva_tx#<br>Χρησιμοποιήστε ; για να διαχωρίσει τις εκφράσεις
+PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index eba1f92f7b3..6dcccff7a50 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -36,8 +36,8 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Εργασίες σχετικές με τα ανοικτά έργα
+WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
 MyTasks=Οι Εργασίες μου
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
index a28060f39b6..ea89236eb59 100644
--- a/htdocs/langs/el_GR/resource.lang
+++ b/htdocs/langs/el_GR/resource.lang
@@ -4,8 +4,8 @@ MenuResourceAdd=Νέος πόρος
 MenuResourcePlanning=Προγραμματισμός των πόρων
 DeleteResource=Διαγραφή πόρων
 ConfirmDeleteResourceElement=Επιβεβαιώστε τη διαγραφή των πόρων για αυτό το στοιχείο
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+NoResourceInDatabase=Δεν υπάρχουν πόροι στη βάση δεδομένων.
+NoResourceLinked=Ο πόρος δεν συνδέεται
 
 ResourcePageIndex=Λίστα Πόρων
 ResourceSingular=Πόρος
@@ -17,16 +17,16 @@ ResourceFormLabel_description=Η περιγραφή πόρου
 
 ResourcesLinkedToElement=Πόροι που σχετίζονται με το στοιχείο
 
-ShowResourcePlanning=Show resource planning
+ShowResourcePlanning=Εμφάνιση σχεδιασμού των πόρων
 GotoDate=Μετάβαση στην ημερομηνία
 
-ResourceElementPage=Element resources
+ResourceElementPage=Στοιχείο πόρων
 ResourceCreatedWithSuccess=Ο Πόρος δημιουργήθηκε με επιτυχία
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+RessourceLineSuccessfullyDeleted=Γραμμή πόρου διαγράφηκε με επιτυχία
+RessourceLineSuccessfullyUpdated=Γραμμή πόρου ενημερώθηκε με επιτυχία
+ResourceLinkedWithSuccess=Ο πόρος συνδέεται με επιτυχία
 
-TitleResourceCard=Resource card
+TitleResourceCard=Κάρτα πόρων
 ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτού του πόρου
 RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
 DictionaryResourceType=Το είδος των πόρων
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index fe1365fda56..7f13ceb6468 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -14,9 +14,9 @@ WithdrawalReceiptShort=Παραλαβή
 LastWithdrawalReceipts=Τελευταία εισπράξεις απόσυρση %s
 WithdrawedBills=Αποσύρθηκε τιμολόγια
 WithdrawalsLines=Απόσυρση γραμμές
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+RequestStandingOrderToTreat=Αίτηση πάγιων εντολών για επεξεργασία
+RequestStandingOrderTreated=Αίτηση πάγιων εντολών επεξεργασίας
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Δεν είναι ακόμη δυνατή. Ανακαλούν το καθεστώς πρέπει να ρυθμιστεί ώστε να «πιστωθεί» πριν δηλώσει απόρριψη στις συγκεκριμένες γραμμές.
 CustomersStandingOrders=Πάγιες εντολές πελατών
 CustomerStandingOrder=Πελάτης πάγια εντολή
 NbOfInvoiceToWithdraw=Nb. του τιμολογίου με το αίτημα απόσυρσης
@@ -47,7 +47,7 @@ RefusedData=Ημερομηνία της απόρριψης
 RefusedReason=Λόγος απόρριψης
 RefusedInvoicing=Χρέωσης για την απόρριψη
 NoInvoiceRefused=Μην φορτίζετε την απόρριψη
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Τιμολόγιο απορρίφθηκε (Φορτίστε την απόρριψη στον πελάτη)
 Status=Κατάσταση
 StatusUnknown=Άγνωστος
 StatusWaiting=Αναμονή
@@ -76,14 +76,14 @@ WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς
 WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Τραπεζικός λογαριασμός για να λάβετε αποσύρει
 CreditDate=Πιστωτικές με
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Άπαξ ο δωρεοδόχος, πηγαίνετε στο μενού Τράπεζας-> Απόσυρση για τη διαχείριση της πάγιας εντολής. Όταν η πάγια εντολή είναι κλειστή, η πληρωμή στο τιμολόγιο θα πρέπει να καταγράφεται αυτόματα και το τιμολόγιο θα κλείσει εάν υπόλοιπο που είναι να πληρώσει είναι μηδενικό.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
 
 ### Notifications
 InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα
diff --git a/htdocs/langs/es_ES/opensurvey.lang b/htdocs/langs/es_ES/opensurvey.lang
index 799274ccf14..8955af9c9fc 100644
--- a/htdocs/langs/es_ES/opensurvey.lang
+++ b/htdocs/langs/es_ES/opensurvey.lang
@@ -27,7 +27,7 @@ RemovePoll=Eliminar encuesta
 UrlForSurvey=URL para indicar el acceso directo a la encuesta
 PollOnChoice=Está creando una encuesta con multi-opciones. Primero introduzca todas las opciones posibles para esta encuesta:
 CreateSurveyDate=Crear una encuesta de fecha
-CreateSurveyStandard=Crear una encuesta estandard
+CreateSurveyStandard=Crear una encuesta estándar
 CheckBox=Checkbox simple
 YesNoList=Lista (vacío/sí/no)
 PourContreList=Lista (vacío/a favor/en contra)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 13c55401371..4397bb313fa 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -138,7 +138,7 @@ Boxes=Boîtes
 MaxNbOfLinesForBoxes=Nombre max de lignes pour les boîtes
 PositionByDefault=Position par défaut
 Position=Position
-MenusDesc=Les gestionnaires de menu définissent le contenu des 2 barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe.
+MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe.
 MenusEditorDesc=L'éditeur de menu permet de définir des entrées personnalisées dans les menus. Il doit être utilisé avec prudence sous peine de mettre Dolibarr en situation instable nécessitant une réinstallation pour retrouver un menu cohérent.<br>Certains modules ajoutent des entrées personnalisées aux menus (dans le menu <b>Tous</b> en général). Si vous détruisez ces entrées par erreur, vous pourrez les récupérer en désactivant puis réactivant le module.
 MenuForUsers=Menu pour les utilisateurs
 LangFile=Fichier .lang
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 88da0f5c87b..30595470a20 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -3,7 +3,7 @@ HRM=GRH
 Holidays=Congés
 CPTitreMenu=Congés
 MenuReportMonth=État mensuel
-MenuAddCP=Créer une demande de congés
+MenuAddCP=Créer demande de congés
 NotActiveModCP=Vous devez activer le module Congés pour afficher cette page.
 NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">cliquer ici</a>.
 NoCPforUser=Vous n'avez plus de jours disponibles
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 6b0f7772e37..6215622af74 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -87,7 +87,7 @@ ExportDataset_user_1=Utilisateurs Dolibarr et attributs
 DomainUser=Utilisateur du domaine %s
 Reactivate=Réactiver
 CreateInternalUserDesc=Cet écran permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utilisez le bouton 'Créer utilisateur Dolibarr' qui se trouve sur la fiche du contact du tiers.
-InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur appartenant à votre société/institution.<br>Un utilisateur <b>externe</b> est un utilisateur client, fournisseur ou autre.<br><br>Dans les 2 cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage)
+InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur appartenant à votre société/institution.<br>Un utilisateur <b>externe</b> est un utilisateur client, fournisseur ou autre.<br><br>Dans les deux cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage)
 PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur.
 Inherited=Hérité
 UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier)
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 0b5b610b2b6..657ddbc4eb8 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -14,13 +14,13 @@ WarehouseTarget=Magazzino di destinazione
 ValidateSending=Convalida spedizione
 CancelSending=Annulla spedizione
 DeleteSending=Elimina spedizione
-Stock=Scorta
+Stock=Scorte
 Stocks=Scorte
 Movement=Movimento
 Movements=Movimenti
 ErrorWarehouseRefRequired=Riferimento magazzino mancante
 ErrorWarehouseLabelRequired=Etichetta del magazzino mancante
-CorrectStock=Scorte di magazzino corrette
+CorrectStock=Variazione manuale scorte
 ListOfWarehouses=Elenco magazzini
 ListOfStockMovements=Elenco movimenti delle scorte
 StocksArea=Warehouses area
@@ -32,9 +32,9 @@ LastMovement=Ultimo movimento
 LastMovements=Ultimi movimenti
 Units=Unità
 Unit=Unità
-StockCorrection=Correzione scorte
+StockCorrection=Variazione manuale scorte
 StockTransfer=Movimento scorte
-StockMovement=Movimento scorta
+StockMovement=Movimento scorte
 StockMovements=Movimenti scorte
 LabelMovement=Etichetta del movimento
 NumberOfUnit=Numero di unità
@@ -59,18 +59,18 @@ ReStockOnValidateOrder=Aumenta scorte effettive alla convalida dell'ordine
 ReStockOnDispatchOrder=Incrementa scorte effettive alla consegna manuale in magazzino, dopo il ricevimento dell'ordine fornitore
 ReStockOnDeleteInvoice=Aumenta scorte effettive alla cancellazione della fattura
 OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino.
-StockDiffPhysicTeoric=Motivo della differenza tra scorta effettiva e teorica
-NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare la scorta.
+StockDiffPhysicTeoric=Motivo della differenza tra scorte effettive e teoriche
+NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare le scorte.
 DispatchVerb=Spedizione
 StockLimitShort=Limite per segnalazioni
-StockLimit=Limite minimo scorta per segnalazioni
-PhysicalStock=Scorta fisica
-RealStock=Scorta reale
-VirtualStock=Scorta virtuale
-MininumStock=Scorta minima
-StockUp=Scorta massima
-MininumStockShort=Scorta min
-StockUpShort=Scorta max
+StockLimit=Limite minimo scorte per avvertimenti
+PhysicalStock=Scorte fisiche
+RealStock=Scorte reali
+VirtualStock=Scorte virtuali
+MininumStock=Scorte minime
+StockUp=Scorte massime
+MininumStockShort=Scorte min
+StockUpShort=Scorte max
 IdWarehouse=Id magazzino
 DescWareHouse=Descrizione magazzino
 LieuWareHouse=Ubicazione magazzino
@@ -84,19 +84,19 @@ EstimatedStockValueShort=Valore stimato scorte
 EstimatedStockValue=Valore stimato delle scorte
 DeleteAWarehouse=Elimina un magazzino
 ConfirmDeleteWarehouse=Sei sicuro di voler eliminare il magazzino <b>%s</b>?
-PersonalStock=Scorta personale %s
+PersonalStock=Scorte personali %s
 ThisWarehouseIsPersonalStock=Questo magazzino rappresenta la riserva personale di %s %s
 SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione delle scorte
 SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte
-NoStockAction=Nessuna azione su questa scorta
+NoStockAction=Nessuna azione su queste scorte
 LastWaitingSupplierOrders=Ordini in attesa di ricezione
-DesiredStock=Scorta desiderata
+DesiredStock=Scorte desiderate
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
 ReplenishmentOrders=Ordini di rifornimento
 VirtualDiffersFromPhysical=In accordo con le opzioni di giacenza incrementa/decrementa, le scorte fisiche e quelle virtuali (fisiche + ordini in corso) possono variare
 UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento
-UseVirtualStock=Usa scorta virtuale
+UseVirtualStock=Usa scorte virtuale
 UsePhysicalStock=Usa giacenza fisica
 CurentSelectionMode=Modalità di selezione corrente
 CurentlyUsingVirtualStock=Giacenza virtuale
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 5debf8efd8c..a0aeaf89735 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -498,7 +498,7 @@ Module1780Name=Sadaļas
 Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
-Module2200Name=Dynamic Prices
+Module2200Name=Dinamiskas cenas
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plānotais uzdevumu pārvaldība
@@ -709,8 +709,8 @@ Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
 Permission1001=Lasīt krājumus
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Assign service/subscription to contract
+Permission1003=Dzēst noliktavas
 Permission1004=Lasīt krājumu pārvietošanas
 Permission1005=Izveidot/mainīt krājumu pārvietošanu
 Permission1101=Skatīt piegādes pasūtījumus
@@ -786,7 +786,7 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Kontu līknes
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=E-pastu paraugi
 SetupSaved=Iestatījumi saglabāti
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
@@ -1424,8 +1424,8 @@ OSCommerceTestOk=Savienojums ar serveri '%s' par datu bāzē '%s' ar lietotāja
 OSCommerceTestKo1=Savienojums ar serveri '%s' izdoties, bet datubāze '%s' nevar sasniegt.
 OSCommerceTestKo2=Savienojums ar serveri '%s' ar lietotāja '%s' neizdevās.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Noliktavu moduļa iestatījumi
+UserWarehouse=Izmantot lietotāja personīgās noliktavas
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Izvēlne dzēsta
@@ -1559,6 +1559,6 @@ NbSpeMin=Minimum number of special characters
 NbIteConsecutive=Maximum number of repeating same characters
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
 SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SortOrder=Kārtošanas secība
 Format=Formāts
 TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index f6a8e0897fd..838abe3a851 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Pasākums piešķirts
 ActionsDoneBy=Pasākumi, ko veikuši
 ActionsForUser=Lietotāja notikumi
 ActionsForUsersGroup=Notikumi visiem grupas lietotājiem
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Notikums piešķirts
 AllMyActions= Visi mani notikumi/uzdevumi
 AllActions= Visi notikumi/uzdevumi
 ViewList=Saraksta skats
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 95aa9d16c4c..54d4a89cb71 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -109,4 +109,4 @@ CategoriesSetup=Sadaļas iestatījumi
 CategorieRecursiv=Link with parent category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Rādīt sadaļu
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 47372bde2af..811966b56c3 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Saraksts darbojas līguma līniju
 ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem
 NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem)
 BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem
-LastContracts=Last %s contracts
+LastContracts=Pēdējie %s līgumi
 LastActivatedServices=Pēdējais %s aktivizētais pakalpojums
 LastModifiedServices=Pēdējais %s labotais pakalpojums
 EditServiceLine=Edit servisa līnija
diff --git a/htdocs/langs/lv_LV/deliveries.lang b/htdocs/langs/lv_LV/deliveries.lang
index 2b5c6da82a6..2baad30f7d1 100644
--- a/htdocs/langs/lv_LV/deliveries.lang
+++ b/htdocs/langs/lv_LV/deliveries.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Piegāde
 Deliveries=Piegādes
-DeliveryCard=Piegādes karte
+DeliveryCard=Piegādes kartiņa
 DeliveryOrder=Piegādes pasūtījums
 DeliveryOrders=Piegādes pasūtījumi
 DeliveryDate=Piegādes datums
 DeliveryDateShort=Ie. datums
-CreateDeliveryOrder=Izveidot piegādes kārtību
+CreateDeliveryOrder=Izveidot piegādes pasūtījumu
 QtyDelivered=Piegādātais daudz
 SetDeliveryDate=Uzstādīt piegādes datumu
 ValidateDeliveryReceipt=Apstiprināt piegādes saņemšanu
@@ -24,3 +24,5 @@ Deliverer=Piegādātājs:
 Sender=Nosūtītājs
 Recipient=Saņēmējs
 ErrorStockIsNotEnough=Nav pietiekami daudz krājumu
+Shippable=Shippable
+NonShippable=Not Shippable
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 257f6ce5e0e..9733c26045e 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -141,7 +141,7 @@ ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at
 ErrorPriceExpression1=Cannot assign to constant '%s'
 ErrorPriceExpression2=Cannot redefine built-in function '%s'
 ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression4=Neatļauts simbols '%s'
 ErrorPriceExpression5=Unexpected '%s'
 ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
 ErrorPriceExpression8=Unexpected operator '%s'
@@ -149,13 +149,13 @@ ErrorPriceExpression9=An unexpected error occured
 ErrorPriceExpression10=Iperator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
 ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression17=Nedefinēta vērtība '%s'
 ErrorPriceExpression19=Expression not found
 ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorPriceExpression21=Nav rezultāta '%s'
+ErrorPriceExpression22=Negatīvs rezultāts '%s'
+ErrorPriceExpressionInternal=Iekšēja kļūda '%s' 
+ErrorPriceExpressionUnknown=Nezināma kļūda '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
index 55591b840fa..de165ef0b5b 100644
--- a/htdocs/langs/lv_LV/externalsite.lang
+++ b/htdocs/langs/lv_LV/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Ārējo vietņu iestatīšana
 ExternalSiteURL=Ārējā Vietnes URL
 ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Manas izvēlnes ieraksti
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index c7d228cf34c..875d92a9d5e 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -203,26 +203,26 @@ ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pa
 
 ##### Calendar common #####
 AddCalendarEntry=Pievienot ierakstu kalendārā %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
+NewCompanyToDolibarr=Kompānijas %s pievienotas
+ContractValidatedInDolibarr=Līgumi %s apstiprināti
+ContractCanceledInDolibarr=Līgumi %s atcelti
+ContractClosedInDolibarr=Līgumi %s slēgti
+PropalClosedSignedInDolibarr=Piedāvājumi %s parakstīti
+PropalClosedRefusedInDolibarr=Piedāvājumi %s atteikti
+PropalValidatedInDolibarr=Piedāvājumi %s apstiprināti
 PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
+InvoiceValidatedInDolibarr=Rēķini %s apstiprināti
+InvoicePaidInDolibarr=Rēķimi %s nomainīti uz apmaksātiem
+InvoiceCanceledInDolibarr=Rēķini %s atcelti
+PaymentDoneInDolibarr=Apmaksa %s veikta
+CustomerPaymentDoneInDolibarr=Klienta apmaksa %s veikta
+SupplierPaymentDoneInDolibarr=Piegādātāja apmaksa %s veikta
+MemberValidatedInDolibarr=Dalībnieks %s apstiprināts
 MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
+MemberDeletedInDolibarr=Dalībnieks %s dzēsts
 MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+ShipmentValidatedInDolibarr=Sūtījumi %s apstiprināti
+ShipmentDeletedInDolibarr=Sūtījums %s dzēsts
 ##### Export #####
 Export=Eksportēt
 ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/printipp.lang b/htdocs/langs/lv_LV/printipp.lang
index 835e6827f12..34b0d4c674c 100644
--- a/htdocs/langs/lv_LV/printipp.lang
+++ b/htdocs/langs/lv_LV/printipp.lang
@@ -2,13 +2,13 @@
 PrintIPPSetup=Setup of Direct Print module
 PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
+PRINTIPP_HOST=Printeru serveris
+PRINTIPP_PORT=Ports
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PRINTIPP_PASSWORD=Parole
+NoPrinterFound=Printeri nav atrasti (pārbaidiet CUPS iestatījumus)
+FileWasSentToPrinter=Fails %s nosūtīts uz printeri
+NoDefaultPrinterDefined=Nav definēts noklusējtais printeris
+DefaultPrinter=Noklusētais printeris
+Printer=Printeris
+CupsServer=CUPS Serveris
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index ca3e49749ab..cab1130f7dc 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -14,7 +14,7 @@ DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
 printBatch=Batch: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
-printQty=Qty: %d
+printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 BatchDefaultNumber=Undefined
 WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index d81b413812e..3bfc33d66a9 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -246,4 +246,4 @@ PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
 PriceMode=Price mode
-PriceNumeric=Number
+PriceNumeric=Numurs
diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
index 32bdd92f884..6558915beb3 100644
--- a/htdocs/langs/lv_LV/resource.lang
+++ b/htdocs/langs/lv_LV/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Resursi
+MenuResourceAdd=Jauni resursi
+MenuResourcePlanning=Resursu plānošana
+DeleteResource=Dzēst resursu
+ConfirmDeleteResourceElement=Apstiprināt resursu dzēšanu šim elementam
+NoResourceInDatabase=Nav datubāzē resursu
+NoResourceLinked=Nav saistītu resursu
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Resursu saraksts
+ResourceSingular=Resursi
+ResourceCard=Resursu karte
+AddResource=Izveidot resursu
+ResourceFormLabel_ref=Resursu nosaukums
+ResourceType=Resursa veids
+ResourceFormLabel_description=Resursa apraksts
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Resurss saistīts ar elementu
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Rādīt resursu plānošanu
+GotoDate=Iet uz datumu
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Elementa resursi
+ResourceCreatedWithSuccess=Resurss veiksmīgi izveidots
+RessourceLineSuccessfullyDeleted=Resursu līnija veiksmīgi dzēsta
+RessourceLineSuccessfullyUpdated=Resursa līnija veiksmīgi atjaunota
+ResourceLinkedWithSuccess=Resurs sasaistīts veiksmīgi
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Resursu karte
+ConfirmDeleteResource=Apstiprināt šī resursa dzēšanu
+RessourceSuccessfullyDeleted=Resurss veiksmīgi dzēsts
+DictionaryResourceType=Resursa veids
 
-SelectResource=Select resource
+SelectResource=Izvēlēties resursu
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 7d8e5c0b9ae..c09b15bc582 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Noliktavas nosaukums ir nepieciešams
 CorrectStock=Labot krājumus
 ListOfWarehouses=Saraksts noliktavās
 ListOfStockMovements=Krājumu pārvietošanas saraksts
-StocksArea=Warehouses area
+StocksArea=Noliktavas platība
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
 NumberOfDifferentProducts=Dažādu produktu skaits
diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang
index c0a47884920..3036761dcbf 100644
--- a/htdocs/langs/nl_NL/dict.lang
+++ b/htdocs/langs/nl_NL/dict.lang
@@ -253,7 +253,6 @@ CivilityMR=Meneer
 CivilityMLE=Mejuffrouw
 CivilityMTRE=Meester
 CivilityDR=Dokter
-
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=Australische Dollars
@@ -290,10 +289,10 @@ CurrencyXOF=Francs CFA BCEAO
 CurrencySingXOF=Franc CFA BCEAO
 CurrencyXPF=Francs CFP
 CurrencySingXPF=Franc CFP
-
 CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=duizend
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Mailing campagne
@@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Mondeling
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Werknemer
 DemandReasonTypeSRC_SPONSORING=Sponsoring
-
 #### Paper formats ####
 PaperFormatEU4A0=Grootte 4A0
 PaperFormatEU2A0=Grootte 2A0
diff --git a/htdocs/langs/nl_NL/opensurvey.lang b/htdocs/langs/nl_NL/opensurvey.lang
index aef968fe765..cf991212fb3 100644
--- a/htdocs/langs/nl_NL/opensurvey.lang
+++ b/htdocs/langs/nl_NL/opensurvey.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-# Survey=Poll
-# Surveys=Polls
-# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-# NewSurvey=New poll
-# NoSurveysInDatabase=%s poll(s) into database.
-# OpenSurveyArea=Polls area
-# AddACommentForPoll=You can add a comment into poll...
-# AddComment=Add comment
-# CreatePoll=Create poll
-# PollTitle=Poll title
-# ToReceiveEMailForEachVote=Receive an email for each vote
-# TypeDate=Type date
-# TypeClassic=Type standard
-# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-# RemoveAllDays=Remove all days
-# CopyHoursOfFirstDay=Copy hours of first day
-# RemoveAllHours=Remove all hours
-# SelectedDays=Selected days
-# TheBestChoice=The best choice currently is
-# TheBestChoices=The best choices currently are
-# with=with
-# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-# CommentsOfVoters=Comments of voters
-# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-# RemovePoll=Remove poll
-# UrlForSurvey=URL to communicate to get a direct access to poll
-# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-# CreateSurveyDate=Create a date poll
-# CreateSurveyStandard=Create a standard poll
-# CheckBox=Simple checkbox
-# YesNoList=List (empty/yes/no)
-# PourContreList=List (empty/for/against)
-# AddNewColumn=Add new column
-# TitleChoice=Choice label
-# ExportSpreadsheet=Export result spreadsheet
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organiseer uw bijeenkomsten en polls eenvoudig. Kies eerst het type poll...
+NewSurvey=Niewe poll
+NoSurveysInDatabase=%s poll(s) in de database.
+OpenSurveyArea=Polls sectie
+AddACommentForPoll=U kunt een commentaar toevoegen aan de poll...
+AddComment=Voeg commentaar toe
+CreatePoll=Creëer poll
+PollTitle=Poll titel
+ToReceiveEMailForEachVote=Ontvang een E-mail voor iedere stem
+TypeDate=Type datum
+TypeClassic=Type standaard
+OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Selected days
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
 ExpireDate=Termijn
-# NbOfSurveys=Number of polls
-# NbOfVoters=Nb of voters
-# SurveyResults=Results
-# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-# 5MoreChoices=5 more choices
-# Abstention=Abstention
-# Against=Against
-# YouAreInivitedToVote=You are invited to vote for this poll
-# VoteNameAlreadyExists=This name was already used for this poll
-# ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
-# OpenSurveyNothingToSetup=There is no specific setup to do.
-# PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
-# AddADate=Add a date
-# AddStartHour=Add start hour
-# AddEndHour=Add end hour
-# votes=vote(s)
-# NoCommentYet=No comments have been posted for this poll yet
-# CanEditVotes=Can change vote of others
-# CanComment=Voters can comment in the poll
-# CanSeeOthersVote=Voters can see other people's vote
-# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-# BackToCurrentMonth=Back to current month
-# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-# ErrorOpenSurveyOneChoice=Enter at least one choice
-# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-# ErrorInsertingComment=There was an error while inserting your comment
-# MoreChoices=Enter more choices for the voters
-# SurveyExpiredInfo=The voting time of this poll has expired.
-# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+NbOfSurveys=Number of polls
+NbOfVoters=Nb of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Abstention=Abstention
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+ErrorPollDoesNotExists=Error, poll <strong>%s</strong> does not exists.
+OpenSurveyNothingToSetup=There is no specific setup to do.
+PollWillExpire=Your poll will expire automatically <strong>%s</strong> days after the last date of your poll.
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanEditVotes=Can change vote of others
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The voting time of this poll has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 99a473d063b..91d161ef1c6 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=contabilidade
+Accounting=Contabilista
 Globalparameters=Parâmetros Globais
 Chartofaccounts=Plano de contas
 Fiscalyear=Anos fiscais
-Menuaccount=contas contabilisticas
+Menuaccount=Contas contabilísticas
 Menuthirdpartyaccount=Contas de terceiros
 MenuTools=Ferramentas
 
 ConfigAccountingExpert=A configuração do módulo especialista em contabilidade
 Journaux=Diarios
 JournalFinancial=Diarios financeiros
-Exports=exportados
+Exports=Exportados
 Modelcsv=Modelo de exportação
-Selectmodelcsv=selecionar modelo de exportação
-Modelcsv_normal=exportação classica
+Selectmodelcsv=Selecione um modelo de exportação
+Modelcsv_normal=Exportação classica
 Modelcsv_CEGID=Exportação em direção Especialista CEGID 
 BackToChartofaccounts=Voltar ao plano de contas
 Back=Voltar
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 3e195800e80..9bd8dc355ed 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -16,7 +16,7 @@ ConfirmPurgeSessions=Deseja limpar todas as sessões? Isto irá terminar as sess
 NoSessionListWithThisHandler=O gestor de guardar a sessão configurado no seu PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas ligações
 ConfirmLockNewSessions=Tem certeza que quer restringir qualquer ligação nova EPR para si mesmo? Depois disso, só o utilizador <b>%s</b> poderá conetar.
-UnlockNewSessions=Remover bloqueio da conexão
+UnlockNewSessions=Remover bloqueio de ligação
 YourSession=A sua sessão
 Sessions=Sessão do utilizador
 WebUserGroup=Utilizador / grupo do servidor da Web
@@ -122,7 +122,7 @@ LanguageBrowserParameter=Variável %s
 LocalisationDolibarrParameters=Parâmetros de localização
 ClientTZ=Fuso Horário do Cliente (utilizador)
 ClientHour=Hora do Cliente (utilizador)
-OSTZ=Server OS Time Zone
+OSTZ=Fuso Horário do Servidor do SO
 PHPTZ=Zona horaria PHP
 PHPServerOffsetWithGreenwich=Offset con Greenwich (segundos)
 ClientOffsetWithGreenwich=Greenwich (segundos)
@@ -137,7 +137,7 @@ Box=Caixa
 Boxes=Caixas
 MaxNbOfLinesForBoxes=Nº de linhas máximo para as caixas
 PositionByDefault=Posição por defeito
-Position=Position
+Position=Posição
 MenusDesc=Os gestores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir diferentes gestores segundo o utilizador seja interno ou externo.
 MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência com a pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente.
 MenuForUsers=Menu para os Utilizadores
@@ -147,7 +147,7 @@ SystemInfo=Info Sistema
 SystemTools=Utilidades do Sistema
 SystemToolsArea=Área de utilidades do sistema
 SystemToolsAreaDesc=Esta área oferece diferentes funções de administração. Use o menu para escolher a Funcionalidade e pesquisa.
-Purge=Purge
+Purge=Limpar
 PurgeAreaDesc=Esta página permite eliminar todos os ficheiros criados ou Gravados pelo ERP/CRM (Ficheiros temporários ou todos os ficheiros da pasta <b>%s</b>). O uso desta função não é necessária. Proporciona-se para os utilizadores que albergam o ERP/CRM no servidor que oferece as permissões de eliminação de ficheiros salvaguardados pelo servidor Web.
 PurgeDeleteLogFile=Apagar <b>ficheiro %s</b> definido para o módulo Syslog (sem risco de perderem os dados)
 PurgeDeleteTemporaryFiles=Eliminar todos os ficheiros temporários (sem perigo de perca de dados)
@@ -181,7 +181,7 @@ CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva
 CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o lixo 'sql'
 ExportCompatibility=Compatibilidade do ficheiro de exportação gerado
 MySqlExportParameters=Parâmetros da exportação MySql
-PostgreSqlExportParameters= PostgreSQL export parameters
+PostgreSqlExportParameters= Parâmetros de exportação PostgreSQL
 UseTransactionnalMode=Utilizar o modo transaccional
 FullPathToMysqldumpCommand=Rota completa do comando mysqldump
 FullPathToPostgreSQLdumpCommand=Caminho completo para o pg_dump comando
@@ -233,7 +233,7 @@ ProtectAndEncryptPdfFiles=Protecção e encriptação dos pdf gerados
 ProtectAndEncryptPdfFilesDesc=A protecção de um documento pdf deixa o documento livre para leitura e impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia são impossíveis.
 Feature=Característica
 DolibarrLicense=Licença
-DolibarrProjectLeader=Chefe de projecto
+DolibarrProjectLeader=Chefe de Projeto
 Developpers=Programadores/contribuintes
 OtherDeveloppers=Outros Programadores/contribuintes
 OfficialWebSite=Sitio web oficial internacional
@@ -266,12 +266,12 @@ MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os e-
 MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
-MAIN_DISABLE_ALL_MAILS=Desactivar globalmente todo o envío de correios electrónicos (para modo de teste)
+MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrónicos (para fins de teste ou demonstrações)
 MAIN_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP
 MAIN_MAIL_SMTPS_PW=Password SMTP para autenticação SMTP
 MAIN_MAIL_EMAIL_TLS= Utilizar TLS (SSL) criptografia
-MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demos)
+MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demonstrações)
 MAIN_SMS_SENDMODE=Método a ser usado para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telefone padrão do remetente para envio de SMS
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
@@ -297,7 +297,7 @@ FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada
 DownloadPackageFromWebSite=Descarregar o pacote do sitio %s.
 UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta raiz do ERP <b>%s</b>
 SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente.
-NotExistsDirect=The alternative root directory is not defined.<br>
+NotExistsDirect=A diretoria raiz alternativa não está definida.<br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
 YouCanSubmitFile=Seleccione o módulo:
@@ -309,8 +309,8 @@ GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}<
 GenericMaskCodes3=Qualquer outro caractere na máscara  fica sem alterações. <br>Não são permitidos espaços <br>
 GenericMaskCodes4a=<u>Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Exemplo sobre um Terceiro criado em 31/03/2007:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes4c=<u>Exemplo no produto criado em 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Devolve um número criado na linha numa máscara definida.
 ServerAvailableOnIPOrPort=Servidor disponivel no endereço <b>%s</b> na porta <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor não disponivel no endereço <b>%s</b> na Porta <b>%s</b>
@@ -334,7 +334,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Arquivos. Lang carregado na memória co
 ExamplesWithCurrentSetup=Exemplos com o funcionamento da actual configuração
 ListOfDirectories=Lista dos modelos OpenDocument directórios
 ListOfDirectoriesForModelGenODT=Lista dos diretórios que contêm arquivos de modelos com o formato OpenDocument. <br><br> Coloque aqui o caminho completo de directórios. <br> Adicionar um retorno de carro entre eah directório. <br> Para adicionar um directório do módulo de GED, adicione aqui <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Os arquivos desses directórios devem terminar <b>com. Odt.</b>
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+NumberOfModelFilesFound=Número de ficheiros de modelos ODT/ODS encontrados nessas diretorias
 ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br> c: \\ mydir <br> / Home mydir / <br> DOL_DATA_ROOT ecm / ecmdir /
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber como criar os seus modelos de documentos odt, antes de armazená-los nestas listas, ler a documentação wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -440,8 +440,8 @@ Module52Name=Stocks de produtos
 Module52Desc=Gestão de stocks de produtos
 Module53Name=Serviços
 Module53Desc=Gestão de serviços
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Contractos/Subscrições
+Module54Desc=Gestão de contractos (serviços ou subscrições periódicas)
 Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
 Module56Name=Central Telefónica
@@ -478,7 +478,7 @@ Module320Name=Ligações RSS
 Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
 Module330Name=Favoritos
 Module330Desc=Gestão de Favoritos
-Module400Name=Projects/Opportunities/Leads
+Module400Name=Projetos/Oportunidades/Chefias
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
@@ -588,11 +588,11 @@ Permission92=Criar/Modificar Impostos e IVA
 Permission93=Eliminar Impostos e IVA
 Permission94=Exportar Impostos Sociais
 Permission95=Consultar balanços e resultados
-Permission101=Consultar Expedições
-Permission102=Criar/Modificar Expedições
-Permission104=Confirmar Expedições
-Permission106=Export sendings
-Permission109=Eliminar Expedições
+Permission101=Consultar envios
+Permission102=Criar/modificar envios
+Permission104=Confirmar envios
+Permission106=Exportar envios
+Permission109=Eliminar envios
 Permission111=Consultar contas financeiras (contas bancarias, caixas)
 Permission112=Criar/Modificar quantidade/eliminar registos bancarios
 Permission113=Configurar contas financeiras (criar, controlar as categorías)
@@ -613,16 +613,16 @@ Permission151=Consultar Débitos Directos
 Permission152=Configurar Débitos Directos
 Permission153=Consultar Débitos Directos
 Permission154=Crédito / recusar recibos de ordens permanentes
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
+Permission161=Ler contractos/subscrições
+Permission162=Criar/modificar contractos/subscrições
+Permission163=Ativar um serviço/subscrição de um contracto
+Permission164=Desativar um serviço/subscrição de um contracto
+Permission165=Apagar contractos/subscrições
 Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
+Permission172=Criar/modificar viagens e despesas
+Permission173=Apagar viagens e despesas
 Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission178=Exportar viagens e despesas
 Permission180=Consultar Fornecedores
 Permission181=Consultar pedidos a Fornecedores
 Permission182=Criar/Modificar pedidos a Fornecedores
@@ -649,7 +649,7 @@ Permission221=Consultar E-Mails
 Permission222=Criar/Modificar E-Mails (assunto, destinatarios, etc.)
 Permission223=Confirmar E-Mails (permite o envío)
 Permission229=Eliminar E-Mails
-Permission237=View recipients and info
+Permission237=Ver destinatários e informação
 Permission238=Manually send mailings
 Permission239=Delete mailings after validation or sent
 Permission241=Consultar categorías
@@ -709,8 +709,8 @@ Permission701=Consultar Bolsas
 Permission702=Criar/Modificar Bolsas
 Permission703=Eliminar Bolsas
 Permission1001=Consultar stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Criar/modificar armazéns
+Permission1003=Apagar armazéns
 Permission1004=Consultar movimientos de stock
 Permission1005=Criar/Modificar movimentos de stock
 Permission1101=Consultar ordens de envío
@@ -737,7 +737,7 @@ Permission1237=Export supplier orders and their details
 Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga)
 Permission1321=Exportar facturas a clientes, atributos e cobranças
 Permission1421=Exportar facturas de clientes e atributos
-Permission23001 = Read Scheduled task
+Permission23001 = Ler tarefa agendada
 Permission23002 = Criar/alterar tarefa agendada
 Permission23003 = Eliminar tarefa agendada
 Permission23004 = Executar tarefa agendada
@@ -798,15 +798,15 @@ VATIsUsedExampleFR=Em França, trata-se de sociedades ou organismos que elegem u
 VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos o profissionais liberais que escolheram o régime fiscal de módulos (IVA em franquia), pagando um IVA em franquia sem fazer declarações de IVA. Esta eleição faz aparecer a anotação  "IVA não aplicavel" nas facturas.
 ##### Local Taxes #####
 LTRate=Rate
-LocalTax1IsUsed=Use second tax
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
+LocalTax1IsUsed=Utilizar um segundo imposto
+LocalTax1IsNotUsed=Não utilizar um segundo imposto
+LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (não IVA)
+LocalTax1IsNotUsedDesc=Não utilizar outro tipo de imposto (não IVA)
+LocalTax1Management=Segundo tipo de imposto
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsed=Utilizar um terceiro imposto
+LocalTax2IsNotUsed=Não utilizar um terceiro imposto
 LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
 LocalTax2Management=Third type of tax
@@ -1034,7 +1034,7 @@ ExtraFieldsProjectTask=Atributos complementares (tarefas)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyCharsAndNoSpace=apenas caracteres alfanuméricos sem espaços
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendingMailSetup=Instalação de envios por e-mail
+SendingMailSetup=Configuração de envios por correio eletrónico
 SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar e-mails, a configuração sendmail  deve conter a opção ba-(mail.force_extra_parameters parâmetro em seu arquivo php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters
 PathToDocuments=Caminhos de acesso a documentos
 PathDirectory=Catálogo
@@ -1400,9 +1400,9 @@ FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Configuração do módulos envíos
 SendingsReceiptModel=Modelo da ficha de expedição
-SendingsNumberingModules=Envios de numeração módulos
-SendingsAbility=Portes pagos pelo cliente
-NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hoja de entregas de produtos é uma operação duplicada sendo rara a vez que é activada.
+SendingsNumberingModules=Envios módulos numerados
+SendingsAbility=Suporte para notas de expedição para as entregas de cliente
+NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hora de entregas de produtos é uma operação duplicada sendo rara a vez que é ativada.
 FreeLegalTextOnShippings=Texto livre em embarques
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 32a51ccee83..7bf37e00221 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,52 +1,56 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Links de informação RSS
-BoxLastProducts=Últimos produtos/serviços
+BoxLastRssInfos=Informação RSS
+BoxLastProducts=Últimos %s produtos/serviços
 BoxProductsAlertStock=Products in stock alert
-BoxLastProductsInContract=Últimos produtos/serviços contratados
-BoxLastSupplierBills=Últimas facturas de Fornecedores
-BoxLastCustomerBills=Últimas facturas a clientes
-BoxOldestUnpaidCustomerBills=Facturas a clientes mais antiguas pendentes de pagamento
-BoxOldestUnpaidSupplierBills=Facturas de Fornecedores mais antiguas pendentes de pagamento
+BoxLastProductsInContract=Últimos %s produtos/serviços contratados
+BoxLastSupplierBills=Últimas faturas dos fornecedores
+BoxLastCustomerBills=Últimas faturas a clientes
+BoxOldestUnpaidCustomerBills=Faturas a clientes mais antigas em débito
+BoxOldestUnpaidSupplierBills=Faturas de fornecedores mais antigas em crédito
 BoxLastProposals=Últimos Orçamentos
-BoxLastProspects=Últimos clientes potenciais
-BoxLastCustomers=Últimos clientes
-BoxLastSuppliers=Últimos Fornecedores
-BoxLastCustomerOrders=Últimos pedidos
+BoxLastProspects=Últimos clientes modificados
+BoxLastCustomers=Últimos clientes modificados
+BoxLastSuppliers=Últimos fornecedores modificados
+BoxLastCustomerOrders=Últimos pedidos de cliente
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Últimos books
 BoxLastActions=Últimas acções
-BoxLastContracts=Ultimos Contractos
+BoxLastContracts=Últimos contractos
 BoxLastContacts=Últimos contatos, endereços
 BoxLastMembers=Últimos membros
-BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Últimas intervenções
+BoxCurrentAccounts=Balanço de abertura das contas
 BoxSalesTurnover=Volume de negocio
-BoxTotalUnpaidCustomerBills=Total facturas a clientes pendentes de pagamento
-BoxTotalUnpaidSuppliersBills=Total facturas de Fornecedores pendentes de pagamento
+BoxTotalUnpaidCustomerBills=Total das faturas de clientes em débito
+BoxTotalUnpaidSuppliersBills=Total das faturas dos fornecedores em crédito
 BoxTitleLastBooks=Os %s últimos Favoritos registados
 BoxTitleNbOfCustomers=Número de clientes
-BoxTitleLastRssInfos=As %s Ultimas Infos de %s
-BoxTitleLastProducts=Os %s Ultimos Produtos/Serviços Registados
+BoxTitleLastRssInfos=As %s últimas notícias de %s
+BoxTitleLastProducts=Os %s últimos produtos/serviços modificados
 BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Os %s últimos pedidos de clientes modificados
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados
 BoxTitleLastCustomers=Os %s últimos clientes modificados
 BoxTitleLastModifiedSuppliers=%s Modificada fornecedores
 BoxTitleLastModifiedCustomers=%s Modificada clientes
-BoxTitleLastCustomersOrProspects=Os %s últimos clientes ou clientes potenciais registados
-BoxTitleLastPropals=Os %s últimos Orçamentos registados
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=As %s últimas facturas a clientes registadas
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=As %s últimas facturas de Fornecedores registadas
-BoxTitleLastProspects=Os %s últimos clientes potenciais modificados
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=%s Modificada perspectivas
 BoxTitleLastProductsInContract=Os %s últimos produtos/serviços contratados
-BoxTitleLastModifiedMembers=%s últimos membros modificados
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=As %s facturas mais antiguas a clientes Pendentes de cobrança
-BoxTitleOldestUnpaidSupplierBills=As %s facturas mais antiguas de Fornecedores Pendentes de pagamento
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Volume de negocio realizado
-BoxTitleTotalUnpaidCustomerBills=Facturas pendentes de clientes
-BoxTitleTotalUnpaidSuppliersBills=Facturas pendentes de Fornecedores
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=%s Última modificação contatos, endereços
 BoxMyLastBookmarks=Os meus ultimos Favoritos
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
@@ -76,7 +80,8 @@ NoContractedProducts=Não contractados produtos / serviços
 NoRecordedContracts=Sem contratos registrados
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Faturas de clientes por mês
 BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 83024e188b6..3d3c2c4ecf5 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -3,14 +3,14 @@ ErrorCompanyNameAlreadyExists=O nome da empresa %s já existe. Indique outro.
 ErrorPrefixAlreadyExists=O prefixo %s já existe. Indique outro.
 ErrorSetACountryFirst=Defina primeiro o país
 SelectThirdParty=Selecione um terceiro
-DeleteThirdParty=Eliminar um Terceiro
-ConfirmDeleteCompany=Está seguro de querer eliminar esta empresa e toda a informação dela pendente?
-DeleteContact=Eliminar um contacto
-ConfirmDeleteContact=Está seguro de querer eliminar este contacto e toda a sua informação inerente?
+DeleteThirdParty=Apague um terceiro
+ConfirmDeleteCompany=Deseja apagar esta empresa e toda a sua informação?
+DeleteContact=Apagar um contacto/morada
+ConfirmDeleteContact=Deseja apagar este contacto e toda a sua informação?
 MenuNewThirdParty=Novo Terceiro
 MenuNewCompany=Nova Empresa
 MenuNewCustomer=Novo Cliente
-MenuNewProspect=Novo Cliente Potencial
+MenuNewProspect=Novo Potencial Cliente
 MenuNewSupplier=Novo Fornecedor
 MenuNewPrivateIndividual=Novo Particular
 MenuSocGroup=Grupos
@@ -93,7 +93,7 @@ LocalTax1ES=RE
 LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeES=Tipo
 ThirdPartyEMail=%s
 WrongCustomerCode=Código cliente incorrecto
 WrongSupplierCode=Código fornecedor incorrecto
@@ -112,7 +112,7 @@ ProfId2=ID profesional 2
 ProfId3=ID profesional 3
 ProfId4=ID profesional 4
 ProfId5=Professional ID 5
-ProfId6=Professional ID 6
+ProfId6=Id. Professional 6
 ProfId1AR=Prof Id 1 (CUIL)
 ProfId2AR=Id Prof 2 (brutos Revenu)
 ProfId3AR=-
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Descontos fixos disponiveis
 DiscountNone=Nenhuma
 Supplier=Fornecedor
 CompanyList=Lista de Empresas
-AddContact=Criar Contacto
-AddContactAddress=Adicionar contactos/endereços
+AddContact=Criar contacto
+AddContactAddress=Novo contacto/morada
 EditContact=Editar contato / endereço
 EditContactAddress=Editar contactos/endereços
 Contact=Contacto
@@ -268,8 +268,8 @@ ContactsAddresses=Contato / Endereços
 NoContactDefinedForThirdParty=Não existem contactos definidos para este terceiro
 NoContactDefined=Nenhum contacto definido para este terceiro
 DefaultContact=Contacto por Defeito
-AddCompany=Criar Empresa
-AddThirdParty=Criar Terceiro
+AddCompany=Criar empresa
+AddThirdParty=Criar terceiro
 DeleteACompany=Eliminar uma Empresa
 PersonalInformations=Informação Pessoal
 AccountancyCode=Código Contabilidade
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Etiqueta de Envío
 DeleteDeliveryAddress=Eliminar uma Direcção de Envío
 ConfirmDeleteDeliveryAddress=Está seguro de querer eliminar esta direcção de envío?
 NewDeliveryAddress=Nova Direcção de Envío
-AddDeliveryAddress=Adicionar Direcção
-AddAddress=Adicionar Direcção
+AddDeliveryAddress=Criar morada
+AddAddress=Criar morada
 NoOtherDeliveryAddress=Não Existe Direcção alternatica definidas
 SupplierCategory=categoria Fornecedor
 JuridicalStatus200=Independente
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Você deve criar contactos e-mails para terceiros, pri
 ListSuppliersShort=Lista de fornecedores
 ListProspectsShort=Lista das perspectivas
 ListCustomersShort=Lista de clientes
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Terceiros e árrea de contacto
 LastModifiedThirdParties=%s Última modificação terceiros
 UniqueThirdParties=Total de originais terceiros
 InActivity=Aberto
@@ -410,5 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Procurar terceiro
+SearchContact=Procurar contacto
diff --git a/htdocs/langs/pt_PT/ftp.lang b/htdocs/langs/pt_PT/ftp.lang
index 6a364103be8..252525c10a6 100644
--- a/htdocs/langs/pt_PT/ftp.lang
+++ b/htdocs/langs/pt_PT/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuração do módulo Cliente de FTP
-NewFTPClient=Nova configuração da ligação FTP
+FTPClientSetup=Configuração do módulo de Cliente FTP
+NewFTPClient=Nova configuração de ligação FTP
 FTPArea=Área de FTP
-FTPAreaDesc=Esta área mostrará o conteúdo de uma visão do servidor FTP
-SetupOfFTPClientModuleNotComplete=Instalação do módulo cliente FTP parece não estar completa
-FTPFeatureNotSupportedByYourPHP=A versão do PHP não suporta funções FTP
-FailedToConnectToFTPServer=Falha ao ligar ao servidor de FTP (servidor: %s, porta: %s)
-FailedToConnectToFTPServerWithCredentials=Falha de login do servidor de FTP com login definido e senha
+FTPAreaDesc=Este ecrã mostra o seu conteúdo de uma visualização do servidor FTP
+SetupOfFTPClientModuleNotComplete=A configuração do módulo de cliente FTP parece não estar concluída
+FTPFeatureNotSupportedByYourPHP=A sua versão do PHP não suporta as funções FTP
+FailedToConnectToFTPServer=Não foi possível ligar ao servidor FTP (servidor: %s, porta: %s)
+FailedToConnectToFTPServerWithCredentials=Não foi possível iniciar a sessão no servidor FTP com o nome/senha definidos
 FTPFailedToRemoveFile=Falha ao remover o ficheiro: <b>%s</b>.
-FTPFailedToRemoveDir=Falha ao remover o directório: <b>%s</b> (Verifique as permissões do diretório e que está vazia).
+FTPFailedToRemoveDir=Não foi possível ao remover a diretoria: <b>%s</b> (Verifique as permissões e se a diretoria está sem dados).
 FTPPassiveMode=Modo passivo
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 2881be0fc16..8c6632c56ab 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Basta seguir as instruções passo-a-passo.
-MiscellaneousChecks=Verificar Pré-requisitos
+MiscellaneousChecks=Verificar pré-requisitos
 DolibarrWelcome=Bem-vindo ao Dolibarr
-ConfFileExists=O ficheiro <b>%s</b> de configuração já existe.
-ConfFileDoesNotExists=O ficheiro <b>%s</b> de configuração não existe!
-ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro <b>%s</b> de configuração não existe e não foi possível criá-lo!
-ConfFileCouldBeCreated=Foi possível criar o ficheiro <b>%s</b> de configuração.
-ConfFileIsNotWritable=O ficheiro de configuração <b>conf.php</b> não é passível de escrita, verifique as permissões sff, o seu servidor web tem de ter permissões de escrita neste ficheiro em Linux, chmod 666).
-ConfFileIsWritable=O ficheiro de configuração <b>conf.php</b> tem as permissões correctas.
-ConfFileReload=Atualizar todas as informações do arquivo de configuração.
+ConfFileExists=O ficheiro de configuração <b>%s</b> já existe.
+ConfFileDoesNotExists=O ficheiro de configuração <b>%s</b> não existe!
+ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuração <b>%s</b> não existe e não foi possível criá-lo!
+ConfFileCouldBeCreated=Foi criado o ficheiro de configuração <b>%s</b>.
+ConfFileIsNotWritable=O ficheiro de configuração <b>%s</b> não é gravável. Verifique as permissões. Na primeira instalação, o seu servidor da Web tem de ter permissões de gravação para este ficheiro durante o processo de configuração ("chmod 666", por exemplo num SO, tal como o Unix).
+ConfFileIsWritable=O ficheiro de configuração <b>%s</b> é gravável.
+ConfFileReload=Recarregar toda a informação do ficheiro de configuração.
 PHPSupportSessions=Este PHP suporta sessões.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
-PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro <b>variables_order</b> em php.ini
-PHPSupportGD=Este suporte PHP GD gráfica funções.
-PHPSupportUTF8=Este suporte PHP UTF8 funções.
-PHPMemoryOK=Seu PHP max sessão memória está definido <b>para %s.</b> Isto deve ser suficiente.
-PHPMemoryTooLow=Seu PHP max sessão memória está definido <b>para %s</b> bytes. Isto deve ser muito baixo. Alterar o seu <b>php.ini memory_limit</b> para definir parâmetro para pelo <b>menos %s</b> bytes.
+PHPSupportPOSTGETKo=É possível que a sua configuração PHP não suporte as variáveis POST e/ou GET. Verifique o seu parâmetro <b>variables_order</b> no php.ini
+PHPSupportGD=Este PHP suporta funções gráficas GD .
+PHPSupportUTF8=Este PHP suporte funções UTF8.
+PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b> Isto deverá ser suficiente.
+PHPMemoryTooLow=A sua memória máxima da sessão PHP está definida para <b>%s</b> bytes. Isto deve ser muito baixo. Altere o seu <b>php.ini</b> para definir o parâmetro <b>memory_limit</b> para pelo menos <b>%s</b> bytes.
 Recheck=Clique aqui para um teste mais significativo
-ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP.
-ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis.
-ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta funções UTF8. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr.
+ErrorPHPDoesNotSupportSessions=A sua instalação PHP não suporta sessões. Esta função é necessária para que o Dolibarr funcione. Verifique a sua configuração PHP.
+ErrorPHPDoesNotSupportGD=A sua instalação PHP não suporta a função gráfica GD. Não terá nenhum gráfico disponível.
+ErrorPHPDoesNotSupportUTF8=A sua instalação PHP não suporta as funções UTF8. O Dolibarr não pode funcionar corretamente. Resolva isto antes de instalar o Dolibarr.
 ErrorDirDoesNotExists=A diretoria %s não existe.
 ErrorGoBackAndCorrectParameters=Voltar atrás e corrigir os parâmetros errados.
-ErrorWrongValueForParameter=Pode ter digitado um valor incorreto para o parâmetro ' %s'.
+ErrorWrongValueForParameter=Pode ter inserido um valor incorreto para o parâmetro ' %s'.
 ErrorFailedToCreateDatabase=Não foi possível criar a base de dados' %s'.
-ErrorFailedToConnectToDatabase=Não foi possível conetar à base de dados' %s'.
+ErrorFailedToConnectToDatabase=Não foi possível ligar à base de dados' %s'.
 ErrorDatabaseVersionTooLow=A versão da base de dados (%s) é muito antiga. É necessária a versão %s ou superior.
 ErrorPHPVersionTooLow=A versão PHP é muito antiga. É necessária a versão %s.
 WarningPHPVersionTooLow=PHP versão muito antiga. %s versão ou mais é o esperado. Esta versão deverá permitir instalar, mas não é suportado.
@@ -34,131 +34,131 @@ IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de dados não existir, volte
 IfDatabaseExistsGoBackAndCheckCreate=Se a base de dados já existir, volte e desmarque a opção "Criar base de dados".
 WarningBrowserTooOld=A versão do navegador é muito antiga. Atualize o seu navegador para uma versão mais recente do Firefox, Chrome ou Ópera.
 PHPVersion=Versão PHP
-YouCanContinue=Pode continuar ...
-PleaseBePatient=Por favor, seja paciente ...
-License=A usar a licença
-ConfigurationFile=Ficheiro de configuração
-WebPagesDirectory=A diretoria onde as páginas da web estão guardadas
-DocumentsDirectory=A diretoria para guardar os documentos e gerados
-URLRoot=URL de raiz
-ForceHttps=Forçar conexões seguras (https)
-CheckToForceHttps=Marque esta opção para forçar conexões seguras (https). <br> Isso exige que o servidor web está configurado com um certificado SSL.
+YouCanContinue=Pode continuar...
+PleaseBePatient=Por favor, seja paciente...
+License=A utilizar a licença
+ConfigurationFile=Ficheiro de Configuração
+WebPagesDirectory=A diretoria onde as páginas da Web são guardadas
+DocumentsDirectory=A diretoria para guardar os documentos enviados e gerados
+URLRoot=URL Raiz
+ForceHttps=Forçar ligações seguras (https)
+CheckToForceHttps=Marque esta opção para forçar as ligações seguras (https). <br> Isto requer que o servidor da Web esteja configurado com um certificado SSL.
 DolibarrDatabase=Base de Dados Dolibarr
-DatabaseChoice=Escolha de base de dados
+DatabaseChoice=Escolha da Base de Dados
 DatabaseType=Tipo de base de dados
-DriverType=Driver tipo
-Server=Server
+DriverType=Tipo de Controlador
+Server=Servidor
 ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web
-ServerPortDescription=Database server port. Mantenha vazio se desconhecido.
-DatabaseServer=Database server
-DatabaseName=Nome da base de dados
-DatabasePrefix=Tabela de prefixos de banco de dados
+ServerPortDescription=A porta do servidor da base de dados. Mantenha em branco, se desconhecida.
+DatabaseServer=Servidor da Base de Dados
+DatabaseName=Nome da Base de Dados
+DatabasePrefix=Tabela de prefixos da base de dados
 Login=Iniciar Sessão
-AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anónimo
+AdminLogin=Início de sessão para o administrador da base de dados Dolibarr. Deixar em branco se a ligação for efetuada como anónimo
 Password=Senha
 PasswordAgain=Contrassenha
 AdminPassword=A senha para o utilizador da base de dados Dolibarr.
 CreateDatabase=Criar base de dados
-CreateUser=Criar utilizador
-DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso Administrador
-CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
-CheckToCreateUser=Caixa de login, se não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
+CreateUser=Criar administrador
+DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso de Administrador
+CheckToCreateDatabase=Marque a caixa se a base de dados não existir e se deverá ser criada. <br> Neste caso, deve preencher o nome/senha para a conta de administrador, no fim desta página.
+CheckToCreateUser=Marque a caixa se o administrador da base de dados não existir e se deverá ser criado. <br> Neste caso, deve escolher o seu nome/senha e preencher também os dados da conta de administrador no fim desta página. Se esta caixa estiver desmarcada, o administrador da base de dados e a sua senha já deverão existir.
 Experimental=(experimental)
-DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web).
+DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem.
 KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto)
 SaveConfigurationFile=Guardar valores
-ConfigurationSaving=A guardar o ficheiro da configuração ...
-ServerConnection=Conexão ao Servidor
-DatabaseConnection=Conexão à Base de Dados
+ConfigurationSaving=A guardar o ficheiro da configuração...
+ServerConnection=Ligação ao Servidor
+DatabaseConnection=Ligação à Base de Dados
 DatabaseCreation=Criação da Base de Dados
 UserCreation=Criação do Utilizador
 CreateDatabaseObjects=Criação dos objetos da base de dados
-ReferenceDataLoading=Dados de base a carregar...
+ReferenceDataLoading=A carregar os dados de referência...
 TablesAndPrimaryKeysCreation=Criação das Tabelas e Chaves Primárias
 CreateTableAndPrimaryKey=Criar tabela %s
 CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s
-OtherKeysCreation=Chaves estrangeiras e índices criação
-FunctionsCreation=Funções criação
+OtherKeysCreation=Chaves estrangeiras e criação de índex
+FunctionsCreation=Criação de Funções
 AdminAccountCreation=Criação da sessão do Administrador
-PleaseTypePassword=Por favor, digite uma senha, não são permitidas senhas em branco!
+PleaseTypePassword=Por favor, insira uma senha, não são permitidas senhas em branco!
 PleaseTypeALogin=Por favor, digite um nome!
 PasswordsMismatch=As senhas não coincidem, por favor, tente de novo!
 SetupEnd=Fim da Configuração
 SystemIsInstalled=Esta instalação está completa.
 SystemIsUpgraded=O Dolibarr foi atualizado com sucesso.
-YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link:
-AdminLoginCreatedSuccessfuly=Sessão de Administrador '<b>%s</b>' criada com sucesso.
+YouNeedToPersonalizeSetup=Precisa de configurar o Dolibarr de acordo com as suas necessidades (apresentação, caraterísticas, ...). Para o efetuar, clique na seguinte hiperligação:
+AdminLoginCreatedSuccessfuly=A sessão de Administrador '<b>%s</b>' foi criada com sucesso.
 GoToDolibarr=Ir para Dolibarr
 GoToSetupArea=Ir para Dolibarr (área de configuração)
-MigrationNotFinished=Versão da base de dados não está completamente atualizada, assim terá que executar novamente o processo de atualização.
+MigrationNotFinished=A versão da base de dados não está completamente atualizada, assim terá que executar novamente o processo de atualização.
 GoToUpgradePage=Ir novamente para a página de atualização
 Examples=Exemplos
-WithNoSlashAtTheEnd=Sem a barra "/" no final
+WithNoSlashAtTheEnd=Sem a barra "/" no fim
 DirectoryRecommendation=É recomendado a utilização da diretoria fora da sua diretoria das suas páginas da web.
 LoginAlreadyExists=Já existe
 DolibarrAdminLogin=Sessão Administrador Dolibarr
 AdminLoginAlreadyExists=A conta de administrador <b>' %s'</b> Dolibarr já existe. Volte atrás, se desejar criar uma conta.
-WarningRemoveInstallDir=Atenção, por razões de segurança, assim que a instalação ou a atualização estiver completa, para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome <b>install.lock</b> na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.</b>
+WarningRemoveInstallDir=Aviso: por motivos de segurança, assim que a instalação ou a atualização estiverem completas, e para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome <b>install.lock</b> na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.</b>
 ThisPHPDoesNotSupportTypeBase=Este sistema PHP não suporta qualquer interface para aceder ao tipo da base de dados %s
 FunctionNotAvailableInThisPHP=Não disponível neste PHP
 MigrateScript=Migrar script
 ChoosedMigrateScript=Escolhido migrar script
 DataMigration=Migração de dados
 DatabaseMigration=Migração da base de dados da estrutura
-ProcessMigrateScript=Script transformação
-ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ...
-FreshInstall=Nova Instalação
-FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo.
+ProcessMigrateScript=Processamento do "Script"
+ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar"...
+FreshInstall=Instalação Nova
+FreshInstallDesc=Utilize este modo, se esta for a sua primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleta, mas se deseja atualizar a sua versão, selecione o modo "Atualizar".
 Upgrade=Atualizar
 UpgradeDesc=Utilize este modo se tiver substituído os ficheiros Dolibarr antigos com ficheiros de uma versão mais recente. Isto irá atualizar a sua base de dados e os dados.
 Start=Iniciar
-InstallNotAllowed=Configuração não permitidas pelas permissões <b>conf.php</b>
+InstallNotAllowed=Configuração não permitida pelas permissões <b>conf.php</b>
 NotAvailable=Não disponível
-YouMustCreateWithPermission=Deve criar o ficheiro %s e definir as permissões de gravação deste para o servidor da web, durante o processo de instalação.
+YouMustCreateWithPermission=Deve criar o ficheiro %s e definir as permissões de gravação deste para o servidor da Web, durante o processo de instalação.
 CorrectProblemAndReloadPage=Por favor, corrija o problema e pressione em 'F5' para recarregar a página.
-AlreadyDone=Já migrou
+AlreadyDone=Já migrada
 DatabaseVersion=Versão da Base de Dados
 ServerVersion=Versão do Servidor da Base de Dados
 YouMustCreateItAndAllowServerToWrite=Deve criar esta diretoria e permitir que o servidor da web grave nela.
 CharsetChoice=Conjunto de carateres escolha
 CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas
 CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web. <br/> Padrão proposto um conjunto de caracteres é o do seu banco de dados.
-DBSortingCollation=Caracteres triagem fim
+DBSortingCollation=Ordem da ordenação dos carateres
 DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
-CharacterSetDatabase=Conjunto de caracteres para o banco de dados
+CharacterSetDatabase=Conjunto de carateres para a base de dados
 CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação. <br/> Esse parâmetro não pode ser definido se de dados já existe.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de <b>dados %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
-YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados <b>login %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados <b>%s</b>, mas para isso, o Dolibarr precisa de ligar ao servidor <b>%s</b> com permissões de administrador <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Pediu para criar a base de dados da sessão <b>%s,</b> mas para isso, o Dolibarr precisa de ligar ao servidor <b>%s</b> com permissões de administrador <b>%s</b>.
 BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado.
-OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s
-RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar.
+OrphelinsPaymentsDetectedByMethod=Detetado o pagamento Orphelins pelo método %s
+RemoveItManuallyAndPressF5ToContinue=Remova-o manualmente e pressione F5 para continuar.
 KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
 KeepDefaultValuesDeb=Você pode usar o assistente de configuração Dolibarr de um Ubuntu ou um pacote Debian, então os valores propostos aqui já estão otimizados. Apenas a senha do proprietário do banco de dados para criar tem de ser concluída. Alterar parâmetros outros apenas se você sabe o que fazer.
 KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
 KeepDefaultValuesProxmox=Você usa o assistente de configuração Dolibarr de um appliance virtual Proxmox, para valores propostos aqui já são otimizados. Alterá-los apenas se você sabe o que fazer.
 FieldRenamed=Campo renomeado
-IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário"
+IfLoginDoesNotExistsCheckCreateUser=Se a sessão ainda não existir, deve marcar a opção "Criar Utilizador"
 ErrorConnection=Servidor <b>" %s",</b> nome do banco de dados <b>" %s",</b> login <b>" %s",</b> ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão.
 InstallChoiceRecommanded=Recomendado opção de instalar a versão do seu <b>%s %s</b> versão atual
-InstallChoiceSuggested=<b>Instale opção sugerida pelo instalador.</b>
+InstallChoiceSuggested=<b>Opção de instalação sugerida pelo instalador.</b>
 MigrateIsDoneStepByStep=A versão de destino (%s) tem uma abertura de várias versões, então assistente de instalação vai voltar a sugerir próxima migração uma vez que esta será uma final.
 CheckThatDatabasenameIsCorrect=Verifique se o nome do banco de dados <b>"%s"</b> está correto.
 IfAlreadyExistsCheckOption=Se esse nome está correto e que banco de dados ainda não existe, você deve marcar a opção "Criar banco de dados".
 OpenBaseDir=parametr openbasedir PHP
-YouAskToCreateDatabaseSoRootRequired=Você marcou a caixa "Criar banco de dados". Para isso, você precisa fornecer login e senha de superusuário (parte inferior do formulário).
-YouAskToCreateDatabaseUserSoRootRequired=Você marcou a caixa "Criar banco de dados proprietário". Para isso, você precisa fornecer login e senha de superusuário (parte inferior do formulário).
+YouAskToCreateDatabaseSoRootRequired=Marcou a caixa "Criar Base de Dados". Para isto, precisa de indicar o nome/senha do administrador (base do formulário).
+YouAskToCreateDatabaseUserSoRootRequired=Marcou a caixa "Criar base de dados do administrador". Para isso, precisa do início de sessão/senha de administrador (base do formulário).
 NextStepMightLastALongTime=etapa atual pode durar vários minutos. Por favor, aguarde até a próxima tela é mostrada completamente antes de continuar.
 MigrationCustomerOrderShipping=Migrar para o transporte de armazenamento ordens do cliente
-MigrationShippingDelivery=Upgrade de armazenamento de navegação
-MigrationShippingDelivery2=Upgrade de armazenamento do transporte 2
-MigrationFinished=Migração terminou
+MigrationShippingDelivery=Atualizar armazenamento de transporte
+MigrationShippingDelivery2=Atualizar armazenamento de transporte 2
+MigrationFinished=Migração terminada
 LastStepDesc=<strong>Último passo:</strong> Defina aqui o login ea senha que você planeja usar para se conectar ao software. Não perca isso, pois é a conta para administrar todos os outros.
-ActivateModule=Ative %s módulo
-ShowEditTechnicalParameters=Clique aqui para exibir / editar os parâmetros avançados (modo avançado)
+ActivateModule=Ative o módulo %s
+ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado)
 
 #########
 # upgrade
-MigrationFixData=Correção de dados desnormalizada
+MigrationFixData=Correção para os dados não normalizados
 MigrationOrder=Migração de dados para os clientes "ordens
 MigrationSupplierOrder=Migração de dados de Fornecedores' ordens
 MigrationProposal=Data migrering for kommersielle forslag
@@ -202,10 +202,10 @@ MigrationMenusDetail=Atualização dinâmica menus quadros
 MigrationDeliveryAddress=Atualizar endereço de entrega em transferências
 MigrationProjectTaskActors=Migração de dados para llx_projet_task_actors tabela
 MigrationProjectUserResp=Dados fk_user_resp domínio da migração de llx_projet para llx_element_contact
-MigrationProjectTaskTime=Atualização de tempo gasto em segundos
-MigrationActioncommElement=Atualizar os dados sobre as ações
+MigrationProjectTaskTime=Atualização do tempo despendido em segundos
+MigrationActioncommElement=Atualizar os dados nas ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 
-ShowNotAvailableOptions=Mostrar opções ocultas
-HideNotAvailableOptions=Esconder opções ocultas
+ShowNotAvailableOptions=Mostrar opções indisponíveis
+HideNotAvailableOptions=Ocultar opções indisponíveis
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index 86eef561efe..df457e8d64f 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -10,7 +10,7 @@ Language_da_DA=Dinamarquês
 Language_da_DK=Dinamarquês
 Language_de_DE=Alemão
 Language_de_AT=Alemão (Áustria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Alemão  (Suíça)
 Language_el_GR=Grego
 Language_en_AU=Inglês (Austrália)
 Language_en_GB=Inglês (Reino Unido)
@@ -20,9 +20,9 @@ Language_en_SA=Inglês (Arábia Saudita)
 Language_en_US=Inglês (Estados Unidos)
 Language_en_ZA=Inglês (África do Sul)
 Language_es_ES=Espanhol
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Espanhol (República Dominicana)
 Language_es_AR=Espanhol (Argentina)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Espanhol (Chile)
 Language_es_HN=Espanhol (Honduras)
 Language_es_MX=Espanhol (México)
 Language_es_PY=Espanhol (Paraguai)
@@ -31,7 +31,7 @@ Language_es_PR=Espanhol (Porto Rico)
 Language_et_EE=Estónia
 Language_eu_ES=Basco
 Language_fa_IR=Persa
-Language_fi_FI=Fins
+Language_fi_FI=Finlandês
 Language_fr_BE=Francês (Bélgica)
 Language_fr_CA=Francês (Canadá)
 Language_fr_CH=Francês (Suíça)
@@ -40,7 +40,7 @@ Language_fr_NC=Francês (Nova Caledónia)
 Language_he_IL=Hebreu
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
-Language_id_ID=Indonesian
+Language_id_ID=Indonésio 
 Language_is_IS=Islandês
 Language_it_IT=Italiano
 Language_ja_JP=Japonês
@@ -48,7 +48,7 @@ Language_ko_KR=Coreano
 Language_lt_LT=Lituano
 Language_lv_LV=Letão
 Language_mk_MK=Macedónio
-Language_nb_NO=Norueguês (bokmål)
+Language_nb_NO=Norueguês (Bokmål)
 Language_nl_BE=Holandês (Bélgica)
 Language_nl_NL=Holandês (Países Baixos)
 Language_pl_PL=Polaco
diff --git a/htdocs/langs/pt_PT/mailmanspip.lang b/htdocs/langs/pt_PT/mailmanspip.lang
index 17e8f05968c..ea2d6f990f5 100644
--- a/htdocs/langs/pt_PT/mailmanspip.lang
+++ b/htdocs/langs/pt_PT/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-# MailmanSpipSetup=Mailman and SPIP module Setup
-# MailmanTitle=Mailman mailing list system
-# TestSubscribe=To test subscription to Mailman lists
-# TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=O teste subscrição foi executado com sucesso
-MailmanDeletionSuccess=O teste de desubscrição foi executado com sucesso
-# SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=Uma atualização ao SPIP será realizado
-# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=Lista(s) para inscrição automática de novos membros (separados por uma vírgula)
-# SPIPTitle=SPIP Content Management System
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=O teste da subscrição foi executado com sucesso
+MailmanDeletionSuccess=O teste do cancelamento da subscrição foi executado com sucesso
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=Será efetuada uma atualização ao Spip
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=Lista(s) para a inscrição automática dos novos membros (separados por uma vírgula)
+SPIPTitle=Sistema de Gestão do Conteúdo SPIP
 DescADHERENT_SPIP_SERVEUR=Servidor SPIP
 DescADHERENT_SPIP_DB=Nome da base de dados SPIP
-DescADHERENT_SPIP_USER=Login de base de dados SPIP
-DescADHERENT_SPIP_PASS=Password da base de dados SPIP
-AddIntoSpip=Adicionar a SPIP
-AddIntoSpipConfirmation=Tem a certeza que quer adicionar este membro ao SPIP?
-AddIntoSpipError=Falha ao adicionar o utilizador ao SPIP
+DescADHERENT_SPIP_USER=Sessão da base de dados SPIP
+DescADHERENT_SPIP_PASS=Senha da base de dados SPIP
+AddIntoSpip=Adicionar ao SPIP
+AddIntoSpipConfirmation=Deseja adicionar este membro ao SPIP?
+AddIntoSpipError=Falha ao adicionar o utilizador no SPIP
 DeleteIntoSpip=Remover do SPIP
-DeleteIntoSpipConfirmation=Tem a certeza que quer remover este membro do SPIP?
-DeleteIntoSpipError=Falha ao eliminar o utilizador do SPIP
-SPIPConnectionFailed=Falha ao ligar-se ao SPIP
-# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+DeleteIntoSpipConfirmation=Deseja remover este membro do SPIP?
+DeleteIntoSpipError=Falha ao remover o utilizador do SPIP
+SPIPConnectionFailed=Falha ao ligar ao SPIP
+SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
+SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 4d6bfc4b519..8bde1900e18 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -77,18 +77,18 @@ IsNotDefined=indefinido
 DolibarrInHttpAuthenticationSoPasswordUseless=-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação <b>%s</b> ao ficheiro de configuração <b>conf.php</b>.<br> Isto significa que a base de dados das Palavras-Passe é externa ao Dolibarr, por isso toda modificação deste campo pode resultar sem efeito algum.
 Administrator=Administrador
 Undefined=Não Definido
-PasswordForgotten=Esqueceu-se da sua palavra-passe?
-SeeAbove=Mencionar anteriormente
+PasswordForgotten=Esqueceu-se da sua senha?
+SeeAbove=Ver acima
 HomeArea=Área Principal
 LastConnexion=Ultima Ligação
-PreviousConnexion=Ultima Ligação
+PreviousConnexion=Ligação Anterior
 ConnectedOnMultiCompany=Conectado sobre entidade
 ConnectedSince=Conectado desde
-AuthenticationMode=Modo autenticação
-RequestedUrl=Url solicitada
-DatabaseTypeManager=Tipo de gestor de base de dados
-RequestLastAccess=Petição último acesso à base de dados
-RequestLastAccessInError=Petição último acesso à base de dados errado
+AuthenticationMode=Modo de autenticação
+RequestedUrl=Url solicitado
+DatabaseTypeManager=Gestor do tipo de base de dados
+RequestLastAccess=Pedido para o último acesso à base de dados
+RequestLastAccessInError=Pedido errado para o último acesso à base de dados
 ReturnCodeLastAccessInError=Código devolvido último acesso à base de dados errado
 InformationLastAccessInError=informação sobre o último acesso à base de dados errado
 DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
@@ -108,8 +108,8 @@ No=Não
 All=Tudo
 Home=Inicio
 Help=Ajuda
-OnlineHelp=Ajuda on-line
-PageWiki=Página da wiki
+OnlineHelp=Ajuda On-line
+PageWiki=Página Wiki
 Always=Sempre
 Never=Nunca
 Under=Baixo
@@ -120,48 +120,48 @@ Activated=Activado
 Closed=Fechado
 Closed2=Fechado
 Enabled=Activado
-Deprecated=obsoleto
+Deprecated=Obsoleto
 Disable=Desactivar
 Disabled=Desactivado
 Add=Adicionar
-AddLink=Adicionar link
-Update=Modificar
-AddActionToDo=Adicionar acção a realizar
-AddActionDone=Adicionar acção realizada
+AddLink=Adicionar hiperligação
+Update=Atualizar
+AddActionToDo=Adicionar evento a realizar
+AddActionDone=Adicionar evento realizado
 Close=Fechar
 Close2=Fechar
 Confirm=Confirmar
-ConfirmSendCardByMail=Quer enviar esta ficha por e-mail?
-Delete=Eliminar
-Remove=Retirar
+ConfirmSendCardByMail=Deseja enviar o conteúdo desta ficha por correio eletrónico para <b>%s</b>?
+Delete=Apagar
+Remove=Remover
 Resiliate=Cancelar
 Cancel=Cancelar
 Modify=Modificar
 Edit=Editar
-Validate=Confirmar
-ToValidate=A Confirmar
+Validate=Validar
+ToValidate=Para validar
 Save=Guardar
-SaveAs=Guardar como
+SaveAs=Guardar Como
 TestConnection=Teste a ligação
-ToClone=Cópiar
-ConfirmClone=Seleccione os dados que deseja copiar.
-NoCloneOptionsSpecified=Não existem dados definidos para copiar
+ToClone=Clonar
+ConfirmClone=Selecione os dados que deseja clonar:
+NoCloneOptionsSpecified=Não existem dados definidos para clonar.
 Of=de
 Go=Avançar
 Run=continuar
 CopyOf=Cópia de
-Show=Ver
-ShowCardHere=Mostrar cartão
+Show=Mostrar
+ShowCardHere=Mostrar ficha
 Search=Procurar
-SearchOf=Pesquisar
+SearchOf=Procurar
 Valid=Confirmar
 Approve=Aprovar
 ReOpen=Reabrir
 Upload=Enviar Ficheiro
 ToLink=Link
-Select=Seleccionar
+Select=Selecionar
 Choose=Escolher
-ChooseLangage=Escolher o seu idioma
+ChooseLangage=Por favor, escolha o seu idioma
 Resize=Redimensionar
 Recenter=Centrar
 Author=Autor
@@ -169,35 +169,35 @@ User=Utilizador
 Users=Utilizadores
 Group=Grupo
 Groups=Grupos
-Password=Palavra-Passe
-PasswordRetype=Repetir Palavra-Passe
-NoteSomeFeaturesAreDisabled=Atenção, só poucos módulos/funcionalidades foram activados nesta demo
+Password=Senha
+PasswordRetype=Contrassenha
+NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração.
 Name=Nome
 Person=Pessoa
 Parameter=Parâmetro
 Parameters=Parâmetros
 Value=Valor
 GlobalValue=Valor global
-PersonalValue=Valor Personalizado
+PersonalValue=Valor pessoal
 NewValue=Novo valor
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
 Language=Idioma
-MultiLanguage=Multi Idioma
+MultiLanguage=Múltiplos Idiomas
 Note=Nota
-CurrentNote=Nota actual
+CurrentNote=Nota atual
 Title=Título
 Label=Etiqueta
-RefOrLabel=Ref. da etiqueta
-Info=Log
+RefOrLabel=Referência ou etiqueta
+Info=Registo de Eventos
 Family=Familia
 Description=Descrição
 Designation=Designação
 Model=Modelo
-DefaultModel=Modelo por defeito
-Action=Acção
-About=Acerca de
+DefaultModel=Modelo predefinido
+Action=Evento
+About=Sobre
 Number=Número
 NumberByMonth=Número por mês
 AmountByMonth=Valor por mês
@@ -219,19 +219,19 @@ Date=Data
 DateStart=Data de Início
 DateEnd=Data de Fim
 DateCreation=Data de Criação
-DateModification=Data Modificação
-DateModificationShort=Data Modif.
-DateLastModification=Data Ultima Modificação
+DateModification=Data de Modificação
+DateModificationShort=Data de Modif.
+DateLastModification=Data da última modificação
 DateValidation=Data de Validação
 DateClosing=Data de Encerramento
-DateDue=Data Vencimento
-DateValue=Data Valor
-DateValueShort=Data Valor
-DateOperation=Data Operação
-DateOperationShort=Data Op.
+DateDue=Data de Vencimento
+DateValue=Data do valor
+DateValueShort=Data do valor
+DateOperation=Data da operação
+DateOperationShort=Data da Op.
 DateLimit=Data Limite
-DateRequest=Data Consulta
-DateProcess=Data Processo
+DateRequest=Data do Pedido
+DateProcess=Data do Processo
 DatePlanShort=Data Planif.
 DateRealShort=Data Real
 DateBuild=Data da geração do Relatório
@@ -278,30 +278,30 @@ b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
-Tb=Terabyte
+Tb=Tb
 Cut=Cortar
 Copy=Copiar
 Paste=Colar
-Default=Defeito
-DefaultValue=Valor por defeito
-DefaultGlobalValue=Valor global
+Default=Predefinição
+DefaultValue=Valor Predefinido
+DefaultGlobalValue=Valor Global
 Price=Preço
 UnitPrice=Preço Unitário
-UnitPriceHT=Preço Base
-UnitPriceTTC=Preço Unitário Total
-PriceU=PU
-PriceUHT=PU
-PriceUTTC=PU Total
+UnitPriceHT=Preço Base (base)
+UnitPriceTTC=Preço Unitário
+PriceU=P.U.
+PriceUHT=P.U. (base)
+PriceUTTC=P.U.
 Amount=Montante
-AmountInvoice=Montante Factura
-AmountPayment=Montante Pagamento
-AmountHTShort=Montante base
+AmountInvoice=Montante da Fatura
+AmountPayment=Montante do Pagamento
+AmountHTShort=Montante (base)
 AmountTTCShort=Montante (IVA inc.)
-AmountHT=Montante Base
-AmountTTC=Montante
-AmountVAT=Montante IVA
-AmountLT1=Valor de Imposto 2
-AmountLT2=Valor de Imposto 3
+AmountHT=Montante (base)
+AmountTTC=Montante (IVA inc.)
+AmountVAT=Montante do IVA
+AmountLT1=Valor do IVA 2
+AmountLT2=Valor do IVA 3
 AmountLT1ES=Montante RE
 AmountLT2ES=Montante IRPF
 AmountTotal=Montante Total
@@ -337,7 +337,7 @@ Delta=Divergencia
 Module=Módulo
 Option=Opção
 List=Lista
-FullList=Lista completa
+FullList=Lista Completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
@@ -349,8 +349,8 @@ RefPayment=Ref. pagamento
 CommercialProposalsShort=Orçamentos
 Comment=Comentário
 Comments=Comentários
-ActionsToDo=Acções a realizar
-ActionsDone=Acções realizadas
+ActionsToDo=Eventos a realizar
+ActionsDone=Eventos realizados
 ActionsToDoShort=A realizar
 ActionsRunningshort=Iniciado
 ActionsDoneShort=Realizadas
@@ -359,17 +359,17 @@ ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=Iniciado
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
-CompanyFoundation=Empresa ou Instituição
-ContactsForCompany=Contactos desta empresa
-ContactsAddressesForCompany=Contatos / endereços para este terceiro
-AddressesForCompany=Endereços para este terceiro
-ActionsOnCompany=Acções nesta sociedade
+CompanyFoundation=Empresa/Fundação
+ContactsForCompany=Contactos para este terceiro
+ContactsAddressesForCompany=Contactos/moradas para este terceiro
+AddressesForCompany=Moradas para este terceiro
+ActionsOnCompany=Eventos sobre este terceiro
 ActionsOnMember=Eventos sobre este membro
-NActions=%s acções
+NActions=%s eventos
 NActionsLate=%s em atraso
 RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
-RemoveFilter=Eliminar filtro
+RemoveFilter=Remover filtro
 ChartGenerated=Gráficos gerados
 ChartNotGenerated=Gráfico não gerado
 GeneratedOn=Gerado o %s
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index ca3e49749ab..b4f6455d41d 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -1,20 +1,20 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Manage batch/serial
-ProductStatusOnBatch=Managed
-ProductStatusNotOnBatch=Not Managed
-ProductStatusOnBatchShort=Managed
-ProductStatusNotOnBatchShort=Not Managed
-Batch=Batch/Serial
+ManageLotSerial=Gerir lote/série
+ProductStatusOnBatch=Gerido
+ProductStatusNotOnBatch=Não Gerido
+ProductStatusOnBatchShort=Gerido
+ProductStatusNotOnBatchShort=Não Gerido
+Batch=Lote/Série
 atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
+batch_number=Número de Lote/Série
 l_eatby=Eat-by date
 l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
-printBatch=Batch: %s
+DetailBatchNumber=Detalhes de Lote/Série
+DetailBatchFormat=Lote/Série: %s - E:%s - S: %s (Qt. : %d)
+printBatch=Lote: %s
 printEatby=Eat-by: %s
 printSellby=Sell-by: %s
-printQty=Qty: %d
+printQty=Qt.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
+BatchDefaultNumber=Não Definido
 WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 7e5a7276994..5966b69f13b 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código da contabilidade para pagamentos de salário
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código da contabilidade para movimentos financeiros
 Salary=Salário
 Salaries=Salários
 Employee=Empregado
@@ -6,3 +8,5 @@ NewSalaryPayment=Novo Pagamento de Salário
 SalaryPayment=Pagamento de Salário
 SalariesPayments=Pagamentos de Salários
 ShowSalaryPayment=Mostrar pagamento de salário
+THM=Preço médio da hora
+TJM=Preço médio diário
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 6f65fee482b..cc64abc3155 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -1,122 +1,122 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Área HRM
 UserCard=Ficha de Utilizador
 ContactCard=Ficha de Contacto
 GroupCard=Ficha de Grupo
-NoContactCard=Não existe nenhuma ficha dos contactos
+NoContactCard=Não existe nenhuma ficha de contactos
 Permission=Permissão
 Permissions=Permissões
-EditPassword=Modificar Palavra-Passe
-SendNewPassword=Enviar Nova Palavra-Passe
-ReinitPassword=Gerar Nova Palavra-Passe
-PasswordChangedTo=Palavra-Passe Modificada em: %s
-SubjectNewPassword=A sua Palavra-Passe
+EditPassword=Editar Palavra-passe
+SendNewPassword=Regenerar e Enviar a Palavra-passe
+ReinitPassword=Regenerar Palavra-passe
+PasswordChangedTo=Palavra-passe alterada em: %s
+SubjectNewPassword=A sua nova palavra-passe para o Dolibarr
 AvailableRights=Permissões Disponiveis
 OwnedRights=As Minhas Permissões
 GroupRights=Permissões de Grupo
 UserRights=Permissões de Utilizador
 UserGUISetup=Interface Utilizador
-DisableUser=Desactivar
-DisableAUser=Desactivar um Utilizador
-DeleteUser=Eliminar
-DeleteAUser=Eliminar um Utilizador
-DisableGroup=Desactivar
-DisableAGroup=Desactivar um Grupo
-EnableAUser=Reactivar um Utilizador
-EnableAGroup=Reactivar um Grupo
-DeleteGroup=Eliminar
-DeleteAGroup=Eliminar um Grupo
-ConfirmDisableUser=Deseja mesmo desactivar o utilizador <b>%s</b> ?
-ConfirmDisableGroup=Deseja mesmo desactivar o grupo <b>%s</b> ?
-ConfirmDeleteUser=Deseja mesmo eliminar o utilizador <b>%s</b> ?
-ConfirmDeleteGroup=Deseja mesmo eliminar o grupo <b>%s</b> ?
-ConfirmEnableUser=Deseja mesmo reactivar o utilizador <b>%s</b> ?
-ConfirmEnableGroup=Deseja mesmo reactivar o grupo <b>%s</b> ?
-ConfirmReinitPassword=Deseja mesmo gerar uma nova palavra-passe para o utilizador <b>%s</b> ?
-ConfirmSendNewPassword=Deseja mesmo enviar uma nova palavra-passe para o utilizador <b>%s</b> ?
+DisableUser=Desativar
+DisableAUser=Desativar um Utilizador
+DeleteUser=Apagar
+DeleteAUser=Apagar um Utilizador
+DisableGroup=Desativar
+DisableAGroup=Desativar um Grupo
+EnableAUser=Ativar um Utilizador
+EnableAGroup=Ativar um Grupo
+DeleteGroup=Apagar
+DeleteAGroup=Apagar um Grupo
+ConfirmDisableUser=Deseja desativar o utilizador <b>%s</b> ?
+ConfirmDisableGroup=Deseja desativar o grupo <b>%s</b> ?
+ConfirmDeleteUser=Deseja apagaro utilizador <b>%s</b> ?
+ConfirmDeleteGroup=Deseja apagar o grupo <b>%s</b> ?
+ConfirmEnableUser=Deseja ativar o utilizador <b>%s</b> ?
+ConfirmEnableGroup=Deseja ativar o grupo <b>%s</b> ?
+ConfirmReinitPassword=Deseja gerar uma nova palavra-passe para o utilizador <b>%s</b> ?
+ConfirmSendNewPassword=Deseja gerar uma e enviar uma nova palavra-passe para o utilizador <b>%s</b> ?
 NewUser=Novo Utilizador
 CreateUser=Criar Utilizador
 SearchAGroup=Procurar um Grupo
 SearchAUser=Procurar um Utilizador
-LoginNotDefined=O Utilizador não está definido
-NameNotDefined=O Nome não está definido
+LoginNotDefined=Os dados de sessão não estão  definidos
+NameNotDefined=O nome não está definido.
 ListOfUsers=Lista de Utilizadores
 Administrator=Administrador
-SuperAdministrator=Super Administrador
-SuperAdministratorDesc=Administrador com todos os direitos
-AdministratorDesc=Entidade administrador
-DefaultRights=Permissões por Defeito
-DefaultRightsDesc=Defina aqui as permissões por defeito: as permissões que se atribuirão automaticamente a um novo utilizador no momento de a sua criação.
-DolibarrUsers=Utilizadores
-LastName=Apelidos
+SuperAdministrator=Administrador Avançado
+SuperAdministratorDesc=Administrador Global
+AdministratorDesc=Entidade Administrador
+DefaultRights=Permissões Predefinidas
+DefaultRightsDesc=Defina aqui as permissões <u>predefinidas</u> que são atribuídas automaticamente a um <u>novo utilizador</u> criado (Vá a 'ficha de utilizador' para alterar a permissão de um utilizador existente).
+DolibarrUsers=Utilizadores do Dolibarr
+LastName=Sobrenome
 FirstName=Nome
 ListOfGroups=Lista de Grupos
 NewGroup=Novo Grupo
 CreateGroup=Criar Grupo
-RemoveFromGroup=Eliminar Grupo
-PasswordChangedAndSentTo=Palavra-Passe alterada e enviada a <b>%s</b>.
-PasswordChangeRequestSent=Pedido para alterar a palavra-passe para <b>%s</b> enviada a <b>%s</b>.
+RemoveFromGroup=Apagar Grupo
+PasswordChangedAndSentTo=Palavra-passe alterada e enviada para <b>%s</b>.
+PasswordChangeRequestSent=Pedido para alterar a palavra-passe para <b>%s</b> enviada para <b>%s</b>.
 MenuUsersAndGroups=Utilizadores e Grupos
 LastGroupsCreated=Os %s últimos grupos criados
 LastUsersCreated=Os %s últimos utilizadores criados
-ShowGroup=Ver grupo
-ShowUser=Ver utilizador
-NonAffectedUsers=Utilizadores não destinados ao grupo
-UserModified=Utilizador correctamente modificado
-PhotoFile=Fotografia
+ShowGroup=Mostrar Grupo
+ShowUser=Mostrar Utilizador
+NonAffectedUsers=Utilizadores não atribuídos
+UserModified=Utilizador modificado com sucesso
+PhotoFile=Ficheiro de Fotografia
 UserWithDolibarrAccess=Utilizador com acesso ao Dolibarr
-ListOfUsersInGroup=Lista de Utilizadores deste grupo
-ListOfGroupsForUser=Lista de grupos deste utilizador
-UsersToAdd=Utilizador a Adicionar a este grupo
-GroupsToAdd=Grupos a Adicionar a este utilizador
+ListOfUsersInGroup=Lista de Utilizadores neste grupo
+ListOfGroupsForUser=Lista de Grupos para este utilizador
+UsersToAdd=Utilizador para adicionar a este grupo
+GroupsToAdd=Grupos para adicionar a este utilizador
 NoLogin=Sem Utilizador
-LinkToCompanyContact=Link para terceiros / contact
-LinkedToDolibarrMember=Link para membro
-LinkedToDolibarrUser=Link para o utilizador do Dolibarr
-LinkedToDolibarrThirdParty=Link para Dolibarr terceiro
-CreateDolibarrLogin=Criar uma Conta
+LinkToCompanyContact=Hiperligação para terceiros / contacto
+LinkedToDolibarrMember=Hiperligação para membro
+LinkedToDolibarrUser=Hiperligação para o utilizador do Dolibarr
+LinkedToDolibarrThirdParty=Hiperligação para terceiros do Dolibarr
+CreateDolibarrLogin=Criar um Utilizador
 CreateDolibarrThirdParty=Criar um Terceiro
-LoginAccountDisable=A conta está desactivada, indique um novo nome de utilizador para a activar.
-LoginAccountDisableInDolibarr=A conta está desactivada no Dolibarr
-LoginAccountDisableInLdap=A conta está desactivada ao dominio
+LoginAccountDisable=A conta está desativada, indique um novo nome de utilizador para a ativar.
+LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr.
+LoginAccountDisableInLdap=A conta está desativada no domínio.
 UsePersonalValue=Utilizar valores personalizados
-GuiLanguage=Idioma do Interface
+GuiLanguage=Idioma da Interface
 InternalUser=Utilizador Interno
 MyInformations=A Minha Informação
-ExportDataset_user_1=Utilizadores e Atributos
-DomainUser=Utilizador de Domínio
-Reactivate=Reactivar
+ExportDataset_user_1=Utilizadores e Propriedades do Dolibarr
+DomainUser=Utilizador de Domínio %s
+Reactivate=Reativar
 CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
 InternalExternalDesc=Um utilizador <b>interno</b> é um utilizador que pertenece à sua Empresa/Instituição.<br>Um utilizador <b>externo</b> é um utilizador cliente, fornecedor ou outro.<br><br>Nos 2 casos, as permissões de utilizadores definem os direitos de acesso, mas o utilizador externo pode além disso ter  um gestor de menus diferente do utilizador interno (ver Inicio - configuração - visualização)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
-UserWillBeInternalUser=Usuário será criado um usuário interno (porque não ligada a um determinado partido terceiros)
-UserWillBeExternalUser=Usuário será criado um usuário externo (porque ligado a um terceiro determinado)
-IdPhoneCaller=ID chamador (telefone)
+UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular)
+UserWillBeExternalUser=O utilizador criado irá ser um utilizador externo (porque está interligado com um terceiro em particular)
+IdPhoneCaller=Id. do Chamador (telefone)
 UserLogged=Utilizador %s Conectado
 UserLogoff=Terminar sessão de %s
 NewUserCreated=Utilizador %s  Criado
-NewUserPassword=Palavra-Passe alterada para %s
+NewUserPassword=Palavra-passe alterada para %s
 EventUserModified=Utilizador %s Modificado
-UserDisabled=Utilizador %s Desactivado
-UserEnabled=Utilizador %s Activado
-UserDeleted=Utilizador %s Eliminado
+UserDisabled=Utilizador %s Desativado
+UserEnabled=Utilizador %s Ativado
+UserDeleted=Utilizador %s Removido
 NewGroupCreated=Grupo %s Criado
-GroupModified=Group %s modified
-GroupDeleted=Grupo %s Eliminado
-ConfirmCreateContact=Tem a certeza que deseja criar uma conta para este contacto?
-ConfirmCreateLogin=Tem a certeza que deseja criar uma conta para este membro?
-ConfirmCreateThirdParty=Tem a certeza que deseja criar um terceiro para este membro?
-LoginToCreate=Login a Criar
+GroupModified=Grupo %s modificado
+GroupDeleted=Grupo %s Removido
+ConfirmCreateContact=Deseja criar uma conta Dolibarr para este contacto?
+ConfirmCreateLogin=Deseja criar uma conta Dolibarr para este membro?
+ConfirmCreateThirdParty=Deseja criar um terceiro para este membro?
+LoginToCreate=Iniciar a sessão para Criar
 NameToCreate=Nome do Terceiro a Criar
-YourRole=Seus papéis
-YourQuotaOfUsersIsReached=A sua quota de utilizadores foi atingida!
-NbOfUsers=N º de utilizadores
+YourRole=As suas funções
+YourQuotaOfUsersIsReached=A sua quota de utilizadores ativos foi atingida!
+NbOfUsers=N º de Utilizadores
 DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
 HierarchicalResponsible=Supervisor
-HierarchicView=Vista Hierárquica
-UseTypeFieldToChange=Use Tipo de Campo para mudar
-OpenIDURL=Endereço OpenID
-LoginUsingOpenID=Utilizar OpenID para autenticação
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+HierarchicView=Visualização Hierárquica
+UseTypeFieldToChange=Utilize o Tipo de Campo para alterar
+OpenIDURL=URL de OpenID
+LoginUsingOpenID=Utilizar OpenID para iniciar a sessão
+WeeklyHours=Horas semanais
+ColorUser=Cor do utilizador
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 4aa5d073a0e..784f5324381 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -118,7 +118,7 @@ DescCashJournal=Jurnal Cash inclusiv tipul plaţii numerar
 CashPayment=Plaţi numerar
 
 SupplierInvoicePayment=Plata factura furnizor
-CustomerInvoicePayment=Plata factura client
+CustomerInvoicePayment=Incasare factura client
 
 ThirdPartyAccount=Cont terţi
 
@@ -141,7 +141,7 @@ Active=Extras
 NewFiscalYear=An fiscal nou
 
 DescVentilCustomer=Consultati aici ventilarea contabilă anuală a facturilor de clienților ale dvs.
-TotalVente=Total Cifră de afaceri fără taxe
+TotalVente=Total Cifră de afaceri fără tva
 TotalMarge=Total Marje vânzări
 DescVentilDoneCustomer=Consultati aici lista liniilor de facturi client și conturile lor  contabile
 DescVentilTodoCustomer=Consultati aici lista liniilor de facturi client cu un cont contabil
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 82af6b13bb6..a0d02d59e15 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Fundaţie
+Foundation=Fundaţie\n
 Version=Versiune
 VersionProgram=Versiune program
 VersionLastInstall=Versiune iniţial  instalată
@@ -34,7 +34,7 @@ InternalUsers=Utilizatori interni
 ExternalUsers=Utilizatori externi
 GlobalSetup=Setări generale
 GUISetup=Afişare
-SetupArea=Zona Configurare
+SetupArea=CONFIGURARE
 FormToTestFileUploadForm=Formular pentru testarear încărcării de  fişiere (în funcţie de configurare)
 IfModuleEnabled=Notă: Da este eficient numai dacă modul  <b>%s</b> este activat
 RemoveLock=Eliminaţi  fişierul <b>%s</b> dacă acesta există, pentru a permite utilizarea instrumentelor de actualizare.
@@ -134,8 +134,8 @@ CurrentSessionTimeOut=Sesiunea curentă timeout
 YouCanEditPHPTZ=Pentru a seta un alt fus orar PHP (nu este obligatoriu), aveți posibilitatea să încercați să adăugați la fișierul .htacces cu o linie de genul acesta"SetEnv TZ Europe/Paris"
 OSEnv=Mediu SO
 Box=Căsuţă
-Boxes=Căsuţe
-MaxNbOfLinesForBoxes=Max numărul de linii pentru căsuţe
+Boxes= Casete 
+MaxNbOfLinesForBoxes=Numărul max de linii pentru casete 
 PositionByDefault=Poziţia implicită
 Position=Poziţie
 MenusDesc=Meniuri manageri definesc conţinutul de 2 bare de meniu (bara orizontală şi bară verticală).
@@ -145,7 +145,7 @@ LangFile=Fişiere. Lang
 System=Sistem
 SystemInfo=Informaţii Sistem
 SystemTools=Instrumente Sistem
-SystemToolsArea=Zona Instrumente Sistem
+SystemToolsArea=Instrumente Sistem
 SystemToolsAreaDesc=Această zonă oferă funcţionalităţi de administrare. Folositi meniul pentru a alege funcţionalitatea pe care o căutaţi.
 Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ştergeţi toate fişierele construit sau stocate de către Dolibarr (fişiere temporare sau toate fişierele în <b>directorul %s).</b> Folosind această facilitate nu este necesar. Este prevăzut pentru utilizatorii ale căror Dolibarr este găzduit de un furnizor care nu oferă permisiuni pentru a şterge fişierele construit de către serverul de web.
@@ -201,7 +201,7 @@ No=Nu
 AutoDetectLang=Autodetect (browser limbă)
 FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
 Rights=Permisiuni
-BoxesDesc=Căsuţele sunt arii de ecran care arată unele informaţii pe unele pagini. Aveţi posibilitatea să alegeţi afişarea sau nu a căsuţelor, prin selectarea  pagini ţintă şi faceţi clic pe "Activaţi", sau făcând clic pe un coş de gunoi  pentru al dezactiva.
+BoxesDesc=Casetele  sunt arii de ecran care arată unele informaţii pe unele pagini. Aveţi posibilitatea să alegeţi afişarea sau nu a casetelor  prin selectarea  pagini ţintă şi faceţi clic pe "Activaţi", sau făcând clic pe un coş de gunoi  pentru al dezactiva.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
 ModulesDesc=Dolibarr modulele care definesc funcţia este activată în software-ul. Unele module necesită permisiuni, trebuie să acorde pentru utilizatori, după care să permită modul.
 ModulesInterfaceDesc=De Dolibarr module de interfaţă vă permite să adăugaţi caracteristici externe, în funcţie de software, sisteme sau servicii.
@@ -213,8 +213,8 @@ DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr E
 DoliPartnersDesc=Listă cu unele companii care pot furniza / dezvolta module  la cerere  sau noi  funcţionalităţi (Notă: orice companie Open Source cunoscând limbajul  PHP vă poate oferi dezvoltări specifice)
 WebSiteDesc=Site-ul Web al furnizorilor unde puteţi căuta şi  găsi mai multe module ...
 URL=Link
-BoxesAvailable=Căsuţe disponibile
-BoxesActivated=Căsuţe activate
+BoxesAvailable= Casete disponibile
+BoxesActivated= Casete  activate
 ActivateOn=Activaţi pe
 ActiveOn=Activat pe
 SourceFile=Fişier sursă
@@ -263,7 +263,7 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-gazdă (Nu este definită în
 MAIN_MAIL_EMAIL_FROM=Expeditor de e-mail pentru mesajele de poştă electronică automată (în mod implicit în <b>php.ini: %s)</b>
 MAIN_MAIL_ERRORS_TO=Expeditor de e-mail folosită pentru e-mailurile trimise de eroare se întoarce
 MAIN_MAIL_AUTOCOPY_TO= Trimite un mod sistematic ascunse carbon copie a tuturor e-mailuri trimise la
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Trimite sistematic un CC ascuns cu propunerilor trimise prin e-mail la
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Trimite sistematic un CC ascuns cu ofertele  trimise prin e-mail la
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Trimite sistematic un CC ascuns cu comenzile trimise prin e-mail la
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Trimite sistematic un CC ascuns cu facturile trimise prin e-mail la
 MAIN_DISABLE_ALL_MAILS=Dezactivaţi toate e-mail-uri sendings (pentru scopuri de testare sau demo)
@@ -352,7 +352,7 @@ SecurityToken=Cheia pentru URL-uri sigure
 NoSmsEngine=Nu expeditor SMS Manager disponibile. SMS expeditor manager nu sunt instalate implicit cu distribuţia (deoarece depinde de un furnizor extern), dar puteţi găsi unele pe http://www.dolistore.com
 PDF=PDF
 PDFDesc=Puteţi seta opţiunile de fiecare globale referitoare la generarea PDF
-PDFAddressForging=Reguli de a forma cutii de adrese
+PDFAddressForging=Reguli de creare a casetelor adresa
 HideAnyVATInformationOnPDF=Ascunde toate informaţiile referitoare la TVA-ul pe PDF generate
 HideDescOnPDF=Ascunde descrierea produselor pe PDF ul generat
 HideRefOnPDF=Ascunde ref. produs pe PDF ul generat
@@ -388,7 +388,7 @@ ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoa
 ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul <br>Sintaxa: able_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br> filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă <br> dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)<br><br>În scopul de avea lista depinzând de alta  :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Librairie utilizată la construirea PDF ului
 WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = &#39;path_to_TCPDF_dir&#39;</b>
-LocalTaxDesc=Unele țări aplică 2 sau 3 impozitele la fiecare linie de factura. Dacă este cazul, alege tipul de al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt: <br> 1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala) <br> 2: taxa locala aplica pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax) <br> 3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala) <br> 4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax) <br> 5: Taxa locală  se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala) <br> 6: TTaxa locală  se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax)
+LocalTaxDesc=Unele țări aplică 2 sau 3 impozite la fiecare linie de factura. Dacă este cazul, alege tipul al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt: <br> 1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala) <br> 2: taxa locala  pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax) <br> 3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala) <br> 4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax) <br> 5: Taxa locală  se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala) <br> 6: Taxa locală  se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax)
 SMS=SMS
 LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial  Url pentru utilizatorul<strong>%s</strong>
 RefreshPhoneLink=Refresh link
@@ -416,8 +416,8 @@ Module2Name=Comercial
 Module2Desc=Management Comercial
 Module10Name=Contabilitate
 Module10Desc=Contabilitate  simplă de gestiune ( jurnale , cifră afaceri) bazată pe baza de date. Fără ventilare.
-Module20Name=Propuneri comerciale
-Module20Desc=Managementul Propunerilor Comerciale
+Module20Name=Oferte
+Module20Desc=Managementul Ofertelor Comerciale
 Module22Name=Emailing
 Module22Desc=Managementul trimiterilor de emailuri în masă
 Module23Name= Energie
@@ -479,7 +479,7 @@ Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini
 Module330Name=Marcaje
 Module330Desc=Marcaje "de gestionare a
 Module400Name=Proiecte / Oportunitati  / Prospecți
-Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comanda, propunere, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
+Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comandă, ofertă, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
 Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
@@ -550,13 +550,13 @@ Permission14=Facturi client validate
 Permission15=Trimite facturi prin e-mail
 Permission16=Crearea de plăţi pentru facturile
 Permission19=Ştergere facturi
-Permission21=Citeşte comerciale propuneri
-Permission22=Creare / Modificare comerciale propuneri
-Permission24=Validate comerciale propuneri
-Permission25=Trimite comerciale propuneri
-Permission26=Inchide comerciale propuneri
-Permission27=Ştergere comerciale propuneri
-Permission28=Export comerciale propuneri
+Permission21=Citeşte oferte comerciale
+Permission22=Creare / Modificare oferte comerciale
+Permission24=Oferte comerciale validate
+Permission25=Trimite oferte comerciale
+Permission26=Inchide oferte comerciale
+Permission27=Ştergere oferte comerciale
+Permission28=Export oferte comerciale
 Permission31=Citiţi cu produse / servicii
 Permission32=Creare / Modificare produse / servicii
 Permission34=Ştergere produse / servicii
@@ -783,7 +783,7 @@ DictionarySendingMethods=Metode Livrare
 DictionaryStaff=Efectiv
 DictionaryAvailability=Livrare întârziere
 DictionaryOrderMethods=Metode de comandă
-DictionarySource=Originea de propuneri / comenzi
+DictionarySource=Originea ofertei  / comenzi
 DictionaryAccountancyplan=Plan de conturi
 DictionaryAccountancysystem=Model pentru plan de conturi
 DictionaryEMailTemplates=Șabloane e-mailuri 
@@ -923,7 +923,7 @@ DelaysOfToleranceDesc=Acest ecran vă permite să definiţi de tolerat întârzi
 Delays_MAIN_DELAY_ACTIONS_TODO=Toleranţă întârziere (în zile) înainte de alertă cu privire la acţiunile planificate care nu au fost încă realizat
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă cu privire la ordinele nu a fost încă realizat
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Toleranţă întârziere (în zile) înainte de alertă privind ordinele de furnizori nu au fost încă prelucrate
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri pentru a închide
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Întârziere toleranță (în zile) înainte de alertă cu privire la propunerile de a închide
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Toleranţă întârziere (în zile) înainte de alertă cu privire la propuneri nu facturat
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la servicii, pentru a activa
 Delays_MAIN_DELAY_RUNNING_SERVICES=Toleranta întârziere (în zile) înainte de alertă cu privire la serviciile expirat
@@ -1086,7 +1086,7 @@ UseNotifications=Utilizaţi notificări
 NotificationsDesc=Funcţia E-mailuri cu notificări vă permite să trimiteți în linişte mail automat, pentru unele evenimente Dolibarr. Targetele pot fi definite: <br> * Pe contactele terţilor  (clienti sau furnizori), un terţ terță o dată<br> * Sau prin stabilirea unei adrese target de e-mail globală de la pagina de configurare a modulului.
 ModelModules=Documente şabloane
 DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
-WatermarkOnDraft=Watermark pe proiect de document
+WatermarkOnDraft=Watermark pe schiţa de document
 JSOnPaimentBill=Activaţi funcţia de autocompletare a liniilor de plata pe formularul de plată
 CompanyIdProfChecker=Professional ID unic
 MustBeUnique=Trebuie să fie unice?
@@ -1111,7 +1111,7 @@ WebCalTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
 WebCalErrorConnectOkButWrongDatabase=Conexiunii la baza de date a reusit, dar nu arata a fi o bază de date Webcalendar.
 WebCalAddEventOnCreateActions=Adauga eveniment calendaristic cu privire la acţiunile crea
 WebCalAddEventOnCreateCompany=Adauga eveniment la calendar companii crea
-WebCalAddEventOnStatusPropal=Adăugaţi calendar eveniment comercial propuneri cu privire la statutul de schimbare
+WebCalAddEventOnStatusPropal=Adaugă eveniment în calendar la schimbarea statusului ofertei comerciale
 WebCalAddEventOnStatusContract=Adauga eveniment calendaristic privind contractele de stare schimba
 WebCalAddEventOnStatusBill=Adăugaţi calendar eveniment de pe facturile de schimbare de stare
 WebCalAddEventOnStatusMember=Adăugaţi calendar eveniment pe membrii schimba starea
@@ -1133,29 +1133,29 @@ EnableEditDeleteValidInvoice=Permite posibilitatea de a edita / şterge valabil
 SuggestPaymentByRIBOnAccount=Propuneţi o plată de către retrage de pe contul
 SuggestPaymentByChequeToAddress=Propuneţi o plată prin cec la
 FreeLegalTextOnInvoices=Free text pe facturi
-WatermarkOnDraftInvoices=Filigranul pe facturile ciornă (niciunul daca e gol)
+WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul daca e gol)
 ##### Proposals #####
-PropalSetup=Comerciale propuneri modul de configurare
+PropalSetup=Modul configurare Oferte Comerciale 
 CreateForm=Creaţi forme
 NumberOfProductLines=Numărul de linii de produse
-ProposalsNumberingModules=Comerciale propunerea de numerotare module
-ProposalsPDFModules=Comerciale propunerea modele de documente
+ProposalsNumberingModules=Modele numerotare  Oferte Comerciale 
+ProposalsPDFModules=Modele documente Oferte Comerciale 
 ClassifiedInvoiced=Clasificate facturate
-HideTreadedPropal=Ascunde tratate comerciale propuneri în lista
+HideTreadedPropal=Ascunde ofertele comerciale tratate în listă
 AddShippingDateAbility=Adauga data de capacitatea de transport maritim
 AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
 UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune
-FreeLegalTextOnProposal=Free text pe comercial propuneri
-WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al propuneri
+FreeLegalTextOnProposal=Text liber pe ofertele comerciale
+WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
 ##### Orders #####
 OrdersSetup=Ordinele de gestionare setup
 OrdersNumberingModules=Ordinele de numerotare module
 OrdersModelModule=Ordinul modele de documente
 HideTreadedOrders=Ascunde comenzile tratate sau anulate  în lista
-ValidOrderAfterPropalClosed=Pentru a valida pentru propunerea după mai aproape, face posibil să nu se pas cu provizoriu pentru
+ValidOrderAfterPropalClosed=Pentru a valida comanda după închiderea ofertei,  face posibil să nu se pas cu provizoriu pentru
 FreeLegalTextOnOrders=Free text de pe ordinele de
-WatermarkOnDraftOrders=Filigranul pe comenzile ciornă (niciunul daca e gol)
+WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol)
 ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă
 ##### Clicktodial #####
 ClickToDialSetup=Click pentru a Dial modul setup
@@ -1166,7 +1166,7 @@ Bookmark4uSetup=Bookmark4u modul de configurare
 InterventionsSetup=Intervenţii de modul de configurare
 FreeLegalTextOnInterventions=Textul gratuit pe documente de intervenţie
 FicheinterNumberingModules=Modulele de intervenţie de numerotare
-TemplatePDFInterventions=Carte de modele de documente de intervenţie
+TemplatePDFInterventions=Modele documente fişă intervenţie
 WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
 ##### Contracts #####
 ContractsSetup=Configurare modul Contracte /  Abonamente 
@@ -1414,7 +1414,7 @@ AdvancedEditor=Editor avansat
 ActivateFCKeditor=Activaţi FCKeditor pentru:
 FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere
 FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota
-FCKeditorForProductDetails=WYSIWIG crearea / ediţie detalii linii de produse pentru toate entităţile (propuneri, comenzilor, facturilor, etc ..) <br> Atenţie: Folosind această opţiune nu este grav recommanded deoarece astfel se pot crea probleme cu caractere speciale şi pagina formating atunci când clădirea fişiere PDF.
+FCKeditorForProductDetails=WYSIWIG crearea / ediție a produselor detalii linii pentru toate entitățile (oferte, comenzi, facturi, etc ...) <font class="warning">Atenție:. Folosind această opțiune pentru acest caz nu este serios recomandata deoarece poate crea probleme cu caractere speciale și pagina formatări atunci când construirea PDF fișiere.</font>
 FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing
 FCKeditorForUserSignature=Creare/editare WYSIWIG  a semnăturii utilizatorilor
 FCKeditorForMail=Creare/editare WYSIWIG a tuturor emailurilor (exceptând  Outils->eMailing)
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index d73a2321e91..bb09848dbb9 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID eveniment
 Actions=Evenimente
-ActionsArea=Zona evenimente (acțiuni și sarcini)
+ActionsArea=Evenimente (acțiuni și sarcini)
 Agenda=Agenda
 Agendas=Agende
 Calendar=Calendar
@@ -43,17 +43,17 @@ AgendaAutoActionDesc= Definiți aici evenimentele pentru care doriți ca Dolibar
 AgendaSetupOtherDesc= Această pagină permite configurarea unor opțiuni pentru exportul de evenimente Dolibarr într-un calendar extern (Thunderbird, Google Calendar, ...)
 AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr.
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
-PropalValidatedInDolibarr=Propunerea %s validată
+PropalValidatedInDolibarr=Oferta %s validată
 InvoiceValidatedInDolibarr=Factura %s validată
 InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
-InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată
+InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul schiţă
 InvoiceDeleteDolibarr=Factura %s ştearsă
 OrderValidatedInDolibarr= Comanda %s validată
 OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
-OrderBackToDraftInDolibarr=Comanda %s revenită de statutul nevalidată
+OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
 OrderCanceledInDolibarr=Comanda  %s anulată
-ProposalSentByEMail=Propunerea comercială %s  trimisă prin e-mail
+ProposalSentByEMail=Oferta comercială %s  trimisă prin e-mail
 OrderSentByEMail=Comanda client %s trimisă prin e-mail
 InvoiceSentByEMail=Factura client %s trimisă prin e-mail
 SupplierOrderSentByEMail=Comanda  furnizor %s  trimisă prin e-mail
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 5782f2b37f2..782a58ab96c 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -3,7 +3,7 @@ Bank=Banca
 Banks=Banci
 MenuBankCash=Banca / Casa
 MenuSetupBank=Setări Banca / Casa
-BankName=Numel bancă
+BankName=Nume bancă
 FinancialAccount=Cont
 FinancialAccounts=Conturi
 BankAccount=Cont bancar
@@ -41,7 +41,7 @@ AccountStatement=Extras Cont
 AccountStatementShort=Extras
 AccountStatements=Extrase Cont
 LastAccountStatements=Ultimele extrase de cont
-Rapprochement=Reconciliate
+Rapprochement=Decontate
 IOMonthlyReporting=Raport Lunar
 BankAccountDomiciliation=Adresă Cont
 BankAccountCountry=Tară Cont
@@ -66,7 +66,7 @@ BankType0=Cont economii
 BankType1=Cont curent sau card de credit
 BankType2=Cont numerar
 IfBankAccount=Dacă contul bancar
-AccountsArea=Zona Conturi
+AccountsArea=CONTURI
 AccountCard=Fişa Cont
 DeleteAccount=Şterge cont
 ConfirmDeleteAccount=Sunteţi sigur că doriţi să ştergeţi acest cont?
@@ -83,11 +83,11 @@ BankTransactions=Tranzacţii bancare
 SearchTransaction=Caută tranzacţie
 ListTransactions=Lista tranzacţiilor
 ListTransactionsByCategory=Lista tranzacţie / categorie
-TransactionsToConciliate=Tranzacţii de conciliat
-Conciliable=Conciliabil
-Conciliate=Conciliază
+TransactionsToConciliate=Tranzacţii de decontat
+Conciliable=Decontabil
+Conciliate=Deconteaza
 Conciliation=Conciliere
-ConciliationForAccount=Conciliază acest cont
+ConciliationForAccount=Deconteaza acest cont
 IncludeClosedAccount=Includeţi conturile închise
 OnlyOpenedAccount=Numai conturile deschise
 AccountToCredit=Cont de credit
@@ -101,9 +101,9 @@ EditBankRecord=Editare înregistrare
 LineRecord=Tranzacţie
 AddBankRecord=Adaugă tranzacţie
 AddBankRecordLong=Adaugă tranzacţie manual
-ConciliatedBy=Conciliate de
-DateConciliating=Data Conciliere
-BankLineConciliated=Tranzacţie conciliată
+ConciliatedBy=Decontat de
+DateConciliating=Data Decontare
+BankLineConciliated=Tranzacţie decontata
 CustomerInvoicePayment=Plată Client
 CustomerInvoicePaymentBack=Return Plată client
 SupplierInvoicePayment=Plată Furnizor
@@ -145,11 +145,11 @@ BankTransactionLine=Tranzacţie bancă
 AllAccounts=Toate  conturile banca / casa
 BackToAccount=Inapoi la cont
 ShowAllAccounts=Arată pentru toate conturile
-FutureTransaction=Tranzacţie viitoare. In nici un caz de conciliat.
+FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat.
 SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a  le include în borderoul de remise şi faceţi clic pe "Crează".
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile (cum ar fi, YYYYMM)
 EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
-ToConciliate=De conciliat ?
+ToConciliate=De decontat ?
 ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click
 BankDashboard=Sinteză  conturi bancare
 DefaultRIB=IBAN Implicit
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 287171e92b8..565b654f58f 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -88,7 +88,7 @@ ClassifyClosed=Clasează "Închisă"
 ClassifyUnBilled=Clasează Nefacturat
 CreateBill=Crează  Factura
 AddBill=Crează  Factura sau Notă de Credit
-AddToDraftInvoices=Adaugă la factura nevalidată
+AddToDraftInvoices=Adaugă la factura schiţă
 DeleteBill=Ştergere factura
 SearchACustomerInvoice=Caută o factură client
 SearchASupplierInvoice=Caută o factură  furnizor
@@ -103,7 +103,7 @@ DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată es
 Amount=Valoare
 PriceBase=Preţul de bază
 BillStatus=Status Factura
-BillStatusDraft=Nevalidată (de validat)
+BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Platite
 BillStatusPaidBackOrConverted=Platite sau convertite în reducere
 BillStatusConverted=Plătită(gata pentru factura finală)
@@ -113,7 +113,7 @@ BillStatusStarted=Începută
 BillStatusNotPaid=Neplătită
 BillStatusClosedUnpaid=Închisă (neplătită)
 BillStatusClosedPaidPartially=Platite (parţial)
-BillShortStatusDraft=Nevalidată
+BillShortStatusDraft=Schiţă
 BillShortStatusPaid=Platite
 BillShortStatusPaidBackOrConverted=Prelucrate
 BillShortStatusConverted=Prelucrate
@@ -132,7 +132,7 @@ ErrorInvoiceAlreadyReplaced=Eroare, încercați să validați o factură pentru
 ErrorDiscountAlreadyUsed=Eroare, reducere este deja atribuită
 ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o valoare negativă
 ErrorInvoiceOfThisTypeMustBePositive=Eroare, acest tip de factură trebuie să aibă o valoare pozitivă
-ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă nevalidată
+ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă
 BillFrom=De la
 BillTo=La
 ActionsOnBill=Evenimente pe factura
@@ -142,13 +142,13 @@ LastCustomersBills=Ultimele %s facturi clienţi
 LastSuppliersBills=Ultimele %s facturi furnizori
 AllBills=Toate facturile
 OtherBills=Alte facturi
-DraftBills=Facturi nevalidate
-CustomersDraftInvoices=Facturi nevalidate Clienţi
-SuppliersDraftInvoices=Facturi nevalidate Furnizori
+DraftBills=Facturi schiţă
+CustomersDraftInvoices=Facturi schiţă Clienţi
+SuppliersDraftInvoices=Facturi schiţă Furnizori
 Unpaid=Neachitate
 ConfirmDeleteBill=Sigur  doriţi să ştergeţi această factură?
 ConfirmValidateBill=Sigur doriţi să validaţi această factură cu referinţa<b>%s</b>?
-ConfirmUnvalidateBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul de nevalidată ?
+ConfirmUnvalidateBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul de schiţă ?
 ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul plătită ?
 ConfirmCancelBill=Sigur doriţi să anulaţi factura <b> %s</b> ?
 ConfirmCancelBillQuestion=De ce vrei să clasezi această factură "abandonată"?
@@ -176,7 +176,7 @@ UnvalidateBill=Devalidează factura
 NumberOfBills=Nr  facturi
 NumberOfBillsByMonth=Nr facturi pe luni
 AmountOfBills=Valoare facturi
-AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără taxe)
+AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
 ShowSocialContribution=Afisează  contribuţiile sociale
 ShowBill=Afisează  factura
 ShowInvoice=Afisează  factura
@@ -200,15 +200,15 @@ SendBillRef=Trimitere factura %s
 SendReminderBillRef=Trimitere factura %s ( reamintire)
 StandingOrders=Ordine de plată
 StandingOrder=Ordin de plată
-NoDraftBills=Nici o  factură nevalidată
-NoOtherDraftBills=Nici o altă  factură nevalidată
-NoDraftInvoices=Nici o factură nevalidată
+NoDraftBills=Nici o  factură schiţă
+NoOtherDraftBills=Nicio altă  factură schiţă
+NoDraftInvoices=Nicio factură schiţă
 RefBill=Ref Factură
 ToBill=De  facturat
 RemainderToBill=Rest de facturat
 SendBillByMail=Trimiteţi factura prin email
 SendReminderBillByMail=Trimite o relansare  prin e-mail
-RelatedCommercialProposals=Propuneri Comerciale asociate
+RelatedCommercialProposals=Oferte comerciale asociate
 MenuToValid=De validat
 DateMaxPayment=Data limită a plăţii
 DateEcheance=Data limită
@@ -279,7 +279,7 @@ InvoiceNote=Notă Factură
 InvoicePaid=Facturiă plătită
 PaymentNumber=Număr plata
 RemoveDiscount=Înlăturaţi discountul
-WatermarkOnDraftBill=Filigran pe facturile nevalidate  (nimic dacă gol)
+WatermarkOnDraftBill=Filigran pe facturile schiţă  (nimic dacă gol)
 InvoiceNotChecked=Nicio factură selectată
 CloneInvoice=Clonează factura
 ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură <b> %s</b>?
@@ -373,7 +373,7 @@ MenuCheques=Cecuri
 MenuChequesReceipts=Borderouri cecuri
 NewChequeDeposit=Depozit nou
 ChequesReceipts=Borderouri cecuri remise
-ChequesArea=Zona Cecuri remise
+ChequesArea=CECURI
 ChequeDeposits=Cecuri remise
 Cheques=Cecuri
 CreditNoteConvertedIntoDiscount=Această notă de credit a fost convertită în %s
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 054fdee5758..d1f0c5e6c65 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -2,95 +2,95 @@
 BoxLastRssInfos=Rss informaţii
 BoxLastProducts=Ultimele produse / servicii
 BoxProductsAlertStock=Alertă produse în stoc
-BoxLastProductsInContract=Ultima contractate de produse / servicii
-BoxLastSupplierBills=Ultima furnizorului facturi
-BoxLastCustomerBills=Ultimul client a facturilor
-BoxOldestUnpaidCustomerBills=Primele facturi neachitate clientului
-BoxOldestUnpaidSupplierBills=Primele facturi neachitate furnizorului
-BoxLastProposals=Ultima comerciale propuneri
-BoxLastProspects=Ultima perspectivele
-BoxLastCustomers=Ultima clienţi
-BoxLastSuppliers=Ultima furnizori
-BoxLastCustomerOrders=Ultima client ordinelor
+BoxLastProductsInContract=Ultimele  %s  produse / servicii contractate 
+BoxLastSupplierBills=Ultimele facturi furnizori
+BoxLastCustomerBills=Ultimele facturi clienţi
+BoxOldestUnpaidCustomerBills=Cele mai vechi facturi clienţi neîncasate
+BoxOldestUnpaidSupplierBills=Cele mai vechi facturi clienţi neplătite
+BoxLastProposals=Ultimele oferte comerciale 
+BoxLastProspects=Ultimele  perspecte modificate
+BoxLastCustomers=Ultimii clienţi modificaţi
+BoxLastSuppliers=Ultimii furnizori modificaţi 
+BoxLastCustomerOrders=Ultimele comenzi clienţi
 BoxLastValidatedCustomerOrders=Ultimele comenzi clienţi validate
-BoxLastBooks=Ultimele cărţi
-BoxLastActions=Ultima acţiuni
+BoxLastBooks=Ultimele marcaje
+BoxLastActions=Ultimele acţiuni
 BoxLastContracts=Ultimele contracte
-BoxLastContacts=Ultimele date de contact / adresele
-BoxLastMembers=Ultimele membri
+BoxLastContacts=Ultimele contacte / adrese
+BoxLastMembers=Ultimii membri
 BoxFicheInter=Ultimele intervenţii
-BoxCurrentAccounts=Sold deschidere cont
-BoxSalesTurnover=Vanzari cifra de afaceri
-BoxTotalUnpaidCustomerBills=Total facturi neachitate clientului
-BoxTotalUnpaidSuppliersBills=Total facturi neachitate furnizorului
-BoxTitleLastBooks=Ultima %s înregistrate cărţi
-BoxTitleNbOfCustomers=Nombre de client
-BoxTitleLastRssInfos=Ultimele noutăţi de la %s %s
-BoxTitleLastProducts=Ultima %s modificate produse / servicii
+BoxCurrentAccounts=Solduri conturi deschise
+BoxSalesTurnover=Cifra de afaceri Vânzări 
+BoxTotalUnpaidCustomerBills=Total facturi clienţi neîncasate
+BoxTotalUnpaidSuppliersBills=Total facturi  furnizori neplătite
+BoxTitleLastBooks=Ultimele %s marcaje înregistrate
+BoxTitleNbOfCustomers=Număr clienţi
+BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s 
+BoxTitleLastProducts=Ultimele %s produse / servicii modificate 
 BoxTitleProductsAlertStock=Alertă produse în stoc
 BoxTitleLastCustomerOrders=Ultimele %s comenzi clienți
 BoxTitleLastModifiedCustomerOrders=Ultimele %s comenzi clienţi validate
-BoxTitleLastSuppliers=Ultima %s înregistrate de furnizori
-BoxTitleLastCustomers=Ultima %s înregistrate de clienţi
-BoxTitleLastModifiedSuppliers=%s Ultima modificare furnizori
-BoxTitleLastModifiedCustomers=%s Ultima modificare clienţii
+BoxTitleLastSuppliers=Ultimii %s furnizori înregistraţi
+BoxTitleLastCustomers=Ultimii %s clienţi înregistraţi
+BoxTitleLastModifiedSuppliers=Ultimii %s furnizori modificaţi
+BoxTitleLastModifiedCustomers=Ultimii %s clienţi modificaţi
 BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
-BoxTitleLastPropals=Ultimele %s propuneri
-BoxTitleLastModifiedPropals=Ultimele %s cpropuneri modificate
-BoxTitleLastCustomerBills=Ultima %s clientului facturi
+BoxTitleLastPropals=Ultimele %s oferte 
+BoxTitleLastModifiedPropals=Ultimele %s oferte modificate
+BoxTitleLastCustomerBills=Ultimele %s facturi clienţi
 BoxTitleLastModifiedCustomerBills=Ultimele %s facturi clienţi modificate
-BoxTitleLastSupplierBills=Ultima %s furnizorului facturi
+BoxTitleLastSupplierBills=Ultimele %s facturi furnizori 
 BoxTitleLastModifiedSupplierBills=Ultimele %s  facturi clienţi modificate
-BoxTitleLastModifiedProspects=%s Ultima modificare perspective
-BoxTitleLastProductsInContract=Ultima %s produse / servicii intr-un contract
+BoxTitleLastModifiedProspects=Ultimele %s prospecte modificate
+BoxTitleLastProductsInContract=Ultimele  %s produse / servicii intr-un contract
 BoxTitleLastModifiedMembers=Ultimii  %s membri
 BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
-BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s  facturi client neachitate 
-BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s  facturi furnizor neachitate 
-BoxTitleCurrentAccounts=Solduri deschidere conturi 
-BoxTitleSalesTurnover=Vanzari cifra de afaceri
-BoxTitleTotalUnpaidCustomerBills=Facturi Clienţi Neîncasate
-BoxTitleTotalUnpaidSuppliersBills=Facturi Furnizori Neachitate 
-BoxTitleLastModifiedContacts=%s Ultima modificare contacte / adrese
-BoxMyLastBookmarks=Ultima mea %s marcaje
-BoxOldestExpiredServices=Cele mai vechi active de servicii a expirat
-BoxLastExpiredServices=Ultimele %s mai vechi contacte cu serviciile de active expirate
-BoxTitleLastActionsToDo=Ultima %s acţiunile de a face
-BoxTitleLastContracts=Ultimele contracte %s
-BoxTitleLastModifiedDonations=%s Ultima modificare donaţii
-BoxTitleLastModifiedExpenses=%s Ultima modificare cheltuieli
+BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s  facturi clienţi neîncasate
+BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s  facturi furnizori neplătite
+BoxTitleCurrentAccounts=Solduri conturi deschise 
+BoxTitleSalesTurnover=Cifra de afaceri vânzări 
+BoxTitleTotalUnpaidCustomerBills=Facturi clienţi neîncasate
+BoxTitleTotalUnpaidSuppliersBills=Facturi furnizori neplătite
+BoxTitleLastModifiedContacts=Ultimele  %s contacte / adrese modificare 
+BoxMyLastBookmarks=Ultimele mele  %s marcaje
+BoxOldestExpiredServices=Cele mai vechi servicii active expirate
+BoxLastExpiredServices=Cele mai vechi %s  contacte cu serviciile active expirate
+BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat
+BoxTitleLastContracts=Ultimele  %s  contracte
+BoxTitleLastModifiedDonations=Ultimele %s  donaţii modificate 
+BoxTitleLastModifiedExpenses= Ultimele  %s cheltuieli modificare 
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
-FailedToRefreshDataInfoNotUpToDate=Nu a reuşit să reîmprospătaţi flux RSS. Ultima reuşită a reîmprospăta data: %s
-LastRefreshDate=Ultima data de reîmprospătare
-NoRecordedBookmarks=No bookmarks defined. Click <a href=Nu marcaje definite. Faceţi clic <a href="%s">aici</a> pentru a adăuga marcaje.
+FailedToRefreshDataInfoNotUpToDate=Eşec la reîmprospătarea fluxului RSS. Ultima reîmprospătare reuşită la data: %s
+LastRefreshDate=Ultima dată reîmprospătare
+NoRecordedBookmarks=Niciun marcaj definit.
 ClickToAdd=Click aici pentru a adăuga.
-NoRecordedCustomers=Nu înregistrate de clienţi
-NoRecordedContacts=Nu sunt înregistrate date de contact
-NoActionsToDo=Nr actiuni pentru a face
-NoRecordedOrders=Nu înregistrate clientului ordinelor
-NoRecordedProposals=Nu înregistrate propuneri
-NoRecordedInvoices=Nu înregistrate clientului facturi
-NoUnpaidCustomerBills=Nu neachitate clientului facturi
-NoRecordedSupplierInvoices=Nu înregistrate furnizorului facturi
-NoUnpaidSupplierBills=Nu facturi neachitate furnizorului
-NoModifiedSupplierBills=Nici un furnizor nu a înregistrat facturile
-NoRecordedProducts=Nu înregistrate produse / servicii
-NoRecordedProspects=Nu înregistrate perspectivele
-NoContractedProducts=Nu produse / servicii contractate
-NoRecordedContracts=Nr contracte înregistrate
-NoRecordedInterventions=Nici o intervenție înregistrată
+NoRecordedCustomers=Niciun client înregistrat
+NoRecordedContacts=Niciun contact înregistrat
+NoActionsToDo=Nicio  acţiune de realizat
+NoRecordedOrders=Nicio comandă client înregistrată
+NoRecordedProposals=Nicio ofertă înregistrată
+NoRecordedInvoices=Nicio factură clienţi înregistrată
+NoUnpaidCustomerBills=Nicio factură clienţi neîncasată
+NoRecordedSupplierInvoices=Nicio factură furnizori înregistrată
+NoUnpaidSupplierBills=Nicio factură furnizori neplătită
+NoModifiedSupplierBills=Nicio factură furnizori înregistrată
+NoRecordedProducts=Niciun produs / serviciu înregistrat
+NoRecordedProspects=Niciun prospect înregistrat
+NoContractedProducts=Niciun  produs / serviciu contractat
+NoRecordedContracts=Niciun contract înregistrat
+NoRecordedInterventions=Nicio intervenție înregistrată
 BoxLatestSupplierOrders=Ultimele comenzi furnizori
 BoxTitleLatestSupplierOrders=Ultimele %s comenzi furnizori
 BoxTitleLatestModifiedSupplierOrders=Ultimele %s comenzi clienţi modificate
 NoSupplierOrder=Nicio comandă furnizor inregistrată
-BoxCustomersInvoicesPerMonth=Facturi Clienţi pe lună
-BoxSuppliersInvoicesPerMonth=Facturi Furnizori pe lună
-BoxCustomersOrdersPerMonth=Comenzi clienţi pe lună
-BoxSuppliersOrdersPerMonth=Comenzi furnizori pe lună
-BoxProposalsPerMonth=Propuneri pe lună
-NoTooLowStockProducts=Niciun produs sub limita minima de stoc
+BoxCustomersInvoicesPerMonth=Facturi clienţi pe luni
+BoxSuppliersInvoicesPerMonth=Facturi furnizori pe luni
+BoxCustomersOrdersPerMonth=Comenzi clienţi pe luni
+BoxSuppliersOrdersPerMonth=Comenzi furnizori pe luni
+BoxProposalsPerMonth=Oferte pe luni
+NoTooLowStockProducts=Niciun produs sub stocul de siguranţă
 BoxProductDistribution=Distribuţie Produse / Servicii
-BoxProductDistributionFor=Distribuţie de %s  pentru%s
-ForCustomersInvoices=Facturi Clienţi
+BoxProductDistributionFor=Distribuţia de %s  pe  %s
+ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
-ForProposals=Propuneri comerciale
+ForProposals=Oferte comerciale
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 4e5a03a7523..ee71f82dd42 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -5,18 +5,18 @@ Rubrique=Categorie
 Rubriques=Categorii
 categories=categorii
 TheCategorie=Categoria
-NoCategoryYet=Nici o categorie de acest tip creată
+NoCategoryYet=Nicio categorie de acest tip creată
 In=În
 AddIn=Adăugă în
 modify=modifică
 Classify=Clasează
-CategoriesArea=Zona Categorii
-ProductsCategoriesArea=Zona Categorii Produse / Servicii
-SuppliersCategoriesArea=Zona Categorii Furnizori
-CustomersCategoriesArea=Zona Categorii Clienţii
-ThirdPartyCategoriesArea=Zona Categorii Terţi
-MembersCategoriesArea=Zona Categorii  Membrii
-ContactsCategoriesArea=Zona Categorii Contacte
+CategoriesArea=CATEGORII
+ProductsCategoriesArea=Categorii Produse / Servicii
+SuppliersCategoriesArea=Categorii Furnizori
+CustomersCategoriesArea=Categorii Clienţii
+ThirdPartyCategoriesArea=Categorii Terţi
+MembersCategoriesArea=Categorii  Membrii
+ContactsCategoriesArea=Categorii Contacte
 MainCats=Categorii Principale
 SubCats=Subcategorii
 CatStatistics=Statistici
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 3ce69c33345..78eb9aecfc7 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - commercial
 Commercial=Comercial
-CommercialArea=Zona Comercial
+CommercialArea=Comercial
 CommercialCard=Fişa Comercial
-CustomerArea=Zona Clienţi
+CustomerArea=Clienţi
 Customer=Client
 Customers=Clienţi
 Prospect=Prospect
@@ -44,7 +44,7 @@ DoneActions=Lista evenimentelor realizate
 DoneActionsFor=Lista evenimentelor realizate  pentru %s
 ToDoActions=Lista evenimentelor incomplete
 ToDoActionsFor=Lista evenimentelor incomplete pentru %s
-SendPropalRef=Transmitere propunere comercială  %s
+SendPropalRef=Transmitere ofertă  comercială  %s
 SendOrderRef=Transmitere comandă  %s
 StatusNotApplicable=Nu se aplică
 StatusActionToDo=De realizat
@@ -68,7 +68,7 @@ ActionUserAsk=Raportat de
 ErrorStatusCantBeZeroIfStarted=Dacă câmpul <b>"Data reală debut  realizare"</b> este completat, acţiunea este începută  (sau terminată), astfel câmpul <b>"Status"</b> nu poate fi 0%%.
 ActionAC_TEL=Apel Telefonic
 ActionAC_FAX=Trimitere fax
-ActionAC_PROP=Trimitere  propunere pe mail
+ActionAC_PROP=Trimitere  ofertă pe mail
 ActionAC_EMAIL=Trimitere email
 ActionAC_RDV=Întâlniri
 ActionAC_INT=Intervenţie pe site
@@ -91,6 +91,6 @@ MargeOrder=Marje( comenzi validate)
 RecapAnnee=Sinteza anului
 NoData=Nu sunt date
 StatusProsp=Statut Prospect
-DraftPropals=Proiectul de propuneri comerciale
-SearchPropal=Căutaţi o propunere comercială
+DraftPropals=Oferte Comerciale Schiţă
+SearchPropal=Căutaţi o ofertă comercială
 CommercialDashboard=Sinteza comercială
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 25e8fbd7c98..40a002486d0 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -19,7 +19,7 @@ NewThirdParty=Terţ nou (prospect, client, furnizor)
 NewSocGroup=Grup  nou de societăţi
 NewPrivateIndividual=Particular nou(prospect, client, furnizor)
 CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor)
-ProspectionArea=Zona Prospecte
+ProspectionArea=Prospecte
 SocGroup=Grup de societăţi
 IdThirdParty=ID Terţ
 IdCompany=ID Societate
@@ -298,11 +298,11 @@ ShowContact=Afişeză contact
 ContactsAllShort=Toate (fără filtru)
 ContactType=Tip Contact
 ContactForOrders=Contact Comenzi
-ContactForProposals=Contact  Propuneri
+ContactForProposals=Contact  Ofertă
 ContactForContracts=Contact  Contracte
 ContactForInvoices=Contact  Facturi
 NoContactForAnyOrder=Acest contact nu este  contact pentru nici o comanda
-NoContactForAnyProposal=AAcest contact nu este  contact pentru nici o propunere comercială
+NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială
 NoContactForAnyContract=Acest contact nu este  contact pentru nici un contract
 NoContactForAnyInvoice=Acest contact nu este  contact pentru nici o factură
 NewContact=Contact nou
@@ -331,7 +331,7 @@ ContactPublic=Partajat
 ContactVisibility=Vizibilitate
 OthersNotLinkedToThirdParty=Alţii, nelegate la un terţ
 ProspectStatus=Statut Prospect
-PL_NONE=Nici unul
+PL_NONE=Niciunul
 PL_UNKNOWN=Necunoscut
 PL_LOW=Scăzut
 PL_MEDIUM=Mediu
@@ -363,7 +363,7 @@ AttachANewFile=Ataşaţi un fişier nou
 NoRIB=Nici un BAN definit
 NoParentCompany=Niciunul
 ExportImport=Import-Export
-ExportCardToFormat=Export fişă la format
+ExportCardToFormat=Export fişă în format
 ContactNotLinkedToCompany=Contact nelegat la un terţ
 DolibarrLogin=Identificator utilizator
 NoDolibarrAccess=Niciun acces utilizator
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Trebuie să creați e-mailuri de contact pentru terţi
 ListSuppliersShort=Lista  furnizori
 ListProspectsShort=Lista  prospecte
 ListCustomersShort=Lista  clienţi
-ThirdPartiesArea=Zona Terţi şi contact
+ThirdPartiesArea=Terţi şi Contacte
 LastModifiedThirdParties=Ultimii  %s terţi modificaţi
 UniqueThirdParties=Total terţi unici
 InActivity=Deschis
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 5fe76b345ce..16f207b90e9 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -54,8 +54,8 @@ LT1SupplierES=RE cumpărări
 VATCollected=TVA colectat
 ToPay=De plată
 ToGet=De rambursat
-SpecialExpensesArea=Zona pentru toate plăţile speciale
-TaxAndDividendsArea=Zona taxe, contribuţii sociale şi dividende
+SpecialExpensesArea=Plăţi speciale
+TaxAndDividendsArea=Taxe, Contribuţii Sociale şi Dividende
 SocialContribution=Contribuţie socială
 SocialContributions=Contribuţii sociale
 MenuSpecialExpenses=Cheltuieli speciale
@@ -65,7 +65,7 @@ MenuSocialContributions=Contribuţii sociale
 MenuNewSocialContribution=Contribuţie nouă
 NewSocialContribution=Contribuţie socială nouă
 ContributionsToPay=Contribuţii de plată
-AccountancyTreasuryArea=Zona Contabilitate / Trezorerie
+AccountancyTreasuryArea=Contabilitate / Trezorerie
 AccountancySetup=Setări Contabilitate
 NewPayment=Plată nouă
 Payments=Plăţi
@@ -162,7 +162,7 @@ RulesVATDueProducts=- Pentru activele materiale, aceasta include facturi cu TVA,
 OptionVatInfoModuleComptabilite=Notă: Pentru bunuri materiale, ar trebui să utilizeze la data livrării să fie mai echitabil.
 PercentOfInvoice=%%/factura
 NotUsedForGoods=Nu sunt utilizate pentru cumpărarea de bunuri
-ProposalStats=Statistici privind propunerile
+ProposalStats=Statistici privind ofertele
 OrderStats=Statistici privind comenzile
 InvoiceStats=Statistici privind facturile
 Dispatch=Dispecerizare
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index c955006df8d..739a7d2f2f8 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Zona Contracte
+ContractsArea=Contracte
 ListOfContracts=Lista contracte
 LastModifiedContracts=Ultimele %s contracte modificare
 AllContracts=Toate contractele
@@ -7,7 +7,7 @@ ContractCard=Fişă Contract
 ContractStatus=Status Contract
 ContractStatusNotRunning=Fără service
 ContractStatusRunning=În service
-ContractStatusDraft=Nevalidat
+ContractStatusDraft=Schiţă
 ContractStatusValidated=Validat
 ContractStatusClosed=Închis
 ServiceStatusInitial=Inactiv
@@ -73,7 +73,7 @@ ServicesNomberShort=%s serviciu (ii)
 RunningServices=Servicii active
 BoardRunningServices=Servicii active şi expirate ăn contract
 ServiceStatus=Status  serviciu
-DraftContracts=Contracte nevalidate
+DraftContracts=Contracte schiţă
 CloseRefusedBecauseOneServiceActive=Contractul nu poate fi închis după cum există cel puţin un serviciu deschis pe ea
 CloseAllContracts=Închide toateliniile de contracte
 DeleteContractLine=Şterge o linie de contract
diff --git a/htdocs/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang
index 78c832f8d85..9d28a1b5ce5 100644
--- a/htdocs/langs/ro_RO/deliveries.lang
+++ b/htdocs/langs/ro_RO/deliveries.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Livrare
 Deliveries=Livrări
-DeliveryCard=Livrarea carte
-DeliveryOrder=De livrare pentru
-DeliveryOrders=Livrarea comenzilor
+DeliveryCard=Fişă Livrarea 
+DeliveryOrder=Ordin de livrare 
+DeliveryOrders=Ordine de livrare
 DeliveryDate=Data de livrare
-DeliveryDateShort=Deliv. dată
-CreateDeliveryOrder=Generarea de livrare pentru
+DeliveryDateShort=Dată livr.
+CreateDeliveryOrder=Generare ordine de livrare 
 QtyDelivered=Cantitate livrată
 SetDeliveryDate=Setaţi data de expediere
-ValidateDeliveryReceipt=Validate livrare la primirea
-ValidateDeliveryReceiptConfirm=Sunteţi sigur că doriţi pentru a valida acest livrare primire?
-DeleteDeliveryReceipt=Ştergeţi confirmare de primire
-DeleteDeliveryReceiptConfirm=Sunteţi sigur că doriţi să ştergeţi <b>%s</b> de livrare de primire?
+ValidateDeliveryReceipt=Validare recepţie  livrare
+ValidateDeliveryReceiptConfirm=Sigur doriţi  să validaţi această receptie ?
+DeleteDeliveryReceipt=Ştergeţi recepţie livrare
+DeleteDeliveryReceiptConfirm=Sunteţi sigur că doriţi să ştergeţi recepţia livrării <b>%s</b> ?
 DeliveryMethod=Metoda de livrare
 TrackingNumber=Număr de urmărire
-DeliveryNotValidated=De livrare nu au fost validate
+DeliveryNotValidated=Livrare  nevalidată
 # merou PDF model
 NameAndSignature=Nume şi Semnătura:
 ToAndDate=To___________________________________ pe ____ / _____ / __________
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index c392d15d66f..4037e2ffbb7 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -14,11 +14,11 @@ DonationsPaid=Donaţii plătite
 DonationsReceived=Donaţii încasate
 PublicDonation=Donaţie Publică
 DonationsNumber=Număr donaţii
-DonationsArea=Zona Donaţii
-DonationStatusPromiseNotValidated=Promisiune nevalidată
+DonationsArea=Donaţii
+DonationStatusPromiseNotValidated=Promisiune schiţă
 DonationStatusPromiseValidated=Promisiune validată
 DonationStatusPaid=Donatie plătită
-DonationStatusPromiseNotValidatedShort=Nevalidată
+DonationStatusPromiseNotValidatedShort=Schiţă
 DonationStatusPromiseValidatedShort=Validată
 DonationStatusPaidShort=Plătită
 ValidPromess=Validează promisiune
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index 08ad4602c0a..28b152a9bf9 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -5,7 +5,7 @@ DocsGenerated=Documente Generate
 DocsElements=Elemente  documente
 DocsThirdParties=Documente Terţi
 DocsContracts=Documente Contracte
-DocsProposals=Documente Propuneri
+DocsProposals=Documente oferte
 DocsOrders=Documente Comenzi
 DocsInvoices=Documente Facturi
 ECMNbOfDocs=Nr documente în director
@@ -25,7 +25,7 @@ ECMNbOfFilesInDir=Număr fişiere în director
 ECMNbOfSubDir=Număr sub-directoare
 ECMNbOfFilesInSubDir=Număr fișiere în sub-directoare
 ECMCreationUser=Creator
-ECMArea=Zona EDM
+ECMArea=EDM
 ECMAreaDesc=Zona EDM (Electronic Document Management), vă permite să salvați, partajaţi și să căutați rapid tot felul de documente în Dolibarr.
 ECMAreaDesc2=* Directoarele automate sunt completate în mod automat atunci când se adaugă documentele din fişa acelui element. <br> * Directoarele manuale poate fi folosite pentru a salva documente ce nu sunt legate de un anumit element.
 ECMSectionWasRemoved=Directorul <b>%s</b> a fost ştears.
@@ -37,7 +37,7 @@ ECMTypeManual=Manual
 ECMTypeAuto=Automat
 ECMDocsBySocialContributions=Documente legate de contribuţiile sociale
 ECMDocsByThirdParties=Documente legate de terţi
-ECMDocsByProposals=Documente legate de propuneri
+ECMDocsByProposals=Documente legate de oferte
 ECMDocsByOrders=Documente legate de comenzi  clienţi
 ECMDocsByContracts=Documente legate de contractele d
 ECMDocsByInvoices=Documente legate de   facturi clienţi
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index e83f98969fc..0f8dbb21b0a 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -93,7 +93,7 @@ ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordin
 ErrorBadMaskBadRazMonth=Eroare, Bad resetare valoarea
 ErrorSelectAtLeastOne=Eroare. Selectaţi cel puţin o intrare.
 ErrorProductWithRefNotExist=Produs cu <i>&quot;%s&quot;</i> de referinţă, nu există
-ErrorDeleteNotPossibleLineIsConsolidated=Ştergeţi nu este posibil, deoarece înregistrarea este legat de o bancă, care este transation conciliate
+ErrorDeleteNotPossibleLineIsConsolidated=Ştergerea nu este posibilă, deoarece înregistrarea este legată de tranzacţie  bancară, care a fost decontată
 ErrorProdIdAlreadyExist=%s se atribuie o altă treime
 ErrorFailedToSendPassword=Nu a reuşit să trimită parola
 ErrorFailedToLoadRSSFile=Nu pentru a obţine RSS feed. Încercaţi să adăugaţi MAIN_SIMPLEXMLLOAD_DEBUG constantă în cazul în care mesajele de eroare nu furnizează suficiente informaţii.
@@ -136,7 +136,7 @@ ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
 ErrorBadFormat=Format gresit!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă legat de nici un terţ. Link  Membru catre un terţ ezistent  sau creați un nou terţ înainte de crearea  abonamentului cu factura.
 ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
-ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost conciliată
+ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost decontată
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
 ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
 ErrorPriceExpression2=Nu se poate redefini  funcția built-in  '%s'
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index 8280d0ff212..0d07957e8a1 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exporturi zona
-ImportArea=Import zona
+ExportsArea=Export
+ImportArea=Import
 NewExport=New export
 NewImport=New import
 ExportableDatas=Exportabil de date
@@ -9,24 +9,24 @@ SelectExportDataSet=Alegeţi de date pe care doriţi să le export ...
 SelectImportDataSet=Alegeţi de date pe care doriţi să o import ...
 SelectExportFields=Alegeţi câmpurile pe care doriţi să le de export, sau selectaţi un profil predefinit de export
 SelectImportFields=Alegeţi  câmpurile din fișier sursă pe care doriți să importați și câmpurile lor țintă în baza de date mutând în sus și în jos cu ancora %s sau selectați un profil de import predefinit:
-NotImportedFields=Domenii de fişier sursă nu importate
+NotImportedFields=Câmpurile fişierului sursă nu importate
 SaveExportModel=Salvaţi acest profil de export dacă aveţi de gând să-l refolosire mai târziu ...
 SaveImportModel=Salvaţi acest profil de import dacă aveţi de gând să-l refolosire mai târziu ...
 ExportModelName=Export profil nume
 ExportModelSaved=Export profil salvat sub <b>numele %s.</b>
-ExportableFields=Exportabil domenii
-ExportedFields=Exportate domenii
+ExportableFields=Câmpuri exportabile
+ExportedFields=Câmpuri exportate
 ImportModelName=Import profil nume
 ImportModelSaved=Import profil salvat sub <b>numele %s.</b>
-ImportableFields=Importable domenii
-ImportedFields=Importate domenii
+ImportableFields=Câmpuri importabile
+ImportedFields=Câmpuri importate
 DatasetToExport=De date la export
 DatasetToImport=De date pentru a importa
-NoDiscardedFields=Nici un câmp în fişierul sursă sunt aruncate
+NoDiscardedFields=Niciun câmp din fişierul sursă sunt înlăturat
 Dataset=De date
 ChooseFieldsOrdersAndTitle=Alegeţi câmpurile pentru ...
-FieldsOrder=Domenii pentru
-FieldsTitle=Domenii titlu
+FieldsOrder=Câmpuri pentru
+FieldsTitle=Câmpuri  titlu
 FieldOrder=Pentru domeniul
 FieldTitle=Domeniul titlu
 ChooseExportFormat=Alegeţi formatul de export
@@ -63,10 +63,10 @@ DownloadEmptyExample=Descărcaţi exemplu de sursă gol fişier
 ChooseFormatOfFileToImport=Alegeţi formatul de fişier pentru al utiliza ca formatul de fişier de import, făcând clic pe picto %s pentru ao selecta ...
 ChooseFileToImport=Alegeţi fişier pentru a importa apoi faceţi clic pe picto %s ...
 SourceFileFormat=Sursa Format fişier
-FieldsInSourceFile=Domenii in fişierul sursă
+FieldsInSourceFile=Câmpuri  in fişierul sursă
 FieldsInTargetDatabase=Câmpuri-țintă în baza de date Dolibarr (bold = obligatoriu)
 Field=Câmp
-NoFields=Nici un câmp
+NoFields=Niciun câmp
 MoveField=Mutare coloana %s domeniul număr
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=Salvaţi acest profil de import
@@ -84,8 +84,8 @@ RunSimulateImportFile=Lansarea simulare de import
 FieldNeedSource=Acest câmp cere date din fişierul sursă
 SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date de la dosar
 InformationOnSourceFile=Informaţii privind fişier sursă
-InformationOnTargetTables=Informaţii privind domeniile-ţintă
-SelectAtLeastOneField=domeniul Switch cel puţin o sursă din coloana de domenii de export
+InformationOnTargetTables=Informaţii privind câmpurile ţintă
+SelectAtLeastOneField=Comută cel puțin un câmp sursă în coloana de câmpuri de exportat
 SelectFormat=Alegeţi acest fişier format de import
 RunImportFile=Lansarea de import dosar
 NowClickToRunTheImport=Verificaţi rezultat al simulării de import. Daca totul este ok, lansarea de import definitiv.
@@ -110,10 +110,10 @@ SourceRequired=valoarea datelor este obligatorie
 SourceExample=Exemplu de valoare posibilă de date
 ExampleAnyRefFoundIntoElement=Orice Ref gasit pentru <b>%s</b> element
 ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit  în dicţionarul <b>%s</b> 
-CSVFormatDesc=<b>Comma Separated Value</b> formatul de fişier (). Csv. <br> Acesta este un format de fişier text în care câmpurile sunt separate prin separatorul [%s]. În cazul în care se găseşte în interiorul separatorului cu un conţinut de domeniu, domeniu este rotunjit cu caracter rotunde [%s]. caracter Escape pentru a scăpa de caractere rundă este [%s].
+CSVFormatDesc=<b>Comma Separated Value</b> format de fișier (csv). <br> Acesta este un format de fișier text în care câmpurile sunt separate prin separatorul [%s]. Dacă separator se găsește în interiorul un conținut unui câmp, câmp este încadrat de caractere [%s]. Escape caracter  este [%s].
 Excel95FormatDesc=<b>Excel</b> format fişier (.xls) <br>Acesta este format nativ Excel 95 (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> format fişier (.xlsx) <br>Acesta este format nativ Excel 2007 (SpreadsheetML).
-TsvFormatDesc=<b> Tab Separat Valoare </ b> format de fișier (. TSV) <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab].
+TsvFormatDesc=<b> Tab Separat Valoare </b> format de fișier (.tsv) <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un tabulator [tab].
 ExportFieldAutomaticallyAdded=Câmpul <b>%s </ b> a fost adăugat în mod automat. Se va evita ca linii similare să fie tratate ca înregistrări dublate (cu acest câmp adaugat, toate liniile vor avea propriul lor ID și vor diferi).
 CsvOptions=Opţiuni Csv
 Separator=Separator
diff --git a/htdocs/langs/ro_RO/ftp.lang b/htdocs/langs/ro_RO/ftp.lang
index 8456d842899..b8eb5443990 100644
--- a/htdocs/langs/ro_RO/ftp.lang
+++ b/htdocs/langs/ro_RO/ftp.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=Configurarea modulului client FTP
 NewFTPClient=Creează o nouă conexiune FTP
-FTPArea=Aria FTP
+FTPArea=FTP
 FTPAreaDesc=Acest ecran afișează conţinutul unui server FTP
 SetupOfFTPClientModuleNotComplete=Configurarea clientului FTP pare incompletă
 FTPFeatureNotSupportedByYourPHP=Versiunea PHP a dvs. nu are suport pentru funcţii FTP
diff --git a/htdocs/langs/ro_RO/help.lang b/htdocs/langs/ro_RO/help.lang
index 1696a827d78..6254c98c667 100644
--- a/htdocs/langs/ro_RO/help.lang
+++ b/htdocs/langs/ro_RO/help.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum / wiki sprijin
-EMailSupport=E-mail-uri de sprijin
-RemoteControlSupport=Online timp real / distanţă de sprijin
-OtherSupport=Alte tipuri de sprijin
+CommunitySupport=Forum/Wiki suport
+EMailSupport=E-mail-uri suport
+RemoteControlSupport=Suport în timp real / remote
+OtherSupport=Alte tipuri de suport
 ToSeeListOfAvailableRessources=Pentru a contacta / vezi resurse disponibile:
 ClickHere=Click aici
 HelpCenter=Centrul de Ajutor
 DolibarrHelpCenter=Dolibarr Centrul de Ajutor şi Asistenţă
 ToGoBackToDolibarr=Altfel, faceţi clic <a href="%s">aici pentru a utiliza Dolibarr</a>
-TypeOfSupport=Sursa de sprijin
-TypeSupportCommunauty=Comunitare (gratuite)
-TypeSupportCommercial=Comerciale
+TypeOfSupport=Sursa suport
+TypeSupportCommunauty=Comunitate (gratuit)
+TypeSupportCommercial=Comercial
 TypeOfHelp=Tip
-NeedHelpCenter=Aveţi nevoie de ajutor sau sprijin?
+NeedHelpCenter=Aveţi nevoie de ajutor sau suport?
 Efficiency=Eficienţa
 TypeHelpOnly=Numai Ajutor
 TypeHelpDev=Ajutor + Dezvoltare
 TypeHelpDevForm=Ajutor  + Dezvoltare + Formare
-ToGetHelpGoOnSparkAngels1=Unele companii pot oferi o repede (cândva imediată) şi mai eficientă asistenţă online, prin luarea de control de pe computer. Aceste ajutoare pot fi găsite pe <b>site-ul %s:</b>
-ToGetHelpGoOnSparkAngels3=De asemenea, puteţi să mergeţi la lista de toate disponibile pentru autocare Dolibarr, pentru aceasta, faceţi clic pe butonul
-ToGetHelpGoOnSparkAngels2=Uneori, nu există nici o companie disponibile în acest moment pe care le faceţi dumneavoastră de căutare, aşa cred că pentru a schimba filtrul de a căuta "disponibilitatea tuturor". Vi se va putea trimite mai multe cereri.
+ToGetHelpGoOnSparkAngels1=Unele companii pot oferi rapid (chiar imediat uneori) şi  mai eficient asistenţă online, prin preluarea controlului de pe computer. Aceste ajutoare pot fi găsite pe site-ul : <b> %s</b>
+ToGetHelpGoOnSparkAngels3=Puteți merge, de asemenea, la lista tuturor antrenorilor disponibili pentru Dolibarr, pentru aceasta click pe butonul
+ToGetHelpGoOnSparkAngels2=Uneori, nu există nicio companie disponibilă în momentul în care faceţi dvs. căutarea, astfel schimbţi filtrul pentru a căuta  pe "toți disponibili". Veți putea trimite mai multe cereri.
 BackToHelpCenter=Altfel, clic aici pentru a merge <a href="%s">înapoi la pentru pagina de start a Centrul de Ajutor</a>.
-LinkToGoldMember=Aveţi posibilitatea să apelaţi unul dintre antrenor preselected de Dolibarr pentru limba dumneavoastră ( %s), făcând clic pe sale Widget (statutul şi preţul maxim sunt actualizate automat):
-PossibleLanguages=Sprijinită de limbi
+LinkToGoldMember=Puteți apela unul dintre antrenori preselectati de Dolibarr pentru limba (%s) făcând clic pe balonul Widget (statusul și prețul maxim sunt actualizate automat):
+PossibleLanguages=Limbi suportate
 MakeADonation=Ajută  proiectul Dolibarr, faceţi o donaţie
 SubscribeToFoundation=Ajută proiectul Dolibarr, subscrie la fundație
 SeeOfficalSupport=Pentru suport oficial Dolibarr în limba dvs:  <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 7001d1c09c5..8229522a90d 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -161,7 +161,7 @@ ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansa
 MigrationFixData=Fix pentru date denormalized
 MigrationOrder=Migrare a datelor pentru comenzile clienţilor
 MigrationSupplierOrder=Migrare de date pentru comenzi furnizor
-MigrationProposal=Migrare de date pentru propuneri de proiecte comerciale
+MigrationProposal=Migrare de date pentru oferte comerciale
 MigrationInvoice=Migrare de date pentru facturile clienţilor
 MigrationContract=Migrarea datelor pentru contracte
 MigrationSuccessfullUpdate=Upgrade de succes
diff --git a/htdocs/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang
index f29dc1002fb..2ed7c6a37e3 100644
--- a/htdocs/langs/ro_RO/ldap.lang
+++ b/htdocs/langs/ro_RO/ldap.lang
@@ -11,7 +11,7 @@ LDAPInformationsForThisGroup=Informaţiile din baza de date LDAP pentru acest gr
 LDAPInformationsForThisMember=Informaţiile din baza de date LDAP pentru acest stat
 LDAPAttribute=LDAP atribut
 LDAPAttributes=LDAP atribute
-LDAPCard=LDAP carte
+LDAPCard=Fişă LDAP 
 LDAPRecordNotFound=Înregistrarea nu a fost găsit în baza de date LDAP
 LDAPUsers=Utilizatorii din baza de date LDAP
 LDAPGroups=Grupuri LDAP în baza de date
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 12c12ea721a..355cca1880f 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -4,7 +4,7 @@ EMailing=Email-uri
 Mailings=EMailings
 EMailings=EMailings
 AllEMailings=Toate eMailings
-MailCard=Carte de email-uri
+MailCard=Fisă email-uri
 MailTargets=Ţinte
 MailRecipients=Destinatari
 MailRecipient=Recipient
@@ -34,7 +34,7 @@ MailingResult=Trimiterea de e-mail-uri rezultat
 TestMailing=Test de email-uri
 ValidMailing=Valid email-uri
 ApproveMailing=Aprobaţi email-uri
-MailingStatusDraft=Proiect
+MailingStatusDraft=Schiţă
 MailingStatusValidated=Validat
 MailingStatusApproved=Aprobat
 MailingStatusSent=Trimis
@@ -103,7 +103,7 @@ MailingModuleDescContactsByFunction=Date de contact ale terţilor (de poziţie /
 LineInFile=Linia %s în fişierul
 RecipientSelectionModules=Definit pentru cererile beneficiarilor de selecţie
 MailSelectedRecipients=Selectat destinatarii
-MailingArea=EMailings zona
+MailingArea=EMailings 
 LastMailings=Ultima %s emailings
 TargetsStatistics=Ţinte statistici
 NbOfCompaniesContacts=Unic de contact din companii
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 090c392f0af..e2932712fd9 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -79,9 +79,9 @@ Administrator=Administrator
 Undefined=Nedefinit
 PasswordForgotten=Parolă uitată?
 SeeAbove=Vezi mai sus
-HomeArea=Zona Acasă
+HomeArea=Acasă
 LastConnexion=Ultima conexiune
-PreviousConnexion=Cconexiunea precedentă
+PreviousConnexion=Conexiunea precedentă
 ConnectedOnMultiCompany=Conectat la entitatea
 ConnectedSince=Conectat de
 AuthenticationMode=Mod autentificare
@@ -220,13 +220,13 @@ DateStart=Dată început
 DateEnd=Dată sfârşit
 DateCreation=Dată creare
 DateModification=Dată modificarea
-DateModificationShort=Datămodif.
+DateModificationShort=Dată modif.
 DateLastModification=Data ultimei modificări
 DateValidation=Dată validare
 DateClosing=Dată închidere
 DateDue=Dată scadenţă
-DateValue=Dată evaluare
-DateValueShort=Dată evaluare
+DateValue=Dată decontare
+DateValueShort=Dată decontare
 DateOperation=Dată operaţie
 DateOperationShort=Dată ope.
 DateLimit=Dată limită
@@ -325,7 +325,7 @@ TotalLT2=Total tax 3
 TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
 IncludedVAT=Inclusiv TVA
-HT=Net fără taxe
+HT=Net fără tva
 TTC=Inc. taxe
 VAT=TVA
 LT1ES=RE
@@ -346,7 +346,7 @@ ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. furnizor
 RefPayment=Ref. plată
-CommercialProposalsShort=Propuneri Comerciale
+CommercialProposalsShort=Oferte Comerciale
 Comment=Comentează
 Comments=Comentarii
 ActionsToDo=Evenimente de făcut
@@ -378,7 +378,7 @@ Duration=Durata
 TotalDuration=Durată totală
 Summary=Sumar
 MyBookmarks=Paginile mele marcate
-OtherInformationsBoxes=Alte cutii de informare
+OtherInformationsBoxes=Alte casete de informare
 DolibarrBoard=Tablou de bord
 DolibarrStateBoard=Statistici
 DolibarrWorkBoard=Sarcini Tablou de bord
@@ -404,8 +404,8 @@ ResultOk=Succes
 ResultKo=Eşec
 Reporting=Raportare
 Reportings=Rapoarte
-Draft=Nevalidat
-Drafts=Nevalidate
+Draft=Schiţă
+Drafts=Schiţe
 Validated=Validat
 Opened=Deschis
 New=Nou
@@ -426,8 +426,8 @@ Preview=Previzualizare
 NextStep=Etapa următoare
 PreviousStep=Etapa precedentă
 Datas=Date
-None=Niciun
-NoneF=Niciun
+None=Niciunul
+NoneF=Niciunul
 Late=Întârziat
 Photo=Foto
 Photos=Fotografii
@@ -580,7 +580,7 @@ PartialMan=Parţial
 TotalWoman=Total
 TotalMan=Total
 NeverReceived=Niciodată primit
-Canceled=Anulat
+Canceled=Anulată
 YouCanChangeValuesForThisListFromDictionarySetup=Se pot schimba valorile pentru această listă din meniul setări - dicționar
 Color=Culoare
 Documents=Fişiere ataşate
@@ -647,8 +647,8 @@ AttributeCode=Cod Atribut
 OptionalFieldsSetup=Setări  atribute suplimentare
 URLPhoto=Url către foto/logo
 SetLinkToThirdParty=Link către un alt terţ
-CreateDraft=Creareză ciornă
-SetToDraft=Inapoi la Draft
+CreateDraft=Creareză schiţă
+SetToDraft=Inapoi la schiţă
 ClickToEdit=Clic pentru a edita
 ObjectDeleted=Obiect %s şters
 ByCountry=Pe ţară
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index a60474b8897..2699157a357 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Membri
-PublicMembersArea=Zona Membri publici
+PublicMembersArea=Membri publici
 MemberCard=Fişă Membru
 SubscriptionCard=Fişă Cotizaţie
 Member=Membru
@@ -24,13 +24,13 @@ SetLinkToUser=Link către un utilizator Dolibarr
 SetLinkToThirdParty=Link către un terţ Dolibarr
 MembersCards=Carţi de vizită  membri
 MembersList=Lista de membri
-MembersListToValid=Lista  membri nevalidaţi (de validat)
+MembersListToValid=Lista  membri schiţă (de validat)
 MembersListValid=Lista de membri validaţi
 MembersListUpToDate=Lista de membri validaţi cu cotizaţia la zi
 MembersListNotUpToDate=Lista de membri validaţi fără cotizaţia la zi
 MembersListResiliated=Lista de membri reziliaţi
 MembersListQualified=Lista de membri calificaţi
-MenuMembersToValidate=Membri nevalidaţi
+MenuMembersToValidate=Membri schiţă
 MenuMembersValidated=Membri validaţi
 MenuMembersUpToDate=Membri cu cotizaţia la zi
 MenuMembersNotUpToDate=Membri fără  cotizaţia la zi
@@ -51,8 +51,8 @@ MemberTypeLabel=Etichetă Tip Membru
 MembersTypes=Tipuri  Membri
 MembersAttributes=Atribute Membri
 SearchAMember=Caută un membru
-MemberStatusDraft=Nevalidat (trebuie să fie validat)
-MemberStatusDraftShort=Nevalidat
+MemberStatusDraft=Schiţă(trebuie să fie validat)
+MemberStatusDraftShort=Schiţă
 MemberStatusActive=Validat (în aşteptareacotizatiei)
 MemberStatusActiveShort=Validat
 MemberStatusActiveLate=Adeziune  expirată
@@ -61,8 +61,8 @@ MemberStatusPaid=Adeziuni la zi
 MemberStatusPaidShort=La zi
 MemberStatusResiliated=Membru reziliat
 MemberStatusResiliatedShort=Reziliat
-MembersStatusToValid=Membri nevalidaţi
-MembersStatusToValidShort=Membri nevalidaţi
+MembersStatusToValid=Membri schiţă
+MembersStatusToValidShort=Membri schiţă
 MembersStatusValidated=Membri validaţi
 MembersStatusPaid=Cotiaţia la zi
 MembersStatusPaidShort=La zi
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index fc26a38bace..0608e7a0949 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -4,7 +4,7 @@ Surveys=Sondaje
 OrganizeYourMeetingEasily=Organizeaza  intalnirile și sondaje dvs cu ușurință. Mai întâi selectați tipul sondajului ...
 NewSurvey=Sondaj nou
 NoSurveysInDatabase=%s sondaj(e) in baza de date
-OpenSurveyArea=Zona Sondaje
+OpenSurveyArea=Sondaje
 AddACommentForPoll=Puteţi adăuga un comentariu în sondaj...
 AddComment=Adaugă comentariu
 CreatePoll=Creaţi sondaj
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 52e5bd348e1..ef95a5c8097 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Zona Comenzi Clienţi
-SuppliersOrdersArea=Zona Comenzi Furnizori
+OrdersArea=Comenzi Clienţi
+SuppliersOrdersArea=Comenzi Furnizori
 OrderCard=Fişă Comandă
 OrderId=ID Comandă
 Order=Comandă
@@ -50,8 +50,8 @@ StatusOrderRefused=Refuzată
 StatusOrderReceivedPartially=Parţial recepţionată
 StatusOrderReceivedAll=Integral recepţionată
 ShippingExist=O expediţie există
-DraftOrWaitingApproved=Comenzi Schiţe sau încă  neaprobate
-DraftOrWaitingShipped=Comenzi Schiţe sau  validate încă neexpediate
+DraftOrWaitingApproved=Comenzi Schiţă sau încă  neaprobate
+DraftOrWaitingShipped=Comenzi Schiţă sau  validate încă neexpediate
 MenuOrdersToBill=Comenzi livrate
 MenuOrdersToBill2=Comenzi facturabile
 SearchOrder=Caută Comanda
@@ -82,7 +82,7 @@ NbOfOrders=Numar  comenzi
 OrdersStatistics=Statistici Comenzi
 OrdersStatisticsSuppliers=Statistici Comenzi Furnizori
 NumberOfOrdersByMonth=Numar comenzi pe luni
-AmountOfOrdersByMonthHT=Valoarea comenzilor pe luna (net fără taxe)
+AmountOfOrdersByMonthHT=Valoarea comenzilor pe luna (net fără tva)
 ListOfOrders=Lista  comenzi
 CloseOrder=Inchide  comanda
 ConfirmCloseOrder=Sigur doriți să setați această comandă în  De Livrat? După ce o comandă este livrată, acesta poate fi setată  De Facturat.
@@ -96,7 +96,7 @@ GenerateBill=Generează Factură
 ClassifyShipped=Clasează livrată
 ClassifyBilled=Clasează facturată
 ComptaCard=Fişă Contabilitate
-DraftOrders=Comenzi Schiţe
+DraftOrders=Comenzi schiţă
 RelatedOrders=Comenzi reatasate
 OnProcessOrders=Comenzi în curs de tratare
 RefOrder=Ref. comanda
@@ -132,7 +132,7 @@ Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Eşec la încărcarea fișierulu
 Error_FailedToLoad_COMMANDE_ADDON_File=Eşec la încărcarea fișierului modul '%s'
 Error_OrderNotChecked=Nici o comandă de facturat selectată
 # Sources
-OrderSource0=Propunere Comercială
+OrderSource0=Ofertă Comercială
 OrderSource1=Internet
 OrderSource2=Campanie poştă
 OrderSource3=Campanie telefon
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 8d336efc6ff..8e456987b22 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -15,7 +15,7 @@ Notify_BILL_UNVALIDATE=Factura client nevalidată
 Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat
 Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat
 Notify_ORDER_VALIDATE=Comandă client validată
-Notify_PROPAL_VALIDATE=Propunere client validată
+Notify_PROPAL_VALIDATE=Ofertă client validată
 Notify_PROPAL_CLOSE_SIGNED=Propunere client semnată inchisă
 Notify_PROPAL_CLOSE_REFUSED=Propunere client refuzată inchisă
 Notify_WITHDRAW_TRANSMIT=Transmitere de retragere
@@ -24,7 +24,7 @@ Notify_WITHDRAW_EMIT=Isue retragere
 Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă
 Notify_COMPANY_CREATE=Terţ a creat
 Notify_COMPANY_SENTBYMAIL=Emailuri trimise din cardul terţului
-Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă
+Notify_PROPAL_SENTBYMAIL=Ofertă comercială  trimisă prin mail
 Notify_BILL_PAYED=Factura platita clienţilor
 Notify_BILL_CANCEL=Factura client anulat
 Notify_BILL_SENTBYMAIL=Factura client trimis prin e-mail
@@ -59,7 +59,7 @@ PredefinedMailTest=Acesta este un e-mail de test. \\ NMesajul două linii sunt s
 PredefinedMailTestHtml=Acesta este un e-mail <b>de testare</b> (test de cuvânt trebuie să fie în aldine). <br> Cele două linii sunt separate printr-un retur de car.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici propunerea comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
@@ -118,7 +118,7 @@ LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Zonă
+Surface=Modul
 SurfaceUnitm2=m2
 SurfaceUnitdm2=dm2
 SurfaceUnitcm2=cm2
@@ -154,19 +154,19 @@ ProfIdShortDesc=<b>Prof Id-ul %s</b> este una de informaţii în funcţie de ţa
 DolibarrDemo=Demo Dolibarr ERP / CRM
 StatsByNumberOfUnits=Statistica în numărul de unităţi
 StatsByNumberOfEntities=Statistica în număr de entităţi
-NumberOfProposals=Număr propuneri pe ultimele 12 luni
+NumberOfProposals=Numărul ofertelor pe ultimele 12 luni
 NumberOfCustomerOrders=Număr comenzi clienţi pe ultimele 12 luni
 NumberOfCustomerInvoices=Număr facturi clienţi pe ultimele 12 luni
 NumberOfSupplierOrders=Număr comenzi furnizor  pe ultimele 12 luni
 NumberOfSupplierInvoices=Număr facturi  furnizor  pe ultimele 12 luni
-NumberOfUnitsProposals=Numărul de unităţi cu privire la propunerile pe ultimele 12 luni
+NumberOfUnitsProposals=Numărul de unităţi pe oferte în ultimele 12 luni
 NumberOfUnitsCustomerOrders=Numărul de unităţi de pe ordinele de client pe ultimele 12 luni
 NumberOfUnitsCustomerInvoices=Numărul de unităţi de pe facturile de client pe ultimele 12 luni
 NumberOfUnitsSupplierOrders=Numărul de unităţi de pe comenzile clienţi pe ultimele 12 luni
 NumberOfUnitsSupplierInvoices=Numărul de unităţi de la furnizor de facturi pe ultimele 12 luni
 EMailTextInterventionValidated=Intervenţia %s validată
 EMailTextInvoiceValidated=Factura %s validată
-EMailTextProposalValidated=Propunerea %s a fost validată.
+EMailTextProposalValidated=Oferta %s a fost validată.
 EMailTextOrderValidated=Comanda %s a fost validată
 EMailTextOrderApproved=Comanda %s a fost  aprobată
 EMailTextOrderApprovedBy=Comanda %s aprobată de către %s
@@ -207,10 +207,10 @@ NewCompanyToDolibarr=Compania %s adăugată
 ContractValidatedInDolibarr=Contract %s validat
 ContractCanceledInDolibarr=Contract %s anulat
 ContractClosedInDolibarr=Contract %s închis
-PropalClosedSignedInDolibarr=Propunere %s semnată
-PropalClosedRefusedInDolibarr=Propunere %s refuzată
-PropalValidatedInDolibarr=Propunere %s validată
-PropalClassifiedBilledInDolibarr=Propunerea %s clasificată facturată
+PropalClosedSignedInDolibarr=Oferta  %s semnată
+PropalClosedRefusedInDolibarr=Oferta  %s refuzată
+PropalValidatedInDolibarr=Oferta  %s validată
+PropalClassifiedBilledInDolibarr=Oferta %s clasificată facturată
 InvoiceValidatedInDolibarr=Factura %s validată
 InvoicePaidInDolibarr=Factura %s schimbată la plată
 InvoiceCanceledInDolibarr=Factura %s anulată
@@ -225,7 +225,7 @@ ShipmentValidatedInDolibarr=Livrare %s validată
 ShipmentDeletedInDolibarr=Livrare %s ştearsă
 ##### Export #####
 Export=Export
-ExportsArea=Zona Export
+ExportsArea=Export
 AvailableFormats=Formatele disponibile
 LibraryUsed=Librarie  folosită
 LibraryVersion=Versiune
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index f2e97e17072..eb7b5a7d622 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -72,9 +72,9 @@ PublicPrice=Preţ Public
 CurrentPrice=Preţ curent
 NewPrice=Preţ nou
 MinPrice=Preţ min.  vânzare
-MinPriceHT=Preţ minim vânzare (fără taxe)
+MinPriceHT=Preţ minim vânzare (fără tva)
 MinPriceTTC=Preţ minim vânzare (inc. tax)
-CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (% s fără taxe). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
+CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
 ContractStatus=Status Contract
 ContractStatusClosed=Închis
 ContractStatusRunning=În service
@@ -90,11 +90,11 @@ Suppliers=Furnizori
 SupplierRef=Ref. produs furnizor
 ShowProduct=Afişează  produs
 ShowService=Afişează serviciu
-ProductsAndServicesArea=Zona Produse şi Servicii
-ProductsArea=Zona Produse
-ServicesArea=Zona Servicii
-AddToMyProposals=Adaugă la propunerile mele
-AddToOtherProposals=Adaugă la alte propuneri
+ProductsAndServicesArea=Produse şi Servicii
+ProductsArea=Produse
+ServicesArea=Servicii
+AddToMyProposals=Adaugă la ofertele mele
+AddToOtherProposals=Adaugă la alte oferte
 AddToMyBills=Adăugă la facturile mele
 AddToOtherBills=Adaugă la alte facturi
 CorrectStock=Corectează Stocul
@@ -111,7 +111,7 @@ BarCode=Coduri de bare
 BarcodeType=Tip Coduri de bare
 SetDefaultBarcodeType=Setări tip cod de bare
 BarcodeValue=Valoarea coduri de bare
-NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, propuneri ...)
+NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, oferte ...)
 CreateCopy=Crează o copie
 ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată:
 MultiPricesAbility=Câteva nivele ale preţurilor produs/serviciu
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index e5fb1a57e8c..7c1260c8c9e 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -12,7 +12,7 @@ MyTasksDesc=Această vedere  este limitată la proiecte sau sarcini  pentru care
 TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 Myprojects=Proiectele mele
-ProjectsArea=Zona Proiecte
+ProjectsArea=Proiecte
 NewProject=Proiect nou
 AddProject=Creare proiect
 DeleteAProject=Şterge  proiect
@@ -59,7 +59,7 @@ Progress=Progres
 ProgressDeclared=Progres calculat
 ProgressCalculated=Progres calculat
 Time=Timp
-ListProposalsAssociatedProject=Lista propuneri comerciale asociate la proiect
+ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect
 ListOrdersAssociatedProject=Lista  comenzi asociate la proiect
 ListInvoicesAssociatedProject=Lista facturi lasociate la proiect
 ListPredefinedInvoicesAssociatedProject=Lista facturi clienţi predefinite asociate  la proiect
@@ -130,5 +130,5 @@ WorkloadOccupation= Volum de lucru Procent
 ProjectReferers=Obiecte asociate
 SearchAProject=Cauta proiect
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
-ProjectDraft=Proiecte draft
+ProjectDraft=Proiecte schiţă
 FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 250c4a62f8b..e0bbcc76543 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -1,41 +1,41 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Propuneri Comerciale
-Proposal=Propunerea Comercială
-ProposalShort=Propunere
-ProposalsDraft=Propuneri Comerciale Schiţe
-ProposalDraft=Propunere Comercială Schiţă
-ProposalsOpened=Deschis comerciale propuneri
-Prop=Propuneri Comerciale
-CommercialProposal=Propunere Comercială
-CommercialProposals=Propuneri Comerciale
-ProposalCard=Fişă Propunere
-NewProp=Propunere Comercială Nouă
-NewProposal=Propunere Comercială Nouă
-NewPropal=Propunere Nouă
+Proposals=Oferte Comerciale
+Proposal=Ofertă  Comercială
+ProposalShort=Ofertă 
+ProposalsDraft=Oferte Comerciale schiţă
+ProposalDraft=Ofertă  Comercială Schiţă
+ProposalsOpened=Oferte comerciale deschise
+Prop=Oferte Comerciale
+CommercialProposal=Ofertă Comercială
+CommercialProposals=Oferte  Comerciale
+ProposalCard=Fişă Ofertă 
+NewProp=Ofertă Comercială Nouă
+NewProposal=Ofertă Comercială Nouă
+NewPropal=Ofertă  Nouă
 Prospect=Prospect
 ProspectList=Listă Prospecte
-DeleteProp=Ştergere Propunere Comercială
-ValidateProp=Validează Propunere Comercială
-AddProp=Crează propunere
-ConfirmDeleteProp=Sigur doriţi să ştergeţi această propunere comercială ?
-ConfirmValidateProp=Sigur doriţi să validaţi această propunere comercială <b>%s</b>?
-LastPropals=Ultimele %s propuneri
-LastClosedProposals=Ultimele %s propuneri comerciale închise
+DeleteProp=Ştergere Ofertă  Comercială
+ValidateProp=Validează Ofertă Comercială
+AddProp=Crează ofertă
+ConfirmDeleteProp=Sigur doriţi să ştergeţi această ofertă comercială ?
+ConfirmValidateProp=Sigur doriţi să validaţi această ofertă comercială <b>%s</b>?
+LastPropals=Ultimele %s oferte
+LastClosedProposals=Ultimele %s oferte comerciale închise
 LastModifiedProposals=Ultimele %s propuneri comerciale modificate
-AllPropals=Toate propunerile
-LastProposals=Ultimele propuneri
-SearchAProposal=Caută o propunere
-ProposalsStatistics=Statistici propuneri comerciale
+AllPropals=Toate ofertele
+LastProposals=Ultimele oferte
+SearchAProposal=Caută o ofertă
+ProposalsStatistics=Statistici oferte comerciale
 NumberOfProposalsByMonth=Număr pe luni
 AmountOfProposalsByMonthHT=Valoarea pe luni (netă)
-NbOfProposals=Număr  propuneri comerciale
-ShowPropal=Afiţează  propunerea
+NbOfProposals=Număr oferte comerciale
+ShowPropal=Afişează oferta
 PropalsDraft=Schiţe
 PropalsOpened=Deschise
 PropalsNotBilled=Închise nefacturate
 PropalStatusDraft=Schiţă (de validat)
-PropalStatusValidated=Validată (propunere deschisă)
-PropalStatusOpened=Validată (propunere deschisă)
+PropalStatusValidated=Validată (oferta e deschisă)
+PropalStatusOpened=Validată (ofertă deschisă)
 PropalStatusClosed=Închisă
 PropalStatusSigned=Semnată (de facturat)
 PropalStatusNotSigned=Nesemnată (inchisă)
@@ -47,17 +47,17 @@ PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
 PropalStatusBilledShort=Facturată
-PropalsToClose=Propuneri Comerciale de închis
-PropalsToBill=Propuneri Comerciale semnate de facturat
-ListOfProposals=Lista  propuneri comerciale
-ActionsOnPropal=Evenimente pe propunerea
-NoOpenedPropals=Nu sunt propuneri comerciale deschise
-NoOtherOpenedPropals=Nu există alte propuneri comerciale deschise
-RefProposal=Ref. Propuneri comerciale
-SendPropalByMail=Trimite  propunerea comercială pe mail
-AssociatedDocuments=Documente asociate la propunere:
+PropalsToClose=Oferte Comerciale de închis
+PropalsToBill=Oferte Comerciale semnate de facturat
+ListOfProposals=Lista  ofertelor comerciale
+ActionsOnPropal=Evenimente pe ofertă
+NoOpenedPropals=Nu sunt oferte comerciale deschise
+NoOtherOpenedPropals=Nu există alte oferte comerciale deschise
+RefProposal=Ref. Ofertă comercială
+SendPropalByMail=Trimite oferta comercială pe mail
+AssociatedDocuments=Documente asociate la ofertă:
 ErrorCantOpenDir=Nu se poate deschide directorul
-DatePropal=Dată  Propunere
+DatePropal=Dată  ofertă
 DateEndPropal=Data valabilităţii
 DateEndPropalShort=Data de sfârşit
 ValidityDuration=Durata de valabilitate
@@ -67,18 +67,18 @@ BuildBill=Crează factură
 ErrorPropalNotFound=Propunearea %s nu a fost găsită
 Estimate=Deviz:
 EstimateShort=Deviz
-OtherPropals=Alte propuneri
-AddToDraftProposals=Adaugă  propunere schiţă
-NoDraftProposals=Nici o propunere schiţă
-CopyPropalFrom=Crează propunerea comercială prin copierea uneia existente
-CreateEmptyPropal=Crează propunerea comercială/deviz Vierge sau din lista de produse / servicii
-DefaultProposalDurationValidity=Durata validării implicite  a propunerii(în zile)
-UseCustomerContactAsPropalRecipientIfExist=Utilizați adresa de contact a clientului  în cazul în care este definită în loc de adresa terţului ca destinatarul propunerii
-ClonePropal=Clonează  propunere  comercială
-ConfirmClonePropal=Sunigur doriţi să clonaţi această propunere comercială <b>%s</b> ?
-ConfirmReOpenProp=Sigur doriţi să redeschideţi propunere comercială <b>%s</b> ?
-ProposalsAndProposalsLines=Propuneri Comerciale  si liniilor
-ProposalLine=Linie Propunere
+OtherPropals=Alte oferte
+AddToDraftProposals=Adaugă  ofertă schiţă
+NoDraftProposals=Nicio ofertă schiţă
+CopyPropalFrom=Crează ofertă comercială prin copierea uneia existente
+CreateEmptyPropal=Crează ofertă comercială/deviz nouă sau din lista de produse / servicii
+DefaultProposalDurationValidity=Durata validării implicite  a ofertei (în zile)
+UseCustomerContactAsPropalRecipientIfExist=Utilizați adresa de contact a clientului  în cazul în care este definită în loc de adresa terţului ca destinatarul ofertei
+ClonePropal=Clonează oferta comercială
+ConfirmClonePropal=Sigur doriţi să clonaţi această ofertă comercială <b>%s</b> ?
+ConfirmReOpenProp=Sigur doriţi să redeschideţi oferta comercială <b>%s</b> ?
+ProposalsAndProposalsLines=Oferte Comerciale  si linii
+ProposalLine=Linie Ofertă
 AvailabilityPeriod=Disponibilitate Livrare
 SetAvailability=Setează  disponibilitatea livrării
 AfterOrder=după comandă
@@ -89,12 +89,12 @@ AvailabilityTypeAV_2W=2 săptămâni
 AvailabilityTypeAV_3W=3 săptămâni
 AvailabilityTypeAV_1M=1 lună
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Reprezentant urmărire propunere
+TypeContact_propal_internal_SALESREPFOLL=Reprezentant urmărire ofertă
 TypeContact_propal_external_BILLING=Contact client  facturare propunere
-TypeContact_propal_external_CUSTOMER=Contact client urmărire propunere
+TypeContact_propal_external_CUSTOMER=Contact client urmărire ofertă
 # Document models
-DocModelAzurDescription=Model de propunerecomercială  completă (logo. ..)
-DocModelJauneDescription=Model propunere Jaune
+DocModelAzurDescription=Model de ofertă comercială  completă (logo. ..)
+DocModelJauneDescription=Model ofertă Jaune
 DefaultModelPropalCreate=Crează model implicit
-DefaultModelPropalToBill=Model implicit la închiderea unei propuneri comerciale (de facturat)
-DefaultModelPropalClosed=Model implicit la închiderea unei propuneri comerciale (nefacturat)
+DefaultModelPropalToBill=Model implicit la închiderea unei oferte comerciale (de facturat)
+DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (nefacturat)
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index b1d76156af1..ac7cdf554b2 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Livrari
 Shipment=Livrare
 Shipments=Livrari
 Receivings=Recepţii
-SendingsArea=Zona Livrari
+SendingsArea=Livrari
 ListOfSendings=Lista Livrari
 SendingMethod=Metodă Livrare
 SendingReceipt=Borderou Livrare
@@ -30,17 +30,17 @@ SendingsForSameOrder=Livrări pentru această comandă
 SendingsAndReceivingForSameOrder=Livrările şi recepţiile pentru această comandă
 SendingsToValidate=Livrări de validat
 StatusSendingCanceled=Anulată
-StatusSendingDraft=Nevalidată
+StatusSendingDraft=Schiţă
 StatusSendingValidated=Validată (produse  de livrat sau deja livrate)
 StatusSendingProcessed=Procesată
 StatusSendingCanceledShort=Anulată
-StatusSendingDraftShort=Nevalidată
+StatusSendingDraftShort=Schiţă
 StatusSendingValidatedShort=Validată
 StatusSendingProcessedShort=Procesată
 SendingSheet=Borderou de livrare
 Carriers=Transportatori
 Carrier=Transportator
-CarriersArea=Zona Transportatori
+CarriersArea=Transportatori
 NewCarrier=Transportatori Nou
 ConfirmDeleteSending=Sigur doriți să ștergeți această livrare ?
 ConfirmValidateSending=Sigur doriți să valdaţiaceastă livrare cu referinţa <b>%s</b> ?
diff --git a/htdocs/langs/ro_RO/sms.lang b/htdocs/langs/ro_RO/sms.lang
index 94fb3035879..c0865411c46 100644
--- a/htdocs/langs/ro_RO/sms.lang
+++ b/htdocs/langs/ro_RO/sms.lang
@@ -2,7 +2,7 @@
 Sms=Sms
 SmsSetup=Sms de configurare
 SmsDesc=Această pagină vă permite să definiţi opţiunile de globali de pe caracteristici SMS
-SmsCard=SMS Card
+SmsCard=Fişă SMS 
 AllSms=Toate SMS campanii de
 SmsTargets=Ţinte
 SmsRecipients=Ţinte
@@ -27,7 +27,7 @@ SmsResult=Rezultatul de trimiterea de SMS
 TestSms=Sms de testare
 ValidSms=Validare Sms
 ApproveSms=Aprobare Sms
-SmsStatusDraft=Proiect
+SmsStatusDraft=Schiţă
 SmsStatusValidated=Validate
 SmsStatusApproved=Aprobat
 SmsStatusSent=Trimisa
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index b951fc80a47..0f237212e6f 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -2,7 +2,7 @@
 WarehouseCard=Fişă Depozit
 Warehouse=Depozit
 Warehouses=Depozite
-NewWarehouse=Depozit  nou
+NewWarehouse=Depozit / Stoc  Nou 
 WarehouseEdit=Modifică depozit
 MenuNewWarehouse=Depozit nou
 WarehouseOpened=Depozit deschis
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie
 CorrectStock=Corectează stoc
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
-StocksArea=Zona Depozite
+StocksArea=Depozite
 Location=Locație
 LocationSummary=Nume scurt locaţie
 NumberOfDifferentProducts=Numărul de produse diferite
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 04593e3e5f2..b21a884733d 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -22,7 +22,7 @@ ProductHasAlreadyReferenceInThisSupplier=Acest produs are deja o referinţă la
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Acest furnizor este deja asociat cu referinta: % s
 NoRecordedSuppliers=Nici un furnizor înregistrat
 SupplierPayment=Plată Furnizor
-SuppliersArea=Zona Furnizori
+SuppliersArea=Furnizori
 RefSupplierShort=Ref. furnizor
 Availability=Disponibilitate
 ExportDataset_fournisseur_1=Facturi furnizori şi linii facturi
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 1846842c439..a606801617c 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
 Trip=Deplasare
 Trips=Deplasări
-TripsAndExpenses=Decont de cheltuieli
-TripsAndExpensesStatistics=Statistici Deconturi de cheltuieli
-TripCard=Fişă Cheltuieli
+TripsAndExpenses=Deplasări şi cheltuieli
+TripsAndExpensesStatistics=Statistici Deplasări şi cheltuieli
+TripCard=Fişă Deplasare
 AddTrip=Creare deplasare
-ListOfTrips=Lista cheltuieli
+ListOfTrips=Lista deplasări
 ListOfFees=Lista note cheltuieli
-NewTrip=Decont de cheltuieli nou
+NewTrip=Deplasare nouă
 CompanyVisited=Societatea / Instituţia vizitată
 Kilometers=Kilometri
 FeesKilometersOrAmout=Valoarea  sau km
 DeleteTrip=Şterge Deplasare
-ConfirmDeleteTrip=Sigur doriţi să ştergeţi acest Decont de Cheltuieli ?
+ConfirmDeleteTrip=Sigur doriţi să ştergeţi aceasăt Deplasarei ?
 TF_OTHER=Altele
 TF_LUNCH=Prânz
 TF_TRIP=Deplasare
-ListTripsAndExpenses=Lista Deconturi de cheltuieli
-ExpensesArea=Zona Deconturi de cheltuieli
-SearchATripAndExpense=Caută Decont de cheltuieli
+ListTripsAndExpenses=Lista Deplasări şi cheltuieli
+ExpensesArea=Deplasări şi cheltuieli
+SearchATripAndExpense=Caută o deplasare şi cheltuială
 ClassifyRefunded=Clasează "Rambursată"
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index e6a719a0b0e..f68a797e3f1 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=Zona HRM 
-UserCard=Utilizator carte
-ContactCard=Contact carte
-GroupCard=Grupul de carte
+HRMArea=HRM 
+UserCard=Fişă Utilizator 
+ContactCard=Fişă Contact
+GroupCard=Fişă Grup
 NoContactCard=Nu carte între persoane de contact
 Permission=Permission
 Permissions=Permisiuni
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 0793f5019ea..a822e29dacf 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Permanent comenzi zona
-CustomersStandingOrdersArea=Clienţii ordine de plată zona
+StandingOrdersArea=Ordine de plată
+CustomersStandingOrdersArea=Ordine de plată clienţi
 StandingOrders=Ordine de plată
 StandingOrder=Ordine de plată
-NewStandingOrder=New permanent pentru
-StandingOrderToProcess=Pentru a procesa
-StandingOrderProcessed=Prelucrate
+NewStandingOrder=Ordin nou de plată
+StandingOrderToProcess=De procesat
+StandingOrderProcessed=Procesate
 Withdrawals=Retrageri
 Withdrawal=Retragerea
-WithdrawalsReceipts=Retragerile încasări
-WithdrawalReceipt=Retragere de la primirea
+WithdrawalsReceipts=Chitanţe retrageri
+WithdrawalReceipt=Chitanţă retrageri
 WithdrawalReceiptShort=Chitanţă
-LastWithdrawalReceipts=Ultima %s retragere încasări
+LastWithdrawalReceipts=Ultimele %s chitanţe retrageri
 WithdrawedBills=Withdrawed facturi
-WithdrawalsLines=Retragerile de linii de
+WithdrawalsLines=Linii retrageri
 RequestStandingOrderToTreat=Cerere pentru ordine de plată de procesat
 RequestStandingOrderTreated=Cerere pentru ordine de plată procesată
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Nu a fost încă posibil. Statutul Withdraw  trebuie să fie setat la "creditat" înaintea declarării respinge pe liniile specifice.
@@ -26,13 +26,13 @@ AmountToWithdraw=Suma de a se retrage
 WithdrawsRefused=Retrage refuzat
 NoInvoiceToWithdraw=Nici un client nu facturii de plată, în modul de "retragere" este în aşteptare. Du-te la "Retrageţi fila" pe factura cardul pentru a face o cerere.
 ResponsibleUser=Responsabil de utilizator
-WithdrawalsSetup=Retragerea setup
-WithdrawStatistics=Retrage "statistici
+WithdrawalsSetup=Setare retragere
+WithdrawStatistics=Statistici Retrageri
 WithdrawRejectStatistics=Retrageţi respinge "statistici
-LastWithdrawalReceipt=Ultima %s retragerea încasări
+LastWithdrawalReceipt=Ultimele %s retrageri
 MakeWithdrawRequest=Face o retragă cererea
-ThirdPartyBankCode=Terţă parte de cod bancar
-ThirdPartyDeskCode=A treia parte birou cod
+ThirdPartyBankCode=Cod terţ bancă
+ThirdPartyDeskCode=Cod terţ birou
 NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN.
 ClassCredited=Clasifica creditat
 ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată pe contul bancar?
@@ -53,14 +53,14 @@ StatusUnknown=Necunoscut
 StatusWaiting=Aşteptare
 StatusTrans=Trimis
 StatusCredited=Creditate
-StatusRefused=A refuzat
+StatusRefused=Refuzat
 StatusMotif0=Nespecificat
 StatusMotif1=Fonduri insuficiente
 StatusMotif2=Cerere contestată
 StatusMotif3=Nici o retragere pentru a
 StatusMotif4=Clientul Ordine
 StatusMotif5=RIB inutilizabil
-StatusMotif6=Cont fără echilibru
+StatusMotif6=Cont fără sold
 StatusMotif7=Hotărâre judecătorească
 StatusMotif8=Alte motive
 CreateAll=Retragă toate
@@ -92,6 +92,6 @@ InfoTransSubject=Transmiterea %s ordine permanente la banca
 InfoTransMessage=Ordinul de plată %s a fost trimis la bancă de %s  %s. <br><br>
 InfoTransData=Suma: %s <br> Metoda: %s <br> Data: %s
 InfoFoot=Acesta este un mesaj automat trimis de Dolibarr
-InfoRejectSubject=Pentru a refuzat permanent
+InfoRejectSubject=Ordin de plată refuzat
 InfoRejectMessage=Bună ziua, <br><br> ordinul de plata al facturii %s de la societatea %s în valoare de %s a fost refuzat de către bancă.<br><br>--<br>%s
 ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index d14dacf619c..54287b2ab5e 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -2,8 +2,8 @@
 WorkflowSetup=Configurare Modul Flux de Lucru
 WorkflowDesc=Acest modul vă permite modificarea comportamentului  acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce  doriţi în ordinea dorită). Puteți activa acțiunile\nautomate de care sunteti interesat
 ThereIsNoWorkflowToModify=Nu există nici un flux de lucru  modificabil pentru modulele  activate.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o propunere comercială este semnată
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o propunere comercială este semnată
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o ofertă comercială este semnată
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o ofertă comercială este semnată
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează o factură client automat, după ce un contract este validat
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o comandă client este închisă
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasează propunere comercială legată ca facturată când comanda client este setată ca plătită
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 2b4fde49279..977dcb96f72 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -3,7 +3,7 @@ CHARSET=UTF-8
 
 Accounting=Računovodstvo
 Globalparameters=Globalni parametri
-Chartofaccounts=Kontni
+Chartofaccounts=Kontni plan
 Fiscalyear=Fiskalna leta
 Menuaccount=Računovodski izkazi
 Menuthirdpartyaccount=Thirdparty računi
@@ -17,20 +17,20 @@ Modelcsv=Model izvoza
 Selectmodelcsv=Izberite model izvoza
 Modelcsv_normal=Classic izvoz
 Modelcsv_CEGID=Izvoz v CEGID Expert
-BackToChartofaccounts=Vrni se kontni
+BackToChartofaccounts=Prikaz kontnega plana
 Back=Return
 
-Definechartofaccounts=Določite kontni
-Selectchartofaccounts=Izberite kontni
+Definechartofaccounts=Določite kontni plan
+Selectchartofaccounts=Izberite kontni plan
 Validate=Potrjevanje
 Addanaccount=Dodaj računovodskega račun
 AccountAccounting=Računovodstvo račun
-Ventilation=Breakdown
+Ventilation=Pregled
 ToDispatch=Odpremo
 Dispatched=Odpošlje
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Pregled kupcev
+SuppliersVentilation=Pregled dobaviteljev
 TradeMargin=Trgovska marža
 Reports=Poročila
 ByCustomerInvoice=Z računov strank,
@@ -45,9 +45,9 @@ WriteBookKeeping=Evidenčnih računov v glavno knjigo
 Bookkeeping=Glavna knjiga
 AccountBalanceByMonth=Stanje na računu po mesecu
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
+AccountingVentilation=Pregled računov
+AccountingVentilationSupplier=Pregled računov dobaviteljev
+AccountingVentilationCustomer=Pregled računov kupcev
 Line=Line
 
 CAHTF=Skupaj nakup dobavitelj HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Prezračevane linije računa
 IntoAccount=Obračunskega računa
 
 Ventilate=Prezračiti
-VentilationAuto=Automatic breakdown
+VentilationAuto=Avtomatski pregled
 
 Processing=Processing
 EndProcessing=Konec obdelave
diff --git a/htdocs/langs/sl_SI/deliveries.lang b/htdocs/langs/sl_SI/deliveries.lang
index 158fb6372b9..2f8319850fb 100644
--- a/htdocs/langs/sl_SI/deliveries.lang
+++ b/htdocs/langs/sl_SI/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Dostavil :
 Sender=Pošiljatelj
 Recipient=Prejemnik
 ErrorStockIsNotEnough=Zaloga je premajhna
+Shippable=Možna odprema
+NonShippable=Ni možna odprema
diff --git a/htdocs/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang
index 47d74f64774..3a15500a30a 100644
--- a/htdocs/langs/sl_SI/dict.lang
+++ b/htdocs/langs/sl_SI/dict.lang
@@ -290,6 +290,8 @@ CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=CFP Francs
 CurrencySingXPF=CFP Franc
 CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=pais
 CurrencyThousandthSingTND=tisočina
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
index 0af6246a824..2a962d2375c 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -31,8 +31,8 @@ DonationRecipient=Prejemnik donacije
 ThankYou=Hvala
 IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku
 MinimumAmount=Najmanjši znesek je %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
+FreeTextOnDonations=Poljubno besedilo v nogi
+FrenchOptions=Opcije za Francijo
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index dc8de0063da..e79da2ce081 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Dopusti
+CPTitreMenu=Dopusti
 MenuReportMonth=Mesečno stanje
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Izdelaj zahtevek za dopust
+NotActiveModCP=Za ogled te strani morate aktivirati modul za dopust
+NotConfigModCP=Za ogled te strani morate konfigurirati modul za dopust. To lahko storite s klikom <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> tukaj </ a>.
+NoCPforUser=Nimate več na voljo nobenega dneva.
+AddCP=Izdelaj zahtevek za dopust
 Employe=Zaposleni
 DateDebCP=Začetni datum
 DateFinCP=Končni datum
@@ -18,24 +18,24 @@ ApprovedCP=Odobreno
 CancelCP=Preklicano
 RefuseCP=Zavrnjeno
 ValidatorCP=Odobril
-ListeCP=List of leaves
+ListeCP=Seznam dopustov
 ReviewedByCP=Pregledal
 DescCP=Opis
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Ustvari zahtevek za dopust
+DelayToRequestCP=Zahtevek za dopust mora biti vložen vsaj <b>%s dan(dni)</b> prej.
+MenuConfCP=Urejanje stanja dopusta
+UpdateAllCP=Posodobitev dopustov
+SoldeCPUser=Stanje dopusta je <b>%s</b> dni.
 ErrorEndDateCP=Končni datum mora biti večji od začetnega.
 ErrorSQLCreateCP=Pri ustvarjanju SQL je prišlo do napake
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Prišlo je do napake, zahtevek za dopust ne obstaja
 ReturnCP=Nazaj na prejšnjo stran
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Nimate dovoljenja za branje tega zahtevka za dopust
+InfosCP=Informacija o zahtevku za dopust
 InfosWorkflowCP=Pretok informacij
 RequestByCP=Zahteval
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Zahtevek za dopust
+NbUseDaysCP=Število porabljenih dni dopusta
 EditCP=Uredi
 DeleteCP=Izbriši
 ActionValidCP=Potrdi
@@ -43,25 +43,25 @@ ActionRefuseCP=Zavrnitev
 ActionCancelCP=Razveljavi
 StatutCP=Status
 SendToValidationCP=Pošlji v potrditev
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=Brisanje zahtevka za dopust
+ConfirmDeleteCP=Potrditev izbrisa tega zahtevka za dopust?
+ErrorCantDeleteCP=Napaka, nimate pravice za brisanje tega zahtevka za dopust.
+CantCreateCP=Nimate dovoljenja za izdelavo zahtevka za dopust
+InvalidValidatorCP=Izbrati morate osebo, ki bo potrdila vaš zahtevek za dopust.
+CantUpdate=Ne morete posodobiti tega zahtevka za dopust.
 NoDateDebut=Izbrati morate začetni datum.
 NoDateFin=Izbrati morate končni datum.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ErrorDureeCP=Vaš zahtevek za dopust ne vsebuje delovnih dni.
+TitleValidCP=Odobri zahtevan dopust
+ConfirmValidCP=Ali zares želite odobriti ta zahtevek za dopust ?
 DateValidCP=Datum odobritve
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Pošlji zahtevek za dopust
+ConfirmToValidCP=Ali zares želite poslati zahtevek za dopust?
+TitleRefuseCP=Zavrni zahtevek za dopust
+ConfirmRefuseCP=Ali zares želite zavrniti zahtevek za dopust?
 NoMotifRefuseCP=Izbrati morate razlog za zavrnitev zahtevka.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Preklic zahtevka za dopust
+ConfirmCancelCP=Ali zares želite preklicati zahtevek za dopust?
 DetailRefusCP=Razlog za zavrnitev
 DateRefusCP=Datum zavrnitve
 DateCancelCP=Datum preklica
@@ -71,42 +71,42 @@ MotifCP=Razlog
 UserCP=Uporabnik
 ErrorAddEventToUserCP=Prišlo je do napake pri dodajanju izredne odsotnosti.
 AddEventToUserOkCP=Dodajanje izredne odsotnosti je zaključeno.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
+MenuLogCP=Ogled dnevnika zahtevkov za dopust
+LogCP=Dnevnik posodobitev dni za dopust, ki so na voljo
 ActionByCP=Izvajalec
 UserUpdateCP=Za uporabnika
 PrevSoldeCP=Prejšnje stanje
 NewSoldeCP=Novo stanje
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Zahtevek za dopust za to obdobje je bil že vložen.
 UserName=Priimek
 Employee=Zaposleni
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Prvi dan dopusta
+LastDayOfHoliday=Zadnji dan dopusta
 HolidaysMonthlyUpdate=Mesečna posodobitev
 ManualUpdate=Ročna posodobitev
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Preklic zahtevka za dopust
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
+ConfCP=Konfiguracija modula zahtevkov za dopust
 DescOptionCP=Opis opcij
 ValueOptionCP=Vrednost
-GroupToValidateCP=Group with the ability to approve leave requests
+GroupToValidateCP=Skupina z dovoljenjem za odobravanje zahtevkov za dopust
 ConfirmConfigCP=Potrditev konfiguracije
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Zadnja avtomatska posodobitev odobrenih dopustov
 UpdateConfCPOK=Uspešno posodobljeno.
 ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno.
-AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
+AddCPforUsers=Prosimo dodajte stanje dopustov uporabnikov s <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom tukaj</a>.
+DelayForSubmitCP=Zadnji rok za izdelavo zahtevka za dopust
+AlertapprobatortorDelayCP=Opozori, če zahtevek za dopust ni bil vložen pravočasno
+AlertValidatorDelayCP=Opozori, če zahtevek za dopust presega možno trajanje
+AlertValidorSoldeCP=Opozori, če zahtevana dolžina dopusta presega stanje dopusta vlagatelja
+nbUserCP=Število uporabnikov, ki jih podpira modul za dopuste
+nbHolidayDeductedCP=Število dni dopusta, ki se odštejejo za vsak izkoriščen dan
+nbHolidayEveryMonthCP=Število dni dopusta, ki se dodajo vsak mesec
+Module27130Name= Upravljanje zahtevkov za dopust
+Module27130Desc= Upravljanje zahtevkov za dopust
+TitleOptionMainCP=Osnovne nastavitve zahtevkov za dopust
+TitleOptionEventCP=Nastavitve zahtevkov za dopust za aktivnosti
 ValidEventCP=Potrdi
 UpdateEventCP=Posodobitev aktivnosti
 CreateEventCP=Kreiraj
@@ -126,23 +126,23 @@ UpdateEventOptionCP=Posodobi
 ErrorMailNotSend=Pri pošiljanju e-pošte je prišlo do napake:
 NoCPforMonth=Ta mesec ni odsotnosti.
 nbJours=Število dni
-TitleAdminCP=Configuration of Leaves
+TitleAdminCP=Konfiguracija dopustov
 #Messages
 Hello=Pozdravljeni
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+HolidaysToValidate=Potrdi zahtevke za dopust
+HolidaysToValidateBody=Spodaj je zahtevek za potrditev dopustov
+HolidaysToValidateDelay=Ta zahtevek za dopust se bo izvedel v obdobju manj kot %s dni.
+HolidaysToValidateAlertSolde=Uporabnik, ki je vložil ta zahtevek za dopust, nima na voljo dovolj dni dopusta.
+HolidaysValidated=Potrjeni zahtevki za dopust
+HolidaysValidatedBody=Vaš zahtevek za dopust od %s do %s je bil potrjen.
+HolidaysRefused=Zahtevek je bil zavrnjen
+HolidaysRefusedBody=Vaš zahtevek za dopust od %s do %s je bil zavrnjen zaradi naslednjih razlogov :
+HolidaysCanceled=Preklican zahtevek za dopust
+HolidaysCanceledBody=Vaš zahtevek za dopust od %s do %s je bil preklican.
+Permission20000=Branje vaših lastnih zahtevkov za dopust
+Permission20001=Kreiranje/spreminjanje vašega zahtevka za dopust
+Permission20002=Kreiranje/spreminjanje zahtevkov za dopust za vse
+Permission20003=Brisanje zahtevkov za dopust
+Permission20004=Nastavitev dni za dopust za uporabnika
+Permission20005=Pregled dnevnika spremenjenih zahtevkov za dopust
+Permission20006=Branje mesečnega poročila o dopustih
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index fe6b027fac1..e4700cda0c7 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -115,7 +115,7 @@ SentBy=Poslal
 MailingNeedCommand=Zaradi varnostnih razlogov je pošiljanje e-pošte boljše, če se izvrši iz ukazne vrstice. Če imate to potrebo, prosite vašega administratorja za zagon naslednjega ukaza za pošiljanje e-pošte vsem prejemnikom:
 MailingNeedCommand2=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji.
 ConfirmSendingEmailing=Če ne morete, ali jo raje pošiljate preko www brskalnika, prosimo potrdite, da zares želite zdaj poslati pošto iz vašega brskalnika ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Opomba: Pošiljanje e-pošte preko spletnega vmesnika je večkrat izvršeno zaradi varnostnih razlogov in časovnih omejitev, <b>%s</b> prejemnikov naenkrat za vsako pošiljanje.
 TargetsReset=Prekliči seznam
 ToClearAllRecipientsClickHere=Kliknite tukaj za preklic seznama prejemnikov te e-pošte
 ToAddRecipientsChooseHere=Dodajanje prejemnikov z izbiro s seznamov
@@ -133,9 +133,9 @@ Notifications=Obvestila
 NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti
 ANotificationsWillBeSent=1 obvestilo bo poslano z e-pošto
 SomeNotificationsWillBeSent=%s obvestil bo poslanih z e-pošto
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Aktiviraj nov cilj za e-poštno obvestilo
+ListOfActiveNotifications=Seznam vseh aktivnih ciljev za e-poštna obvestila
 ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
+MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
+MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
diff --git a/htdocs/langs/sl_SI/printipp.lang b/htdocs/langs/sl_SI/printipp.lang
index 835e6827f12..741b5f6666c 100644
--- a/htdocs/langs/sl_SI/printipp.lang
+++ b/htdocs/langs/sl_SI/printipp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PrintIPPSetup=Nastavitev modula za direktno tiskanje
+PrintIPPDesc=Ta modul doda gumb za direktno pošiljanje dokumenta na tiskalnik. Zahteva nameščen sistem Linux z CUPS
+PRINTIPP_ENABLED=Prikaži ikono za "Direktno tiskanje" na seznamu dokumentov
+PRINTIPP_HOST=Tiskalniški strežnik
+PRINTIPP_PORT=Vrata
+PRINTIPP_USER=Uporabniško ime
+PRINTIPP_PASSWORD=Geslo
+NoPrinterFound=Ni najden noben tiskalnik (preveri nastavitve CUPS)
+FileWasSentToPrinter=Datoteka %s je bila poslana na tiskalnik
+NoDefaultPrinterDefined=Ni izbran privzet tiskalnik
+DefaultPrinter=Privzet tiskalnik
+Printer=Tiskalnik
+CupsServer=CUPS Strežnik
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 264a54e753c..22a9c532922 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -56,8 +56,8 @@ UseSearchToSelectCompany=Använd automatisk komplettering fält för att välja
 ActivityStateToSelectCompany= Lägg till ett filter alternativ för att visa / dölja thirdparties som för närvarande är i aktivitet eller har upphört att
 UseSearchToSelectContactTooltip=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectContact=Använd automatisk komplettering fält för att välja kontakt (istället för att använda en listruta).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+DelaiedFullListToSelectCompany=Vänta du trycker på en tangent innan lastning innehåll thirdparties combo listan (Detta kan öka prestandan om du har ett stort antal thirdparties)
+DelaiedFullListToSelectContact=Vänta du trycker på en tangent innan lastning innehållet i kontakt combo listan (Detta kan öka prestandan om du har ett stort antal kontakter)
 SearchFilter=Sök filter alternativ
 NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
 ViewFullDateActions=Visa fullständig datum åtgärder i tredje blad
@@ -210,7 +210,7 @@ ModulesJobDesc=Business moduler ge enkla fördefinierade inställningar för Dol
 ModulesMarketPlaceDesc=Du kan hitta fler moduler för att ladda ner på externa webbplatser på Internet ...
 ModulesMarketPlaces=Fler moduler ...
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+DoliPartnersDesc=Lista med några företag som kan ge / utveckla on-demand-moduler eller funktioner (Notera: någon Open Source företag knowning PHP kan ge dig specifik utveckling)
 WebSiteDesc=Webbplats leverantörer kan du söka för att hitta fler moduler ...
 URL=Länk
 BoxesAvailable=Rutor
@@ -447,7 +447,7 @@ Module55Desc=Barcode ledning
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
 Module57Name=Stående order
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Stående order och återkallande hantering. Inkluderar även generation SEPA-fil för europeiska länder.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -478,8 +478,8 @@ Module320Name=RSS-flöde
 Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor
 Module330Name=Bokmärken
 Module330Desc=Bokmärk ledning
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projekt / Möjligheter / Leads
+Module400Desc=Förvaltning av projekt, möjligheter eller leads. Du kan sedan tilldela varje element (faktura, beställning, förslag, ingripande, ...) till ett projekt och få ett övergripande vy från projekt vyn.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
@@ -498,8 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Dynamiska priser
+Module2200Desc=Aktivera användningen av matematiska uttryck för priser
 Module2300Name=Cron
 Module2300Desc=Hantera planlagda uppgifter
 Module2400Name=Agenda
@@ -508,8 +508,8 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
 Module2600Name=WebServices
 Module2600Desc=Aktivera Dolibarr webbtjänster server
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2650Name=WebServices (klient)
+Module2650Desc=Aktivera Dolibarr webbtjänster klient (Kan användas för att driva data / ansökningar till externa servrar. Leverantörs order stöds bara för stunden)
 Module2700Name=Gravatar
 Module2700Desc=Använder online Gravatar tjänst (www.gravatar.com) för att visa foto av användare / medlemmar (hittade med sin e-post). Behöver en internet
 Module2800Desc=FTP-klient
@@ -524,7 +524,7 @@ Module6000Desc=Workflow management
 Module20000Name=Lämna Framställningar förvaltning
 Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
 Module39000Name=Produktsats
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module39000Desc=Batch eller serienummer, äter-by och bäst före-datum hantering på produkter
 Module50000Name=Paybox
 Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox
 Module50100Name=Point of sales
@@ -534,7 +534,7 @@ Module50200Desc=Modul för att erbjuda en online-betalning sidan med kreditkort
 Module50400Name=Redovisning (avancerad)
 Module50400Desc=Bokföring och redovisning (dubbla parter)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module54000Desc=Direktutskrift (utan att öppna dokumenten) använder Cups IPP-gränssnitt (skrivare måste vara synlig från servern, och CUPS måste vara installerad på servern).
 Module55000Name=Öppen Poll
 Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...)
 Module59000Name=Marginaler
@@ -786,7 +786,7 @@ DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
 DictionaryAccountancyplan=Kontoplan
 DictionaryAccountancysystem=Modeller för kontoplan
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=E-postmeddelanden mallar
 SetupSaved=Setup sparas
 BackToModuleList=Tillbaka till moduler lista
 BackToDictionaryList=Tillbaka till ordlistan
@@ -896,7 +896,7 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Aktivera HTML5 (Develope - Endast tillgängligt på Eldy mall)
 SystemSuccessfulyUpdated=Att ditt system har uppdaterats
 CompanyInfo=Företag / stiftelse information
 CompanyIds=Företag / stiftelse identiteter
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index df18edf920f..b9c1c0343b4 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
 ActionsForUser=Händelser för användaren
 ActionsForUsersGroup=Händelser för alla användare av grupp
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Händelse delad
 AllMyActions= Alla mina handlingar och uppgifter
 AllActions= Alla åtgärder / uppgifter
 ViewList=Visa lista
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index 0d5b012104f..8fc4e33c6e3 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Förteckning över löpande kontrakt linjer
 ListOfRunningServices=Förteckning över löpande tjänster
 NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt)
 BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt
-LastContracts=Last %s contracts
+LastContracts=Senaste %s kontrakt
 LastActivatedServices=Senaste %s aktiverade tjänster
 LastModifiedServices=Senast %s uppdaterade tjänster
 EditServiceLine=Redigera servicelinjen
@@ -91,7 +91,7 @@ ListOfServicesToExpire=Förteckning över tjänster som löper ut
 NoteListOfYourExpiredServices=Denna förteckning omfattar endast tjänster från avtal med tredje part i förhållande till vilka du är säljare.
 StandardContractsTemplate=Standardkontrakt mall
 ContactNameAndSignature=För %s, namn och underskrift:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+OnlyLinesWithTypeServiceAreUsed=Endast rader med typ "Service" kommer att klonas.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Säljare som tecknar avtal
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index e05970fa6f1..c3346d18dfa 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -138,24 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu koppla
 ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
 ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorPriceExpression1=Kan inte tilldela till konstant '%s'
+ErrorPriceExpression2=Kan inte omdefiniera inbyggd funktion %s
+ErrorPriceExpression3=Odefinierad variabel '%s' i funktionsdefinition
+ErrorPriceExpression4=Otillåten karaktär "%s '
+ErrorPriceExpression5=Oväntad '%s'
+ErrorPriceExpression6=Fel antal argument (%s givet, %s förväntades)
+ErrorPriceExpression8=Oväntad operatör '%s'
+ErrorPriceExpression9=Ett oväntat fel uppstod
+ErrorPriceExpression10=Iperator %s saknar operand
+ErrorPriceExpression11=Förväntar '%s'
+ErrorPriceExpression14=Division med noll
+ErrorPriceExpression17=Odefinierad variabel '%s'
+ErrorPriceExpression19=Expression hittades inte
+ErrorPriceExpression20=Tomma uttryck
+ErrorPriceExpression21=Tomt resultat '%s'
+ErrorPriceExpression22=Negativt resultat '%s'
+ErrorPriceExpressionInternal=Internt fel '%s'
+ErrorPriceExpressionUnknown=Okänt fel '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 1fcf12f9f2b..3fb67836367 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -203,4 +203,4 @@ MembersByNature=Medlemmar på sort
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkten används för beställnings linje i fakturan: %s
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index d9456de8b17..51817febe22 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -242,8 +242,8 @@ ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
 PriceByCustomerLog=Pris per kundlogg
 MinimumPriceLimit=Minimipris kan inte vara lägre än %s
 MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
-PriceMode=Price mode
-PriceNumeric=Number
+PriceExpressionEditor=Pris uttryck redigerare
+PriceExpressionSelected=Valda pris uttryck
+PriceExpressionEditorHelp="pris = 2 + 2" eller "2 + 2" för det pris <br> ExtraFields är variabler som "# options_myextrafieldkey # * 2" <br> Det finns speciella variabler som # mängd # och # tva_tx # <br> Använd ; att separera uttryck
+PriceMode=Prisläge
+PriceNumeric=Nummer
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index b771cfecc0b..ad639b44769 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -36,8 +36,8 @@ TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Uppgifter om öppnade projekt
+WorkloadNotDefined=Arbetsbelastning inte definierad
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mina uppgifter
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 49cab6a2f77..3c34fb7a2c1 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -79,11 +79,11 @@ CreditDate=Krediter på
 WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
 ShowWithdraw=Visa Dra
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Denna flik tillåter dig att begära en stående beställning. När gjort, gå in på menyn Bank-> Återkallande att hantera den stående beställningen. När stående order är stängd, kommer betalningen på faktura automatiskt registreras, och fakturan stängs om resten att betala är null.
 WithdrawalFile=Utträde fil
 SetToStatusSent=Ställ in på status "File Skickat"
 ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Statistik efter status linjer
 
 ### Notifications
 InfoCreditSubject=Betalning av %s stående order av banken
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index f481824e463..5af51d0e2ba 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -29,8 +29,8 @@ Ventilation=Analiz
 ToDispatch=Gönderilecek
 Dispatched=Gönderilmiş
 
-CustomersVentilation=Müşterilerin analizi
-SuppliersVentilation=Tedarikçilerin analizi
+CustomersVentilation=Müşteri analizi
+SuppliersVentilation=Tedarikç analizi
 TradeMargin=Ticaret oranı
 Reports=Raporlar
 ByCustomerInvoice=Müşteri faturalarına göre
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index f1710cd2aad..082c6c9cd44 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -56,8 +56,8 @@ UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak y
 ActivityStateToSelectCompany= Halen faaliyette olan olan ya da durdurulmuş olan üçüncü partilerin görünmesi/gizlenmesi için bir süzgeç seçeneği ekleyin
 UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+DelaiedFullListToSelectCompany=Üçüncü parti içeriği açılır listesini yüklemek için bir düğmeye basmadan önce bekleyin (Çok sayıda üçüncü parti varsa, beklemek performansı arttıracaktır)
+DelaiedFullListToSelectContact=Açılır liste içeriğini yüklemek için bir düğmeye basmadan önce bekleyin (Çok sayıda üçüncü parti varsa, beklemek performansı arttıracaktır)
 SearchFilter=Arama süzgeçi seçenekleri
 NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
 ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster
@@ -210,7 +210,7 @@ ModulesJobDesc=İş modülleri belirli bir iş için önceden tanımlanmış bas
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesMarketPlaces=Daha çok modül...
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+DoliPartnersDesc=İstek üzerine modül ve özellik yapan/geliştiren bazı firmaların listesi. (Not: Açık kaynak kullanan PHP bilen herhangi bir firma size özel geliştirme hizmetleri sağlayabilir)
 WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları...
 URL=Bağlantı
 BoxesAvailable=Kutular mevcut
@@ -447,7 +447,7 @@ Module55Desc=Barkod yönetimi
 Module56Name=Telefon
 Module56Desc=Telefon entegrasyonu
 Module57Name=Ödeme talimatları
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Ödeme talimatları ve para çekme yönetimi. Aynı zamanda Avrupa ülkeleri için SEPA belgelerinin oluşturulmasını da içerir.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -896,7 +896,7 @@ PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Html5 i etkinleştir (Geliştirme - Yalnızca Eldy şablonunda mevcut)
 SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi
 CompanyInfo=Firma/dernek bilgileri
 CompanyIds=Firma/dernek kimlikleri
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 4dc82ae066f..6ba800e4820 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -29,7 +29,7 @@ ActionsToDoBy=Etkinlikten etkilenen
 ActionsDoneBy=Etkinliği yapan
 ActionsForUser=Kullanıcı etkinlikleri
 ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Etkinlik için görevlendirilen
 AllMyActions= Tüm etkinliklerim/görevlerim
 AllActions= Tüm etkinlikler/görevler
 ViewList=Liste görünümü
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index d5b9448378c..69cb8b4606c 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -91,7 +91,7 @@ ListOfServicesToExpire=Süresi dolacak Hizmetler Listesi
 NoteListOfYourExpiredServices=Bu listede yalnızca satış temsilcisi olarak atandığınız üçüncü partilere ait hizmet sözleşmeleri bulunur.
 StandardContractsTemplate=Standart sözleşme kalıbı
 ContactNameAndSignature=%s için, ad ve imza
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+OnlyLinesWithTypeServiceAreUsed=Yalnızca "Hizmet" türündeki satırlar klonlanacaktır.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sözleşmeyi imzalalayacak satış temsilcisi
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index ed188e7fdb8..ce113a437a0 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -79,11 +79,11 @@ CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
 ShowWithdraw=Para çekme göster
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Bu sekme bir ödeme talimatı isteği yapmanızı sağlar. Yaptıktan sonra, ödeme talimatı yönetimi için Banka->Para çekme menüsüne gidin. Ödeme talimatı kapatıldıktan sonra, fatura ödemesi otomatik olarak kaydedilecek ve eğer bakiye sıfırsa fatura kapatılacaktır.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
-StatisticsByLineStatus=Statistics by status of lines
+StatisticsByLineStatus=Durum satırlarına göre istatistkler
 
 ### Notifications
 InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 6229c7c4a90..eb6a21adcba 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -6,9 +6,9 @@ Products=Sản phẩm
 Services=Dịch vụ
 Product=Sản phẩm
 Service=Dịch vụ
-ProductId=Sản phẩm / dịch vụ id
+ProductId=Số ID Sản phẩm/dịch vụ
 Create=Tạo
-Reference=Tài liệu tham khảo
+Reference=Tham chiếu
 NewProduct=Sản phẩm mới
 NewService=Dịch vụ mới
 ProductCode=Mã sản phẩm
@@ -22,10 +22,10 @@ ProductAccountancySellCode=Mã kế toán (bán)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
-ProductsAndServicesOnSell=Sản phẩm có sẵn và dịch vụ
-ProductsAndServicesNotOnSell=Sản phẩm cũ và Dịch vụ
-ProductsAndServicesStatistics=Sản phẩm và dịch vụ thống kê
-ProductsStatistics=Sản phẩm thống kê
+ProductsAndServicesOnSell=Sản phẩm và dịch vụ có sẵn
+ProductsAndServicesNotOnSell=Sản phẩm và dịch vụ lỗi thời
+ProductsAndServicesStatistics=Thống kê Sản phẩm và Dịch vụ
+ProductsStatistics=Thống kê Sản phẩm
 ProductsOnSell=Sản phẩm có sẵn
 ProductsNotOnSell=Sản phẩm lỗi thời
 ProductsOnSellAndOnBuy=Sản phẩm không phải để bán cũng không mua
@@ -33,15 +33,15 @@ ServicesOnSell=Dịch vụ có sẵn
 ServicesNotOnSell=Dịch vụ lỗi thời
 ServicesOnSellAndOnBuy=Dịch vụ không phải để bán cũng không mua
 InternalRef=Tham khảo nội bộ
-LastRecorded=Sản phẩm cuối cùng / dịch vụ bán ghi
-LastRecordedProductsAndServices=Cuối% s ghi nhận sản phẩm / dịch vụ
-LastModifiedProductsAndServices=Cuối% s sửa đổi sản phẩm / dịch vụ
-LastRecordedProducts=Cuối% của sản phẩm ghi
-LastRecordedServices=Dịch vụ cuối% s ghi
+LastRecorded=Sản phẩm/dịch vụ được bán cuối cùng
+LastRecordedProductsAndServices=Sản phẩm/dịch vụ %s được ghi cuối cùng
+LastModifiedProductsAndServices=Sản phẩm/dịch vụ %s được sửa cuối cùng
+LastRecordedProducts=Sản phẩm %s cuối cùng được ghi
+LastRecordedServices=Dịch vụ %s cuối cùng được ghi
 LastProducts=Sản phẩm cuối cùng
-CardProduct0=Sản phẩm thẻ
-CardProduct1=Dịch vụ thẻ
-CardContract=Thẻ đồng
+CardProduct0=Thẻ Sản phẩm
+CardProduct1=Thẻ Dịch vụ
+CardContract=Thẻ Hợp đồng
 Warehouse=Kho
 Warehouses=Các kho hàng
 WarehouseOpened=Kho mở
@@ -52,61 +52,61 @@ Movement=Chuyển kho
 Movements=Danh sách chuyển kho
 Sell=Bán hàng
 Buy=Mua
-OnSell=Bán
-OnBuy=Mua
+OnSell=Để bán
+OnBuy=Để Mua
 NotOnSell=Không phải để bán
-ProductStatusOnSell=Bán
-ProductStatusNotOnSell=Không phải để bán
-ProductStatusOnSellShort=Bán
-ProductStatusNotOnSellShort=Không phải để bán
-ProductStatusOnBuy=Mua
-ProductStatusNotOnBuy=Không mua
-ProductStatusOnBuyShort=Mua
-ProductStatusNotOnBuyShort=Không mua
-UpdatePrice=Giá cập nhật
+ProductStatusOnSell=Để bán
+ProductStatusNotOnSell=Không dành để bán
+ProductStatusOnSellShort=Để bán
+ProductStatusNotOnSellShort=Không dành để bán
+ProductStatusOnBuy=Để Mua
+ProductStatusNotOnBuy=Không dành để Mua
+ProductStatusOnBuyShort=Để Mua
+ProductStatusNotOnBuyShort=Không dành để Mua
+UpdatePrice=Cập nhật Giá
 AppliedPricesFrom=Giá áp dụng từ
 SellingPrice=Giá bán
 SellingPriceHT=Giá bán (đã trừ thuế)
 SellingPriceTTC=Giá bán (bao thuế.)
-PublicPrice=Giá công
+PublicPrice=Giá niêm yết
 CurrentPrice=Giá hiện tại
 NewPrice=Giá mới
-MinPrice=Giọt. giá bán
+MinPrice=Giá bán tối thiểu
 MinPriceHT=Giọt. giá bán (đã trừ thuế)
 MinPriceTTC=Giọt. giá bán (bao thuế.)
-CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (% s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng.
+CantBeLessThanMinPrice=Giá bán không thấp hơn mức cho phép cho sản phẩm này (%s không có thuế) tối thiểu. Thông báo này cũng có thể xuất hiện khi bạn nhập một giảm quá quan trọng.
 ContractStatus=Tình trạng hợp đồng
-ContractStatusClosed=Đóng
-ContractStatusRunning=Chạy
-ContractStatusExpired=hết hạn
+ContractStatusClosed=Đã đóng
+ContractStatusRunning=Đang chạy
+ContractStatusExpired=Đã hết hạn
 ContractStatusOnHold=Không chạy
-ContractStatusToRun=Để có được chạy
+ContractStatusToRun=Để được chạy
 ContractNotRunning=Hợp đồng này không hoạt động
-ErrorProductAlreadyExists=Một sản phẩm có sự tham khảo% s đã tồn tại.
-ErrorProductBadRefOrLabel=Giá trị sai để tham khảo hoặc nhãn.
+ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại.
+ErrorProductBadRefOrLabel=Sai giá trị tham khảo hoặc nhãn
 ErrorProductClone=Có một vấn đề trong khi cố gắng để sao chép các sản phẩm hoặc dịch vụ.
 ErrorPriceCantBeLowerThanMinPrice=Lỗi giá không thể thấp hơn giá tối thiểu.
 Suppliers=Nhà cung cấp
 SupplierRef=Ref sản phẩm của nhà cung cấp.
 ShowProduct=Hiện sản phẩm
 ShowService=Hiện dịch vụ
-ProductsAndServicesArea=Sản phẩm và dịch vụ khu vực
+ProductsAndServicesArea=Khu vực Sản phẩm và DỊch vụ
 ProductsArea=Khu vực sản phẩm
 ServicesArea=Khu vực dịch vụ
 AddToMyProposals=Thêm vào đề nghị của tôi
 AddToOtherProposals=Thêm vào các đề xuất khác
 AddToMyBills=Thêm vào hóa đơn của tôi
 AddToOtherBills=Thêm vào hóa đơn khác
-CorrectStock=Chứng khoán chính xác
+CorrectStock=Chính xác tồn kho
 AddPhoto=Thêm hình ảnh
-ListOfStockMovements=Danh sách chuyển động chứng khoán
+ListOfStockMovements=Danh sách chuyển tồn kho
 BuyingPrice=Giá mua
-SupplierCard=Nhà cung cấp thẻ
-CommercialCard=Thẻ thương mại
-AllWays=Con đường để tìm sản phẩm của bạn trong kho
-NoCat=Sản phẩm của bạn không có trong bất kỳ thể loại
-PrimaryWay=Con đường chính
-PriceRemoved=Giá loại bỏ
+SupplierCard=Thẻ Nhà cung cấp
+CommercialCard=Thẻ Thương mại
+AllWays=Đường dẫn để tìm sản phẩm của bạn trong kho
+NoCat=Sản phẩm của bạn không có trong bất kỳ ngành nào
+PrimaryWay=Đường dẫn chính
+PriceRemoved=Giá đã bị xóa
 BarCode=Mã vạch
 BarcodeType=Loại mã vạch
 SetDefaultBarcodeType=Đặt mã vạch loại
@@ -115,30 +115,30 @@ NoteNotVisibleOnBill=Lưu ý (không hiển thị trên hóa đơn, đề nghị
 CreateCopy=Tạo bản sao
 ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ với thời gian hạn chế:
 MultiPricesAbility=Một số mức giá cho mỗi sản phẩm / dịch vụ
-MultiPricesNumPrices=Số giá
+MultiPricesNumPrices=Số của Giá
 MultiPriceLevelsName=Loại giá
-AssociatedProductsAbility=Kích hoạt tính năng gói ảo
-AssociatedProducts=Sản phẩm trọn gói
-AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm này gói ảo
-ParentProductsNumber=Số sản phẩm bao bì mẹ
-IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm trọn gói ảo
-IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm gói ảo
-EditAssociate=Phó
+AssociatedProductsAbility=Kích hoạt tính năng bao bì ảo
+AssociatedProducts=Bao bì sản phẩm
+AssociatedProductsNumber=Số lượng sản phẩm được tạo bao bì ảo
+ParentProductsNumber=Số sản phẩm bao bì gốc
+IfZeroItIsNotAVirtualProduct=Nếu bằng 0, sản phẩm này không phải là một sản phẩm bao bì ảo
+IfZeroItIsNotUsedByVirtualProduct=Nếu bằng 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm bao bì ảo
+EditAssociate=Phụ kiện
 Translation=Dịch
 KeywordFilter=Bộ lọc từ khóa
 CategoryFilter=Bộ lọc danh mục
 ProductToAddSearch=Tìm kiếm sản phẩm để thêm
 AddDel=Thêm / Xóa
 Quantity=Số lượng
-NoMatchFound=Không có trận đấu được tìm thấy
-ProductAssociationList=Danh sách sản phẩm / dịch vụ liên quan: tên của sản phẩm / dịch vụ (số lượng bị ảnh hưởng)
-ProductParentList=Danh sách sản phẩm / dịch vụ trọn gói với sản phẩm này như là một thành phần
-ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại
-DeleteProduct=Xóa một sản phẩm / dịch vụ
-ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ?
-ProductDeleted=Sản phẩm / dịch vụ "% s" sẽ bị xóa khỏi cơ sở dữ liệu.
-DeletePicture=Xóa một bức tranh
-ConfirmDeletePicture=Bạn Bạn có chắc chắn muốn xóa ảnh này?
+NoMatchFound=Không tìm thấy
+ProductAssociationList=Danh sách sản phẩm/dịch vụ liên quan: tên của sản phẩm/dịch vụ (số lượng bị ảnh hưởng)
+ProductParentList=Danh sách bao bì sản phẩm/dịch vụ với sản phẩm này như là một thành phần
+ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là gốc của sản phẩm hiện tại
+DeleteProduct=Xóa một sản phẩm/dịch vụ
+ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này/dịch vụ?
+ProductDeleted=Sản phẩm / dịch vụ "%s" sẽ bị xóa khỏi cơ sở dữ liệu.
+DeletePicture=Xóa một hình
+ConfirmDeletePicture=Bạn có chắc chắn muốn xóa hình này?
 ExportDataset_produit_1=Sản phẩm
 ExportDataset_service_1=Dịch vụ
 ImportDataset_produit_1=Sản phẩm
@@ -146,20 +146,20 @@ ImportDataset_service_1=Dịch vụ
 DeleteProductLine=Xóa dòng sản phẩm
 ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản phẩm này?
 NoProductMatching=Không có sản phẩm / dịch vụ phù hợp với tiêu chí của bạn
-MatchingProducts=Phù hợp với sản phẩm / dịch vụ
+MatchingProducts=Sản phẩm / dịch vụ trùng khớp
 NoStockForThisProduct=Không có tồn kho nào cho sản phẩm này
 NoStock=Không tồn kho
 Restock=Restock
 ProductSpecial=Đặc biệt
 QtyMin=Số lượng tối thiểu
 PriceQty=Giá cho số lượng này
-PriceQtyMin=Giá cho tối thiểu này. SL (w / o giảm giá)
+PriceQtyMin=Giá cho tối SL thiểu này (không giảm giá)
 VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm)
 DiscountQtyMin=Mặc định giảm giá cho SL
 NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm
 NoSupplierPriceDefinedForThisProduct=Không có giá nhà cung cấp / SL được xác định cho sản phẩm này
-RecordedProducts=Sản phẩm được ghi lại
-RecordedServices=Dịch vụ ghi
+RecordedProducts=Sản phẩm được ghi
+RecordedServices=Dịch vụ được ghi
 RecordedProductsAndServices=Sản phẩm / dịch vụ được ghi nhận
 PredefinedProductsToSell=Sản phẩm được xác định trước để bán
 PredefinedServicesToSell=Dịch vụ được xác định trước để bán
@@ -167,72 +167,72 @@ PredefinedProductsAndServicesToSell=Sản phẩm được xác định trước
 PredefinedProductsToPurchase=Sản phẩm được xác định trước để mua hàng
 PredefinedServicesToPurchase=Dịch vụ được xác định trước để mua hàng
 PredefinedProductsAndServicesToPurchase=Sản phẩm được xác định trước / dịch vụ để puchase
-GenerateThumb=Tạo ngón tay cái
-ProductCanvasAbility=Sử dụng đặc biệt "vải" addons
+GenerateThumb=Generate thumb
+ProductCanvasAbility=Sử dụng phần mở rộng "canvas" đặc biệt
 ServiceNb=Dịch vụ #% s
-ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ nổi tiếng
-ListProductByPopularity=Danh sách sản phẩm nổi tiếng
-ListServiceByPopularity=Danh sách các dịch vụ nổi tiếng
+ListProductServiceByPopularity=Danh sách sản phẩm / dịch vụ phổ biến
+ListProductByPopularity=Danh sách sản phẩm phổ biến
+ListServiceByPopularity=Danh sách các dịch vụ phổ biến
 Finished=Sản phẩm sản xuất
 RowMaterial=Nguyên liệu
-CloneProduct=Sản phẩm hoặc dịch vụ sao chép
-ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch <b>vụ% s?</b>
-CloneContentProduct=Sao lưu tất cả thông tin chính của sản phẩm / dịch vụ
-ClonePricesProduct=Thông tin chính sao chép và giá cả
-CloneCompositionProduct=sao chép đóng gói sản phẩm / dịch vụ
+CloneProduct=Sao chép sản phẩm hoặc dịch vụ
+ConfirmCloneProduct=Bạn có chắc chắn bạn muốn sao chép sản phẩm hoặc dịch vụ <b>%s</b>?
+CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm / dịch vụ
+ClonePricesProduct=Sao chép Thông tin chính và giá cả
+CloneCompositionProduct=Sao chép bao bì sản phẩm/dịch vụ
 ProductIsUsed=Sản phẩm này được sử dụng
-NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ
+NewRefForClone=Số tham chiếu các sản phẩm/dịch vụ mới
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (các sản phẩm hoặc dịch vụ)
-CustomCode=Luật hải quan
+CustomCode=Mã hải quan
 CountryOrigin=Nước xuất xứ
-HiddenIntoCombo=Thành viên ẩn danh vào danh sách chọn
-Nature=Thiên nhiên
-ProductCodeModel=Ref sản phẩm mẫu
-ServiceCodeModel=Dịch vụ ref mẫu
-AddThisProductCard=Tạo ra sản phẩm thẻ
+HiddenIntoCombo=Ẩn vào danh sách chọn
+Nature=Tự nhiên
+ProductCodeModel=Mẫu tham chiếu Sản phẩm
+ServiceCodeModel=MẪu tham chiếu dịch vụ
+AddThisProductCard=Tạo thẻ Sản phẩm
 HelpAddThisProductCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một sản phẩm nếu nó không tồn tại.
-AddThisServiceCard=Tạo dịch vụ thẻ
+AddThisServiceCard=Tạo thẻ Dịch vụ
 HelpAddThisServiceCard=Tùy chọn này cho phép bạn tạo ra hoặc sao chép một dịch vụ nếu nó không tồn tại.
 CurrentProductPrice=Giá hiện tại
 AlwaysUseNewPrice=Luôn luôn sử dụng giá hiện tại của sản phẩm / dịch vụ
-AlwaysUseFixedPrice=Sử dụng các mức giá cố định
-PriceByQuantity=Giá bán của của số lượng
+AlwaysUseFixedPrice=Sử dụng giá cố định
+PriceByQuantity=Giá bán theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
-ProductsDashboard=Sản phẩm / dịch vụ tóm tắt
+ProductsDashboard=Tóm tắt Sản phẩm / dịch vụ
 UpdateOriginalProductLabel=Sửa đổi nhãn gốc
 HelpUpdateOriginalProductLabel=Cho phép chỉnh sửa tên của sản phẩm
 ### composition fabrication
-Building=Sản xuất và các mặt hàng dispatchment
+Building=Sản xuất và các mặt hàng điều phối
 Build=Sản xuất
-BuildIt=Sản xuất & văn
-BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 cho không có thêm hành động)
+BuildIt=Sản xuất & điều phối
+BuildindListInfo=Số lượng có sẵn để sản xuất mỗi kho (đặt nó là 0 nếu không có hành động tiếp theo)
 QtyNeed=Số lượng
 UnitPmp=Đơn vị VWAP Net
 CostPmpHT=Tổng VWAP Net
-ProductUsedForBuild=Tự động tiêu thụ sản
+ProductUsedForBuild=Tự động tiêu thụ bởi sản xuất
 ProductBuilded=Sản xuất hoàn thành
 ProductsMultiPrice=Sản phẩm đa giá
 ProductsOrServiceMultiPrice=Giá của khách hàng (những sản phẩm, dịch vụ, đa giá)
 ProductSellByQuarterHT=Sản phẩm doanh thu quý VWAP
 ServiceSellByQuarterHT=Dịch vụ doanh thu quý VWAP
-Quarter1=1. Quý
-Quarter2=2. Quý
-Quarter3=3. Quý
-Quarter4=4. Quý
+Quarter1=Quý 1
+Quarter2=Quý 2
+Quarter3=Quý 3
+Quarter4=Quý 4
 BarCodePrintsheet=In mã vạch
-PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào <b>nút% s.</b>
-NumberOfStickers=Số nhãn in trên trang
-PrintsheetForOneBarCode=In nhiều dán một mã vạch
+PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in tờ dán mã vạch. Chọn định dạng của trang nhãn dán của bạn, loại mã vạch và giá trị của mã vạch, sau đó nhấn vào nút <b>%s</b>.
+NumberOfStickers=Số nhãn để in trên trang
+PrintsheetForOneBarCode=In nhiều nhãn cho một mã vạch
 BuildPageToPrint=Tạo trang in
 FillBarCodeTypeAndValueManually=Điền loại mã vạch và giá trị bằng tay.
 FillBarCodeTypeAndValueFromProduct=Điền loại mã vạch và giá trị từ mã vạch của sản phẩm.
 FillBarCodeTypeAndValueFromThirdParty=Điền loại mã vạch và giá trị từ mã vạch của một của bên thứ ba.
-DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm% s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho% s của bên thứ ba.
-BarCodeDataForProduct=Thông tin mã vạch của sản phẩm% s:
-BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của% s:
+DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho các sản phẩm %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho %s của bên thứ ba.
+BarCodeDataForProduct=Thông tin mã vạch của sản phẩm %s:
+BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của %s:
 ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các hồ sơ (cũng sẽ thiết lập lại giá trị này đã được xác định mã vạch với các giá trị mới)
 PriceByCustomer=Giá bán của khách hàng
 PriceCatalogue=Giá duy nhất cho mỗi sản phẩm / dịch vụ
@@ -240,8 +240,8 @@ PricingRule=Quy định giá
 AddCustomerPrice=Thêm giá của khách hàng
 ForceUpdateChildPriceSoc=Đặt giá trên cùng một công ty con của khách hàng
 PriceByCustomerLog=Giá bán của khách hàng đăng nhập
-MinimumPriceLimit=Giá tối thiểu không thấp hơn% s
-MinimumRecommendedPrice=Giá đề nghị tối thiểu là:% s
+MinimumPriceLimit=Giá tối thiểu không thấp hơn %s
+MinimumRecommendedPrice=Giá đề nghị tối thiểu là: %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions

From e6d016cc48c4ec75a9016ac6840299c4ad6999eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Jan 2015 20:55:15 +0100
Subject: [PATCH 318/345] Fixed: pmp update after makign a stock move.

---
 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 1efc3924aa7..352750295af 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -199,7 +199,8 @@ if ($action == "transfert_stock" && ! $cancel)
 
 				// 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->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp;
+				if (isset($product->pmp)) $pricesrc=$product->pmp;
 				$pricedest=$pricesrc;
 
 				$pdluoid=GETPOST('pdluoid','int');

From 8b3faf46db34bd9f225dcbd508e6a4c632eeb27b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jan 2015 15:38:59 +0100
Subject: [PATCH 319/345] Add PMP into selection of buy price.

---
 htdocs/core/tpl/objectline_create.tpl.php | 64 +++++++++++++++++------
 htdocs/fourn/ajax/getSupplierPrices.php   |  7 ++-
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 6037f6c77c9..a3cac080ab5 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -448,41 +448,73 @@ jQuery(document).ready(function() {
 		setforpredef();
 		jQuery('#trlinefordates').show();
 	});
+
+	/* Sur changemenr de produit, on recharge la liste des prix fournisseur */
 	$("#idprod, #idprodfournprice").change(function()
 	{
 		setforpredef();
 		jQuery('#trlinefordates').show();
 
-		<?php if (! empty($usemargins) && $user->rights->margins->creer) { ?>
+		<?php
+		if (! empty($usemargins) && $user->rights->margins->creer)
+		{
+			$langs->load('stocks');
+			?>
 
 		/* Code for margin */
   		$("#fournprice_predef options").remove();
 		$("#fournprice_predef").hide();
 		$("#buying_price").val("").show();
+		/* Call post to load content of combo list fournprice_predef */
   		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', { 'idprod': $(this).val() }, function(data) {
 	    	if (data && data.length > 0)
 	    	{
     	  		var options = '';
+    	  		var defaultkey = '';
+    	  		var defaultprice = '';
 	      		var i = 0;
 	      		$(data).each(function() {
-	        		i++;
-	        		options += '<option value="'+this.id+'" price="'+this.price+'"';
-	        		if (i == 1) {
-	          			options += ' selected';
-	          			$("#buying_price").val(this.price);
-	        		}
-	        		options += '>'+this.label+'</option>';
+	      			if (this.id != 'pmpprice')
+		      		{
+		        		i++;
+		        		options += '<option value="'+this.id+'" price="'+this.price+'"';
+		        		if (this.price > 0 && i == 1) { defaultkey = this.id; defaultprice = this.price; }
+		        		options += '>'+this.label+'</option>';
+		      		}
+	      			if (this.id == 'pmpprice')
+	      			{
+		      			if (this.price > 0 && 1 == 1) { defaultkey = this.id; defaultprice = this.price; }
+	    	      		options += '<option value="'+this.id+'" price="'+this.price+'">'+this.label+'</option>';
+	      			}
 	      		});
-	      		options += '<option value=""><?php echo $langs->trans("InputPrice"); ?></option>';
-	      		$("#buying_price").hide();
+	      		options += '<option value="inputprice" price="'+defaultprice+'"><?php echo $langs->trans("InputPrice"); ?></option>';
+
+				/* alert(defaultkey+' '+defaultprice); */
 	      		$("#fournprice_predef").html(options).show();
+	      		$("#fournprice_predef").val(defaultkey);
+
+	      		/* At loading, no product are yet selected, so we hide field of buying_price */
+	      		$("#buying_price").hide();
+
+	      		/* Define default price at loading */
+	      		var defaultprice = $("#fournprice_predef").find('option:selected').attr("price");
+	      		$("#buying_price").val(defaultprice);
+
 	      		$("#fournprice_predef").change(function() {
-	        		var selval = $(this).find('option:selected').attr("price");
-	        		if (selval)
-	          			$("#buying_price").val(selval).hide();
-	        		else
-	          			$('#buying_price').show();
-	      		});
+	      			/* 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");
+	        		if (linevalue != 'inputprice' && linevalue != 'pmpprice') {
+	          			$("#buying_price").val(pricevalue).hide();	/* We set value then hide field */
+	        		}
+	        		if (linevalue == 'inputprice') {
+		          		$('#buying_price').show();
+	        		}
+	        		if (linevalue == 'pmpprice') {
+	        			$("#buying_price").val(pricevalue);
+		          		$('#buying_price').hide();
+	        		}
+				});
 	    	}
 	  	},
 	  	'json');
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index cdff85ccde0..907e34f8d35 100755
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       /htdocs/fourn/ajax/getSupplierPrices.php
- *	\brief      File to return Ajax response on get supplier prices
+ *	\brief      File to return an Ajax response to get a supplier prices
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
@@ -119,6 +119,11 @@ if (! empty($idprod))
 			$db->free($result);
 		}
 	}
+
+	// Add price for pmp
+	$price=123;
+	$prices[] = array("id" => 'pmpprice', "price" => $price, "label" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency));
+
 }
 
 echo json_encode($prices);

From a886136e67eaf0711674583919830aeb9368b3f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Jan 2015 22:13:15 +0100
Subject: [PATCH 320/345] More comment and add a unit test to check that {t}
 tag is correctly supported.

---
 htdocs/core/lib/functions2.lib.php    |  4 ++--
 test/phpunit/NumberingModulesTest.php | 31 ++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 54014d907b1..cd99afaf373 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -628,8 +628,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     if (preg_match('/\{(t+)\}/i',$mask,$regType))
     {
         $masktype=$regType[1];
-        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));//get n first characters of client code where n is length in mask
-        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);
+        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
+        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
     }
     else
     {
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index a3788b309d1..48d26216268 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -500,7 +500,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
     	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
     	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
-    	
+
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
     	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
@@ -510,7 +510,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result3=$localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('198001-0001', $result);	// counter must start to 1
-    	
+
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
     	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
@@ -520,7 +520,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result3=$localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('198001-0002', $result);	// counter must start to 2
-    	
+
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
     	$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
@@ -530,7 +530,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result3=$localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('198002-0001', $result);	// counter must start to 1
-    	
+
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
     	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
@@ -540,7 +540,28 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result3=$localobject->validate($user, $result);
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals('198101-0001', $result);	// counter must start to 1
-      	
+
+    	// Test with {t} tag
+    	$conf->global->SOCIETE_FISCAL_MONTH_START=1;
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
+
+    	$tmpthirdparty=new Societe($this->savdb);
+    	$tmpthirdparty->initAsSpecimen();
+    	$tmpthirdparty->typent_code = 'TE_ABC';
+
+    	$localobject=new Facture($this->savdb);
+    	$localobject->initAsSpecimen();
+    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1980 to be sure to not have existing invoice for this year
+    	$numbering=new mod_facture_mercure();
+    	$result=$numbering->getNextValue($tmpthirdparty, $localobject);
+    	$result2=$localobject->create($user,1);
+    	$result3=$localobject->validate($user, $result);
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals('A198201-0001', $result);	// counter must start to 1
+
+
+
     	return $result;
     }
 

From f92bc7986babac9f25924fca030cde916ece4bfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 10:46:50 +0100
Subject: [PATCH 321/345] Add Weighted average price as default price for
 buying price for margin calculation. Add option
 MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.

---
 ChangeLog                                 |  3 ++-
 htdocs/core/tpl/objectline_create.tpl.php |  3 ++-
 htdocs/fourn/ajax/getSupplierPrices.php   | 10 +++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7c373ebaaf..3e61b274398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ For users:
 - New: Use new combobox.
 - New: Add hidden option MAXTABS_IN_CARD.
 - Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
-
+- Add Weighted average price as default price for buying price for margin calculation. Add option 
+  MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.
 
 For translators:
 - Update language files.
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index a3cac080ab5..70ac13c79cd 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -483,7 +483,8 @@ jQuery(document).ready(function() {
 		      		}
 	      			if (this.id == 'pmpprice')
 	      			{
-		      			if (this.price > 0 && 1 == 1) { defaultkey = this.id; defaultprice = this.price; }
+		      			var defaultbuyprice = <?php echo (isset($conf->global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE)?int($conf->global->MARGIN_PMP_AS_DEFAULT_BUY_PRICE):1); ?>;
+		      			if (this.price > 0 && 1 == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; }
 	    	      		options += '<option value="'+this.id+'" price="'+this.price+'">'+this.label+'</option>';
 	      			}
 	      		});
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 907e34f8d35..e14e872a24f 100755
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -28,6 +28,7 @@ if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 
 $idprod=GETPOST('idprod','int');
 
@@ -43,8 +44,11 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
-if (! empty($idprod))
+if ($idprod > 0)
 {
+	$producttmp=new ProductFournisseur($db);
+	$producttmp->fetch($idprod);
+
 	$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
 	$sql.= " pfp.ref_fourn,";
 	$sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,";
@@ -111,6 +115,7 @@ if (! empty($idprod))
 				if ($objp->duration) $label .= " - ".$objp->duration;
 
 				$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);
 				$i++;
@@ -121,9 +126,8 @@ if (! empty($idprod))
 	}
 
 	// Add price for pmp
-	$price=123;
+	$price=$producttmp->pmp;
 	$prices[] = array("id" => 'pmpprice', "price" => $price, "label" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price,0,$langs,0,0,-1,$conf->currency));
-
 }
 
 echo json_encode($prices);

From 806477977d0ccdf68723960fbdf5547d5f07edb3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 13:51:21 +0100
Subject: [PATCH 322/345] Fix: css

---
 htdocs/comm/action/peruser.php          |   2 +-
 htdocs/core/menus/standard/eldy.lib.php |   2 +-
 htdocs/theme/eldy/img/menus/README.md   |  12 +++++++++
 htdocs/theme/eldy/img/menus/chart.png   | Bin 0 -> 1792 bytes
 htdocs/theme/eldy/style.css.php         |  34 ++++++------------------
 5 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/menus/README.md
 create mode 100644 htdocs/theme/eldy/img/menus/chart.png

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 22cf8841c02..8379960f764 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -679,7 +679,7 @@ foreach ($usernames as $username)
 {
 	$var = ! $var;
 	echo "<tr>";
-	echo '<td class="cal_current_month"'.($var?' style="background: #F8F8F8"':'').'>' . $username->getNomUrl(1). '</td>';
+	echo '<td class="cal_current_month cal_peruserviewname"'.($var?' style="background: #F8F8F8"':'').'>' . $username->getNomUrl(1). '</td>';
 	$tmpday = $sav;
 
 	// Lopp on each day of week
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 74d6b95df73..8ae46c5d8da 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -354,7 +354,7 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 	if ($showmode == 1)
 	{
 		print '<a class="tmenuimage" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
-		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
 		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
 		print '<span class="mainmenuaspan">';
diff --git a/htdocs/theme/eldy/img/menus/README.md b/htdocs/theme/eldy/img/menus/README.md
new file mode 100644
index 00000000000..1b3942d1913
--- /dev/null
+++ b/htdocs/theme/eldy/img/menus/README.md
@@ -0,0 +1,12 @@
+
+Tutorial to create a new image for menu:
+
+1) First find an image.
+2) With Gimp, open image and check there is a alpha channel. If not add one.
+3) Convert image into back and white.
+4) Use the degrade tool with option:
+* Erase color
+* Opacity: 50 +/-
+* Offset: 0
+* Shape: Linear
+Il est possible aussi d'augmenter la transparence globale depuis le calque.
diff --git a/htdocs/theme/eldy/img/menus/chart.png b/htdocs/theme/eldy/img/menus/chart.png
new file mode 100644
index 0000000000000000000000000000000000000000..abd089a44bea64e7880045b878c0392e57802c59
GIT binary patch
literal 1792
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

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 50b80258ea6..2fe1a3201f5 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -526,8 +526,8 @@ margin : 0px auto;
 
 <?php
 $minwidthtmenu=66;
-$heightmenu=52;
-$heightmenu2=40;
+$heightmenu=46;			/* height of top menu, part with image */
+$heightmenu2=46;        /* height of top menu, ârt with login  */
 ?>
 
 div#tmenu_tooltip {
@@ -673,7 +673,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-17); ?>px;
+	height: <?php echo ($heightmenu-19); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -698,16 +698,10 @@ div.mainmenu.bank {
     background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>);
 }
 
-div.mainmenu.bookmark {
-}
-
 div.mainmenu.cashdesk {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>);
 }
 
-div.mainmenu.click2dial {
-}
-
 div.mainmenu.companies {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1) ?>);
 }
@@ -728,12 +722,6 @@ div.mainmenu.ftp {
     background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
 }
 
-div.mainmenu.gravatar {
-}
-
-div.mainmenu.geopipmaxmind {
-}
-
 div.mainmenu.hrm {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>);
 }
@@ -742,9 +730,6 @@ div.mainmenu.members {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
 }
 
-div.mainmenu.paypal {
-}
-
 div.mainmenu.products {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
 	margin-left: 10px;
@@ -758,14 +743,6 @@ div.mainmenu.tools {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
 }
 
-div.mainmenu.webservices {
-}
-
-div.mainmenu.google {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1) ?>);
-}
-
-
 <?php
 // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
@@ -2423,6 +2400,11 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
 .cal_event_busy      { }
+.cal_peruserviewname { max-width: 100px; height: 22px; }
+
+.topmenuimage {
+	background-size: 28px auto;
+}
 
 /* ============================================================================== */
 /*  Ajax - Liste deroulante de l'autocompletion                                   */

From e10b5637d46012eb22730961eb816ad98536da9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 18:54:56 +0100
Subject: [PATCH 323/345] Fixed: Avoid spaces into address string

---
 htdocs/core/lib/functions.lib.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 990c30c0f60..511cee34d62 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -749,10 +749,13 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		$displaytab=$i;
 	}
 
+	$out.="</div>\n";
+
 	if ($displaytab > $limittoshow)
 	{
-		$out.='<div id=moretabs class="inline-block tabsElem"><a href="" data-role="button" style="background-color: #f0f0f0;" class="tab inline-block">Plus</a>';
-		$out.='<div id=moretabsList style="position: absolute; left: -999em;text-align: left;margin:0px;padding:2px">'.$outmore.'</div></div>';
+		$out.='<div id="moretabs" class="inline-block tabsElem">';
+		$out.='<a href="" data-role="button" style="background-color: #f0f0f0;" class="tab inline-block">'.$langs->trans("More").'...</a>';
+		$out.='<div id="moretabsList" style="position: absolute; left: -999em;text-align: left;margin:0px;padding:2px">'.$outmore.'</div>';
 		$out.="</div>\n";
 
 		$out.="<script>";
@@ -844,7 +847,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
-		$ret .= ' '.$object->town;
+		$ret .= ($object->town?' '.$object->town:'');
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
 			$ret.="\n".$object->state;
@@ -854,14 +857,14 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
-		$ret .= ' '.$object->town;
+		$ret .= ($object->town?' '.$object->town:'');
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
 			$ret.=", ".$object->state;
 		}
 	}
 	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if ($withcountry) $ret.=($object->country_code?$sep.$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
 
 	return $ret;
 }

From a2c9d5bd4a3cb548bf7014896f25438b60cd1d6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 19:10:21 +0100
Subject: [PATCH 324/345] Fixed balance of td introduced by MAX_TAB option.

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 511cee34d62..d83d1e8b1a5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -659,7 +659,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto
  */
 function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto='', $pictoisfullpath=0)
 {
-	global $conf;
+	global $conf,$langs;
 
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
@@ -749,8 +749,6 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		$displaytab=$i;
 	}
 
-	$out.="</div>\n";
-
 	if ($displaytab > $limittoshow)
 	{
 		$out.='<div id="moretabs" class="inline-block tabsElem">';
@@ -764,6 +762,8 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 		$out.="</script>";
 	}
 
+	$out.="</div>\n";
+
 	if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
 
 	return $out;

From 1d1970b5a1c23fd3ac9003f31198c13803b29429 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 19:10:48 +0100
Subject: [PATCH 325/345] Sec: Bad security test

---
 htdocs/public/test/test_arrays.php | 7 +++++--
 htdocs/public/test/test_forms.php  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 6725c776cd4..5ff161f0b1a 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -4,11 +4,14 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
 
 require '../../main.inc.php';
-if ($_SERVER['HTTP_HOST'] != 'localhost')
+
+if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1')
 {
-	print "Page available only with url  http://localhost/...";
+	print "Page available only frome remote address 127.0.0.1";
 	exit;
 }
+
+
 $usedolheader=0;	// 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
 
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 55b8296e43a..ece0c218160 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -6,9 +6,9 @@ define('REQUIRE_JQUERY_MULTISELECT','select2');
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if ($_SERVER['HTTP_HOST'] != 'localhost')
+if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1')
 {
-	print "Page available only with url  http://localhost/...";
+	print "Page available only frome remote address 127.0.0.1";
 	exit;
 }
 

From e3f3956bedaa6022773e168cd2f1fd87218af357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 19:10:48 +0100
Subject: [PATCH 326/345] Sec: Bad security test

---
 htdocs/public/test/test_arrays.php | 7 +++++--
 htdocs/public/test/test_forms.php  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 6725c776cd4..5ff161f0b1a 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -4,11 +4,14 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
 
 require '../../main.inc.php';
-if ($_SERVER['HTTP_HOST'] != 'localhost')
+
+if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1')
 {
-	print "Page available only with url  http://localhost/...";
+	print "Page available only frome remote address 127.0.0.1";
 	exit;
 }
+
+
 $usedolheader=0;	// 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
 
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index c600e9b0acd..deb3e2fe0c4 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -6,9 +6,9 @@ define('REQUIRE_JQUERY_MULTISELECT','select2');
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if ($_SERVER['HTTP_HOST'] != 'localhost')
+if ($_SERVER['REMOTE_ADDR'] != '127.0.0.1')
 {
-	print "Page available only with url  http://localhost/...";
+	print "Page available only frome remote address 127.0.0.1";
 	exit;
 }
 

From 4c64b8ceae276cee0f9953450de52a4d4ff67788 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 19:12:22 +0100
Subject: [PATCH 327/345] Add menu image

---
 htdocs/theme/eldy/img/menus/chart.png | Bin 1792 -> 1321 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/theme/eldy/img/menus/chart.png b/htdocs/theme/eldy/img/menus/chart.png
index abd089a44bea64e7880045b878c0392e57802c59..6efce90a78859b6f4649304a8481fd193e6cb609 100644
GIT binary patch
delta 1253
zcmV<B1RDE*4yg)|Hwgd$0002_L%V;GKp}q%IT{VH!T10G1gS|xK~z}7?U_r9TvZf>
zzjdnePE0}&d;~#6j82@0MEnB|L_~1v#NXhbaW2lCWZ*zh6v2TKFc1uC3`QjnB8f?-
z>)x{*WS`FNo7-KLPFV?<3q?WIsaxypz1G@$p9_z#$JhVs(xMA%twmA+j@y18ct?NI
zMc`xGUrFjD)kh9|t@Vhcw}AJ67e<!cwEdZ+Q?}2RQf7}5_)mZn(x&B3?<IZyp`;&H
z0lqA>L+N@0YTE(0y%e7{%1l;8o9UvImt@<uMLz(eJJ;QG*!7VDZ@ZJ!0o68=7yxb=
znuMqu-F5*7BptMUwUl!6VMN}x`>lW6WU!I_@%}RK25=IXO8T|d`UP;NlyYU2;QRF2
zZih(vtJeAv@H%h^IB46Fo|p6*@SE*#fm4#Mtcvq}66IFHuC~`Cy<+=VWMoZu1cRgl
zzzN`0+dl)}{O8~$^}&13S=t3qheld9tj#_<ku+Hu=Y#L_XwwJCMllEG+H8M0#N7k4
zTI*EOyTG%y&j6=^OR-rmlk?pIwCTb^``Ab>WKQDlfHmN4-~(Wfq&I;Jz**pH+vkAw
z?KZJ6_yE(-snA*2-2iwQSg&nA9rQA=7kDXNCxP#5e+pcCV8Lz?c@1e3RB7UN`n|KT
zV}omPU#ELW(v!f8k`6yG_!fWl5aK-A<jrnW-9h?Wc8<mOx1$#1zG>Eq-!dXU*D4#}
z$iODf4_b>^*yiB|G#9*ZsJR+jD)=VSq>m<2+g8p{qE8q1E+e&NIc~FsU`J__>q7H+
zpd=d9=v3Dmg(Q{KBaKmQ$3?0Rg|%JeBSUrI^G>wsY)_juA}A$ueqMi|c0wD^tHi<Y
z)`e~mK1VTv(V|`>%KgZHK6vEQ&Fcd6Y8>CFuqoo1^OGoOU3R8{BQ3S7tYh|-=@64t
zA9Tppm)n~Tn8hag_?=QO#3GqqxG`%*YM#$GiX|F&q@eZTKE0&2wlv`JUYF_f^8~Bl
z`tDfQCz`ZbH+P?tq>q0ZV$W{VFU4(!zC9d31`U@+8nYq2dfT@fZ6X62ak%AJWenD%
zv`L>e7wHC@^?){A6eZ^-E@j5c7VPLSk~b58*TZS<5$s^N>C-0rfuOxK+O(oEuQ3b$
zPEw{Ezfp1#f+mwRam@yq@zMlqd$wSa>Y^rWcz1J;kp`|yR=IzvqPBr%S)4CGo08Zj
zB5j7PvA#u7BjBegTjW9&PE_X|M=l!q_3&d4c|LR{+wG6rDchJ}`)G^X$#Tu}t)z9}
zJaBzkjakhnX4{-HG<|d<b%4~UVfzyBgrr?T&3`1F1AYOnNxHSFBGp`JJ)&N-z!PxA
z_j_%BF6k`rl%#(@fUCA|mQofv@4VmM#)Bhn-EA5-cw1U8KRBE%wu_`S;7{APN+|};
z+rF@q2NU;OVectY0~$?(KHme+0S6@=io@35ZC|#18Mv4S>zzJPnJxglv`%p_hi*Cv
zOLON`(vP;!1N&_6m$WZH|GmtoCX0YSE@}Vp=p+1F$$?Rd?MZ5`ZU8qP+WEZg-N4c2
z+2Qx?5NQ*afy<J<1g@^?;er;V4Zzg)5lKgZBetKBv?pxsCrK*<-L8KDzU-ddJ9_K!
P00000NkvXXu0mjf@;r5O

delta 1728
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
WvA2INX1v${0000<MNUMnLSTa3gI=}(


From 68441a563acee476f1e01b9230432849293bbf71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Jan 2015 19:17:58 +0100
Subject: [PATCH 328/345] Fixed: Avoid space into address string

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dcb76a10cd7..3ec602c9d2b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -800,7 +800,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	else if (in_array($object->country_code,array('ES','TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
-		$ret .= ' '.$object->town;
+		$ret .= ($object->town?' '.$object->town:'');
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
 			$ret.="\n".$object->state;
@@ -810,14 +810,14 @@ function dol_format_address($object,$withcountry=0,$sep="\n",$outputlangs='')
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= ($ret ? $sep : '' ).$object->zip;
-		$ret .= ' '.$object->town;
+		$ret .= ($object->town?' '.$object->town:'');
 		if ($object->state && in_array($object->country_code,$countriesusingstate))
 		{
 			$ret.=", ".$object->state;
 		}
 	}
 	if (! is_object($outputlangs)) $outputlangs=$langs;
-	if ($withcountry) $ret.=($object->country_code?$sep.$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
+	if ($withcountry) $ret.=($object->country_code?($ret?$sep:'').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)):'');
 
 	return $ret;
 }

From ba49cce47a9e62c930021bd5f7705e40bd6aecf2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 02:06:04 +0100
Subject: [PATCH 329/345] Fix: The filter into event views on user must be done
 on assigned resource, not only owner.

---
 htdocs/comm/action/class/actioncomm.class.php |  3 +
 htdocs/comm/action/index.php                  | 38 ++++----
 htdocs/comm/action/listactions.php            | 95 +++++--------------
 htdocs/comm/action/peruser.php                | 37 ++++----
 htdocs/core/lib/agenda.lib.php                |  2 +-
 .../install/mysql/migration/3.6.0-3.7.0.sql   |  3 +
 .../tables/llx_actioncomm_resources.key.sql   |  2 +-
 htdocs/install/upgrade2.php                   | 80 ++++++++++++++++
 htdocs/langs/en_US/install.lang               |  1 +
 9 files changed, 146 insertions(+), 115 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 135b775249b..bf668be6daa 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -141,6 +141,9 @@ class ActionComm extends CommonObject
         $userownerid=$this->userownerid;
         $userdoneid=$this->userdoneid;
 
+        // Be sure assigned user array is not empty.
+        if (count($this->userassigned) == 0) $this->userassigned = array('id'=>$this->$userownerid);
+
         if (! $this->type_id || ! $this->type_code)
         {
         	$key=empty($this->type_id)?$this->type_code:$this->type_id;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 4630d486ebf..7820de113b7 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -40,9 +40,7 @@ if (! empty($conf->projet->enabled)) {
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
 $filter=GETPOST("filter",'',3);
-$filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
-$filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
@@ -72,9 +70,7 @@ if (! $user->rights->agenda->myactions->read) accessforbidden();
 if (! $user->rights->agenda->allactions->read) $canedit=0;
 if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
 {
-    $filtera=$user->id;
     $filtert=$user->id;
-    $filterd=$user->id;
 }
 
 $action=GETPOST('action','alpha');
@@ -283,9 +279,7 @@ $param='';
 if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
 if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter)  $param.="&filter=".$filter;
-if ($filtera) $param.="&filtera=".$filtera;
 if ($filtert) $param.="&filtert=".$filtert;
-if ($filterd) $param.="&filterd=".$filterd;
 if ($socid)   $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid)     $param.="&projectid=".$pid;
@@ -340,7 +334,7 @@ $paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
 $head = calendars_prepare_head($paramnoaction);
 
 dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$action,$listofextcals,$actioncode,$usergroup);
+print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,0,$filtert,0,$pid,$socid,$action,$listofextcals,$actioncode,$usergroup);
 dol_fiche_end();
 
 $showextcals=$listofextcals;
@@ -405,27 +399,29 @@ print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
 // Get event in an array
 $eventarray=array();
 
-$sql = 'SELECT a.id,a.label,';
+$sql = 'SELECT ';
+if ($usergroup > 0) $sql.=" DISTINCT";
+$sql.= ' a.id, a.label,';
 $sql.= ' a.datep,';
 $sql.= ' a.datep2,';
-$sql.= ' a.datea,';
-$sql.= ' a.datea2,';
 $sql.= ' a.percent,';
-$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
+$sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql.= ' a.fk_soc, a.fk_contact,';
 $sql.= ' ca.code as type_code, ca.libelle as type_label';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
 $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'";
 if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
 if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
-// FIXME: We must filter on assignement table
-if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
     $sql.= " AND (";
@@ -459,14 +455,12 @@ if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
-// FIXME: We must filter on assignement table
-if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
-    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
-    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
-	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
+    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }
 // Sort on date
@@ -1094,7 +1088,7 @@ $db->close();
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60)
 {
     global $user, $conf, $langs;
-    global $action, $filter, $filtera, $filtert, $filterd, $status, $actioncode;	// Filters used into search form
+    global $action, $filter, $filtert, $status, $actioncode;	// Filters used into search form
     global $theme_datacolor;
     global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 
@@ -1383,7 +1377,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                 {
                 	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
                     print ($status?'&status='.$status:'').($filter?'&filter='.$filter:'');
-                    print ($filtera?'&filtera='.$filtera:'').($filtert?'&filtert='.$filtert:'').($filterd?'&filterd='.$filterd:'');
+                    print ($filtert?'&filtert='.$filtert:'');
                     print ($actioncode!=''?'&actioncode='.$actioncode:'');
                     print '">'.img_picto("all","1downarrow_selected.png").' ...';
                     print ' +'.(count($eventarray[$daykey])-$maxprint);
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index a53628e3d31..b8c913df271 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
+$langs->load("users");
 $langs->load("companies");
 $langs->load("agenda");
 $langs->load("commercial");
@@ -52,9 +53,7 @@ if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $s
 if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
 $filter=GETPOST("filter",'',3);
-$filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
-$filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
@@ -94,9 +93,7 @@ if (! $user->rights->agenda->myactions->read) accessforbidden();
 if (! $user->rights->agenda->allactions->read) $canedit=0;
 if (! $user->rights->agenda->allactions->read || $filter=='mine')	// If no permission to see all, we show only affected to me
 {
-	$filtera=$user->id;
 	$filtert=$user->id;
-	$filterd=$user->id;
 }
 
 // Purge search criteria
@@ -133,15 +130,14 @@ if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
  */
 
 $form=new Form($db);
+$userstatic=new User($db);
 
 $nav='';
 $nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
 if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
 if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
-if ($filtera) $nav.='<input type="hidden" name="filtera" value="'.$filtera.'">';
 if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
-if ($filterd) $nav.='<input type="hidden" name="filterd" value="'.$filterd.'">';
 if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
 if ($showbirthday)  $nav.='<input type="hidden" name="showbirthday" value="1">';
 if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
@@ -163,65 +159,57 @@ $param='';
 if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
 if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter) $param.="&filter=".$filter;
-if ($filtera) $param.="&filtera=".$filtera;
 if ($filtert) $param.="&filtert=".$filtert;
-if ($filterd) $param.="&filterd=".$filterd;
 if ($socid) $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid) $param.="&projectid=".$pid;
 if ($type) $param.="&type=".$type;
 if ($usergroup) $param.="&usergroup=".$usergroup;
 
-$sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
-$sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
-$sql.= " a.fk_contact, a.note, a.label, a.percent as percent,";
+$sql = "SELECT";
+if ($usergroup > 0) $sql.=" DISTINCT";
+$sql.= " s.nom as societe, s.rowid as socid, s.client,";
+$sql.= " a.id, a.label, a.datep as dp, a.datep2 as dp2,";
+$sql.= ' a.fk_user_author,a.fk_user_action,';
+$sql.= " a.fk_contact, a.note, a.percent as percent,";
 $sql.= " c.code as type_code, c.libelle as type_label,";
-$sql.= " ua.login as loginauthor, ua.rowid as useridauthor,";
-$sql.= " ut.login as logintodo, ut.rowid as useridtodo,";
-//$sql.= " ud.login as logindone, ud.rowid as useriddone,";
 $sql.= " sp.lastname, sp.firstname";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c,";
-$sql.= " ".MAIN_DB_PREFIX.'user as u,';
-$sql.= " ".MAIN_DB_PREFIX."actioncomm as a";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON a.fk_user_author = ua.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid";
-//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid";
-if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= " WHERE c.id = a.fk_action";
-$sql.= ' AND a.fk_user_author = u.rowid';
 $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 if ($actioncode) $sql.=" AND c.code='".$db->escape($actioncode)."'";
 if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
 if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
-// FIXME: We must filter on assignement table
-if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($type) $sql.= " AND c.id = ".$type;
 if ($status == '0') { $sql.= " AND a.percent = 0"; }
 if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
-// FIXME: We must filter on assignement table
-if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
-    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
-    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
-	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
+    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }
+
 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
 if ($dateselect > 0) $sql.= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect-3600)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'))";
 if ($datestart > 0) $sql.= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart+3600*24-1)."'";
 if ($dateend > 0) $sql.= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend+3600*24-1)."'";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
-
 //print $sql;
 
 dol_syslog("comm/action/listactions.php", LOG_DEBUG);
@@ -246,7 +234,7 @@ if ($resql)
 	$head = calendars_prepare_head($param);
 
     dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-    print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$action,-1,$actioncode,$usergroup);
+    print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,0,$filtert,0,$pid,$socid,$action,-1,$actioncode,$usergroup);
     dol_fiche_end();
 
     // Add link to show birthdays
@@ -275,14 +263,11 @@ if ($resql)
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
-	//print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-	//print_liste_field_titre($langs->trans("ActionUserAsk"),$_SERVER["PHP_SELF"],"ua.login",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder);
-	//print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
 
@@ -375,46 +360,16 @@ if ($resql)
 		}
 		print '</td>';
 
-		// User author
-		/*
-		print '<td align="left">';
-		if ($obj->useridauthor)
-		{
-			$userstatic=new User($db);
-			$userstatic->id=$obj->useridauthor;
-			$userstatic->login=$obj->loginauthor;
-			print $userstatic->getLoginUrl(1);
-		}
-		else print '&nbsp;';
-		print '</td>';
-		*/
-
 		// User to do
 		print '<td align="left">';
-		if ($obj->useridtodo)
+		if ($obj->fk_user_action > 0)
 		{
-			$userstatic=new User($db);
-			$userstatic->id=$obj->useridtodo;
-			$userstatic->login=$obj->logintodo;
+			$userstatic->fetch($obj->fk_user_action);
 			print $userstatic->getLoginUrl(1);
 		}
 		else print '&nbsp;';
 		print '</td>';
 
-		// User did
-		/*
-		print '<td align="left">';
-		if ($obj->useriddone)
-		{
-			$userstatic=new User($db);
-			$userstatic->id=$obj->useriddone;
-			$userstatic->login=$obj->logindone;
-			print $userstatic->getLoginUrl(1);
-		}
-		else print '&nbsp;';
-		print '</td>';
-		*/
-
 		// Status/Percent
 		print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>';
 
@@ -434,6 +389,6 @@ else
 }
 
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 8379960f764..04353190adb 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -39,9 +39,7 @@ if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
 $filter=GETPOST("filter",'',3);
-$filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
-$filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -73,9 +71,7 @@ if (! $user->rights->agenda->myactions->read) accessforbidden();
 if (! $user->rights->agenda->allactions->read) $canedit=0;
 if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
 {
-    $filtera=$user->id;
     $filtert=$user->id;
-    $filterd=$user->id;
 }
 
 //$action=GETPOST('action','alpha');
@@ -130,6 +126,7 @@ if (GETPOST('viewday') || $action == 'show_day')  {
 }                                  // View by day
 
 
+$langs->load("users");
 $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
@@ -198,9 +195,7 @@ $param='';
 if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
 if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter)  $param.="&filter=".$filter;
-if ($filtera) $param.="&filtera=".$filtera;
 if ($filtert) $param.="&filtert=".$filtert;
-if ($filterd) $param.="&filterd=".$filterd;
 if ($usergroup) $param.="&usergroup=".$usergroup;
 if ($socid)   $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
@@ -280,7 +275,7 @@ $paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
 $head = calendars_prepare_head($paramnoaction);
 
 dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup);
+print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup);
 dol_fiche_end();
 
 $showextcals=$listofextcals;
@@ -332,27 +327,29 @@ print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
 // Get event in an array
 $eventarray=array();
 
-$sql = 'SELECT a.id,a.label,';
+$sql = 'SELECT';
+if ($usergroup > 0) $sql.=" DISTINCT";
+$sql.= ' a.id, a.label,';
 $sql.= ' a.datep,';
 $sql.= ' a.datep2,';
-$sql.= ' a.datea,';
-$sql.= ' a.datea2,';
 $sql.= ' a.percent,';
-$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
+$sql.= ' a.fk_user_author,a.fk_user_action,';
 $sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype,';
 $sql.= ' ca.code, ca.color';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 $sql.= ' WHERE a.fk_action = ca.id';
 $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'";
 if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
 if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
-// FIXME: We must filter on assignement table
-if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0) $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
     $sql.= " AND (";
@@ -386,14 +383,12 @@ if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
-// FIXME: We must filter on assignement table
-if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
+// We must filter on assignement table
+if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
-    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
-    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
-	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
+    if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }
 // Sort on date
@@ -809,7 +804,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 {
 	global $db;
 	global $user, $conf, $langs, $hookmanager, $action;
-	global $filter, $filtera, $filtert, $filterd, $status, $actioncode;	// Filters used into search form
+	global $filter, $filtert, $status, $actioncode;	// Filters used into search form
 	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
 	global $cachethirdparties, $cachecontacts, $colorindexused;
 	global $begin_h, $end_h;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 23a17534ccf..80e556378c0 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -70,7 +70,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		print '<tr>';
 		print '<td class="nowrap">';
-		print $langs->trans("ActionsOwnedBy").' &nbsp; ';
+		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td class="nowrap maxwidthonsmartphone">';
 		print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
 		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("Group").' &nbsp; ';
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index ad05f850e16..7dbdb7eb7dc 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -153,6 +153,9 @@ ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_da
 
 ALTER TABLE llx_actioncomm_resources CHANGE COLUMN transparent transparency smallint default 1;
 
+ALTER TABLE llx_actioncomm_resources DROP INDEX idx_actioncomm_resources_idx1;
+ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX uk_actioncomm_resources(fk_actioncomm, element_type, fk_element);
+
 
 -- Localtaxes by thirds
 ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
index caaa0969944..8c7bb4ad237 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
@@ -18,7 +18,7 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element);
+ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX uk_actioncomm_resources(fk_actioncomm, element_type, fk_element);
 ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element);
 
 -- Pas de contrainte sur fk_source et fk_target car pointe sur differentes tables
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 57004f3cb16..86ab911c71b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -362,6 +362,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         $beforeversionarray=explode('.','3.7.9');	// target is before this
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
+       	    migrate_event_assignement($db,$langs,$conf);
+
         	// Reload modules (this must be always and only into last targeted version)
 			$listofmodule=array(
 				    	'MAIN_MODULE_AGENDA',
@@ -391,6 +393,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         $db->commit();
         $db->close();
 
+
         // Actions for all version (not in database)
         migrate_delete_old_files($db,$langs,$conf);
 
@@ -3519,6 +3522,83 @@ function migrate_categorie_association($db,$langs,$conf)
 	print '</td></tr>';
 }
 
+/**
+ * Migrate event assignement to owner
+ *
+ * @param	DoliDB		$db				Database handler
+ * @param	Translate	$langs			Object langs
+ * @param	Conf		$conf			Object conf
+ * @return	void
+ */
+function migrate_event_assignement($db,$langs,$conf)
+{
+	print '<tr><td colspan="4">';
+
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationEvents')."</b><br>\n";
+
+	$error = 0;
+
+	dolibarr_install_syslog("upgrade2::migrate_event_assignement");
+
+	$db->begin();
+
+	$sqlSelect = "SELECT a.id, a.fk_user_action";
+	$sqlSelect.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+	$sqlSelect.= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar ON ar.fk_actioncomm = a.id AND ar.element_type = 'user' AND ar.fk_element = a.fk_user_action";
+	$sqlSelect.= " WHERE fk_user_action > 0 AND fk_user_action NOT IN (SELECT fk_element FROM ".MAIN_DB_PREFIX."actioncomm_resources as ar WHERE ar.fk_actioncomm = a.id AND ar.element_type = 'user')";
+	$sqlSelect.= " ORDER BY a.id";
+	//print $sqlSelect;
+
+	$resql = $db->query($sqlSelect);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
+
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+
+				$sqlUpdate = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element) ";
+				$sqlUpdate.= "VALUES(".$obj->id.", 'user', ".$obj->fk_user_action.")";
+
+				$result=$db->query($sqlUpdate);
+				if (! $result)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				print ". ";
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+		$db->rollback();
+	}
+
+
+	print '</td></tr>';
+}
+
 /**
  * Migration directory
  *
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 20abe7b9c70..c296bd788e8 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -206,6 +206,7 @@ MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
+MigrationEvents=Migration of events to add event owner into assignement table
 
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
\ No newline at end of file

From ccfbd3614e6bdfe07999e3a66e5d3a92725e190d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 02:09:28 +0100
Subject: [PATCH 330/345] Not nice looking

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

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1a936db37fb..72e249ce542 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1754,7 +1754,8 @@ else
         print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'" class="nowrap">';
     	if (! empty($object->country_code))
     	{
-           	$img=picto_from_langcode($object->country_code);
+           	//$img=picto_from_langcode($object->country_code);
+           	$img='';
            	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
            	else print ($img?$img.' ':'').$object->country;
     	}

From 4d67e6f4d41611b3ceb2d3f73cce6aff9e1bd59d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 02:11:22 +0100
Subject: [PATCH 331/345] Add ignore

---
 htdocs/custom/.gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 htdocs/custom/.gitignore

diff --git a/htdocs/custom/.gitignore b/htdocs/custom/.gitignore
new file mode 100644
index 00000000000..ed069fdfd81
--- /dev/null
+++ b/htdocs/custom/.gitignore
@@ -0,0 +1,4 @@
+/a*
+/b*
+/c*
+/d*

From 362167f31974f2367faa4989ba896e6fd956ea33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 02:32:15 +0100
Subject: [PATCH 332/345] Fixed: Export was not using user assigned

---
 htdocs/admin/agenda_xcal.php                  |  2 +-
 htdocs/comm/action/class/actioncomm.class.php | 32 ++++++-------------
 htdocs/langs/en_US/agenda.lang                |  2 +-
 htdocs/public/agenda/agendaexport.php         |  4 +--
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 40454ed1302..fd8c3092c0d 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -171,7 +171,7 @@ $message.='<br>';
 print $message;
 
 $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
-$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
+//$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bf668be6daa..9a750daa015 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -976,7 +976,7 @@ class ActionComm extends CommonObject
             $sql.= " a.label, a.code, a.note, a.fk_action as type_id,";
             $sql.= " a.fk_soc,";
             $sql.= " a.fk_user_author, a.fk_user_mod,";
-            $sql.= " a.fk_user_action, a.fk_user_done,";
+            $sql.= " a.fk_user_action,";
             $sql.= " a.fk_contact, a.percent as percentage,";
             $sql.= " a.fk_element, a.elementtype,";
             $sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
@@ -984,9 +984,11 @@ class ActionComm extends CommonObject
             $sql.= " s.nom as socname,";
             $sql.= " c.id as type_id, c.code as type_code, c.libelle";
             $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";	// Link to get author of event for export
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
-            $sql.= " WHERE a.fk_action=c.id";
+			// We must filter on assignement table
+			if ($filters['logint'] || $filters['login']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			$sql.= " WHERE a.fk_action=c.id";
             $sql.= " AND a.entity = ".$conf->entity;
             foreach ($filters as $key => $value)
             {
@@ -996,17 +998,8 @@ class ActionComm extends CommonObject
                 if ($key == 'idfrom')       $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
                 if ($key == 'idto')         $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
                 if ($key == 'project')      $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
-                if ($key == 'login')
-                {
-                    $login=$value;
-                    $userforfilter=new User($this->db);
-                    $result=$userforfilter->fetch('',$value);
-                    $sql.= " AND (";
-                    $sql.= " a.fk_user_author = ".$userforfilter->id;
-                    $sql.= " OR a.fk_user_action = ".$userforfilter->id;
-                    $sql.= " OR a.fk_user_done = ".$userforfilter->id;
-                    $sql.= ")";
-                }
+    	        // We must filter on assignement table
+				if ($key == 'logint' || $key == 'login') $sql.= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
                 if ($key == 'logina')
                 {
                     $logina=$value;
@@ -1014,19 +1007,12 @@ class ActionComm extends CommonObject
                     $result=$userforfilter->fetch('',$value);
                     $sql.= " AND a.fk_user_author = ".$userforfilter->id;
                 }
-                if ($key == 'logint')
+                if ($key == 'logint' || $key == 'login')
                 {
                     $logint=$value;
                     $userforfilter=new User($this->db);
                     $result=$userforfilter->fetch('',$value);
-                    $sql.= " AND a.fk_user_action = ".$userforfilter->id;
-                }
-                if ($key == 'logind')
-                {
-                    $logind=$value;
-                    $userforfilter=new User($this->db);
-                    $result=$userforfilter->fetch('',$value);
-                    $sql.= " AND a.fk_user_done = ".$userforfilter->id;
+                    $sql.= " AND ar.fk_element = ".$userforfilter->id;
                 }
             }
             $sql.= " AND a.datep IS NOT NULL";		// To exclude corrupted events and avoid errors in lightning/sunbird import
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 1cc01ec2e7b..9ed2d79edd2 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -68,7 +68,7 @@ DateActionDoneEnd= Real end date
 DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
+AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index c36766e2777..2b1d02ef493 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -69,7 +69,6 @@ if (! empty($_GET["project"]))  $filters['project']=$_GET["project"];
 if (! empty($_GET["login"]))    $filters['login']=$_GET["login"];
 if (! empty($_GET["logina"]))   $filters['logina']=$_GET["logina"];
 if (! empty($_GET["logint"]))   $filters['logint']=$_GET["logint"];
-if (! empty($_GET["logind"]))   $filters['logind']=$_GET["logind"];
 // Not older than
 if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;
 $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
@@ -111,8 +110,7 @@ foreach ($filters as $key => $value)
     if ($key == 'project')         $filename.='-project'.$value;
     if ($key == 'login')	       $filename.='-login'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
-	if ($key == 'logind')	       $filename.='-logind'.$value;	// Affected to
-	if ($key == 'logint')	       $filename.='-logint'.$value;	// Done by
+	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }
 // Add extension
 if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }

From d16ce7eb96a8461a1eb5d251d09136085e3607e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 02:42:41 +0100
Subject: [PATCH 333/345] Fix: Bad var

---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 test/phpunit/NumberingModulesTest.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9a750daa015..dd7819f7dbb 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -142,7 +142,7 @@ class ActionComm extends CommonObject
         $userdoneid=$this->userdoneid;
 
         // Be sure assigned user array is not empty.
-        if (count($this->userassigned) == 0) $this->userassigned = array('id'=>$this->$userownerid);
+        if (count($this->userassigned) == 0) $this->userassigned = array('id'=>$userownerid);
 
         if (! $this->type_id || ! $this->type_code)
         {
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 48d26216268..891bc5495cf 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -165,7 +165,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(1, $result);						// Can be deleted
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertEquals(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent
+		$this->assertEquals(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent)
 
 		// Now we try with a reset
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
@@ -552,7 +552,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 
     	$localobject=new Facture($this->savdb);
     	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1980 to be sure to not have existing invoice for this year
+    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
     	$numbering=new mod_facture_mercure();
     	$result=$numbering->getNextValue($tmpthirdparty, $localobject);
     	$result2=$localobject->create($user,1);

From c5a3b4481e382ac2042a4a0d01c27b56f7921fc4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 03:11:06 +0100
Subject: [PATCH 334/345] Fixed: use object

---
 htdocs/societe/agenda.php | 53 ++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 8d731875442..a6ba3d7b1cf 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -59,9 +59,6 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-/*
- * Fiche categorie de client et/ou fournisseur
- */
 if ($socid)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -70,79 +67,79 @@ if ($socid)
 	$langs->load("companies");
 
 
-	$soc = new Societe($db);
-	$result = $soc->fetch($socid);
+	$object = new Societe($db);
+	$result = $object->fetch($socid);
 	llxHeader("",$langs->trans("Agenda"),'');
 
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($soc);
+	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'agenda', $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>';
 
     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 ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		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 ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		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 valign=\"top\">".$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->phone,$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->phone,$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>';
 
@@ -171,7 +168,7 @@ if ($socid)
 
     print '<br>';
 
-    $objthirdparty=$soc;
+    $objthirdparty=$object;
     $objcon=new stdClass();
 
     $out='';
@@ -189,10 +186,10 @@ if ($socid)
     print load_fiche_titre($langs->trans("ActionsOnCompany"),$out,'');
 
     // List of todo actions
-    show_actions_todo($conf,$langs,$db,$soc);
+    show_actions_todo($conf,$langs,$db,$object);
 
     // List of done actions
-    show_actions_done($conf,$langs,$db,$soc);
+    show_actions_done($conf,$langs,$db,$object);
 }
 
 

From e20c1decdf30886e4c36654ddd3175a92ea1bebc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Jan 2015 03:51:47 +0100
Subject: [PATCH 335/345] Fixed: object instead of soc and vis versa.

---
 htdocs/categories/categorie.php   |  2 +-
 htdocs/core/lib/functions.lib.php |  1 +
 htdocs/societe/info.php           | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index e9e11b656b9..a77751fcb29 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -278,7 +278,7 @@ if ($socid)
 
 	// Address
 	print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
-    print dol_print_address($soc->address,'gmap','thirdparty',$object->id);
+    print dol_print_address($soc->address,'gmap','thirdparty',$soc->id);
     print '</td></tr>';
 
 	// Zip / Town
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3ec602c9d2b..cdb7e2b4d78 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4574,6 +4574,7 @@ function dol_eval($s,$returnvalue=0)
 	global $leftmenu;
 	global $rights;
 	global $object;
+    global $soc;
 
 	//print $s."<br>\n";
 	if ($returnvalue) return @eval('return '.$s.';');
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index 305936e6f56..9d06d203d9c 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -59,21 +59,21 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$langs->trans("ThirdParty"),$help_url);
 
-$soc = new Societe($db);
-$soc->fetch($socid);
-$soc->info($socid);
+$object = new Societe($db);
+$object->fetch($socid);
+$object->info($socid);
 
 /*
  * Affichage onglets
  */
-$head = societe_prepare_head($soc);
+$head = societe_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company');
 
 
 
 print '<table width="100%"><tr><td>';
-dol_print_object_info($soc);
+dol_print_object_info($object);
 print '</td></tr></table>';
 
 

From f03ffaf5a3fe2892daba5d637b65f9a54e23ead6 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 15 Jan 2015 10:00:52 +0100
Subject: [PATCH 336/345] Fix: withdrawal create error if in the same month are
 deleted previus withdrawals.

Conflicts:
	ChangeLog
---
 ChangeLog                                                | 2 ++
 htdocs/compta/prelevement/class/bonprelevement.class.php | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3b8e1193ab..1e87b51ca43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -172,6 +172,8 @@ Dolibarr better:
 
 ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
 - Fix: ref_ext was not saved when recording a customer order from web service
+- Fix: amarok is a bugged theme making dolidroid failed. We swith to eldy automatically with dolidroid.
+- Fix: withdrawal create error if in the same month are deleted previus withdrawals.
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 497d690072b..d044e32e078 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014 		Ferran Marcet       <fmarcet@2byte.es>
  *
@@ -895,10 +895,11 @@ class BonPrelevement extends CommonObject
             {
                 $ref = "T".substr($year,-2).$month;
 
-                $sql = "SELECT count(*)";
+                $sql = "SELECT CAST(RIGHT(ref,2) AS SIGNED INTEGER)";
                 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
                 $sql.= " WHERE ref LIKE '".$ref."%'";
                 $sql.= " AND entity = ".$conf->entity;
+                $sql.= " ORDER BY ref DESC LIMIT 1";
 
                 dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                 $resql = $this->db->query($sql);

From 1930d0677e9207fc7322217af644ba09ca2f835e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 15 Jan 2015 10:00:52 +0100
Subject: [PATCH 337/345] Fix: withdrawal create error if in the same month are
 deleted previus withdrawals.

Conflicts:
	ChangeLog
---
 ChangeLog                                                | 2 ++
 htdocs/compta/prelevement/class/bonprelevement.class.php | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e61b274398..6485000c375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -189,6 +189,8 @@ Dolibarr better:
 
 ***** ChangeLog for 3.6.3 compared to 3.6.2 *****
 - Fix: ref_ext was not saved when recording a customer order from web service
+- Fix: amarok is a bugged theme making dolidroid failed. We swith to eldy automatically with dolidroid.
+- Fix: withdrawal create error if in the same month are deleted previus withdrawals.
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index d88bc8da8ac..457209c5e76 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014 		Ferran Marcet       <fmarcet@2byte.es>
  *
@@ -895,10 +895,11 @@ class BonPrelevement extends CommonObject
             {
                 $ref = "T".substr($year,-2).$month;
 
-                $sql = "SELECT count(*)";
+                $sql = "SELECT CAST(RIGHT(ref,2) AS SIGNED INTEGER)";
                 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
                 $sql.= " WHERE ref LIKE '".$ref."%'";
                 $sql.= " AND entity = ".$conf->entity;
+                $sql.= " ORDER BY ref DESC LIMIT 1";
 
                 dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                 $resql = $this->db->query($sql);

From eb90e0124e32e56769a1442f021eaa16ffadcba7 Mon Sep 17 00:00:00 2001
From: Vincent Robert <vincent.robert@cantor.fr>
Date: Tue, 30 Dec 2014 12:05:55 +0100
Subject: [PATCH 338/345] Add support for configurable first day of week

- Force loading of database configuration to retrieve the first day of week
- Order the day titles based on first day of week
- Change layout based on first day of week

Conflicts:
	htdocs/core/datepicker.php
---
 htdocs/core/datepicker.php | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 7c5c4898fce..9c584c2ef6e 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -27,7 +27,7 @@
  */
 
 if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 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);
@@ -186,27 +186,13 @@ function displayBox($selectedDate,$month,$year)
 	</tr>
 	<tr class="dpDayNames">
 	<?php
-	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
-	if($startday==1)
-	{?>
-		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
-		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
-		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>     
-	<?php
-	}else {?>	
-		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
-		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
-		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
-		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
-		<?php
-	}?>
+	$first_day_of_week = isset($conf->global->MAIN_START_WEEK) ? (int) $conf->global->MAIN_START_WEEK : 0;
+	$day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
+	for( $i=0; $i < 7; $i++ )
+	{
+		echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $first_day_of_week) % 7]), '</td>', "\n";
+	}
+	?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";
@@ -222,7 +208,7 @@ function displayBox($selectedDate,$month,$year)
 		{
 			echo "<TR class=\"dpWeek\">";
 			$cols=0;
-			for($i=0;$i< $mydate["wday"];$i++)
+			for($i=0;$i< ($mydate["wday"]+7-$first_day_of_week)%7;$i++)
 			{
 				echo "<TD>&nbsp;</TD>";
 				$cols++;
@@ -230,7 +216,7 @@ function displayBox($selectedDate,$month,$year)
 		}
 		else
 		{
-			if ($mydate["wday"]==0)
+			if ($mydate["wday"]==$first_day_of_week)
 			{
 				echo "<TR class=\"dpWeek\">";
 				$cols=0;
@@ -254,7 +240,7 @@ function displayBox($selectedDate,$month,$year)
 		echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
 		$cols++;
 
-		if ($mydate["wday"]==6) echo "</TR>\n";
+		if ($mydate != $firstdate && $mydate["wday"]==(($first_day_of_week + 6)%7)) echo "</TR>\n";
 
 		//$thedate=strtotime("tomorrow",$thedate);
 		$day++;

From 93d3ffb06fdeb1170ccba075ee3225d23ee2d9f0 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 16 Jan 2015 17:59:58 +0100
Subject: [PATCH 339/345] Fix: PostgreSQL compatibilty

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
---
 .../class/bonprelevement.class.php            | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 457209c5e76..724c2dc9a64 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -893,31 +893,31 @@ class BonPrelevement extends CommonObject
              */
             if (!$error)
             {
-                $ref = "T".substr($year,-2).$month;
+				$ref = substr($year,-2).$month;
+				
+				$sql = "SELECT substring(ref from char_length(ref) - 1)";
+				$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
+				$sql.= " WHERE ref LIKE '%".$ref."%'";
+				$sql.= " AND entity = ".$conf->entity;
+				$sql.= " ORDER BY ref DESC LIMIT 1";
+				
+				dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+				$resql = $this->db->query($sql);
 
-                $sql = "SELECT CAST(RIGHT(ref,2) AS SIGNED INTEGER)";
-                $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
-                $sql.= " WHERE ref LIKE '".$ref."%'";
-                $sql.= " AND entity = ".$conf->entity;
-                $sql.= " ORDER BY ref DESC LIMIT 1";
+				if ($resql)
+				{
+					$row = $this->db->fetch_row($resql);
+				}
+				else
+				{
+					$error++;
+					dol_syslog("Erreur recherche reference");
+				}
 
-                dol_syslog(get_class($this)."::Create", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-
-                if ($resql)
-                {
-                    $row = $this->db->fetch_row($resql);
-                }
-                else
-                {
-                    $error++;
-                    dol_syslog("Erreur recherche reference");
-                }
-
-                $ref = $ref . substr("00".($row[0]+1), -2);
-
-                $filebonprev = $ref;
+				$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT);
 
+				$filebonprev = $ref;
+                
                 // Create withdraw receipt in database
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
                 $sql.= " ref, entity, datec";

From 26e5efd71db015fe31fc934f47ecb8ab7c8d55c3 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 16 Jan 2015 23:09:13 +0100
Subject: [PATCH 340/345] Improve code create function

---
 .../class/bonprelevement.class.php            | 109 +++++++++---------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 724c2dc9a64..9188d573924 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -736,8 +736,8 @@ class BonPrelevement extends CommonObject
     function Create($banque=0, $agence=0, $mode='real')
     {
         global $conf,$langs;
-
-        dol_syslog(get_class($this)."::Create banque=$banque agence=$agence");
+        
+        dol_syslog(__METHOD__."::Bank=".$banque." Office=".$agence, LOG_DEBUG);
 
         require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
         require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
@@ -781,7 +781,8 @@ class BonPrelevement extends CommonObject
             //if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
             //if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
 
-            dol_syslog(get_class($this)."::Create", LOG_DEBUG);
+            dol_syslog(__METHOD__."::Read invoices, sql=".$sql, LOG_DEBUG);
+            
             $resql = $this->db->query($sql);
             if ($resql)
             {
@@ -795,13 +796,12 @@ class BonPrelevement extends CommonObject
                     $i++;
                 }
                 $this->db->free($resql);
-                dol_syslog($i." invoices to withdraw");
+                dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
             }
             else
             {
-                $error = 1;
-                dol_syslog("Erreur -1");
-                dol_syslog($this->db->error());
+                $error++;
+                dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
             }
         }
 
@@ -812,7 +812,7 @@ class BonPrelevement extends CommonObject
 
         	// Check RIB
             $i = 0;
-            dol_syslog("Start RIB check");
+            dol_syslog(__METHOD__."::Check RIB", LOG_DEBUG);
 
             if (count($factures) > 0)
             {
@@ -836,24 +836,24 @@ class BonPrelevement extends CommonObject
                             }
                             else
 							{
-								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
+								dol_syslog(__METHOD__."::Check RIB Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
                                 $this->invoice_in_error[$fac[0]]="Error on default bank number RIB/IBAN for invoice ".$fact->getNomUrl(0)." for thirdparty (reported by function verif) ".$soc->name;
                             }
                         }
                         else
 						{
-                            dol_syslog("Failed to read company", LOG_ERR);
+                            dol_syslog(__METHOD__."::Check RIB Failed to read company", LOG_ERR);
                         }
                     }
                     else
 					{
-                        dol_syslog("Failed to read invoice", LOG_ERR);
+                        dol_syslog(__METHOD__."::Check RIB Failed to read invoice", LOG_ERR);
                     }
                 }
             }
             else
 			{
-                dol_syslog("No invoice to process");
+                dol_syslog(__METHOD__."::Check RIB No invoice to process", LOG_ERR);
             }
         }
 
@@ -902,50 +902,52 @@ class BonPrelevement extends CommonObject
 				$sql.= " ORDER BY ref DESC LIMIT 1";
 				
 				dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+				dol_syslog(__METHOD__."::Treatments", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
 				if ($resql)
 				{
 					$row = $this->db->fetch_row($resql);
+					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT);
+	
+					$filebonprev = $ref;
+	                
+	                // Create withdraw receipt in database
+	                $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
+	                $sql.= " ref, entity, datec";
+	                $sql.= ") VALUES (";
+	                $sql.= "'".$this->db->escape($ref)."'";
+	                $sql.= ", ".$conf->entity;
+	                $sql.= ", '".$this->db->idate($now)."'";
+	                $sql.= ")";
+	
+	                dol_syslog(__METHOD__, LOG_DEBUG);
+	                $resql = $this->db->query($sql);
+	
+	                if ($resql)
+	                {
+	                    $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
+	
+	                    $dir=$conf->prelevement->dir_output.'/receipts';
+	                    $file=$filebonprev;
+	                    if (! is_dir($dir)) dol_mkdir($dir);
+	
+	                    $bonprev = new BonPrelevement($this->db, $dir."/".$file);
+	                    $bonprev->id = $prev_id;
+	                }
+	                else
+	                {
+	                    $error++;
+	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->error(), LOG_ERR);
+	                }
 				}
 				else
 				{
 					$error++;
-					dol_syslog("Erreur recherche reference");
+					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->error(), LOG_ERR);
 				}
 
-				$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT);
-
-				$filebonprev = $ref;
-                
-                // Create withdraw receipt in database
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
-                $sql.= " ref, entity, datec";
-                $sql.= ") VALUES (";
-                $sql.= "'".$this->db->escape($ref)."'";
-                $sql.= ", ".$conf->entity;
-                $sql.= ", '".$this->db->idate($now)."'";
-                $sql.= ")";
-
-                dol_syslog(get_class($this)."::Create", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-
-                if ($resql)
-                {
-                    $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
-
-                    $dir=$conf->prelevement->dir_output.'/receipts';
-                    $file=$filebonprev;
-                    if (! is_dir($dir)) dol_mkdir($dir);
-
-                    $bonprev = new BonPrelevement($this->db, $dir."/".$file);
-                    $bonprev->id = $prev_id;
-                }
-                else
-                {
-                    $error++;
-                    dol_syslog("Erreur creation du bon de prelevement");
-                }
+				
             }
 
             /*
@@ -988,13 +990,12 @@ class BonPrelevement extends CommonObject
                         $sql.= ", fk_prelevement_bons = ".$prev_id;
                         $sql.= " WHERE rowid = ".$fac[1];
 
-                        dol_syslog(get_class($this)."::Create", LOG_DEBUG);
+                        dol_syslog(__METHOD__."::Update Orders::Sql=".$sql, LOG_DEBUG);
                         $resql=$this->db->query($sql);
                         if (! $resql)
                         {
                             $error++;
-                            dol_syslog("Erreur mise a jour des demandes");
-                            dol_syslog($this->db->error());
+                            dol_syslog(__METHOD__."::Update Orders::Error=".$this->db->error() ,LOG_ERR);
                         }
 
                     }
@@ -1009,8 +1010,8 @@ class BonPrelevement extends CommonObject
                  * Withdraw receipt
                  */
 
-                dol_syslog("Debut prelevement - Nombre de factures ".count($factures_prev));
-
+            	dol_syslog(__METHOD__."::Init withdraw receipt for ".count($factures_prev)." invoices", LOG_DEBUG);
+              
                 if (count($factures_prev) > 0)
                 {
                     $bonprev->date_echeance = $datetimeprev;
@@ -1032,8 +1033,7 @@ class BonPrelevement extends CommonObject
                     //Build file
                     $bonprev->generate();
                 }
-                dol_syslog($filebonprev);
-                dol_syslog("Fin prelevement");
+                dol_syslog(__METHOD__."::End withdraw receipt, file ".$filebonprev, LOG_DEBUG);
             }
 
             /*
@@ -1045,12 +1045,14 @@ class BonPrelevement extends CommonObject
             $sql.= " WHERE rowid = ".$prev_id;
             $sql.= " AND entity = ".$conf->entity;
 
-            dol_syslog(get_class($this)."::Create", LOG_DEBUG);
+            dol_syslog(__METHOD__."::Update total, sql=".$sql, LOG_DEBUG);
+            
             $resql=$this->db->query($sql);
             if (! $resql)
             {
                 $error++;
                 dol_syslog("Erreur mise a jour du total - $sql");
+                dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
             }
 
             /*
@@ -1063,7 +1065,6 @@ class BonPrelevement extends CommonObject
             else
             {
                 $this->db->rollback();
-                dol_syslog("Error",LOG_ERR);
             }
 
             return count($factures_prev);

From a7d263c14e6c9aaa5afa7c37300181a37f88bcfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 16 Jan 2015 23:34:10 +0100
Subject: [PATCH 341/345] Typo

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 9188d573924..e4fa1e05d29 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -995,7 +995,7 @@ class BonPrelevement extends CommonObject
                         if (! $resql)
                         {
                             $error++;
-                            dol_syslog(__METHOD__."::Update Orders::Error=".$this->db->error() ,LOG_ERR);
+                            dol_syslog(__METHOD__."::Update Orders::Error=".$this->db->error(), LOG_ERR);
                         }
 
                     }

From 8cd46e483088cd72fd35225d2c8028e0075469fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Jan 2015 14:34:16 +0100
Subject: [PATCH 342/345] Introduce option MAIN_HTML_TITLE to start to control
 format of html title content.

---
 ChangeLog                                |  1 +
 htdocs/comm/card.php                     | 41 ++++++++++++------------
 htdocs/core/class/commonobject.class.php |  1 -
 htdocs/fourn/card.php                    | 18 ++++++++---
 htdocs/main.inc.php                      |  3 +-
 htdocs/societe/soc.php                   | 28 +++++++---------
 6 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e61b274398..37b693f2ab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ For users:
 - Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
 - Add Weighted average price as default price for buying price for margin calculation. Add option 
   MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.
+- Introduce option MAIN_HTML_TITLE to start to control format of html title content.
 
 For translators:
 - Update language files.
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 5b64c834401..ecb171c6570 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -85,7 +85,7 @@ $cancelbutton = GETPOST('cancel');
 
 if ($action == 'setcustomeraccountancycode')
 {
-	if (! $cancelbutton) 
+	if (! $cancelbutton)
 	{
 		$result=$object->fetch($id);
 		$object->code_compta=$_POST["customeraccountancycode"];
@@ -105,6 +105,7 @@ if ($action == 'setconditions' && $user->rights->societe->creer)
 	$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
 	if ($result < 0) dol_print_error($db,$object->error);
 }
+
 // mode de reglement
 if ($action == 'setmode' && $user->rights->societe->creer)
 {
@@ -112,16 +113,14 @@ if ($action == 'setmode' && $user->rights->societe->creer)
 	$result=$object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
 	if ($result < 0) dol_print_error($db,$object->error);
 }
+
 // assujetissement a la TVA
 if ($action == 'setassujtva' && $user->rights->societe->creer)
 {
 	$object->fetch($id);
 	$object->tva_assuj=$_POST['assujtva_value'];
-
-	// TODO move to DAO class
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET tva_assuj='".$_POST['assujtva_value']."' WHERE rowid='".$id."'";
-	$result = $db->query($sql);
-	if (! $result) dol_print_error($result);
+	$result=$object->update($object->id);
+	if ($result < 0) dol_print_error($db,$object->error);
 }
 
 // set prospect level
@@ -133,7 +132,7 @@ if ($action == 'setprospectlevel' && $user->rights->societe->creer)
 	if ($result < 0) setEventMessage($object->error,'errors');
 }
 
-// Update communication level
+// update prospect level
 if ($action == 'cstc')
 {
 	$object->fetch($id);
@@ -142,10 +141,10 @@ if ($action == 'cstc')
 	if ($result < 0) setEventMessage($object->error,'errors');
 }
 
-// Update communication level
+// update outstandng limit
 if ($action == 'setOutstandingBill')
 {
-	if (!$cancelbutton) 
+	if (!$cancelbutton)
 	{
 		$object->fetch($id);
 		$object->outstanding_limit=GETPOST('OutstandingBill');
@@ -159,14 +158,24 @@ if ($action == 'setOutstandingBill')
  * View
  */
 
-llxHeader('',$langs->trans('CustomerCard'));
-
-
 $contactstatic = new Contact($db);
 $userstatic=new User($db);
 $form = new Form($db);
 $formcompany=new FormCompany($db);
 
+if ($id > 0 && empty($object->id))
+{
+	// Load data of third party
+	$res=$object->fetch($id);
+	if ($object->id <= 0) dol_print_error($db,$object->error);
+}
+
+$title=$langs->trans("CustomerCard");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name;
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
+
 
 if ($mode == 'search')
 {
@@ -196,14 +205,6 @@ if ($mode == 'search')
 
 if ($id > 0)
 {
-	// Load data of third party
-	$object->fetch($id);
-	if ($object->id <= 0)
-	{
-		dol_print_error($db,$object->error);
-	}
-
-
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company');
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 183fed325be..c2718cf504c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2191,7 +2191,6 @@ abstract class CommonObject
             $obj = $this->db->fetch_object($resql);
             if ($obj)
             {
-                $this->id       = $obj->rowid;
                 $this->canvas   = $obj->canvas;
                 return 1;
             }
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 8511a3e1a48..0447bd0a758 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -63,7 +63,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if ($action == 'setsupplieraccountancycode')
 {
 	$cancelbutton = GETPOST('cancel');
-	if (! $cancelbutton) 
+	if (! $cancelbutton)
 	{
 		$result=$object->fetch($id);
    		$object->code_compta_fournisseur=$_POST["supplieraccountancycode"];
@@ -98,12 +98,22 @@ if ($action == 'setmode' && $user->rights->societe->creer)
 $contactstatic = new Contact($db);
 $form = new Form($db);
 
-if ($object->fetch($id))
+if ($id > 0 && empty($object->id))
 {
-	llxHeader('',$langs->trans('SupplierCard'));
+	// Load data of third party
+	$res=$object->fetch($id);
+	if ($object->id <= 0) dol_print_error($db,$object->error);
+}
+
+if ($object->id > 0)
+{
+	$title=$langs->trans("SupplierCard");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name;
+	$help_url='';
+	llxHeader('',$title, $help_url);
 
 	/*
-	 * Affichage onglets
+	 * Show tabs
 	 */
 	$head = societe_prepare_head($object);
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b805e098706..48f788c96fa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -976,7 +976,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         // Displays meta
         print '<meta name="robots" content="noindex,nofollow">'."\n";      // Evite indexation par robots
         print '<meta name="author" content="Dolibarr Development Team">'."\n";
-		if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";	// Needed for Responsive Web Design
+		if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";	// Needed for Responsive Web Design
         $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
         if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
         print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
@@ -988,6 +988,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         $appli='Dolibarr';
         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>';
         if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
         else print "<title>".dol_htmlentities($appli)."</title>";
         print "\n";
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 656e88ec83c..67757376569 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -106,7 +106,6 @@ if (empty($reshook))
     {
     	//obtidre selected del combobox
     	$value=GETPOST('lt1');
-    	$object = new Societe($db);
     	$object->fetch($socid);
     	$res=$object->setValueFrom('localtax1_value', $value);
     }
@@ -114,7 +113,6 @@ if (empty($reshook))
     {
     	//obtidre selected del combobox
     	$value=GETPOST('lt2');
-    	$object = new Societe($db);
     	$object->fetch($socid);
     	$res=$object->setValueFrom('localtax2_value', $value);
     }
@@ -583,14 +581,22 @@ if (empty($reshook))
  *  View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
-
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
 
+if ($socid > 0 && empty($object->id))
+{
+    $res=$object->fetch($socid);
+	if ($result <= 0) dol_print_error('',$object->error);
+}
+
+$title=$langs->trans("ThirdParty");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name;
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
@@ -598,12 +604,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
     // -----------------------------------------
     // When used with CANVAS
     // -----------------------------------------
-    if (empty($object->error) && $socid)
- 	{
-	     $object = new Societe($db);
-	     $result=$object->fetch($socid);
-	     if ($result <= 0) dol_print_error('',$object->error);
- 	}
    	$objcanvas->assign_values($action, $object->id, $object->ref);	// Set value for templates
     $objcanvas->display_canvas($action);							// Show template
 }
@@ -1111,9 +1111,6 @@ else
 
         if ($socid)
         {
-            $object = new Societe($db);
-            $res=$object->fetch($socid);
-            if ($res < 0) { dol_print_error($db,$object->error); exit; }
             $res=$object->fetch_optionals($object->id,$extralabels);
             //if ($res < 0) { dol_print_error($db); exit; }
 
@@ -1624,9 +1621,6 @@ else
         /*
          * View
          */
-        $object = new Societe($db);
-        $res=$object->fetch($socid);
-        if ($res < 0) { dol_print_error($db,$object->error); exit; }
         $res=$object->fetch_optionals($object->id,$extralabels);
         //if ($res < 0) { dol_print_error($db); exit; }
 

From 2396f03093171f06342abd1e3825c3b3cf259d77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jan 2015 11:21:43 +0100
Subject: [PATCH 343/345] Add PHP 5.6 into travis tests

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

diff --git a/.travis.yml b/.travis.yml
index 98ebd9ceea3..f65d575f924 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ php:
  - "5.3"
  - "5.4"
  - "5.5" 
+ - "5.6"
 
 env:
  - DB=mysql

From 1681e3b03d8cbe064d33115d2a1b128860790574 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jan 2015 11:36:15 +0100
Subject: [PATCH 344/345] Fix: Not allowed types
 (http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)

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

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 02265ff86c8..cea731b9dc9 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
@@ -32,8 +32,8 @@ ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAUL
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1);
 
 -- Add situation invoices
-ALTER TABLE llx_facture ADD situation_cycle_ref smallint UNSIGNED;
-ALTER TABLE llx_facture ADD situation_counter tinyint UNSIGNED;
-ALTER TABLE llx_facture ADD situation_final boolean;
+ALTER TABLE llx_facture ADD situation_cycle_ref integer;
+ALTER TABLE llx_facture ADD situation_counter integer;
+ALTER TABLE llx_facture ADD situation_final integer;
 ALTER TABLE llx_facturedet ADD situation_percent real;
 ALTER TABLE llx_facturedet ADD fk_prev_id integer;

From b53b8d2e45ab6d532705a5c4c46d27d3271c24f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Jan 2015 11:48:52 +0100
Subject: [PATCH 345/345] Fixed: Backward compatibility

---
 htdocs/comm/action/class/actioncomm.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fb7195fdd68..b58123578dd 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -138,6 +138,13 @@ class ActionComm extends CommonObject
         if ($this->elementtype=='commande') $this->elementtype='order';
         if ($this->elementtype=='contrat')  $this->elementtype='contract';
 
+        if (! is_array($this->userassigned))	// For backward compatibility
+        {
+        	$tmpid=$this->userassigned;
+        	$this->userassigned=array();
+        	$this->userassigned[$tmpid]=array('id'=>$tmpid);
+        }
+
         $userownerid=$this->userownerid;
         $userdoneid=$this->userdoneid;